diff options
Diffstat (limited to 'archivers/gtar-base/patches/patch-ab')
-rw-r--r-- | archivers/gtar-base/patches/patch-ab | 56 |
1 files changed, 14 insertions, 42 deletions
diff --git a/archivers/gtar-base/patches/patch-ab b/archivers/gtar-base/patches/patch-ab index 812ca478105..648d50ad733 100644 --- a/archivers/gtar-base/patches/patch-ab +++ b/archivers/gtar-base/patches/patch-ab @@ -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; |