Changes 1.26:

* Fix the --verify option, which broke in version 1.24.
* Fix storing long sparse file names in PAX archives.
* Fix correctness of --atime-preserve=replace.
* Work around POSIX incompatibilities on FreeBSD, NetBSD and Tru64.
* Fix bug with --one-file-system --listed-incremental.

11 files changed, 30 insertions, 181 deletions

diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile
index fc61cfcb868..1bb1858cc84 100644
--- a/archivers/gtar-base/Makefile
+++ b/archivers/gtar-base/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.70 2011/04/22 13:42:49 obache Exp $
+# $NetBSD: Makefile,v 1.71 2011/05/11 07:49:58 adam Exp $
 
-DISTNAME=	tar-1.25
-PKGNAME=	gtar-base-1.25
-PKGREVISION=	4
+DISTNAME=	tar-1.26
+PKGNAME=	${DISTNAME:S/tar/gtar-base/}
 SVR4_PKGNAME=	gtarb
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GNU:=tar/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/tar/tar.html
@@ -18,9 +18,10 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_FEATURES=		snprintf
+USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		msgfmt
-USE_PKGLOCALEDIR=	YES
-GNU_CONFIGURE=		YES
+GNU_CONFIGURE=		yes
+
 INSTALLATION_DIRS=	${PKGMANDIR}/man1
 
 .include "../../mk/bsd.prefs.mk"
@@ -40,7 +41,6 @@ CONFIGURE_ARGS+=	--program-prefix=${GTAR_PROGRAM_PREFIX:Q}
 
 # lie to configure about gettext -- it does not need GNU gettext
 CONFIGURE_ENV+=		gt_cv_func_gnugettext2_libintl=yes
-
 # allow configure to run as root
 CONFIGURE_ENV+=		FORCE_UNSAFE_CONFIGURE=1
 
@@ -56,7 +56,7 @@ PLIST.gtar=		yes
 .endif
 
 # don't include rmt if gtar won't build it
-.if ${OPSYS} != "Interix"
+.if ${OPSYS} != "Interix" && ${OPSYS} != "Darwin"
 PLIST.rmt=		yes
 .endif
 
diff --git a/archivers/gtar-base/distinfo b/archivers/gtar-base/distinfo
index f82147590ab..9f505f1b46d 100644
--- a/archivers/gtar-base/distinfo
+++ b/archivers/gtar-base/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.29 2010/12/16 10:12:53 wiz Exp $
+$NetBSD: distinfo,v 1.30 2011/05/11 07:49:58 adam Exp $
 
