diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
commit | d87262dd706fec50cd150aab3e93883b6337466d (patch) | |
tree | 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-arch/tar/files | |
parent | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-arch/tar/files')
-rw-r--r-- | app-arch/tar/files/rmt | 8 | ||||
-rw-r--r-- | app-arch/tar/files/tar-1.29-add-files.patch | 194 | ||||
-rw-r--r-- | app-arch/tar/files/tar-1.29-extract-pathname-bypass-upstream.patch | 60 | ||||
-rw-r--r-- | app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch | 27 | ||||
-rw-r--r-- | app-arch/tar/files/tar-1.30-fix-test-117-and-118.patch | 89 | ||||
-rw-r--r-- | app-arch/tar/files/tar-1.30-fix-test-92.patch | 13 |
6 files changed, 0 insertions, 391 deletions
diff --git a/app-arch/tar/files/rmt b/app-arch/tar/files/rmt deleted file mode 100644 index 15ed6aa91fad..000000000000 --- a/app-arch/tar/files/rmt +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# This is not a mistake. This shell script (/etc/rmt) has been provided -# for compatibility with other Unix-like systems, some of which have -# utilities that expect to find (and execute) rmt in the /etc directory -# on remote systems. -# -exec rmt "$@" diff --git a/app-arch/tar/files/tar-1.29-add-files.patch b/app-arch/tar/files/tar-1.29-add-files.patch deleted file mode 100644 index 8ab15ac32aff..000000000000 --- a/app-arch/tar/files/tar-1.29-add-files.patch +++ /dev/null @@ -1,194 +0,0 @@ -From 3a283cfe9f8f1f127e8dc5597a5ea1d249985a54 Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff <gray@gnu.org> -Date: Sat, 12 Nov 2016 11:20:47 +0200 -Subject: [PATCH] Fix the --add-file option. - -* src/common.h (name_more_files): New proto. -(files_from_option): Remove. -* src/names.c (name_more_files): New file. -(names_options): Fix declaration of the -add-file option. -(names_parse_opt): Handle --add-file. -* src/tar.c (struct tar_args): Remove the input_files member. -Change all uses: use name_more_files() instead. -* tests/Makefile.am: Add new test. -* tests/add-file.at: New testcase. -* tests/testsuite.at: Add new test. ---- - src/common.h | 4 +--- - src/names.c | 24 ++++++++++++------- - src/tar.c | 16 ++++--------- - tests/Makefile.am | 3 ++- - tests/add-file.at | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - tests/testsuite.at | 1 + - 6 files changed, 92 insertions(+), 23 deletions(-) - create mode 100644 tests/add-file.at - -diff --git a/src/common.h b/src/common.h -index 50c34cc7c09b..6fdb6225f18b 100644 ---- a/src/common.h -+++ b/src/common.h -@@ -414,9 +414,6 @@ GLOBAL bool show_transformed_names_option; - timestamps from archives with an unusual member order. It is automatically - set for incremental archives. */ - GLOBAL bool delay_directory_restore_option; -- --/* When set, tar will not refuse to create empty archives */ --GLOBAL bool files_from_option; - - /* Declarations for each module. */ - -@@ -738,6 +735,7 @@ void uid_to_uname (uid_t uid, char **uname); - int uname_to_uid (char const *uname, uid_t *puid); - - void name_init (void); -+bool name_more_files (void); - void name_add_name (const char *name); - void name_term (void); - const char *name_next (int change_dirs); -diff --git a/src/names.c b/src/names.c -index 219aa77a4356..1a9465667cd3 100644 ---- a/src/names.c -+++ b/src/names.c -@@ -32,7 +32,8 @@ static void name_add_file (const char *name); - - enum - { -- EXCLUDE_BACKUPS_OPTION = 256, -+ ADD_FILE_OPTION = 256, -+ EXCLUDE_BACKUPS_OPTION, - EXCLUDE_CACHES_OPTION, - EXCLUDE_CACHES_UNDER_OPTION, - EXCLUDE_CACHES_ALL_OPTION, -@@ -67,7 +68,7 @@ static struct argp_option names_options[] = { - {NULL, 0, NULL, 0, - N_("Local file name selection:"), GRID }, - -- {"add-file", ARGP_KEY_ARG, N_("FILE"), 0, -+ {"add-file", ADD_FILE_OPTION, N_("FILE"), 0, - N_("add given FILE to the archive (useful if its name starts with a dash)"), GRID+1 }, - {"directory", 'C', N_("DIR"), 0, - N_("change to directory DIR"), GRID+1 }, -@@ -190,10 +191,10 @@ names_parse_opt (int key, char *arg, struct argp_state *state) - - case 'T': - name_add_file (arg); -- /* Indicate we've been given -T option. This is for backward -- compatibility only, so that `tar cfT archive /dev/null will -- succeed */ -- files_from_option = true; -+ break; -+ -+ case ADD_FILE_OPTION: -+ name_add_name (arg); - break; - - default: -@@ -651,8 +652,8 @@ struct name_elt /* A name_array element. */ - } v; - }; - --static struct name_elt *name_head; /* store a list of names */ --size_t name_count; /* how many of the entries are names? */ -+static struct name_elt *name_head;/* store a list of names */ -+size_t name_count; /* how many of the entries are file names? */ - - static struct name_elt * - name_elt_alloc (void) -@@ -784,6 +785,12 @@ name_list_advance (void) - } - } - -+/* Return true if there are names or options in the list */ -+bool -+name_more_files (void) -+{ -+ return name_count > 0; -+} - - /* Add to name_array the file NAME with fnmatch options MATFLAGS */ - void -@@ -823,6 +830,7 @@ name_add_file (const char *name) - ep->v.file.name = name; - ep->v.file.line = 0; - ep->v.file.fp = NULL; -+ name_count++; - } - - /* Names from external name file. */ -diff --git a/src/tar.c b/src/tar.c -index 35bac38c2793..a361fc2c607f 100644 ---- a/src/tar.c -+++ b/src/tar.c -@@ -813,7 +813,6 @@ struct tar_args /* Variables used during option parsing */ - bool pax_option; /* True if --pax-option was given */ - char const *backup_suffix_string; /* --suffix option argument */ - char const *version_control_string; /* --backup option argument */ -- bool input_files; /* True if some input files where given */ - int compress_autodetect; /* True if compression autodetection should - be attempted when creating archives */ - }; -@@ -1322,7 +1321,6 @@ parse_opt (int key, char *arg, struct argp_state *state) - case ARGP_KEY_ARG: - /* File name or non-parsed option, because of ARGP_IN_ORDER */ - name_add_name (arg); -- args->input_files = true; - break; - - case 'A': -@@ -2179,7 +2177,7 @@ more_options (int argc, char **argv, struct option_locus *loc) - args.loc = loc; - if (argp_parse (&argp, argc, argv, ARGP_IN_ORDER|ARGP_NO_EXIT, &idx, &args)) - abort (); /* shouldn't happen */ -- if (loc->source == OPTS_ENVIRON && args.input_files) -+ if (loc->source == OPTS_ENVIRON && name_more_files ()) - USAGE_ERROR ((0, 0, _("non-option arguments in %s"), loc->name)); - } - -@@ -2221,7 +2219,6 @@ decode_options (int argc, char **argv) - args.pax_option = false; - args.backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX"); - args.version_control_string = 0; -- args.input_files = false; - args.compress_autodetect = false; - - subcommand_option = UNKNOWN_SUBCOMMAND; -@@ -2340,10 +2337,7 @@ decode_options (int argc, char **argv) - - /* Handle operands after any "--" argument. */ - for (; idx < argc; idx++) -- { -- name_add_name (argv[idx]); -- args.input_files = true; -- } -+ name_add_name (argv[idx]); - - /* Derive option values and check option consistency. */ - -@@ -2365,7 +2359,7 @@ decode_options (int argc, char **argv) - - if (occurrence_option) - { -- if (!args.input_files) -+ if (!name_more_files ()) - USAGE_ERROR ((0, 0, - _("--occurrence is meaningless without a file list"))); - if (!IS_SUBCOMMAND_CLASS (SUBCL_OCCUR)) -@@ -2569,7 +2563,7 @@ decode_options (int argc, char **argv) - { - /* --test-label is silent if the user has specified the label name to - compare against. */ -- if (!args.input_files) -+ if (!name_more_files ()) - verbose_option++; - } - else if (utc_option) -@@ -2598,7 +2592,7 @@ decode_options (int argc, char **argv) - switch (subcommand_option) - { - case CREATE_SUBCOMMAND: -- if (!args.input_files && !files_from_option) -+ if (!name_more_files ()) - USAGE_ERROR ((0, 0, - _("Cowardly refusing to create an empty archive"))); - if (args.compress_autodetect && archive_names diff --git a/app-arch/tar/files/tar-1.29-extract-pathname-bypass-upstream.patch b/app-arch/tar/files/tar-1.29-extract-pathname-bypass-upstream.patch deleted file mode 100644 index 2030ca6d2bdd..000000000000 --- a/app-arch/tar/files/tar-1.29-extract-pathname-bypass-upstream.patch +++ /dev/null @@ -1,60 +0,0 @@ -https://bugs.gentoo.org/598334 - -From 7340f67b9860ea0531c1450e5aa261c50f67165d Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@Penguin.CS.UCLA.EDU> -Date: Sat, 29 Oct 2016 21:04:40 -0700 -Subject: [PATCH] When extracting, skip ".." members - -* NEWS: Document this. -* src/extract.c (extract_archive): Skip members whose names -contain "..". ---- - NEWS | 8 +++++++- - src/extract.c | 8 ++++++++ - 2 files changed, 15 insertions(+), 1 deletion(-) - ---- a/NEWS -+++ b/NEWS -@@ -1,6 +1,16 @@ - GNU tar NEWS - User visible changes. 2016-05-16 - Please send GNU tar bug reports to <bug-tar@gnu.org> - -+ -+ -+version 1.29-r2+ Gentoo -+ -+* Member names containing '..' components are now skipped when extracting. -+ -+This fixes tar's behavior to match its documentation, and is a bit -+safer when extracting untrusted archives over old files (an unsafe -+practice that the tar manual has long recommended against). -+ - - version 1.29 - Sergey Poznyakoff, 2016-05-16 - ---- a/src/extract.c -+++ b/src/extract.c -@@ -1629,12 +1629,20 @@ - { - char typeflag; - tar_extractor_t fun; -+ bool skip_dotdot_name; - - fatal_exit_hook = extract_finish; - - set_next_block_after (current_header); - -+ skip_dotdot_name = (!absolute_names_option -+ && contains_dot_dot (current_stat_info.orig_file_name)); -+ if (skip_dotdot_name) -+ ERROR ((0, 0, _("%s: Member name contains '..'"), -+ quotearg_colon (current_stat_info.orig_file_name))); -+ - if (!current_stat_info.file_name[0] -+ || skip_dotdot_name - || (interactive_option - && !confirm ("extract", current_stat_info.file_name))) - { --- -2.11.0.rc2 - diff --git a/app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch b/app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch deleted file mode 100644 index 6470fe082bda..000000000000 --- a/app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/lib/paxnames.c 2016-04-06 00:04:47.314860045 +0300 -+++ b/lib/paxnames.c 2016-04-06 02:08:44.962297881 +0300 -@@ -18,6 +18,7 @@ - #include <system.h> - #include <hash.h> - #include <paxlib.h> -+#include <quotearg.h> - - - /* Hash tables of strings. */ -@@ -114,7 +115,15 @@ - for (p = file_name + prefix_len; *p; ) - { - if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2])) -- prefix_len = p + 2 - file_name; -+ { -+ static char const *const diagnostic[] = -+ { -+ N_("%s: Member name contains '..'"), -+ N_("%s: Hard link target contains '..'") -+ }; -+ ERROR ((0, 0, _(diagnostic[link_target]), -+ quotearg_colon (file_name))); -+ } - - do - { diff --git a/app-arch/tar/files/tar-1.30-fix-test-117-and-118.patch b/app-arch/tar/files/tar-1.30-fix-test-117-and-118.patch deleted file mode 100644 index 2f75da6cd247..000000000000 --- a/app-arch/tar/files/tar-1.30-fix-test-117-and-118.patch +++ /dev/null @@ -1,89 +0,0 @@ -tests: fix race in dirrem01 and dirrem02 - -Previously the '--checkpoint-action=echo' was triggered after -'--checkpoint-action=sleep=1' - so the order of events *usually* -was (for --format='gnu'): - - ... - 1. checkpoint handler before write of 'dir/sub' member - 2. one-second delay - 3. stderr write: 'tar: Write checkpoint 3' - 4. write the member 'dir/sub' into the archive - 5. check that the member's ctime has not been changed - 6. genfile's detecting 'Write checkpoint', doing unlink - ... - -But sometimes, the genfile was fast enough to win the race and -unlinked the directory before the member was written into the -archive (IOW, the order was 1-2-3-6-4-5). This led to the -occasional warning 'tar: dir/sub: file changed as we read it'. - -Swap the order of 'sleep=1' and 'echo' actions so the genfile -utility has (hopefully) enough time to do the unlink before -writing the file into the archive (enforce 1-2-3-6-4-5 order). - -* tests/dirrem01.at: Swap 'sleep=1' and 'echo' actions. -* tests/dirrem02.at: Likewise. - -Origin: https://lists.gnu.org/archive/html/bug-tar/2018-01/msg00000.html ---- - tests/dirrem01.at | 5 +++-- - tests/dirrem02.at | 7 ++++--- - 2 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/tests/dirrem01.at b/tests/dirrem01.at -index 40344dc..dabc206 100644 ---- a/tests/dirrem01.at -+++ b/tests/dirrem01.at -@@ -47,14 +47,15 @@ gnu) CPT=3;; - esac - - genfile --run --checkpoint=$CPT --unlink dir/sub/file2 --unlink dir/sub -- \ -- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \ -- --checkpoint-action='echo' -c -f archive.tar \ -+ tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='echo' \ -+ --checkpoint-action='sleep=1' -c -f archive.tar \ - --listed-incremental db -v dir >/dev/null - ], - [1], - [ignore], - [tar: dir: Directory is new - tar: dir/sub: Directory is new -+tar: dir/sub: file changed as we read it - tar: dir/sub: File removed before we read it - ],[],[],[gnu,posix]) - -diff --git a/tests/dirrem02.at b/tests/dirrem02.at -index e1cf9ef..924454f 100644 ---- a/tests/dirrem02.at -+++ b/tests/dirrem02.at -@@ -20,7 +20,7 @@ - - # Description: - # --# When an explicitley named directory disappears during creation -+# When an explicitly named directory disappears during creation - # of incremental dump, tar should still exit with TAREXIT_FAILURE (2). - # - # For further details see dirrem01.at -@@ -44,14 +44,15 @@ gnu) CPT=3;; - esac - - genfile --run --checkpoint=$CPT --unlink dir/sub/file2 --unlink dir/sub -- \ -- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \ -- --checkpoint-action='echo' -c -f archive.tar \ -+ tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='echo' \ -+ --checkpoint-action='sleep=1' -c -f archive.tar \ - --listed-incremental db -v dir dir/sub >/dev/null - ], - [2], - [ignore], - [tar: dir: Directory is new - tar: dir/sub: Directory is new -+tar: dir/sub: file changed as we read it - tar: dir/sub: Cannot open: No such file or directory - tar: Exiting with failure status due to previous errors - ],[],[],[gnu,posix]) --- -cgit v1.0-41-gc330 - diff --git a/app-arch/tar/files/tar-1.30-fix-test-92.patch b/app-arch/tar/files/tar-1.30-fix-test-92.patch deleted file mode 100644 index d5a63e4ab355..000000000000 --- a/app-arch/tar/files/tar-1.30-fix-test-92.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://lists.gnu.org/archive/html/bug-tar/2017-12/msg00027.html - ---- a/tests/difflink.at -+++ b/tests/difflink.at -@@ -21,7 +21,7 @@ mkdir a - genfile -f a/x - ln -s x a/y - ln a/y a/z --tar cf a.tar a -+tar cf a.tar a/x a/y a/z - rm a/z - ln -s x a/z - tar df a.tar |