libarchive-2.4.14:

Fix mix-up of gname and uname on one place when writing pax archives.
Reported by tron@.

6 files changed, 20 insertions, 14 deletions

diff --git a/archivers/libarchive/files/Makefile.am b/archivers/libarchive/files/Makefile.am
index 89b67660844..ca8a7aa516e 100644
--- a/archivers/libarchive/files/Makefile.am
+++ b/archivers/libarchive/files/Makefile.am
@@ -223,7 +223,7 @@ libarchive_test_SOURCES=					\
 	libarchive/test/test_write_format_tar_empty.c		\
 	libarchive/test/test_write_open_memory.c
 
-libarchive_test_CPPFLAGS= -I$(top_builddir)/libarchive -I$(top_builddir)/libarchive/test
+libarchive_test_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_builddir)/libarchive/test
 
 # The "list.h" file just lists all of the tests defined in all of the sources.
 # Building it automatically provides a sanity-check on libarchive_test_SOURCES
diff --git a/archivers/libarchive/files/Makefile.in b/archivers/libarchive/files/Makefile.in
index f8ba7aa3a8b..6960f4c7a2e 100644
--- a/archivers/libarchive/files/Makefile.in
+++ b/archivers/libarchive/files/Makefile.in
@@ -653,7 +653,7 @@ libarchive_test_SOURCES = \
 	libarchive/test/test_write_format_tar_empty.c		\
 	libarchive/test/test_write_open_memory.c
 
-libarchive_test_CPPFLAGS = -I$(top_builddir)/libarchive -I$(top_builddir)/libarchive/test
+libarchive_test_CPPFLAGS = -I$(top_srcdir)/libarchive -I$(top_builddir)/libarchive/test
 libarchive_TESTS_ENVIRONMENT = LIBARCHIVE_TEST_FILES=`cd $(top_builddir);/bin/pwd`
 libarchive_test_EXTRA_DIST = \
 	libarchive/test/test_compat_gtar_1.tgz.uu			\
diff --git a/archivers/libarchive/files/NEWS b/archivers/libarchive/files/NEWS
index d5b257a3239..991509e47d8 100644
--- a/archivers/libarchive/files/NEWS
+++ b/archivers/libarchive/files/NEWS
@@ -1,3 +1,9 @@
+Mar 14, 2008: libarchive 2.4.14 released.  This is identical to 2.4.13
+	except it contains a one-line fix to the uname/gname problem
+	introduced by the Feb 25 UTF-8 fix.  This bug makes libarchive
+	refuse to add a file to a pax archive if it has a valid gname
+	but not a valid uname.  In some cases, it can also cause the
+	uname to be stored for the gname.
 
 Feb 26, 2008: libarchive 2.4.13 released
 Feb 25, 2008: Handle path, linkname, gname, or uname that can't be converted
diff --git a/archivers/libarchive/files/configure b/archivers/libarchive/files/configure
index 408b10afa9c..63e707eb91b 100755
--- a/archivers/libarchive/files/configure
+++ b/archivers/libarchive/files/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for libarchive 2.4.13.
+# Generated by GNU Autoconf 2.61 for libarchive 2.4.14.
 #
 # Report bugs to <kientzle@freebsd.org>.
 #
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='libarchive'
 PACKAGE_TARNAME='libarchive'
-PACKAGE_VERSION='2.4.13'
-PACKAGE_STRING='libarchive 2.4.13'
+PACKAGE_VERSION='2.4.14'
+PACKAGE_STRING='libarchive 2.4.14'
 PACKAGE_BUGREPORT='kientzle@freebsd.org'
 
 ac_unique_file="libarchive"
@@ -1408,7 +1408,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libarchive 2.4.13 to adapt to many kinds of systems.
+\`configure' configures libarchive 2.4.14 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1478,7 +1478,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libarchive 2.4.13:";;
+     short | recursive ) echo "Configuration of libarchive 2.4.14:";;
    esac
   cat <<\_ACEOF
 
@@ -1596,7 +1596,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libarchive configure 2.4.13
+libarchive configure 2.4.14
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1610,7 +1610,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libarchive $as_me 2.4.13, which was
+It was created by libarchive $as_me 2.4.14, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2304,7 +2304,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libarchive'
- VERSION='2.4.13'
+ VERSION='2.4.14'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -27785,7 +27785,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libarchive $as_me 2.4.13, which was
+This file was extended by libarchive $as_me 2.4.14, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27838,7 +27838,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-libarchive config.status 2.4.13
+libarchive config.status 2.4.14
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/archivers/libarchive/files/libarchive/archive_write_set_format_pax.c b/archivers/libarchive/files/libarchive/archive_write_set_format_pax.c
index 4604d99a6e8..a1bd6881156 100644
--- a/archivers/libarchive/files/libarchive/archive_write_set_format_pax.c
+++ b/archivers/libarchive/files/libarchive/archive_write_set_format_pax.c
@@ -470,7 +470,7 @@ archive_write_pax_header(struct archive_write *a,
 		hdrcharset = "BINARY";
 	}
 	gname = archive_entry_gname(entry_main);
-	gname_w = archive_entry_uname_w(entry_main);
+	gname_w = archive_entry_gname_w(entry_main);
 	if (gname != NULL && gname_w == NULL) {
 		archive_set_error(&a->archive, EILSEQ,
 		    "Can't translate gname '%s' to UTF-8", gname);
diff --git a/archivers/libarchive/files/version b/archivers/libarchive/files/version
index 9c846566f75..3eb2ae3ef12 100644
--- a/archivers/libarchive/files/version
+++ b/archivers/libarchive/files/version
@@ -1 +1 @@
-2.4.13
\ No newline at end of file
+2.4.14
\ No newline at end of file