Has bsdtar found any users yet? Here's an update of libarchive to 2.4.0. Mostly internal changes. Plus, I have enabled bsdcpio. It took regression runs on three architectures before that subtle problem in cpio's path matching showed up.
Index: Makefile =================================================================== RCS file: /cvs/ports/archivers/libarchive/Makefile,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 Makefile --- Makefile 29 Oct 2007 19:28:29 -0000 1.1.1.1 +++ Makefile 23 Nov 2007 21:30:33 -0000 @@ -2,9 +2,9 @@ COMMENT= library for reading and writing streaming archives -V= 2.3.4 +V= 2.4.0 DISTNAME= libarchive-$V -SHARED_LIBS += archive 0.0 # .5.4 +SHARED_LIBS += archive 1.0 # .6.0 CATEGORIES= archivers HOMEPAGE= http://people.freebsd.org/~kientzle/libarchive/ @@ -26,7 +26,8 @@ USE_LIBTOOL= Yes CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} +CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ + --enable-bsdcpio CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config.aux Index: distinfo =================================================================== RCS file: /cvs/ports/archivers/libarchive/distinfo,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 distinfo --- distinfo 29 Oct 2007 19:28:29 -0000 1.1.1.1 +++ distinfo 23 Nov 2007 21:30:33 -0000 @@ -1,10 +1,10 @@ -MD5 (libarchive-2.3.4.tar.gz) = IhOPpTXo1HwexajfiBQkDQ== -MD5 (libarchive-catpages-2.3.4.tar.gz) = /+UhNP4GbuHkBr5jqPgGJA== -RMD160 (libarchive-2.3.4.tar.gz) = 6j1+0YIh7Lacp5TBD14tkVWL7Uo= -RMD160 (libarchive-catpages-2.3.4.tar.gz) = 0a58/5JFUpAQIMXPZaAbnqKMRkw= -SHA1 (libarchive-2.3.4.tar.gz) = meWneRHpMxYtGaC2m+NXuIJOiLs= -SHA1 (libarchive-catpages-2.3.4.tar.gz) = I/1K1kFygxvKxdLHux3dzPQ67QE= -SHA256 (libarchive-2.3.4.tar.gz) = GVbjhPIJcDGwoXl8HIFyRYJw+xO5lE7m+csPS3HKHAc= -SHA256 (libarchive-catpages-2.3.4.tar.gz) = 13usbHPxfWHCXeHDEbO+4Yq+WJ3NI7MsPBggd3Rcb5Y= -SIZE (libarchive-2.3.4.tar.gz) = 682180 -SIZE (libarchive-catpages-2.3.4.tar.gz) = 48536 +MD5 (libarchive-2.4.0.tar.gz) = mwaZXGydAAiStzIKSk/tyw== +MD5 (libarchive-catpages-2.4.0.tar.gz) = F1AcQIHNsnSAyt0VST5YtA== +RMD160 (libarchive-2.4.0.tar.gz) = +sOfwzbdZwHDyHHGY04odiOe9Yw= +RMD160 (libarchive-catpages-2.4.0.tar.gz) = oXbXzjq/PVedqfua316sZXZsTlk= +SHA1 (libarchive-2.4.0.tar.gz) = sdhF4cnhYxuksiBidgSDKhTYRnk= +SHA1 (libarchive-catpages-2.4.0.tar.gz) = YWK1/+xq1Inu4YyC4XFxl9v2vPM= +SHA256 (libarchive-2.4.0.tar.gz) = 7d55C9yuFkovSr2l47NLatbBXEWx0w1WG7tnvvTNlyQ= +SHA256 (libarchive-catpages-2.4.0.tar.gz) = A9jn9wv6HCGxgLg9+IUEKJPD1pg2+4O3Q4SOWy1q/Vg= +SIZE (libarchive-2.4.0.tar.gz) = 791312 +SIZE (libarchive-catpages-2.4.0.tar.gz) = 51328 Index: patches/patch-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Makefile_in 23 Nov 2007 21:30:33 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- Makefile.in.orig Fri Nov 23 20:06:16 2007 ++++ Makefile.in Fri Nov 23 20:06:48 2007 +@@ -705,7 +705,7 @@ bsdcpio_test_EXTRA_DIST = \ + cpio/test/test_option_t.stdout \ + cpio/test/test_option_tv.stdout + +-bsdcpio_test_CPPFLAGS = -I$(top_builddir)/cpio/test ++bsdcpio_test_CPPFLAGS = -I$(top_builddir)/libarchive -I$(top_builddir)/cpio/test + @[EMAIL PROTECTED] = + @[EMAIL PROTECTED] = bsdcpio_test + @[EMAIL PROTECTED] = Index: patches/patch-cpio_bsdcpio_1 =================================================================== RCS file: patches/patch-cpio_bsdcpio_1 diff -N patches/patch-cpio_bsdcpio_1 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-cpio_bsdcpio_1 23 Nov 2007 21:30:33 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- cpio/bsdcpio.1.orig Fri Nov 23 17:43:01 2007 ++++ cpio/bsdcpio.1 Fri Nov 23 17:43:21 2007 +@@ -28,7 +28,7 @@ + .Dt BSDCPIO 1 + .Os + .Sh NAME +-.Nm cpio ++.Nm bsdcpio + .Nd copy files to and from archives + .Sh SYNOPSIS + .Nm Index: patches/patch-cpio_match_c =================================================================== RCS file: patches/patch-cpio_match_c diff -N patches/patch-cpio_match_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-cpio_match_c 23 Nov 2007 21:30:33 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- cpio/match.c.orig Fri Nov 23 22:14:11 2007 ++++ cpio/match.c Fri Nov 23 22:16:51 2007 +@@ -70,6 +70,8 @@ pathmatch(const char *p, const char *s) + return (0); + break; + case '?': ++ if (*s == '\0') ++ return (0); + ++p; + ++s; + break; Index: patches/patch-cpio_test_main_c =================================================================== RCS file: patches/patch-cpio_test_main_c diff -N patches/patch-cpio_test_main_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-cpio_test_main_c 23 Nov 2007 21:30:33 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ +--- cpio/test/main.c.orig Fri Nov 23 20:10:51 2007 ++++ cpio/test/main.c Fri Nov 23 20:11:07 2007 +@@ -276,8 +276,8 @@ test_assert_equal_wstring(const char *file, int line, + return; + fprintf(stderr, "%s:%d: Assertion failed: Unicode strings not equal\n", + file, line); +- fwprintf(stderr, L" %s = \"%ls\"\n", e1, v1); +- fwprintf(stderr, L" %s = \"%ls\"\n", e2, v2); ++/* fwprintf(stderr, L" %s = \"%ls\"\n", e1, v1); ++ fwprintf(stderr, L" %s = \"%ls\"\n", e2, v2); */ + report_failure(extra); + } + Index: patches/patch-libarchive_test_main_c =================================================================== RCS file: /cvs/ports/archivers/libarchive/patches/patch-libarchive_test_main_c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-libarchive_test_main_c --- patches/patch-libarchive_test_main_c 29 Oct 2007 19:28:29 -0000 1.1.1.1 +++ patches/patch-libarchive_test_main_c 23 Nov 2007 21:30:33 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-libarchive_test_main_c,v 1.1.1.1 2007/10/29 19:28:29 naddy Exp $ ---- libarchive/test/main.c.orig Wed Oct 24 18:25:33 2007 -+++ libarchive/test/main.c Wed Oct 24 18:25:48 2007 +--- libarchive/test/main.c.orig Fri Nov 23 17:35:32 2007 ++++ libarchive/test/main.c Fri Nov 23 17:35:55 2007 @@ -285,8 +285,8 @@ test_assert_equal_wstring(const char *file, int line, return; fprintf(stderr, "%s:%d: Assertion failed: Unicode strings not equal\n", @@ -9,6 +9,6 @@ - fwprintf(stderr, L" %s = \"%ls\"\n", e2, v2); +/* fwprintf(stderr, L" %s = \"%ls\"\n", e1, v1); + fwprintf(stderr, L" %s = \"%ls\"\n", e2, v2); */ - test_failed(a); + report_failure(extra); } Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/archivers/libarchive/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 PLIST --- pkg/PLIST 29 Oct 2007 19:28:29 -0000 1.1.1.1 +++ pkg/PLIST 23 Nov 2007 21:30:33 -0000 @@ -1,10 +1,12 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2007/10/29 19:28:29 naddy Exp $ %%SHARED%% +bin/bsdcpio bin/bsdtar include/archive.h include/archive_entry.h lib/libarchive.a lib/libarchive.la [EMAIL PROTECTED] man/cat1/bsdcpio.0 @man man/cat1/bsdtar.0 @man man/cat3/archive_entry.0 @man man/cat3/archive_read.0 @@ -17,6 +19,7 @@ @man man/cat5/libarchive-formats.0 @man man/cat5/mtree.0 @man man/cat5/tar.0 [EMAIL PROTECTED] man/man1/bsdcpio.1 @comment @man man/man1/bsdtar.1 @comment @man man/man3/archive_entry.3 @comment @man man/man3/archive_read.3 -- Christian "naddy" Weisgerber [EMAIL PROTECTED]
