From: Tim Kientzle <kientzle@gmail.com>
Date: Wed, 2 Jul 2008 23:24:10 +0000 (-0400)
Subject: Portable release of libarchive 2.5.5, bsdtar 2.5.5, bsdcpio 1.0.0
X-Git-Tag: v2.6.0~143
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3686bcd46918138a7bb01050edaa8865cff86775;p=thirdparty%2Flibarchive.git

Portable release of libarchive 2.5.5, bsdtar 2.5.5, bsdcpio 1.0.0

SVN-Revision: 149
---

diff --git a/NEWS b/NEWS
index 1936820e6..36005fd1e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
-Jun 20, 2008: If a -l link fails with EXDEV, copy the file instead
-Jun 19, 2008: Add some additional long options for better GNU cpio compat
+
+Jul 02, 2008: libarchive 2.5.5 released
+
+Jul 02, 2008: libarchive 2.5.5b released
+Jul 01, 2008: bsdcpio is being used by enough people, we can call it 1.0.0 now
+Jun 20, 2008: bsdcpio: If a -l link fails with EXDEV, copy the file instead
+Jun 19, 2008: bsdcpio: additional long options for better GNU cpio compat
 Jun 15, 2008: Many small portability and bugfixes since 2.5.4b.
 
 May 25, 2008: libarchive 2.5.4b released
diff --git a/configure.ac b/configure.ac
index 3d3f5058a..317947b1d 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.4b])
-m4_define([LIBARCHIVE_VERSION_N],[2005004])
+m4_define([LIBARCHIVE_VERSION_S],[2.5.5])
+m4_define([LIBARCHIVE_VERSION_N],[2005005])
 
 dnl bsdtar versioning tracks libarchive
 m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S())
diff --git a/libarchive/archive.h b/libarchive/archive.h
index 2849b145f..3f9f6e1cf 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 2005004
+#define	ARCHIVE_VERSION_NUMBER 2005005
 __LA_DECL int		archive_version_number(void);
 
 /*
  * Textual name/version of the library, useful for version displays.
  */
-#define	ARCHIVE_VERSION_STRING "libarchive 2.5.4b"
+#define	ARCHIVE_VERSION_STRING "libarchive 2.5.5"
 __LA_DECL const char *	archive_version_string(void);
 
 #if ARCHIVE_VERSION_NUMBER < 3000000
diff --git a/tar/Makefile b/tar/Makefile
index d65b23a9a..6b3b8165c 100644
--- a/tar/Makefile
+++ b/tar/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD: src/usr.bin/tar/Makefile,v 1.36 2008/05/26 17:10:10 kientzle Exp $
 
 PROG=	bsdtar
-BSDTAR_VERSION_STRING=2.5.4b
+BSDTAR_VERSION_STRING=2.5.5
 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 bd20368be..b50fb110a 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2005004b
+2005005