update to gtar 1.15.1

changes:
- enable installation of grmt

changes in gtar:
version 1.15.1 - Sergey Poznyakoff, 2004-12-21

This version fixes a bug introduced in 1.15 which caused
tar to refuse to extract files from standard input.

version 1.15 - Sergey Poznyakoff, 2004-12-20

* Compressed archives are recognised automatically, it is no longer
necessary to specify -Z, -z, or -j options to read them. Thus, you can
now run `tar tf archive.tar.gz'.

* When restoring incremental dumps, --one-file-system option
prevents directory hierarchies residing on different devices
from being purged.

With the previous versions of tar it was dangerous to create
incremental dumps with --one-file-system option, since they
would recursively remove mount points when restoring from the
back up. This change fixes the bug.

* Renamed --strip-path to --strip-components for consistency with
the GNU convention.

* Skipping archive members is sped up if the archive media supports
seeks.

* Restore script starts restoring only if it is given --all (-a) option,
or some patterns. This is to prevent accidental restores.

* `tar --verify' prints a warning if during archive creation some of
the file names had their prefixes stripped off.

* New option --exclude-caches instructs tar to exclude cache directories
automatically on archive creation. Cache directories are those
containing a standardized tag file, as specified at:

	http://www.brynosaurus.com/cachedir/spec.html

* New configure option --with-rmt allows to specify full path name to
the `rmt' utility. This supercedes DEFAULT_RMT_COMMAND variable
introduced in version 1.14

* New configure variable DEFAULT_RMT_DIR allows to specify the directory
where to install `rmt' utility. This is necessary since modifying
--libexecdir as was suggested for version 1.14 produced a side effect: it
also modified installation prefix for backup scripts (if
--enable-backup-scripts was given).

* Bugfixes:
** Fixed flow in recognizing files to be included in incremental dumps.
** Correctly recognize sparse archive members when used with -T option.
** GNU multivolume headers cannot store filenames longer than 100 characters.
Do not allow multivolume archives to begin with such filenames.
** If a member with link count > 2 was stored in the archive twice,
previous versions of tar were not able to extract it, since they
were trying to link the file to itself, which always failed and
lead to removing the already extracted copy. Preserve the first
extracted copy in such cases.
** Restore script was passing improper argument to tar --listed option (which
didn't affect the functionality, but was logically incorrect).
** Fixed verification of created archives.
** Fixed unquoting of file names containing backslash escapes (previous
versions failed to recognize \a and \v).
** When attempting to delete a non-existing member from the archive, previous
versions of tar used to overwrite last archive block with zeroes.

12 files changed, 88 insertions, 94 deletions

diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile
index 427af40720f..492471f1f02 100644
--- a/archivers/gtar-base/Makefile
+++ b/archivers/gtar-base/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2004/10/02 22:40:24 recht Exp $
+# $NetBSD: Makefile,v 1.39 2005/01/09 22:52:13 recht Exp $
 #
 
-DISTNAME=       tar-1.14
-PKGNAME=	gtar-base-1.14
+DISTNAME=       tar-1.15.1
+PKGNAME=	gtar-base-1.15.1
 SVR4_PKGNAME=	gtarb
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GNU:=tar/}
diff --git a/archivers/gtar-base/PLIST b/archivers/gtar-base/PLIST
index fd21750aea7..fff4fc84bbd 100644
--- a/archivers/gtar-base/PLIST
+++ b/archivers/gtar-base/PLIST
@@ -1,14 +1,17 @@
-@comment $NetBSD: PLIST,v 1.7 2004/09/27 16:12:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/01/09 22:52:13 recht Exp $
 bin/${GTAR_PROGRAM_PREFIX}tar
 ${GTAR_LINK}bin/gtar
+libexec/${GTAR_PROGRAM_PREFIX}rmt
 man/man1/${GTAR_PROGRAM_PREFIX}tar.1
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/tar.mo
@@ -19,6 +22,7 @@ ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/tar.mo
diff --git a/archivers/gtar-base/distinfo b/archivers/gtar-base/distinfo
index d421b78289a..80a89ae4586 100644
--- a/archivers/gtar-base/distinfo
+++ b/archivers/gtar-base/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.11 2004/10/02 14:52:08 danw Exp $
+$NetBSD: distinfo,v 1.12 2005/01/09 22:52:13 recht Exp $
 
