Update to GNU tar 1.20. All self-tests pass under NetBSD-current. Changes: 3.5 years worth of development; too much to list here.diff -r1.62 -r1.63 pkgsrc/archivers/gtar-base/Makefile
(tnn)
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2008/04/12 22:42:57 jlam Exp $
+# $NetBSD: Makefile,v 1.63 2008/05/18 01:48:09 tnn Exp $
-DISTNAME= tar-1.15.1
-PKGNAME= gtar-base-1.15.1
-PKGREVISION= 6
+DISTNAME= tar-1.20
+PKGNAME= gtar-base-1.20
SVR4_PKGNAME= gtarb
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_GNU:=tar/}
@@ -54,6 +53,11 @@
# don't include rmt if gtar won't build it
.if ${OPSYS} != "Interix"
PLIST.rmt= yes
+.endif
+
+# XXX see similar hack in coreutils.
+.if ${OPSYS} != "Linux"
+CONFIGURE_ENV+= gt_cv_func_gnugettext3_libintl=yes
.endif
post-install:
@@ -1,14 +1,16 @@
-@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:42:57 jlam Exp $
+@comment $NetBSD: PLIST,v 1.13 2008/05/18 01:48:09 tnn Exp $
bin/${GTAR_PROGRAM_PREFIX}tar
${PLIST.gtar}bin/gtar
${PLIST.rmt}libexec/${GTAR_PROGRAM_PREFIX}rmt
man/man1/${GTAR_PROGRAM_PREFIX}tar.1
+share/locale/bg/LC_MESSAGES/tar.mo
share/locale/cs/LC_MESSAGES/tar.mo
share/locale/da/LC_MESSAGES/tar.mo
share/locale/de/LC_MESSAGES/tar.mo
share/locale/el/LC_MESSAGES/tar.mo
share/locale/es/LC_MESSAGES/tar.mo
share/locale/et/LC_MESSAGES/tar.mo
+share/locale/eu/LC_MESSAGES/tar.mo
share/locale/fi/LC_MESSAGES/tar.mo
share/locale/fr/LC_MESSAGES/tar.mo
share/locale/ga/LC_MESSAGES/tar.mo
@@ -19,10 +21,10 @@
share/locale/it/LC_MESSAGES/tar.mo
share/locale/ja/LC_MESSAGES/tar.mo
share/locale/ko/LC_MESSAGES/tar.mo
+share/locale/ky/LC_MESSAGES/tar.mo
share/locale/ms/LC_MESSAGES/tar.mo
share/locale/nb/LC_MESSAGES/tar.mo
share/locale/nl/LC_MESSAGES/tar.mo
-share/locale/no/LC_MESSAGES/tar.mo
share/locale/pl/LC_MESSAGES/tar.mo
share/locale/pt/LC_MESSAGES/tar.mo
share/locale/pt_BR/LC_MESSAGES/tar.mo
@@ -32,5 +34,7 @@
share/locale/sl/LC_MESSAGES/tar.mo
share/locale/sv/LC_MESSAGES/tar.mo
share/locale/tr/LC_MESSAGES/tar.mo
+share/locale/uk/LC_MESSAGES/tar.mo
+share/locale/vi/LC_MESSAGES/tar.mo
share/locale/zh_CN/LC_MESSAGES/tar.mo
share/locale/zh_TW/LC_MESSAGES/tar.mo
@@ -1,16 +1,10 @@
-$NetBSD: distinfo,v 1.21 2008/04/02 22:03:07 tonnerre Exp $
+$NetBSD: distinfo,v 1.22 2008/05/18 01:48:09 tnn Exp $
-SHA1 (tar-1.15.1.tar.gz) = 21574ae5d39b698f7f577e2cecc91a5ec89b659c
+SHA1 (tar-1.20.tar.gz) = 1bc0731a00f2483f381c48e0b3f359877ddff910
-RMD160 (tar-1.15.1.tar.gz) = 83f35ee090d05f0865ebd9915bbd1b649a6555c5
+RMD160 (tar-1.20.tar.gz) = 6ac6847b4d0f4fcd61408f63df18b503699f2fb9
-Size (tar-1.15.1.tar.gz) = 2204322 bytes
+Size (tar-1.20.tar.gz) = 2822777 bytes
-SHA1 (patch-aa) = adbd252113bfb131de80bbcf8150b2a955e17058
+SHA1 (patch-ab) = bc2cb4547a0df1d1877a3d09a6e3969123ddecab
-SHA1 (patch-ab) = 59e75a2051738076ad948ebc4db1240d47e7d366
+SHA1 (patch-ad) = c5106ba2d0a0414ccbc55dfbf71c95280080b190
-SHA1 (patch-ac) = 072a7eaff685093b86289e0b45281c41ae06f4fc
+SHA1 (patch-ae) = 99323cf270e3e60dd21db42aea3556dd9255cef2
-SHA1 (patch-ad) = 8f109cbc150cb7db48b7a59dcba9eefb654875e0
+SHA1 (patch-af) = 8e57e09e3b1a79310dc343c3741fc94916788b79
-SHA1 (patch-ae) = 6518ab82e19c831f16bc772136fafc037a592df4
+SHA1 (patch-ag) = 8e1f6d2b6d38a029485cd7a1987cc6acb6a4cc84
-SHA1 (patch-af) = be20dafd1c65db4ca60a5aedbc7a972117cd7072
-SHA1 (patch-ag) = 39fd6e84665a632258c722a35359713a1e194287
-SHA1 (patch-ah) = d8532a99bf2bd0c35a9d994101fbd722f52c9ead
-SHA1 (patch-ai) = 9e065a4bbe3fcaee7e08a53b64e863b8fbd0d32a
-SHA1 (patch-aj) = 409760785d3a0e12175760f2f71e192c3dd1ef52
-SHA1 (patch-ak) = 0bc0bae9d39eafdc6a54a59708e01063b9e41497
@@ -1,60 +1,32 @@
-$NetBSD: patch-ab,v 1.11 2006/12/03 15:21:20 tron Exp $
+$NetBSD: patch-ab,v 1.12 2008/05/18 01:48:09 tnn Exp $
---- src/tar.c.orig 2004-12-21 14:11:26.000000000 +0000
-+++ src/tar.c 2006-12-03 15:13:25.000000000 +0000
-@@ -181,6 +181,7 @@
- enum
- {
- ANCHORED_OPTION = CHAR_MAX + 1,
-+ ALLOW_NAME_MANGLING_OPTION,
- ATIME_PRESERVE_OPTION,
- BACKUP_OPTION,
- CHECKPOINT_OPTION,
-@@ -203,6 +204,7 @@
+--- src/tar.c.orig 2008-04-14 14:03:13.000000000 +0200
++++ src/tar.c
+@@ -285,6 +286,7 @@ enum
NO_RECURSION_OPTION,
NO_SAME_OWNER_OPTION,
NO_SAME_PERMISSIONS_OPTION,
+ NO_UNLINK_FIRST_OPTION,
- NO_WILDCARDS_OPTION,
+ NO_UNQUOTE_OPTION,
NO_WILDCARDS_MATCH_SLASH_OPTION,
- NULL_OPTION,
-@@ -340,6 +342,8 @@
- N_("try extracting files with the same ownership"), 31 },
+ NO_WILDCARDS_OPTION,
+@@ -483,6 +485,8 @@ static struct argp_option options[] = {
+ N_("try extracting files with the same ownership"), GRID+1 },
{"no-same-owner", NO_SAME_OWNER_OPTION, 0, 0,
- N_("extract files as yourself"), 31 },
+ N_("extract files as yourself"), GRID+1 },
+ {"no-unlink-first", NO_UNLINK_FIRST_OPTION, 0, 0,
-+ N_("don't remove each file prior to extracting"), 31 },
++ N_("don't remove each file prior to extracting"), GRID+1 },
{"numeric-owner", NUMERIC_OWNER_OPTION, 0, 0,
- N_("always use numbers for user/group names"), 31 },
+ N_("always use numbers for user/group names"), GRID+1 },
{"preserve-permissions", 'p', 0, 0,
-@@ -528,6 +532,8 @@
-
- {NULL, 'o', 0, 0,
- N_("when creating, same as --old-archive. When extracting, same as --no-same-owner"), 91 },
-+ {"allow-name-mangling", ALLOW_NAME_MANGLING_OPTION, 0, 0,
-+ N_("when creating, allow GNUTYPE_NAMES mangling -- considered dangerous"), 91 },
-
- {NULL, 0, NULL, 0,
- N_("Other options:"), 100 },
-@@ -865,6 +871,10 @@
- case 'U':
+@@ -1495,6 +1501,10 @@ parse_opt (int key, char *arg, struct ar
old_files_option = UNLINK_FIRST_OLD_FILES;
break;
-+
+
+ case NO_UNLINK_FIRST_OPTION:
+ old_files_option = 0;
+ break;
-
++
case UTC_OPTION:
utc_option = true;
-@@ -913,6 +923,10 @@
- case 'Z':
- set_use_compress_program_option ("compress");
break;
-+
-+ case ALLOW_NAME_MANGLING_OPTION:
-+ allow_name_mangling_option = true;
-+ break;
-
- case ANCHORED_OPTION:
- args->exclude_options |= EXCLUDE_ANCHORED;
@@ -1,9 +1,9 @@
-$NetBSD: patch-ad,v 1.7 2005/01/09 22:52:14 recht Exp $
+$NetBSD: patch-ad,v 1.8 2008/05/18 01:48:09 tnn 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@
+--- Makefile.in.orig 2008-04-14 14:04:01.000000000 +0200
++++ Makefile.in
+@@ -532,7 +532,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = ChangeLog.1 PORTS
-SUBDIRS = doc lib rmt src scripts po tests
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.7 2005/01/09 22:52:14 recht Exp $
+$NetBSD: patch-ae,v 1.8 2008/05/18 01:48:09 tnn 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
+--- lib/Makefile.in.orig 2008-04-14 14:03:58.000000000 +0200
++++ lib/Makefile.in
+@@ -980,7 +980,6 @@ check: $(BUILT_SOURCES)
+ all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) all-local
installdirs:
install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-am
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.3 2005/02/09 16:00:42 tv Exp $
+$NetBSD: patch-af,v 1.4 2008/05/18 01:48:09 tnn Exp $
---- tests/testsuite.orig 2004-12-21 08:36:33.000000000 -0500
+--- tests/testsuite.orig 2008-04-14 14:11:06.000000000 +0200
+++ tests/testsuite
-@@ -303,7 +303,7 @@ at_times_file=$at_suite_dir/at-times
+@@ -620,7 +620,7 @@ at_times_file=$at_suite_dir/at-times
# List of the tested programs.
at_tested='tar'
# List of the all the test groups.
--at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37'
-+at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37'
- # As many dots as there are digits in the last test group number.
+-at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74'
++at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74'
+ # As many question marks as there are digits in the last test group number.
# Used to normalize the test group numbers so that `ls' lists them in
# numerical order.
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.4 2006/12/03 15:21:20 tron Exp $
+$NetBSD: patch-ag,v 1.5 2008/05/18 01:48:09 tnn Exp $
---- src/extract.c.orig 2004-12-21 09:55:12.000000000 +0000
-+++ src/extract.c 2006-12-03 15:13:25.000000000 +0000
-@@ -195,7 +195,11 @@
+--- src/extract.c.orig 2007-08-26 10:56:55.000000000 +0200
++++ src/extract.c
+@@ -186,7 +186,11 @@ set_mode (char const *file_name,
mode = cur_info->st_mode ^ invert_permissions;
}
@@ -14,56 +14,3 @@
chmod_error_details (file_name, mode);
}
-@@ -235,7 +239,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. */
-@@ -248,6 +257,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
-@@ -256,6 +266,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
- {
-@@ -1101,7 +1121,13 @@
- break;
-
- case GNUTYPE_NAMES:
-- extract_mangle ();
-+ if (allow_name_mangling_option) {
-+ extract_mangle ();
-+ }
-+ else {
-+ ERROR ((0, 0, _("GNUTYPE_NAMES mangling ignored")));
-+ skip_member ();
-+ }
- break;
-
- case GNUTYPE_MULTIVOL: