Update gtar* to 1.13.25 on the netbsd-1-6 pkgsrc branch, for security

reasons.

Requested by Manuel Bouyer.

The files are synced with the following revisions, with changes necessary
for the 1.6 pkgsrc environnement (USE_BUILDLINK2, USE_PKGLOCALEDIR).

gtar/Makefile           1.17
gtar-base/Makefile      1.23
gtar-base/PLIST         1.3
gtar-base/distinfo      1.8
gtar-base/files/gtar.1  1.3
gtar-base/patches/patch-aa 1.5
gtar-base/patches/patch-ab 1.8
gtar-base/patches/patch-ac removed
gtar-base/patches/patch-ad removed
gtar-base/patches/patch-ae 1.4
gtar-base/patches/patch-af 1.1 (new file)
gtar-base/patches/patch-ag 1.1 (new file)
gtar-info/Makefile      1.8
gtar-info/PLIST         1.3
gtar-info/distinfo      1.3

8 files changed, 135 insertions, 31 deletions

diff --git a/archivers/gtar-base/patches/patch-ac b/archivers/gtar-base/patches/patch-ac
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/archivers/gtar-base/patches/patch-ac
+++ /dev/null
diff --git a/archivers/gtar-base/patches/patch-ad b/archivers/gtar-base/patches/patch-ad
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/archivers/gtar-base/patches/patch-ad
+++ /dev/null
diff --git a/archivers/gtar-base/patches/patch-ae b/archivers/gtar-base/patches/patch-ae
index cfa2d83fae4..c1273ca14da 100644
--- a/archivers/gtar-base/patches/patch-ae
+++ b/archivers/gtar-base/patches/patch-ae
@@ -1,21 +1,21 @@
-$NetBSD: patch-ae,v 1.3 2001/12/27 21:50:57 agc Exp $
+$NetBSD: patch-ae,v 1.3.8.1 2002/12/22 08:29:20 agc Exp $
 
---- Makefile.in.orig	Fri Apr 25 20:21:57 1997
-+++ Makefile.in	Thu Dec 27 16:28:31 2001
-@@ -102,9 +102,15 @@
- 
- AUTOMAKE_OPTIONS = gnits dist-shar
+--- Makefile.in.orig	Wed Sep 26 22:35:05 2001
++++ Makefile.in	Sun Nov 17 18:32:32 2002
+@@ -102,10 +102,15 @@
+ rmt_LDADD = @rmt_LDADD@
+ tar_LDADD = @tar_LDADD@
  
 +OPSYS!= uname -s
-+
- BABYL = rmail/* admin/*/RMAIL
- EXTRA_DIST = AC-PATCHES AM-PATCHES BI-PATCHES PORTS rebox.el
--SUBDIRS = doc lib intl src scripts po tests
+ AUTOMAKE_OPTIONS = gnits dist-bzip2 dist-shar
+ ACLOCAL_AMFLAGS = -I m4
+ EXTRA_DIST = ChangeLog.1 PORTS
+-SUBDIRS = doc intl lib m4 src scripts po tests
 +.if ${OPSYS} == "Darwin"
-+SUBDIRS = lib intl src scripts tests
++SUBDIRS = intl lib m4 src scripts tests
 +.else
-+SUBDIRS = lib intl src scripts po tests
++SUBDIRS = intl lib m4 src scripts po tests
 +.endif
+ subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- CONFIG_HEADER_IN = config.h.in
- CONFIG_HEADER_FULL = config.h
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/archivers/gtar-base/patches/patch-af b/archivers/gtar-base/patches/patch-af
new file mode 100644
index 00000000000..16f7c7b8c48
--- /dev/null
+++ b/archivers/gtar-base/patches/patch-af
@@ -0,0 +1,35 @@
+$NetBSD: patch-af,v 1.1.2.2 2002/12/22 08:29:20 agc Exp $
+This is based on, tar-dots.patch from RedHat tar-1.13.25-4.7.1.src.rpm, and
+http://www.security.nnov.ru/files/archive/tar-1.13.19.patch
+
+--- src/misc.c.orig	Mon Nov 11 15:09:06 2002
++++ src/misc.c	Mon Nov 11 15:14:34 2002
+@@ -203,17 +203,25 @@
+ {
+   char const *p = name + FILESYSTEM_PREFIX_LEN (name);
+ 
++  if (ISSLASH (*p)) return 1;
+   for (;;)
+     {
+-      if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
++      if (p[0] == '.' && p[1] == '.' && (!p[2] || ISSLASH (p[2])))
+ 	return 1;
+ 
+       do
+ 	{
+-	  if (! *p++)
++	  if (! *p)
+ 	    return 0;
+ 	}
+-      while (! ISSLASH (*p));
++      while (! ISSLASH (*p++));
++
++      do
++        {
++          if (! *p++)
++            return 0;
++        }
++      while ( ISSLASH (*p));
+     }
+ }
+ 
diff --git a/archivers/gtar-base/patches/patch-ag b/archivers/gtar-base/patches/patch-ag
new file mode 100644
index 00000000000..9d9e90afe47
--- /dev/null
+++ b/archivers/gtar-base/patches/patch-ag
@@ -0,0 +1,76 @@
+$NetBSD: patch-ag,v 1.1.2.2 2002/12/22 08:29:20 agc Exp $
+This include tar-1.13.19-absolutenames.patch, from RedHat tar-1.13.25-4.7.1.src.rpm
+
+--- src/extract.c.orig	Sun Nov 17 18:35:32 2002
++++ src/extract.c	Sun Nov 17 18:35:09 2002
+@@ -180,7 +180,11 @@
+       mode = current_stat_info->st_mode ^ invert_permissions;
+     }
+ 
++#if (defined (__NetBSD__) && NetBSD > 199706 && !defined(NetBSD1_2))
++  if (lchmod (file_name, mode) != 0)
++#else
+   if (chmod (file_name, mode) != 0)
++#endif
+     chmod_error_details (file_name, mode);
+ }
+ 
+@@ -216,7 +220,12 @@
+ {
+   struct utimbuf utimbuf;
+ 
++#if !(defined (__NetBSD__) && NetBSD > 199706 && !defined(NetBSD1_2))
+   if (typeflag != SYMTYPE)
++#else
++  struct timeval tv[2];
++#endif
++
+     {
+       /* We do the utime before the chmod because some versions of utime are
+ 	 broken and trash the modes of the file.  */
+@@ -229,6 +238,7 @@
+ 
+ 	  /* FIXME: incremental_option should set ctime too, but how?  */
+ 
++#if !(defined (__NetBSD__) && NetBSD > 199706 && !defined(NetBSD1_2))
+ 	  if (incremental_option)
+ 	    utimbuf.actime = stat_info->st_atime;
+ 	  else
+@@ -237,6 +247,16 @@
+ 	  utimbuf.modtime = stat_info->st_mtime;
+ 
+ 	  if (utime (file_name, &utimbuf) < 0)
++#else
++	if (incremental_option)
++		tv[0].tv_sec = stat_info->st_atime;
++	else
++		tv[0].tv_sec = start_time;
++	tv[0].tv_usec = 0;
++	tv[1].tv_sec = stat_info->st_mtime;
++	tv[1].tv_usec = 0;
++	if (lutimes (file_name, tv) < 0)
++#endif
+ 	    utime_error (file_name);
+ 	  else
+ 	    {
+@@ -1019,10 +1039,19 @@
+       {
+ 	struct stat st1, st2;
+ 	int e;
++	size_t skiplinkcrud;
++
++	if (absolute_names_option)
++	  skiplinkcrud = 0;
++	else {
++	  skiplinkcrud = FILESYSTEM_PREFIX_LEN (current_link_name);
++	  while (ISSLASH (current_link_name[skiplinkcrud]))
++	    skiplinkcrud++;
++	}
+ 
+ 	/* MSDOS does not implement links.  However, djgpp's link() actually
+ 	   copies the file.  */
+-	status = link (current_link_name, CURRENT_FILE_NAME);
++	status = link (current_link_name + skiplinkcrud, CURRENT_FILE_NAME);
+ 
+ 	if (status == 0)
+ 	  {
diff --git a/archivers/gtar-info/Makefile b/archivers/gtar-info/Makefile
index 12213b29ee7..9bc84793e8e 100644
--- a/archivers/gtar-info/Makefile
+++ b/archivers/gtar-info/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.6 2002/02/18 15:14:01 seb Exp $
+# $NetBSD: Makefile,v 1.6.8.1 2002/12/22 08:29:20 agc Exp $
 #
 
-DISTNAME=       tar-1.12
-PKGNAME=	gtar-info-1.12
+DISTNAME=       tar-1.13.25
+PKGNAME=	gtar-info-1.13.25
 SVR4_PKGNAME=	gtari
 CATEGORIES=	archivers
-MASTER_SITES=   ${MASTER_SITE_GNU:=tar/}
-EXTRACT_SUFX=	.shar.gz
+MASTER_SITES=	ftp://alpha.gnu.org/gnu/tar/ \
+		ftp://ftp.sunsite.org.uk/Mirrors/alpha.gnu.org/gnu/tar/ \
+		ftp://ftp.funet.fi/pub/mirrors/alpha.gnu.org/gnu/tar/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/tar/tar.html
diff --git a/archivers/gtar-info/PLIST b/archivers/gtar-info/PLIST
index 62e206bfcf9..29ef70e40e9 100644
--- a/archivers/gtar-info/PLIST
+++ b/archivers/gtar-info/PLIST
@@ -1,12 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:01 seb Exp $
+@comment $NetBSD: PLIST,v 1.2.8.1 2002/12/22 08:29:21 agc Exp $
 @unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/tar.info
 info/tar.info
-info/tar.info-1
-info/tar.info-2
-info/tar.info-3
-info/tar.info-4
-info/tar.info-5
-info/tar.info-6
-info/tar.info-7
-info/tar.info-8
 @exec ${INSTALL_INFO} --info-dir=%D/info %D/info/tar.info
diff --git a/archivers/gtar-info/distinfo b/archivers/gtar-info/distinfo
index dafbbcb13a4..bef442fec00 100644
--- a/archivers/gtar-info/distinfo
+++ b/archivers/gtar-info/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 11:21:04 agc Exp $
+$NetBSD: distinfo,v 1.2.8.1 2002/12/22 08:29:21 agc Exp $
 
-SHA1 (tar-1.12.shar.gz) = 4cab31f6be9c6803679213a46bb3432670a151fc
-Size (tar-1.12.shar.gz) = 1258219 bytes
+SHA1 (tar-1.13.25.tar.gz) = d27fda27af621a1182bff289d4bfc7b37019effe
+Size (tar-1.13.25.tar.gz) = 1312227 bytes