Mark this as 2.6.901a - as of this point, FreeBSD-CURRENT is in sync with

libarchive.googlecode.com (except for the xz/lzma support).

SVN-Revision: 745

diff --git a/build/release.sh b/build/release.sh
index d66c903630fbf833ea2cbeeae08060660dea7da8..c45acf83f531d53cbc68581ede52b65201738b50 100755 (executable)
--- a/build/release.sh
+++ b/build/release.sh
@@ -38,7 +38,7 @@ perl -p -i -e "s/^(#define\tARCHIVE_VERSION_NUMBER).*/\$1 $VN/" libarchive/archi
 perl -p -i -e "s/^(#define\tARCHIVE_VERSION_STRING).*/\$1 \"libarchive $VS\"/" libarchive/archive.h
 # Substitute the string version into tar and cpio Makefiles
 perl -p -i -e "s/^(BSDTAR_VERSION_STRING)=.*/\$1=$VS/" tar/Makefile
-#perl -p -i -e "s/^(BSDCPIO_VERSION_STRING)=.*/\$1=$VS/" cpio/Makefile
+perl -p -i -e "s/^(BSDCPIO_VERSION_STRING)=.*/\$1=$VS/" cpio/Makefile
 # Substitute versions into configure.ac as well
 perl -p -i -e 's/(m4_define\(\[LIBARCHIVE_VERSION_S\]),.*\)/$1,['"$VS"'])/' configure.ac
 perl -p -i -e 's/(m4_define\(\[LIBARCHIVE_VERSION_N\]),.*\)/$1,['"$VN"'])/' configure.ac

diff --git a/build/version b/build/version
index e546fe1cfa666acb52c7a23b1045fbc05831b146..4a70a81ce2a560d402a84a74c3bd2eaad182ad26 100644 (file)
--- a/build/version
+++ b/build/version
@@ -1 +1 @@
-2006900a
+2006901a

diff --git a/configure.ac b/configure.ac
index 4d1b751185bb1ea020408492645738053db45e6a..9157497ab10d95c7eeb41a2317e86d0e945c4316 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,13 +4,12 @@ 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.6.900a])
-m4_define([LIBARCHIVE_VERSION_N],[2006900])
+m4_define([LIBARCHIVE_VERSION_S],[2.6.901a])
+m4_define([LIBARCHIVE_VERSION_N],[2006901])
 
-dnl bsdtar versioning tracks libarchive
+dnl bsdtar and bsdcpio versioning tracks libarchive
 m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S())
-dnl bsdcpio is still versioning separately, as it's less mature.
-m4_define([BSDCPIO_VERSION_S],[1.1.0])
+m4_define([BSDCPIO_VERSION_S],LIBARCHIVE_VERSION_S())
 
 #
 # Now starts the "real" configure script.

diff --git a/cpio/Makefile b/cpio/Makefile
index ab54b0a217415bdde5254c01a0630be4ee4acdb9..5f128e340ce7366cac4ab088c18b5705c04a108e 100644 (file)
--- a/cpio/Makefile
+++ b/cpio/Makefile
@@ -3,7 +3,7 @@
 .include <bsd.own.mk>
 
 PROG=  bsdcpio
-BSDCPIO_VERSION_STRING=1.1.0
+BSDCPIO_VERSION_STRING=2.6.901a
 SRCS=  cpio.c cmdline.c err.c matching.c pathmatch.c
 WARNS?=        6
 DPADD= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2}

diff --git a/libarchive/archive.h b/libarchive/archive.h
index 6430e8343bd6d9d07e1a3ebf6427cae547475a13..6b8e099933b2ab197f25c27ce701a47fbf8427f8 100644 (file)
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -118,13 +118,13 @@ extern "C" {
  *             (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000)
  * #endif
  */
-#define        ARCHIVE_VERSION_NUMBER 2006900
+#define        ARCHIVE_VERSION_NUMBER 2006901
 __LA_DECL int          archive_version_number(void);
 
 /*
  * Textual name/version of the library, useful for version displays.
  */
-#define        ARCHIVE_VERSION_STRING "libarchive 2.6.900a"
+#define        ARCHIVE_VERSION_STRING "libarchive 2.6.901a"
 __LA_DECL const char * archive_version_string(void);
 
 #if ARCHIVE_VERSION_NUMBER < 3000000

diff --git a/tar/Makefile b/tar/Makefile
index d93d2527543099bf849c0afec09821b165690777..b434a43dca660a50570b7ecc1ada22ce18009a82 100644 (file)
--- a/tar/Makefile
+++ b/tar/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD: src/usr.bin/tar/Makefile,v 1.40 2008/12/06 07:38:14 kientzle Exp $
 
 PROG=  bsdtar
-BSDTAR_VERSION_STRING=2.6.900a
+BSDTAR_VERSION_STRING=2.6.901a
 SRCS=  bsdtar.c cmdline.c getdate.c matching.c read.c siginfo.c subst.c tree.c util.c write.c
 WARNS?=        5
 DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ}