Stage 1 of system GNU tar upgrade to a modern version:

Merge all applicable bugfixes, local hacks and new features from the ancient
base system tar into the port, so those two are interchangeable.

Bump PORTREVISION.

10 files changed, 417 insertions, 1 deletions

diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index b0dbbb9d6bbe..271f028c6d07 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tar
 PORTVERSION=	1.13.25
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	ftp://alpha.gnu.org/gnu/tar/ \
 		ftp://ftp.sunsite.org.uk/Mirrors/alpha.gnu.org/gnu/tar/ \
diff --git a/archivers/gtar/files/patch-src::buffer.c b/archivers/gtar/files/patch-src::buffer.c
new file mode 100644
index 000000000000..f0346806ed87
--- /dev/null
+++ b/archivers/gtar/files/patch-src::buffer.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/buffer.c	2002/06/01 21:08:46	1.1
++++ src/buffer.c	2002/06/01 21:09:16
+@@ -1540,7 +1540,7 @@
+ 		  child = xfork ();
+ 		  if (child == 0)
+ 		    {
+-		      execlp (shell, "-sh", "-i", 0);
++		      execlp (shell, "-sh", "-i", (char *) 0);
+ 		      exec_fatal (shell);
+ 		    }
+ 		  else
diff --git a/archivers/gtar/files/patch-src::common.h b/archivers/gtar/files/patch-src::common.h
new file mode 100644
index 000000000000..6215a44754ac
--- /dev/null
+++ b/archivers/gtar/files/patch-src::common.h
@@ -0,0 +1,25 @@
+
+$FreeBSD$
+
+--- src/common.h	2002/06/01 21:08:46	1.1
++++ src/common.h	2002/06/01 21:09:16
+@@ -152,6 +152,9 @@
+ /* Patterns that match file names to be excluded.  */
+ GLOBAL struct exclude *excluded;
+ 
++/* Boolean value.  */
++GLOBAL int fast_read_option;
++
+ /* Specified file containing names to work on.  */
+ GLOBAL const char *files_from_option;
+ 
+@@ -195,6 +198,9 @@
+ 
+ /* Boolean value.  */
+ GLOBAL int multi_volume_option;
++
++/* Boolean value.  */
++GLOBAL int namelist_freed;
+ 
+ /* The same variable hold the time, whether mtime or ctime.  Just fake a
+    non-existing option, for making the code clearer, elsewhere.  */
diff --git a/archivers/gtar/files/patch-src::compare.c b/archivers/gtar/files/patch-src::compare.c
new file mode 100644
index 000000000000..f6c79e504590
--- /dev/null
+++ b/archivers/gtar/files/patch-src::compare.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/compare.c	2002/06/01 21:08:46	1.1
++++ src/compare.c	2002/06/01 21:09:16
+@@ -565,7 +565,7 @@
+ 	size_t len = strlen (current_link_name);
+ 	char *linkbuf = alloca (len + 1);
+ 
+-	status = readlink (current_file_name, linkbuf, len + 1);
++	status = readlink (current_file_name, linkbuf, len);
+ 
+ 	if (status < 0)
+ 	  {
diff --git a/archivers/gtar/files/patch-src::create.c b/archivers/gtar/files/patch-src::create.c
new file mode 100644
index 000000000000..f012ae313219
--- /dev/null
+++ b/archivers/gtar/files/patch-src::create.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/create.c	2002/06/01 21:08:46	1.1
++++ src/create.c	2002/06/01 21:09:16
+@@ -1473,7 +1473,7 @@
+ 	  if (linklen != current_stat.st_size || linklen + 1 == 0)
+ 	    xalloc_die ();
+ 	  buffer = (char *) alloca (linklen + 1);
+-	  size = readlink (p, buffer, linklen + 1);
++	  size = readlink (p, buffer, linklen);
+ 	  if (size < 0)
+ 	    {
+ 	      if (ignore_failed_read_option)
diff --git a/archivers/gtar/files/patch-src::list.c b/archivers/gtar/files/patch-src::list.c
new file mode 100644
index 000000000000..11ecc9e532de
--- /dev/null
+++ b/archivers/gtar/files/patch-src::list.c
@@ -0,0 +1,49 @@
+
+$FreeBSD$
+
+--- src/list.c	2002/06/01 21:08:46	1.1
++++ src/list.c	2002/06/01 21:09:16
+@@ -24,6 +24,7 @@
+ 
+ #include "system.h"
+ #include <quotearg.h>
++#include <langinfo.h>
+ 
+ #include "common.h"
+ 
+@@ -78,6 +79,10 @@
+     {
+       prev_status = status;
+       status = read_header (0);
++      /* check if the namelist got emptied during the course of reading */
++      /* the tape, if so stop by setting status to EOF */
++      if (namelist_freed)
++        status = HEADER_END_OF_FILE;
+       switch (status)
+ 	{
+ 	case HEADER_STILL_UNREAD:
+@@ -832,6 +837,7 @@
+ char const *
+ tartime (time_t t)
+ {
++#if !defined(__FreeBSD__)
+   static char buffer[max (UINTMAX_STRSIZE_BOUND + 1,
+ 			  INT_STRLEN_BOUND (int) + 16)];
+   char *p;
+@@ -870,6 +876,16 @@
+   while (buffer + sizeof buffer - 19 - 1 < p)
+     *--p = ' ';
+   return p;
++#else /* __FreeBSD__ */
++  static char buffer[80];
++  static int d_first = -1;
++
++  if (d_first < 0)
++    d_first = (*nl_langinfo(D_MD_ORDER) == 'd');
++  strftime(buffer, sizeof(buffer), d_first ? "%e %b %R %Y" : "%b %e %R %Y",
++           localtime(&t));
++  return buffer;
++#endif /* __FreeBSD__ */
+ }
+ 
+ /* Actually print it.
diff --git a/archivers/gtar/files/patch-src::misc.c b/archivers/gtar/files/patch-src::misc.c
new file mode 100644
index 000000000000..1a891c28e9a3
--- /dev/null
+++ b/archivers/gtar/files/patch-src::misc.c
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- src/misc.c	2002/06/01 21:08:46	1.1
++++ src/misc.c	2002/06/01 21:09:16
+@@ -549,10 +549,8 @@
+ chmod_error_details (char const *name, mode_t mode)
+ {
+   int e = errno;
+-  char buf[10];
+-  decode_mode (mode, buf);
+-  ERROR ((0, e, _("%s: Cannot change mode to %s"),
+-	  quotearg_colon (name), buf));
++  ERROR ((0, e, _("%s: Cannot change mode to 0%o"),
++	  quotearg_colon (name), mode));
+ }
+ 
+ void
diff --git a/archivers/gtar/files/patch-src::names.c b/archivers/gtar/files/patch-src::names.c
new file mode 100644
index 000000000000..0403fa23abfc
--- /dev/null
+++ b/archivers/gtar/files/patch-src::names.c
@@ -0,0 +1,52 @@
+
+$FreeBSD$
+
+--- src/names.c	2002/06/01 21:08:46	1.1
++++ src/names.c	2002/06/01 21:09:16
+@@ -549,6 +549,7 @@
+   while (1)
+     {
+       struct name *cursor = namelist;
++      struct name *tmpnlp;
+ 
+       if (!cursor)
+ 	return ! files_from_option;
+@@ -572,6 +573,38 @@
+ 	      nametail = &namelist;
+ 	    }
+ 	  chdir_do (cursor->change_dir);
++	  if (fast_read_option)
++	    {
++	    /* remove the current entry, since we found a match */
++	      if (namelist->next == NULL)
++	        {
++	          /* the list contains one element */
++	          free(namelist);
++	          namelist = 0;
++	          nametail = &namelist;
++	          /* set a boolean to decide wether we started with a */
++	          /* non-empty  namelist, that was emptied */
++	          namelist_freed = 1;
++	        }
++	      else
++	        {
++	          if (cursor == namelist)
++	            {
++	              /* the first element is the one */
++	              tmpnlp = namelist->next;
++	              free(namelist);
++	              namelist = tmpnlp;
++	            }
++	          else
++	            {
++	              tmpnlp = namelist;
++	              while (tmpnlp->next != cursor)
++	                tmpnlp = tmpnlp->next;
++	              tmpnlp->next = cursor->next;
++	              free(cursor);
++	            }
++	        }
++	    }
+   
+ 	  /* We got a match.  */
+ 	  return 1;
diff --git a/archivers/gtar/files/patch-src::rtapelib.c b/archivers/gtar/files/patch-src::rtapelib.c
new file mode 100644
index 000000000000..0ac28e95f6d9
--- /dev/null
+++ b/archivers/gtar/files/patch-src::rtapelib.c
@@ -0,0 +1,29 @@
+
+$FreeBSD$
+
+--- src/rtapelib.c	2002/06/01 21:08:46	1.1
++++ src/rtapelib.c	2002/06/01 21:09:16
+@@ -437,6 +437,9 @@
+     /* Identify the remote command to be executed.  */
+ 
+     if (!remote_shell)
++      remote_shell = getenv("TAR_RSH");
++
++    if (!remote_shell)
+       {
+ #ifdef REMOTE_SHELL
+ 	remote_shell = REMOTE_SHELL;
+@@ -488,10 +491,10 @@
+ #endif
+ 
+ 	if (remote_user)
+-	  execl (remote_shell, remote_shell_basename, remote_host,
+-		 "-l", remote_user, "/etc/rmt", (char *) 0);
++	  execlp (remote_shell, remote_shell_basename, "-l", remote_user,
++	  	remote_host, "/etc/rmt", (char *) 0);
+ 	else
+-	  execl (remote_shell, remote_shell_basename, remote_host,
++	  execlp (remote_shell, remote_shell_basename, remote_host,
+ 		 "/etc/rmt", (char *) 0);
+ 
+ 	/* Bad problems if we get here.  */
diff --git a/archivers/gtar/files/patch-src::tar.c b/archivers/gtar/files/patch-src::tar.c
new file mode 100644
index 000000000000..781003101b5c
--- /dev/null
+++ b/archivers/gtar/files/patch-src::tar.c
@@ -0,0 +1,201 @@
+
+$FreeBSD$
+
+--- src/tar.c	2002/06/01 21:08:46	1.1
++++ src/tar.c	2002/06/01 21:09:16
+@@ -184,7 +184,9 @@
+   {"block-number", no_argument, 0, 'R'},
+   {"block-size", required_argument, 0, OBSOLETE_BLOCKING_FACTOR},
+   {"blocking-factor", required_argument, 0, 'b'},
++  {"bzip", no_argument, 0, 'j'},
+   {"bzip2", no_argument, 0, 'j'},
++  {"bunzip2", no_argument, 0, 'j'},
+   {"catenate", no_argument, 0, 'A'},
+   {"checkpoint", no_argument, &checkpoint_option, 1},
+   {"compare", no_argument, 0, 'd'},
+@@ -200,6 +202,7 @@
+   {"exclude", required_argument, 0, EXCLUDE_OPTION},
+   {"exclude-from", required_argument, 0, 'X'},
+   {"extract", no_argument, 0, 'x'},
++  {"fast-read", no_argument, &fast_read_option, 1},
+   {"file", required_argument, 0, 'f'},
+   {"files-from", required_argument, 0, 'T'},
+   {"force-local", no_argument, &force_local_option, 1},
+@@ -230,6 +233,7 @@
+   {"no-ignore-case", no_argument, 0, NO_IGNORE_CASE_OPTION},
+   {"no-wildcards", no_argument, 0, NO_WILDCARDS_OPTION},
+   {"no-wildcards-match-slash", no_argument, 0, NO_WILDCARDS_MATCH_SLASH_OPTION},
++  {"norecurse", no_argument, &recursion_option, 0},
+   {"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},
+@@ -266,6 +270,7 @@
+   {"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'},
+   {"use-compress-program", required_argument, 0, USE_COMPRESS_PROGRAM_OPTION},
+@@ -326,15 +331,17 @@
+   -k, --keep-old-files       don't replace existing files when extracting\n\
+       --overwrite            overwrite existing files when extracting\n\
+       --overwrite-dir        overwrite directory metadata when extracting\n\
+-  -U, --unlink-first         remove each file prior to extracting over it\n\
++  -U, --unlink,\n\
++      --unlink-first         remove each file prior to extracting over it\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\
+   -G, --incremental          handle old GNU-format incremental backup\n\
+   -g, --listed-incremental=FILE\n\
+                              handle new GNU-format incremental backup\n\
+-      --ignore-failed-read   do not exit with nonzero on unreadable files\n"),
+-	     stdout);
++      --ignore-failed-read   do not exit with nonzero on unreadable files\n\
++      --fast-read            stop after desired names in archive have been found\n"),
++	    stdout);
+       fputs (_("\
+ \n\
+ Handling of file attributes:\n\
+@@ -344,6 +351,8 @@
+       --atime-preserve         don't change access times on dumped files\n\
+   -m, --modification-time      don't extract file modified time\n\
+       --same-owner             try extracting files with the same ownership\n\
++      --show-omitted-dirs      show omitted directories while processing the\n\
++                               archive\n\
+       --no-same-owner          extract files as yourself\n\
+       --numeric-owner          always use numbers for user/group names\n\
+   -p, --same-permissions       extract permissions information\n\
+@@ -357,7 +366,7 @@
+ \n\
+ Device selection and switching:\n\
+   -f, --file=ARCHIVE             use archive file or device ARCHIVE\n\
+-      --force-local              archive file is local even if has a colon\n\
++      --force-local              archive file is local even if it has a colon\n\
+       --rsh-command=COMMAND      use remote COMMAND instead of rsh\n\
+   -[0-7][lmh]                    specify drive and density\n\
+   -M, --multi-volume             create/list/extract multi-volume archive\n\
+@@ -381,7 +390,7 @@
+               PATTERN                at list/extract time, a globbing PATTERN\n\
+   -o, --old-archive, --portability   write a V7 format archive\n\
+       --posix                        write a POSIX format archive\n\
+-  -j, --bzip2                        filter the archive through bzip2\n\
++  -j, -y, --bzip, --bzip2, --bunzip2 filter the archive through bzip2\n\
+   -z, --gzip, --ungzip               filter the archive through gzip\n\
+   -Z, --compress, --uncompress       filter the archive through compress\n\
+       --use-compress-program=PROG    filter through PROG (must accept -d)\n"),
+@@ -390,9 +399,9 @@
+ \n\
+ Local file selection:\n\
+   -C, --directory=DIR          change to directory DIR\n\
+-  -T, --files-from=NAME        get names to extract or create from file NAME\n\
++  -T, -I, --files-from=NAME    get names to extract or create from file NAME\n\
+       --null                   -T reads null-terminated names, disable -C\n\
+-      --exclude=PATTERN        exclude files, given as a PATTERN\n\
++      --exclude=PATTERN        exclude files, given as a a globbing PATTERN\n\
+   -X, --exclude-from=FILE      exclude patterns listed in FILE\n\
+       --anchored               exclude patterns match file name start (default)\n\
+       --no-anchored            exclude patterns match after any /\n\
+@@ -404,14 +413,17 @@
+       --no-wildcards-match-slash exclude pattern wildcards do not match '/'\n\
+   -P, --absolute-names         don't strip leading `/'s from file names\n\
+   -h, --dereference            dump instead the files symlinks point to\n\
++  -n, --norecurse\n\
+       --no-recursion           avoid descending automatically in directories\n\
+   -l, --one-file-system        stay in local file system when creating archive\n\
+   -K, --starting-file=NAME     begin at file NAME in the archive\n"),
+ 	     stdout);
+ #if !MSDOS
+       fputs (_("\
+-  -N, --newer=DATE             only store files newer than DATE\n\
+-      --newer-mtime=DATE       compare date and time when data changed only\n\
++  -N, --newer=DATE             only store files with creation time newer than\n\
++                               DATE\n\
++      --newer-mtime=DATE       only store files with modification time newer\n\
++                               than DATE\n\
+       --after-date=DATE        same as -N\n"),
+ 	     stdout);
+ #endif
+@@ -425,7 +437,7 @@
+       --help            print this help, then exit\n\
+       --version         print tar program version number, then exit\n\
+   -v, --verbose         verbosely list files processed\n\
+-      --checkpoint      print directory names while reading the archive\n\
++      --checkpoint      print number of buffer reads/writes\n\
+       --totals          print total bytes written while creating archive\n\
+   -R, --block-number    show block number within archive with each message\n\
+   -w, --interactive     ask for confirmation for every action\n\
+@@ -467,7 +479,7 @@
+    Y  per-block gzip compression */
+ 
+ #define OPTION_STRING \
+-  "-01234567ABC:F:GIK:L:MN:OPRST:UV:WX:Zb:cdf:g:hijklmoprstuvwxyz"
++  "-01234567ABC:F:GI:K:L:MnN:OPRST:UV:WX:Zb:cdf:g:hijklmoprstuvwxyz"
+ 
+ static void
+ set_subcommand_option (enum subcommand subcommand)
+@@ -507,6 +519,7 @@
+   excluded = new_exclude ();
+   newer_mtime_option = TYPE_MINIMUM (time_t);
+   recursion_option = FNM_LEADING_DIR;
++  namelist_freed = 0;
+ 
+   owner_option = -1;
+   group_option = -1;
+@@ -691,13 +704,8 @@
+ 	ignore_zeros_option = 1;
+ 	break;
+ 
+-      case 'I':
+-	USAGE_ERROR ((0, 0,
+-		      _("Warning: the -I option is not supported;"
+-			" perhaps you meant -j or -T?")));
+-	break;
+-
+       case 'j':
++      case 'y':
+ 	set_use_compress_program_option ("bzip2");
+ 	break;
+ 
+@@ -744,6 +752,10 @@
+ 	multi_volume_option = 1;
+ 	break;
+ 
++      case 'n':
++	recursion_option = 0;
++	break;
++
+ #if !MSDOS
+       case 'N':
+ 	after_date_option = 1;
+@@ -834,6 +846,7 @@
+ 	break;
+ 
+       case 'T':
++      case 'I':
+ 	files_from_option = optarg;
+ 	break;
+ 
+@@ -875,12 +888,6 @@
+ 	  }
+ 	break;
+ 
+-      case 'y':
+-	USAGE_ERROR ((0, 0,
+-		      _("Warning: the -y option is not supported;"
+-			" perhaps you meant -j?")));
+-	break;
+-
+       case 'z':
+ 	set_use_compress_program_option ("gzip");
+ 	break;
+@@ -1266,7 +1273,7 @@
+ #endif
+     start_time = time (0);
+   program_name = argv[0];
+-  setlocale (LC_ALL, "");
++  (void) setlocale (LC_ALL, "");
+   bindtextdomain (PACKAGE, LOCALEDIR);
+   textdomain (PACKAGE);
+