-SHA1 (tar-1.25.tar.gz) = 28bcf4cfcb32805afead8a6259158064d96359fb
-RMD160 (tar-1.25.tar.gz) = 8013ed400958cc8e9d605f5541e52e413bf878dc
-Size (tar-1.25.tar.gz) = 3400086 bytes
-SHA1 (patch-aa) = 976d0caa9dd67c04a3c1b40ca5d5bea91bc9fcdf
-SHA1 (patch-ab) = ce8f4a5b0a20a5c7da44f06b0e55115e27f7d7e0
-SHA1 (patch-ad) = 5573bd0e8aaf71b8a23d8b031c61b48c97b3fa97
-SHA1 (patch-al) = 53056a3b20a40aac0e04a1137856c5b47a7d6e0c
-SHA1 (patch-am) = aec3b1496c227a64b098d0f3666ff9be4e4b10b5
-SHA1 (patch-an) = 75c83efad6f197e82b9f1966c1034c393e749930
+SHA1 (tar-1.26.tar.bz2) = 70f298c3cd997b694864c55e6d8655324c87a0cc
+RMD160 (tar-1.26.tar.bz2) = d507dc5a57a823701cae5cdd2b98aba48ec74d3f
+Size (tar-1.26.tar.bz2) = 2339773 bytes
+SHA1 (patch-ad) = f3a988a6b675a389d8d307fe1a90dde81ba98df5
diff --git a/archivers/gtar-base/patches/patch-aa b/archivers/gtar-base/patches/patch-aa
deleted file mode 100644
index 3d8c49c5eb0..00000000000
--- a/archivers/gtar-base/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2010/12/12 13:10:40 wiz Exp $
-
-Unportable test(1) construct.
-
---- configure.orig	2010-12-12 12:26:48.000000000 +0000
-+++ configure
-@@ -35225,7 +35225,7 @@ $as_echo "$as_me: failed program was:" >
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
--if test $? == 99 && test x"$FORCE_UNSAFE_CONFIGURE" = x; then
-+if test $? = 99 && test x"$FORCE_UNSAFE_CONFIGURE" = x; then
-             { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { { $as_echo "$as_me:$LINENO: error: you should not run configure as root (set FORCE_UNSAFE_CONFIGURE=1 in environment to bypass this check)
diff --git a/archivers/gtar-base/patches/patch-ab b/archivers/gtar-base/patches/patch-ab
deleted file mode 100644
index 5e8e8af3cbb..00000000000
--- a/archivers/gtar-base/patches/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ab,v 1.16 2010/12/16 10:12:54 wiz Exp $
-
-Add two patches from upstream, fixing test 39:
-* src/extract.c (maybe_recoverable): Treat EMLINK like ELOOP, for
-FreeBSD.  Problem reported by Christian Weisgerber in
-<http://lists.gnu.org/archive/html/bug-tar/2010-11/msg00080.html>.
-Problem reported by Bruno Haible in
-<http://lists.gnu.org/archive/html/bug-gnulib/2010-11/msg00306.html>.
-* src/extract.c (maybe_recoverable):  Also treat EFTYPE (if defined)
-and ENOTSUP like ELOOP.
-
---- src/extract.c.orig	2010-11-01 20:34:59.000000000 +0000
-+++ src/extract.c
-@@ -609,6 +609,18 @@ maybe_recoverable (char *file_name, bool
-   switch (e)
-     {
-     case ELOOP:
-+
-+      /* With open ("symlink", O_NOFOLLOW|...), POSIX says errno == ELOOP,
-+        but some operating systems do not conform to the standard.  */
-+#ifdef EFTYPE
-+      /* NetBSD uses errno == EFTYPE; see <http://gnats.netbsd.org/43154>.  */
-+    case EFTYPE:
-+#endif
-+      /* FreeBSD 8.1 uses errno == EMLINK.  */
-+    case EMLINK:
-+      /* Tru64 5.1B uses errno == ENOTSUP.  */
-+    case ENOTSUP:
-+
-       if (! regular
- 	  || old_files_option != OVERWRITE_OLD_FILES || dereference_option)
- 	break;
diff --git a/archivers/gtar-base/patches/patch-ad b/archivers/gtar-base/patches/patch-ad
index 2dd609118f9..b5155e185d4 100644
--- a/archivers/gtar-base/patches/patch-ad
+++ b/archivers/gtar-base/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.10 2010/12/12 13:10:40 wiz Exp $
+$NetBSD: patch-ad,v 1.11 2011/05/11 07:49:59 adam Exp $
 
 Don't install documentation with this package, it is in
 gtar-info (to reduce dependencies when gtar is used for
@@ -6,7 +6,7 @@ bootstrapping).
 
 --- Makefile.in.orig	2010-11-07 13:53:49.000000000 +0000
 +++ Makefile.in
-@@ -947,7 +947,7 @@ top_builddir = @top_builddir@
+@@ -1028,7 +1028,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  ACLOCAL_AMFLAGS = -I m4
  EXTRA_DIST = ChangeLog.1 Make.rules
diff --git a/archivers/gtar-base/patches/patch-al b/archivers/gtar-base/patches/patch-al
deleted file mode 100644
index 68f99944cda..00000000000
--- a/archivers/gtar-base/patches/patch-al
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-al,v 1.1 2010/12/15 20:37:38 tez Exp $
-
-fix bug with --one-file-system --listed-incremental
-(used by amanda)
-
---- src/create.c.orig	2010-12-15 13:53:21.658522400 -0600
-+++ src/create.c	2010-12-15 13:55:08.938651400 -0600
-@@ -1680,7 +1680,7 @@
-      This check is omitted if incremental_option is set *and* the
-      requested file is not explicitely listed in the command line. */
- 
--  if (!(incremental_option && !is_individual_file (p))
-+  if (! (incremental_option && ! top_level)
-       && !S_ISDIR (st->stat.st_mode)
-       && OLDER_TAR_STAT_TIME (*st, m)
-       && (!after_date_option || OLDER_TAR_STAT_TIME (*st, c)))
diff --git a/archivers/gtar-base/patches/patch-am b/archivers/gtar-base/patches/patch-am
deleted file mode 100644
index 98a484cfedd..00000000000
--- a/archivers/gtar-base/patches/patch-am
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-am,v 1.1 2010/12/15 20:37:38 tez Exp $
-
-fix bug with --one-file-system --listed-incremental 
-(used by amanda)
-
---- src/incremen.c.orig	2010-12-15 13:53:32.763202200 -0600
-+++ src/incremen.c	2010-12-15 13:57:33.751064600 -0600
-@@ -426,7 +426,6 @@
- {
-   struct directory *directory;
-   struct stat *stat_data = &st->stat;
--  dev_t device = st->parent ? st->parent->stat.st_dev : 0;
-   bool nfs = NFS_FILE_STAT (*stat_data);
- 
-   if ((directory = find_directory (name_buffer)) != NULL)
-@@ -540,11 +539,8 @@
- 	}
-     }
- 
--  /* If the directory is on another device and --one-file-system was given,
--     omit it... */
--  if (one_file_system_option && device != stat_data->st_dev
--      /* ... except if it was explicitely given in the command line */
--      && !is_individual_file (name_buffer))
-+  if (one_file_system_option && st->parent
-+      && stat_data->st_dev != st->parent->stat.st_dev)
-     /* FIXME:
- 	WARNOPT (WARN_XDEV,
- 		 (0, 0,
diff --git a/archivers/gtar-base/patches/patch-an b/archivers/gtar-base/patches/patch-an
deleted file mode 100644
index 059e4bba2f8..00000000000
--- a/archivers/gtar-base/patches/patch-an
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-an,v 1.1 2010/12/15 20:37:38 tez Exp $
-
-fix bug with --one-file-system --listed-incremental 
-(used by amanda)
-
---- src/names.c.orig	2010-10-24 13:07:55.000000000 -0500
-+++ src/names.c	2010-12-15 14:17:10.636670200 -0600
-@@ -47,8 +47,6 @@
- static uid_t cached_no_such_uid;
- static gid_t cached_no_such_gid;
- 
--static void register_individual_file (char const *name);
--
- /* Given UID, find the corresponding UNAME.  */
- void
- uid_to_uname (uid_t uid, char **uname)
-@@ -360,8 +358,6 @@
- 	{
- 	  if (unquote_option)
- 	    unquote_string (name_buffer);
--	  if (incremental_option)
--	    register_individual_file (name_buffer);
- 	  entry.type = ep->type;
- 	  entry.v.name = name_buffer;
- 	  return &entry;
-@@ -1152,28 +1148,6 @@
-   return excluded_file_name (excluded, name + FILE_SYSTEM_PREFIX_LEN (name));
- }
- 
--static Hash_table *individual_file_table;
--
--static void
--register_individual_file (char const *name)
--{
--  struct stat st;
--
--  if (deref_stat (name, &st) != 0)
--    return; /* Will be complained about later */
--  if (S_ISDIR (st.st_mode))
--    return;
--
--  hash_string_insert (&individual_file_table, name);
--}
--
--bool
--is_individual_file (char const *name)
--{
--  return hash_string_lookup (individual_file_table, name);
--}
--
--
- 
- /* Return the size of the prefix of FILE_NAME that is removed after
-    stripping NUM leading file name components.  NUM must be
diff --git a/archivers/gtar-info/Makefile b/archivers/gtar-info/Makefile
index 600dcbb10a6..af3c58bd2f0 100644
--- a/archivers/gtar-info/Makefile
+++ b/archivers/gtar-info/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.29 2010/12/12 13:10:40 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.30 2011/05/11 07:49:59 adam Exp $
 
-DISTNAME=	tar-1.25
-PKGNAME=	gtar-info-1.25
+DISTNAME=	tar-1.26
+PKGNAME=	${DISTNAME:S/tar/gtar-info/}
 SVR4_PKGNAME=	gtari
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GNU:=tar/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/tar/tar.html
@@ -15,9 +15,9 @@ LICENSE=	gnu-fdl-v1.1
 PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-INFO_FILES=	yes
+NO_CONFIGURE=		yes
+NO_BUILD=		yes
+INFO_FILES=		yes
 
 INSTALLATION_DIRS=	${PKGINFODIR}
 
diff --git a/archivers/gtar-info/distinfo b/archivers/gtar-info/distinfo
index 82b1c542a14..c4019cb9f8f 100644
--- a/archivers/gtar-info/distinfo
+++ b/archivers/gtar-info/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2010/12/12 13:10:40 wiz Exp $
+$NetBSD: distinfo,v 1.11 2011/05/11 07:49:59 adam Exp $
 
-SHA1 (tar-1.25.tar.gz) = 28bcf4cfcb32805afead8a6259158064d96359fb
-RMD160 (tar-1.25.tar.gz) = 8013ed400958cc8e9d605f5541e52e413bf878dc
-Size (tar-1.25.tar.gz) = 3400086 bytes
+SHA1 (tar-1.26.tar.bz2) = 70f298c3cd997b694864c55e6d8655324c87a0cc
+RMD160 (tar-1.26.tar.bz2) = d507dc5a57a823701cae5cdd2b98aba48ec74d3f
+Size (tar-1.26.tar.bz2) = 2339773 bytes
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index dab13983469..f978ccbf6c6 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2010/12/12 13:10:39 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2011/05/11 07:49:58 adam Exp $
 
-DISTNAME=	gtar-1.25
+DISTNAME=	gtar-1.26
 CATEGORIES=	archivers
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -12,8 +12,8 @@ LICENSE=	gnu-gpl-v3 AND gnu-fdl-v1.1
 
 META_PACKAGE=	yes
 
-DEPENDS+=	gtar-base-1.25{,nb*}:../../archivers/gtar-base
-DEPENDS+=	gtar-info-1.25{,nb*}:../../archivers/gtar-info
+DEPENDS+=	gtar-base-${PKGVERSION_NOREV}{,nb*}:../../archivers/gtar-base
+DEPENDS+=	gtar-info-${PKGVERSION_NOREV}{,nb*}:../../archivers/gtar-info
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir