From: Tim Kientzle <kientzle@gmail.com>
Date: Sun, 28 Dec 2008 23:55:11 +0000 (-0500)
Subject: Libarchive 2.6
X-Git-Tag: v2.6.0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84d5809db34f8e7ed6f4a0c655f437c8c846fdca;p=thirdparty%2Flibarchive.git

Libarchive 2.6

SVN-Revision: 295
---

diff --git a/NEWS b/NEWS
index ff53dc654..71464555d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 
+Dec 28, 2008: libarchive 2.6.0 released
+
 Dec 25, 2008: libarchive 2.5.905a released
 
 Dec 10, 2008: libarchive 2.5.904a released
diff --git a/configure.ac b/configure.ac
index a26c37ba9..545737ec6 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.905a])
-m4_define([LIBARCHIVE_VERSION_N],[2005905])
+m4_define([LIBARCHIVE_VERSION_S],[2.6.0])
+m4_define([LIBARCHIVE_VERSION_N],[2006000])
 
 dnl bsdtar versioning tracks libarchive
 m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S())
diff --git a/libarchive/archive.h b/libarchive/archive.h
index ab2259eca..9da0bc013 100644
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -113,13 +113,13 @@ extern "C" {
  *             (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000)
  * #endif
  */
-#define	ARCHIVE_VERSION_NUMBER 2005905
+#define	ARCHIVE_VERSION_NUMBER 2006000
 __LA_DECL int		archive_version_number(void);
 
 /*
  * Textual name/version of the library, useful for version displays.
  */
-#define	ARCHIVE_VERSION_STRING "libarchive 2.5.905a"
+#define	ARCHIVE_VERSION_STRING "libarchive 2.6.0"
 __LA_DECL const char *	archive_version_string(void);
 
 #if ARCHIVE_VERSION_NUMBER < 3000000
diff --git a/tar/Makefile b/tar/Makefile
index cda8f89b1..f8369ed88 100644
--- 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.5.905a
+BSDTAR_VERSION_STRING=2.6.0
 SRCS=	bsdtar.c cmdline.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 0203b60ff..69e1e8c1b 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2005905a
+2006000