From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 09C90138334 for ; Mon, 16 Jul 2018 06:45:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC855E0830; Mon, 16 Jul 2018 06:45:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B89DE0830 for ; Mon, 16 Jul 2018 06:45:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7F8F335C95 for ; Mon, 16 Jul 2018 06:45:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2FE9D2CC for ; Mon, 16 Jul 2018 06:45:46 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1531723489.de933339703cdb66aa0298c231b9d4fe0e54e106.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/tar/files/, app-arch/tar/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/tar/Manifest app-arch/tar/files/tar-1.29-add-files.patch app-arch/tar/files/tar-1.29-extract-pathname-bypass-upstream.patch app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch app-arch/tar/tar-1.29-r1.ebuild app-arch/tar/tar-1.29-r3.ebuild X-VCS-Directories: app-arch/tar/files/ app-arch/tar/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: de933339703cdb66aa0298c231b9d4fe0e54e106 X-VCS-Branch: master Date: Mon, 16 Jul 2018 06:45:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d2d036cc-9c54-4be9-bebf-79aa21562447 X-Archives-Hash: 41d63301e4a106e6ebada294a50cba61 commit: de933339703cdb66aa0298c231b9d4fe0e54e106 Author: Lars Wendler gentoo org> AuthorDate: Mon Jul 16 06:44:49 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Jul 16 06:44:49 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de933339 app-arch/tar: Removed old. Package-Manager: Portage-2.3.42, Repoman-2.3.9 app-arch/tar/Manifest | 1 - app-arch/tar/files/tar-1.29-add-files.patch | 194 --------------------- ...tar-1.29-extract-pathname-bypass-upstream.patch | 60 ------- .../files/tar-1.29-extract-pathname-bypass.patch | 27 --- app-arch/tar/tar-1.29-r1.ebuild | 80 --------- app-arch/tar/tar-1.29-r3.ebuild | 81 --------- 6 files changed, 443 deletions(-) diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest index c087d7a3260..4d3b42f1260 100644 --- a/app-arch/tar/Manifest +++ b/app-arch/tar/Manifest @@ -1,2 +1 @@ -DIST tar-1.29.tar.bz2 2715993 BLAKE2B 656b77a49c463ec7ade87a97b71469dadbf01551131bdf0cfa895b7b2a7d073a4cd51e9bec4169b134d83155aca18af1a89ddb5d14cb1dc0d9968184870d69f3 SHA512 d2cea9892892dfa0c8efd390303b75dccc085c4895e07ced684074592d69729916d6ea12475aa6aff873d076a729bb7dc2499c233edcfb9c7e8e8995481eef3b DIST tar-1.30.tar.bz2 2858639 BLAKE2B 82a8b1fbf1eb5c0347b2f8cf35854498e2955eb85eaf041ec44a38bbd9bc82cc7184d5cb858f9905f503c9178ec6d0ed50be2dc27be9933b29e0a18b8e6c0b8f SHA512 07a1157430898fee1a2c6fd3853d59d4ae13998db685669c8c702f73d2466eeb9892f84a5f0495bfe088c8190a643a99ac9f2cb16b85c9fe3ae0d83cc0f338e8 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 8ab15ac32af..00000000000 --- 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 -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 2030ca6d2bd..00000000000 --- 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 -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 - -+ -+ -+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 6470fe082bd..00000000000 --- 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 - #include - #include -+#include - - - /* 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/tar-1.29-r1.ebuild b/app-arch/tar/tar-1.29-r1.ebuild deleted file mode 100644 index cc4cfe9bcbe..00000000000 --- a/app-arch/tar/tar-1.29-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit flag-o-matic eutils - -DESCRIPTION="Use this to make tarballs :)" -HOMEPAGE="https://www.gnu.org/software/tar/" -SRC_URI="mirror://gnu/tar/${P}.tar.bz2 - mirror://gnu-alpha/tar/${P}.tar.bz2" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr" - -RDEPEND="acl? ( virtual/acl ) - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - nls? ( >=sys-devel/gettext-0.10.35 ) - xattr? ( elibc_glibc? ( sys-apps/attr ) )" - -PATCHES=( - "${FILESDIR}/${P}-extract-pathname-bypass.patch" -) - -src_prepare() { - epatch "${PATCHES[@]}" - epatch_user - - if ! use userland_GNU ; then - sed -i \ - -e 's:/backup\.sh:/gbackup.sh:' \ - scripts/{backup,dump-remind,restore}.in \ - || die "sed non-GNU" - fi -} - -src_configure() { - use static && append-ldflags -static - FORCE_UNSAFE_CONFIGURE=1 \ - econf \ - --enable-backup-scripts \ - --bindir="${EPREFIX}"/bin \ - --libexecdir="${EPREFIX}"/usr/sbin \ - $(usex userland_GNU "" "--program-prefix=g") \ - $(use_with acl posix-acls) \ - $(use_enable nls) \ - $(use_with selinux) \ - $(use_with xattr xattrs) -} - -src_install() { - default - - local p=$(usex userland_GNU "" "g") - if [[ -z ${p} ]] ; then - # a nasty yet required piece of baggage - exeinto /etc - doexe "${FILESDIR}"/rmt - fi - - # autoconf looks for gtar before tar (in configure scripts), hence - # in Prefix it is important that it is there, otherwise, a gtar from - # the host system (FreeBSD, Solaris, Darwin) will be found instead - # of the Prefix provided (GNU) tar - if use prefix ; then - dosym tar /bin/gtar - fi - - mv "${ED}"/usr/sbin/${p}backup{,-tar} || die - mv "${ED}"/usr/sbin/${p}restore{,-tar} || die - - if use minimal ; then - find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \ - -type f -a '!' '(' -name tar -o -name ${p}tar ')' \ - -delete || die - fi -} diff --git a/app-arch/tar/tar-1.29-r3.ebuild b/app-arch/tar/tar-1.29-r3.ebuild deleted file mode 100644 index 7f8e1ba1631..00000000000 --- a/app-arch/tar/tar-1.29-r3.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit flag-o-matic eutils - -DESCRIPTION="Use this to make tarballs :)" -HOMEPAGE="https://www.gnu.org/software/tar/" -SRC_URI="mirror://gnu/tar/${P}.tar.bz2 - mirror://gnu-alpha/tar/${P}.tar.bz2" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr" - -RDEPEND="acl? ( virtual/acl ) - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - nls? ( >=sys-devel/gettext-0.10.35 ) - xattr? ( elibc_glibc? ( sys-apps/attr ) )" - -PATCHES=( - "${FILESDIR}/${P}-extract-pathname-bypass-upstream.patch" #598334 - "${FILESDIR}/${P}-add-files.patch" -) - -src_prepare() { - epatch "${PATCHES[@]}" - epatch_user - - if ! use userland_GNU ; then - sed -i \ - -e 's:/backup\.sh:/gbackup.sh:' \ - scripts/{backup,dump-remind,restore}.in \ - || die "sed non-GNU" - fi -} - -src_configure() { - use static && append-ldflags -static - FORCE_UNSAFE_CONFIGURE=1 \ - econf \ - --enable-backup-scripts \ - --bindir="${EPREFIX}"/bin \ - --libexecdir="${EPREFIX}"/usr/sbin \ - $(usex userland_GNU "" "--program-prefix=g") \ - $(use_with acl posix-acls) \ - $(use_enable nls) \ - $(use_with selinux) \ - $(use_with xattr xattrs) -} - -src_install() { - default - - local p=$(usex userland_GNU "" "g") - if [[ -z ${p} ]] ; then - # a nasty yet required piece of baggage - exeinto /etc - doexe "${FILESDIR}"/rmt - fi - - # autoconf looks for gtar before tar (in configure scripts), hence - # in Prefix it is important that it is there, otherwise, a gtar from - # the host system (FreeBSD, Solaris, Darwin) will be found instead - # of the Prefix provided (GNU) tar - if use prefix ; then - dosym tar /bin/gtar - fi - - mv "${ED}"/usr/sbin/${p}backup{,-tar} || die - mv "${ED}"/usr/sbin/${p}restore{,-tar} || die - - if use minimal ; then - find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \ - -type f -a '!' '(' -name tar -o -name ${p}tar ')' \ - -delete || die - fi -}