From a5361a44fe13fe3937574e05ed93299cfd1e4a5f Mon Sep 17 00:00:00 2001
From: Tim Kientzle <kientzle@gmail.com>
Date: Mon, 19 Jan 2009 01:34:26 -0500
Subject: [PATCH] libarchive 2.6.1

SVN-Revision: 454
---
 NEWS                 | 2 ++
 configure.ac         | 4 ++--
 libarchive/archive.h | 4 ++--
 tar/Makefile         | 2 +-
 version              | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 71464555d..431a8b01d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 
+Jan 18, 2009: libarchive 2.6.1 released
+
 Dec 28, 2008: libarchive 2.6.0 released
 
 Dec 25, 2008: libarchive 2.5.905a released
diff --git a/configure.ac b/configure.ac
index 545737ec6..cddeb48bf 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.6.0])
-m4_define([LIBARCHIVE_VERSION_N],[2006000])
+m4_define([LIBARCHIVE_VERSION_S],[2.6.1])
+m4_define([LIBARCHIVE_VERSION_N],[2006001])
 
 dnl bsdtar versioning tracks libarchive
 m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S())
diff --git a/libarchive/archive.h b/libarchive/archive.h
index edb653a7c..62b762523 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 2006000
+#define	ARCHIVE_VERSION_NUMBER 2006001
 __LA_DECL int		archive_version_number(void);
 
 /*
  * Textual name/version of the library, useful for version displays.
  */
-#define	ARCHIVE_VERSION_STRING "libarchive 2.6.0"
+#define	ARCHIVE_VERSION_STRING "libarchive 2.6.1"
 __LA_DECL const char *	archive_version_string(void);
 
 #if ARCHIVE_VERSION_NUMBER < 3000000
diff --git a/tar/Makefile b/tar/Makefile
index f8369ed88..06b277616 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.6.0
+BSDTAR_VERSION_STRING=2.6.1
 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 69e1e8c1b..154178193 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2006000
+2006001
-- 
2.47.3