-SHA1 (tar-1.14.tar.gz) = 484d3ac9c15a598f2ee110155d87b3daecc7b13c
-Size (tar-1.14.tar.gz) = 1485633 bytes
-SHA1 (patch-aa) = df97e08202682939f329f33222540b46ed6baa36
-SHA1 (patch-ab) = 416495f330cb7614eb466547bc468213213e3a90
-SHA1 (patch-ac) = 41d4153b44b5852664401d9be3a0b0a4ef4984eb
-SHA1 (patch-ag) = 3cb3f8ed288a141896e65410c453b15578943ab3
+SHA1 (tar-1.15.1.tar.gz) = 21574ae5d39b698f7f577e2cecc91a5ec89b659c
+Size (tar-1.15.1.tar.gz) = 2204322 bytes
+SHA1 (patch-ab) = db7dc670cab8ba4eab9cf7b8efd79395ac4ea43c
+SHA1 (patch-ac) = 072a7eaff685093b86289e0b45281c41ae06f4fc
+SHA1 (patch-ad) = 8f109cbc150cb7db48b7a59dcba9eefb654875e0
+SHA1 (patch-ae) = 6518ab82e19c831f16bc772136fafc037a592df4
+SHA1 (patch-ag) = dc39d490b0085e452664b8ea7af0329f01f630d5
diff --git a/archivers/gtar-base/patches/patch-aa b/archivers/gtar-base/patches/patch-aa
deleted file mode 100644
index 3ccf3f645af..00000000000
--- a/archivers/gtar-base/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2004/09/27 16:12:04 wiz Exp $
-
---- src/Makefile.in.orig	2004-05-11 10:13:27.000000000 +0200
-+++ src/Makefile.in
-@@ -44,7 +44,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
- bin_PROGRAMS = tar$(EXEEXT)
--libexec_PROGRAMS = @RMT@
-+libexec_PROGRAMS =
- EXTRA_PROGRAMS = rmt$(EXEEXT)
- subdir = src
- DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
diff --git a/archivers/gtar-base/patches/patch-ab b/archivers/gtar-base/patches/patch-ab
index 28a3640f086..4512b775611 100644
--- a/archivers/gtar-base/patches/patch-ab
+++ b/archivers/gtar-base/patches/patch-ab
@@ -1,55 +1,32 @@
-$NetBSD: patch-ab,v 1.9 2004/09/27 16:12:04 wiz Exp $
+$NetBSD: patch-ab,v 1.10 2005/01/09 22:52:14 recht Exp $
 
---- src/tar.c.orig	2004-05-10 13:49:19.000000000 +0200
-+++ src/tar.c
-@@ -196,6 +196,7 @@ enum
-   NO_ANCHORED_OPTION,
-   NO_IGNORE_CASE_OPTION,
-   NO_OVERWRITE_DIR_OPTION,
+--- src/tar.c.orig	Sat Dec 18 21:01:07 2004
++++ src/tar.c	Sun Jan  9 18:21:37 2005
+@@ -203,6 +203,7 @@
+   NO_RECURSION_OPTION,
+   NO_SAME_OWNER_OPTION,
+   NO_SAME_PERMISSIONS_OPTION,
 +  NO_UNLINK_FIRST_OPTION,
    NO_WILDCARDS_OPTION,
    NO_WILDCARDS_MATCH_SLASH_OPTION,
    NULL_OPTION,
-@@ -292,6 +293,7 @@ static struct option long_options[] =
-   {"no-recursion", no_argument, &recursion_option, 0},
-   {"no-same-owner", no_argument, &same_owner_option, -1},
-   {"no-same-permissions", no_argument, &same_permissions_option, -1},
-+  {"no-unlink-first", no_argument, NULL, NO_UNLINK_FIRST_OPTION},
-   {"numeric-owner", no_argument, 0, NUMERIC_OWNER_OPTION},
-   {"occurrence", optional_argument, 0, OCCURRENCE_OPTION},
-   {"old-archive", no_argument, 0, 'o'},
-@@ -327,6 +329,7 @@ static struct option long_options[] =
-   {"touch", no_argument, 0, 'm'},
-   {"uncompress", no_argument, 0, 'Z'},
-   {"ungzip", no_argument, 0, 'z'},
-+  {"unlink", no_argument, 0, 'U'},
-   {"unlink-first", no_argument, 0, 'U'},
-   {"update", no_argument, 0, 'u'},
-   {"utc", no_argument, 0, UTC_OPTION },
-@@ -390,6 +393,7 @@ Operation modifiers:\n\
-       --overwrite            overwrite existing files when extracting\n\
-       --no-overwrite-dir     preserve metadata of existing directories\n\
-   -U, --unlink-first         remove each file prior to extracting over it\n\
-+      --no-unlink-first      don't remove each file prior to extracting\n\
-       --recursive-unlink     empty hierarchies prior to extracting directory\n\
-   -S, --sparse               handle sparse files efficiently\n\
-   -O, --to-stdout            extract files to standard output\n\
-@@ -604,6 +608,7 @@ decode_options (int argc, char **argv)
- 
-   owner_option = -1;
-   group_option = -1;
-+  old_files_option = UNLINK_FIRST_OLD_FILES;
- 
-   backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
- 
-@@ -916,6 +921,10 @@ decode_options (int argc, char **argv)
- 	old_files_option = UNLINK_FIRST_OLD_FILES;
- 	break;
- 
-+      case NO_UNLINK_FIRST_OPTION:
-+	old_files_option = 0;
-+	break;
+@@ -340,6 +341,8 @@
+    N_("try extracting files with the same ownership"), 31 },
+   {"no-same-owner", NO_SAME_OWNER_OPTION, 0, 0,
+    N_("extract files as yourself"), 31 },
++  {"no-unlink-first", NO_UNLINK_FIRST_OPTION, 0, 0,
++   N_("don't remove each file prior to extracting"), 31 },
+   {"numeric-owner", NUMERIC_OWNER_OPTION, 0, 0,
+    N_("always use numbers for user/group names"), 31 },
+   {"preserve-permissions", 'p', 0, 0,
+@@ -864,6 +867,10 @@
+       
+     case 'U':
+       old_files_option = UNLINK_FIRST_OLD_FILES;
++      break;
 +
-       case UTC_OPTION:
- 	utc_option = true;
- 	break;
++    case NO_UNLINK_FIRST_OPTION:
++      old_files_option = 0;
+       break;
+       
+     case UTC_OPTION:
diff --git a/archivers/gtar-base/patches/patch-ac b/archivers/gtar-base/patches/patch-ac
index d982644ed1c..da95f92cf52 100644
--- a/archivers/gtar-base/patches/patch-ac
+++ b/archivers/gtar-base/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2004/09/27 16:12:04 wiz Exp $
+$NetBSD: patch-ac,v 1.6 2005/01/09 22:52:14 recht Exp $
 
---- src/system.h.orig	2004-05-11 10:11:49.000000000 +0200
-+++ src/system.h
-@@ -282,6 +282,9 @@ extern int errno;
+--- lib/system.h.orig	Mon Sep  6 15:49:42 2004
++++ lib/system.h	Sun Jan  9 18:25:02 2005
+@@ -282,6 +282,9 @@
  
  #if MAJOR_IN_MKDEV
  # include <sys/mkdev.h>
diff --git a/archivers/gtar-base/patches/patch-ad b/archivers/gtar-base/patches/patch-ad
new file mode 100644
index 00000000000..1f739a6ce38
--- /dev/null
+++ b/archivers/gtar-base/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.7 2005/01/09 22:52:14 recht Exp $
+
+--- Makefile.in.orig	Mon Dec 20 12:06:01 2004
++++ Makefile.in	Sun Jan  9 19:30:11 2005
+@@ -247,7 +247,7 @@
+ target_alias = @target_alias@
+ ACLOCAL_AMFLAGS = -I m4
+ EXTRA_DIST = ChangeLog.1 PORTS
+-SUBDIRS = doc lib rmt src scripts po tests
++SUBDIRS = lib rmt src scripts po tests
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
diff --git a/archivers/gtar-base/patches/patch-ae b/archivers/gtar-base/patches/patch-ae
new file mode 100644
index 00000000000..41e38124ba5
--- /dev/null
+++ b/archivers/gtar-base/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.7 2005/01/09 22:52:14 recht Exp $
+
+--- lib/Makefile.in.orig	Sun Jan  9 18:41:01 2005
++++ lib/Makefile.in	Sun Jan  9 18:42:35 2005
+@@ -668,7 +668,6 @@
+ all-am: Makefile $(LIBRARIES) $(HEADERS) all-local
+ installdirs:
+ install: $(BUILT_SOURCES)
+-	$(MAKE) $(AM_MAKEFLAGS) install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+ uninstall: uninstall-am
diff --git a/archivers/gtar-base/patches/patch-ag b/archivers/gtar-base/patches/patch-ag
index 14d33bb4a09..e07084f974c 100644
--- a/archivers/gtar-base/patches/patch-ag
+++ b/archivers/gtar-base/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2004/09/27 16:12:04 wiz Exp $
+$NetBSD: patch-ag,v 1.3 2005/01/09 22:52:14 recht Exp $
 
---- src/extract.c.orig	2004-04-05 09:23:51.000000000 +0200
-+++ src/extract.c
-@@ -182,7 +182,11 @@ set_mode (char const *file_name,
+--- src/extract.c.orig	Mon Sep 13 10:12:04 2004
++++ src/extract.c	Sun Jan  9 18:26:07 2005
+@@ -195,7 +195,11 @@
        mode = cur_info->st_mode ^ invert_permissions;
      }
  
@@ -14,7 +14,7 @@ $NetBSD: patch-ag,v 1.2 2004/09/27 16:12:04 wiz Exp $
      chmod_error_details (file_name, mode);
  }
  
-@@ -222,7 +226,12 @@ set_stat (char const *file_name,
+@@ -235,7 +239,12 @@
  {
    struct utimbuf utimbuf;
  
@@ -27,7 +27,7 @@ $NetBSD: patch-ag,v 1.2 2004/09/27 16:12:04 wiz Exp $
      {
        /* We do the utime before the chmod because some versions of utime are
  	 broken and trash the modes of the file.  */
-@@ -235,6 +244,7 @@ set_stat (char const *file_name,
+@@ -248,6 +257,7 @@
  
  	  /* FIXME: incremental_option should set ctime too, but how?  */
  
@@ -35,7 +35,7 @@ $NetBSD: patch-ag,v 1.2 2004/09/27 16:12:04 wiz Exp $
  	  if (incremental_option)
  	    utimbuf.actime = stat_info->st_atime;
  	  else
-@@ -243,6 +253,16 @@ set_stat (char const *file_name,
+@@ -256,6 +266,16 @@
  	  utimbuf.modtime = stat_info->st_mtime;
  
  	  if (utime (file_name, &utimbuf) < 0)
diff --git a/archivers/gtar-info/Makefile b/archivers/gtar-info/Makefile
index d5bbffabf00..0853100c1af 100644
--- a/archivers/gtar-info/Makefile
+++ b/archivers/gtar-info/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/09/27 16:12:04 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/01/09 22:52:14 recht Exp $
 #
 
-DISTNAME=       tar-1.14
-PKGNAME=	gtar-info-1.14
+DISTNAME=       tar-1.15.1
+PKGNAME=	gtar-info-1.15.1
 SVR4_PKGNAME=	gtari
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GNU:=tar/}
diff --git a/archivers/gtar-info/distinfo b/archivers/gtar-info/distinfo
index 2ab0514cdbb..d852272edaf 100644
--- a/archivers/gtar-info/distinfo
+++ b/archivers/gtar-info/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2004/09/27 16:12:04 wiz Exp $
+$NetBSD: distinfo,v 1.5 2005/01/09 22:52:14 recht Exp $
 
-SHA1 (tar-1.14.tar.gz) = 484d3ac9c15a598f2ee110155d87b3daecc7b13c
-Size (tar-1.14.tar.gz) = 1485633 bytes
+SHA1 (tar-1.15.1.tar.gz) = 21574ae5d39b698f7f577e2cecc91a5ec89b659c
+Size (tar-1.15.1.tar.gz) = 2204322 bytes
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index e4fbd70b7d8..78f0a749101 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2004/09/27 16:12:04 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/01/09 22:52:13 recht Exp $
 
-DISTNAME=	gtar-1.14
+DISTNAME=	gtar-1.15.1
 CATEGORIES=	archivers
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -9,8 +9,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/tar/tar.html
 COMMENT=	The "meta-package" for the GNU tape archiver (tar)
 
-DEPENDS+=	gtar-base-1.14:../../archivers/gtar-base
-DEPENDS+=	gtar-info-1.14:../../archivers/gtar-info
+DEPENDS+=	gtar-base-1.15.1:../../archivers/gtar-base
+DEPENDS+=	gtar-info-1.15.1:../../archivers/gtar-info
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews