From: Tim Kientzle <kientzle@gmail.com>
Date: Sun, 25 May 2008 11:43:31 +0000 (-0400)
Subject: 2.5.4b
X-Git-Tag: v2.6.0~198
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d22c278e53e20b6a4b2a0ff7e5edc362c46f9d2;p=thirdparty%2Flibarchive.git

2.5.4b

SVN-Revision: 94
---

diff --git a/NEWS b/NEWS
index 7a3bdfa22..b7e578e29 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+
+May 25, 2008: libarchive 2.5.4b released
 May 21, 2008: Joerg Sonnenberger: fix bsdtar hardlink handling for newc format
 
 May 21, 2008: More progress on Windows building.  Thanks to "Scott"
diff --git a/configure.ac b/configure.ac
index 9fb719b81..405490bd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,8 @@ dnl First, define all of the version numbers up front.
 dnl In particular, this allows the version macro to be used in AC_INIT
 
 dnl These first two version numbers are updated automatically on each release.
-m4_define([LIBARCHIVE_VERSION_S],[2.5.3b])
-m4_define([LIBARCHIVE_VERSION_N],[2005003])
+m4_define([LIBARCHIVE_VERSION_S],[2.5.4b])
+m4_define([LIBARCHIVE_VERSION_N],[2005004])
 
 dnl bsdtar versioning tracks libarchive
 m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S())
diff --git a/libarchive/archive.h b/libarchive/archive.h
index 0465cff1c..6bfe81eb2 100644
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -112,13 +112,13 @@ extern "C" {
  *             (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000)
  * #endif
  */
-#define	ARCHIVE_VERSION_NUMBER 2005003
+#define	ARCHIVE_VERSION_NUMBER 2005004
 __LA_DECL int		archive_version_number(void);
 
 /*
  * Textual name/version of the library, useful for version displays.
  */
-#define	ARCHIVE_VERSION_STRING "libarchive 2.5.3b"
+#define	ARCHIVE_VERSION_STRING "libarchive 2.5.4b"
 __LA_DECL const char *	archive_version_string(void);
 
 #if ARCHIVE_VERSION_NUMBER < 3000000
diff --git a/tar/Makefile b/tar/Makefile
index 57888f269..a3e4630af 100644
--- a/tar/Makefile
+++ b/tar/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD: src/usr.bin/tar/Makefile,v 1.35 2008/05/18 06:24:47 cperciva Exp $
 
 PROG=	bsdtar
-BSDTAR_VERSION_STRING=2.5.3b
+BSDTAR_VERSION_STRING=2.5.4b
 SRCS=	bsdtar.c getdate.y matching.c read.c siginfo.c subst.c tree.c util.c write.c
 WARNS?=	5
 DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
diff --git a/version b/version
index 6ecc7f4fb..bd20368be 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2005003b
+2005004b