Update to bugfix release 1.26.

7 files changed, 16 insertions, 76 deletions

diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 6b1334d3e40..278fd628577 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tar
-PORTVERSION=	1.25
-PORTREVISION=	1
+PORTVERSION=	1.26
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,6 +20,7 @@ COMMENT=	GNU version of the traditional tape archiver
 
 INFO=		tar
 
+USE_AUTOTOOLS=	autoconf:env	# autom4te
 USE_XZ=		yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
diff --git a/archivers/gtar/distinfo b/archivers/gtar/distinfo
index e8b1f3e6c49..b96b82d2a9d 100644
--- a/archivers/gtar/distinfo
+++ b/archivers/gtar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tar-1.25.tar.xz) = 81230b829e2acea2fcd4c686b15f6a77d961871d0d72b961bbebcbd65e04d04c
-SIZE (tar-1.25.tar.xz) = 1767776
+SHA256 (tar-1.26.tar.xz) = 8e7959b8edfa1eeed75819d887a2da2412a4467ef7312f7242cfc6907854b332
+SIZE (tar-1.26.tar.xz) = 1783904
diff --git a/archivers/gtar/files/patch-src_create.c b/archivers/gtar/files/patch-src_create.c
deleted file mode 100644
index 05ee743a2f5..00000000000
--- a/archivers/gtar/files/patch-src_create.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$FreeBSD$
-
-Fix bug with --one-file-system and --listed-incremental.
-
---- src/create.c.orig	2010-11-01 21:34:59.000000000 +0100
-+++ src/create.c	2010-11-27 21:12:55.000000000 +0100
-@@ -1680,7 +1680,7 @@ dump_file0 (struct tar_stat_info *st, ch
-      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/files/patch-src_extract.c b/archivers/gtar/files/patch-src_extract.c
deleted file mode 100644
index 4d412bb3276..00000000000
--- a/archivers/gtar/files/patch-src_extract.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$FreeBSD$
-
-FreeBSD produces errno == EMLINK for open("symlink", O_NOFOLLOW|...).
-
---- src/extract.c.orig	2010-11-23 16:56:47.000000000 +0100
-+++ src/extract.c	2010-11-23 16:57:04.000000000 +0100
-@@ -609,6 +609,7 @@ maybe_recoverable (char *file_name, bool
-   switch (e)
-     {
-     case ELOOP:
-+    case EMLINK:
-       if (! regular
- 	  || old_files_option != OVERWRITE_OLD_FILES || dereference_option)
- 	break;
diff --git a/archivers/gtar/files/patch-src_incremen.c b/archivers/gtar/files/patch-src_incremen.c
deleted file mode 100644
index 3c2ae5d7e8d..00000000000
--- a/archivers/gtar/files/patch-src_incremen.c
+++ /dev/null
@@ -1,28 +0,0 @@
-$FreeBSD$
-
-Fix bug with --one-file-system and --listed-incremental.
-
---- src/incremen.c.orig	2010-10-24 20:07:55.000000000 +0200
-+++ src/incremen.c	2010-11-27 21:08:05.000000000 +0100
-@@ -426,7 +426,6 @@ procdir (const char *name_buffer, struct
- {
-   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 @@ procdir (const char *name_buffer, struct
- 	}
-     }
- 
--  /* 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/files/patch-src_names.c b/archivers/gtar/files/patch-src_names.c
deleted file mode 100644
index 8f29ba48e18..00000000000
--- a/archivers/gtar/files/patch-src_names.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$FreeBSD$
-
-Fix bug with --one-file-system and --listed-incremental.
-
---- src/names.c.orig	2010-10-24 20:07:55.000000000 +0200
-+++ src/names.c	2010-11-27 21:11:20.000000000 +0100
-@@ -360,8 +360,6 @@ name_next_elt (int change_dirs)
- 	{
- 	  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;
diff --git a/archivers/gtar/files/patch-tests_sparse04.at b/archivers/gtar/files/patch-tests_sparse04.at
new file mode 100644
index 00000000000..b7a329d817a
--- /dev/null
+++ b/archivers/gtar/files/patch-tests_sparse04.at
@@ -0,0 +1,12 @@
+$FreeBSD$
+--- tests/sparse04.at.orig	2011-02-16 23:12:16.000000000 +0100
++++ tests/sparse04.at	2011-03-15 22:27:50.000000000 +0100
+@@ -34,7 +34,7 @@ m4_define([NAME_111],
+ 
+ AT_TAR_CHECK([
+ genfile --sparse --file NAME_111 --block-size 512 8M A || AT_SKIP_TEST
+-tar -c --sparse --posix NAME_111 | tar t
++tar -f - -c --sparse --posix NAME_111 | tar tf -
+ ],
+ [0],
+ [NAME_111