From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- app-arch/tar/Manifest | 11 ++ app-arch/tar/files/rmt | 8 + 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/metadata.xml | 14 ++ app-arch/tar/tar-1.29-r1.ebuild | 80 +++++++++ app-arch/tar/tar-1.29-r2.ebuild | 80 +++++++++ app-arch/tar/tar-1.29-r3.ebuild | 81 +++++++++ 9 files changed, 555 insertions(+) create mode 100644 app-arch/tar/Manifest create mode 100644 app-arch/tar/files/rmt create mode 100644 app-arch/tar/files/tar-1.29-add-files.patch create mode 100644 app-arch/tar/files/tar-1.29-extract-pathname-bypass-upstream.patch create mode 100644 app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch create mode 100644 app-arch/tar/metadata.xml create mode 100644 app-arch/tar/tar-1.29-r1.ebuild create mode 100644 app-arch/tar/tar-1.29-r2.ebuild create mode 100644 app-arch/tar/tar-1.29-r3.ebuild (limited to 'app-arch/tar') diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest new file mode 100644 index 000000000000..742be526be48 --- /dev/null +++ b/app-arch/tar/Manifest @@ -0,0 +1,11 @@ +AUX rmt 263 SHA256 c0371cb0243a190b6bb43609c86dfb4cd637882d4ff3ff9651ca7ec8d6b59355 SHA512 2f1a9d3a522fc1f0d5385d1ea4c27da88a1c9357b866340432c6310604c01d3e328e33080ed1e951c0da6f025c3ee2a0c9f170d4b86a1d235ebb56be48fef152 WHIRLPOOL 11869239f2ebbb237f8429d1f13f146fd2414e90edc2475d190f16659d052d3ac949d717939dcfc815a30942855fb26e60b6b506104876ccad32747191b04727 +AUX tar-1.29-add-files.patch 6602 SHA256 187538c4e45201572510c700a7eac064299731bf3f35c77a2527b10877089628 SHA512 5c87dd4a8e6d86c8e2311ac8487958abbda846484aec664ab82b7502ac1bb6a6cd43d3869fc64e06f792915b6a0659c41b9481357e5da19fbe43f9c913a10f3e WHIRLPOOL f31bd92d6681251ae4ef95a35cd0e4a9ad79aab14941561f64405cde8a67be6345dd751447d4052e0a81e68604f9a904b5312e918a54e5e29206ec3126ba1d5d +AUX tar-1.29-extract-pathname-bypass-upstream.patch 1604 SHA256 f9d60be9a2b84a773f0bd29898a33ef2898d55cf04d82766efd762bd8e2d8a51 SHA512 c13046f8b0bcc435197c859006b1cfd12b79377f3b90edfd4b77f86ec6d3ca431c716d731be84884f0ec6d6129765cbfbccb5971d0b909c3f45aff8f0b9b45cb WHIRLPOOL 302ee68c7b001e1e652e4b71041160a907de972176751b88abbf7d303788b3b35f40355428b440055917efc580ef6ba167e9617b797b5a7994de429fd4a94bb3 +AUX tar-1.29-extract-pathname-bypass.patch 723 SHA256 c5aef4c88c46978a51e0b4bd344d9de5d5b6e2c619e1b2e1f8bfd5dda1919455 SHA512 ba06ae53b4effcdd0996be07ae03fae7237c579a82d2606fe25100bed447287a68e37282ba2b017eed0c26cb0f4bf77dcdb4fca2f5175e1bbaed91408b0bd54a WHIRLPOOL 6328a758f1ae1e27bf2b6ad37a95fd1c02878aaf015dc6bef818a2be926a914054a3990b6fff5adf17bade0868f1c7654fc196cdb74260457e3652194319213e +DIST tar-1.29.tar.bz2 2715993 SHA256 236b11190c0a3a6885bdb8d61424f2b36a5872869aa3f7f695dea4b4843ae2f2 SHA512 d2cea9892892dfa0c8efd390303b75dccc085c4895e07ced684074592d69729916d6ea12475aa6aff873d076a729bb7dc2499c233edcfb9c7e8e8995481eef3b WHIRLPOOL fa5f66a7bb7698c35ad842bc4900a62997da5eb2f3cd6154391b88505a581078a64a8399bb5976d4723d90951d34c084e00d17908d90792bb5139184e8b92a94 +EBUILD tar-1.29-r1.ebuild 2157 SHA256 4f05d483c649c0d3d0b7a33ea3877d721ae692bb11069ee0ee899095ad414ee6 SHA512 9445561ce892822feb1365f6a227143a3bea6767a19bacea08345057ac2fab80cd5035c81281b27161a443c5103e5432288e9b69ec0fe33218c587ccb9d20a4b WHIRLPOOL 5aa1d2c3e0c7891bc158045572c76a3b3754561a64b7d1d115c6b320d59957af20232bfd0f341c65da2015aa6bf61b2a88af24d1e62f0e83b2d13bfcc8b1e821 +EBUILD tar-1.29-r2.ebuild 2189 SHA256 2cb98b7bb62b43b44a6ffd3eb76bf0d36f2324a62591f1b49a33bc3d9727730c SHA512 940b2a32fe1058e0a40feb016779927019b45bfa402f4e5a32f44110bd2fea67d08e4df842b9ec93c730a25eb6e6a7408ab01174919828827938875d2579db9c WHIRLPOOL f58640df4c929475ea48da9a46c0a2a08b58f4bd49d76f8cb10574f637cc022faff9e703c8285d2f3badd6a3dcfe3fa587130ed6627c051ca8bed996f3ca09db +EBUILD tar-1.29-r3.ebuild 2237 SHA256 ad83cb69dddcddb154e9b989a3db999e886f40dda06beabfca46b6862aa99201 SHA512 3507c7519fccc100b8f0c12aedfb24ddc907e459a9a66d0cad417f085c05d3d6212654bdf9aabec3ef582f3a90a426c676c34dd7bbbefe79ed76b6f237cf8307 WHIRLPOOL 9d80b343873931175a9c8e78f341d24b330b8f4cc75bd0689f3700a26a26a768e48ba1f662d615672920106b7e2cad6da6024e39b49f84f73b6c7a8c0ef0583a +MISC ChangeLog 6826 SHA256 4d216216b686a8bf3c1ac2afde5649a1e4faa81ec4935edd7177c50fdb2169be SHA512 7953d186e78e680e7578995393d52670495e6dc792d6bfd10620a06f01f8f20a5cc46c0ee06a386eb6ab90c53f393d53a27051c78318c73fe09fe4f827e8a065 WHIRLPOOL bf4a5a1b471d3d889b0aab88796676d777a8f6fd34fa1238aa194b9035abfd6e407f39e2333a4958ae232bd4fb46e13069ea1185caa97caf5c6b31b088d1c9ac +MISC ChangeLog-2015 31970 SHA256 9e334cc3415e0417fbaed891f6bba1d434ffb07d7ea080688447e0cffec5e462 SHA512 8b8b47dec0e0cd310947ce1b355dec2b9d3173ddb1f7915fb41de337debf35640eafa5b8f6d160fe0e45fc832419f4cf470972ce1bd0e1498879d120a490341b WHIRLPOOL eb05a9e69d7e0efd1a9c0352207e1704b252cf6e9a6fbb8c1154dbea8becfb487b437b3caf83852129d50521bd22d93ab9fdf24dbe5ac59aad852ab1f884d6b0 +MISC metadata.xml 387 SHA256 fae089b1cff94a61ec673decb3bdad5f363260f048d8a6dad027bd141b1d739d SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7 WHIRLPOOL 66a5d269f6023bcef32e4520a189735fc84a1c028a2e9db19fb9fb8ba091fa05fb4cf93ae1c76de16f89e5c4055f45ba345989e81ae1af0b0134914faa28aec3 diff --git a/app-arch/tar/files/rmt b/app-arch/tar/files/rmt new file mode 100644 index 000000000000..15ed6aa91fad --- /dev/null +++ b/app-arch/tar/files/rmt @@ -0,0 +1,8 @@ +#!/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 new file mode 100644 index 000000000000..8ab15ac32aff --- /dev/null +++ b/app-arch/tar/files/tar-1.29-add-files.patch @@ -0,0 +1,194 @@ +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 new file mode 100644 index 000000000000..2030ca6d2bdd --- /dev/null +++ b/app-arch/tar/files/tar-1.29-extract-pathname-bypass-upstream.patch @@ -0,0 +1,60 @@ +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 new file mode 100644 index 000000000000..6470fe082bda --- /dev/null +++ b/app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch @@ -0,0 +1,27 @@ +--- 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/metadata.xml b/app-arch/tar/metadata.xml new file mode 100644 index 000000000000..c7c95933065b --- /dev/null +++ b/app-arch/tar/metadata.xml @@ -0,0 +1,14 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + + just install `tar` + + + cpe:/a:gnu:tar + + diff --git a/app-arch/tar/tar-1.29-r1.ebuild b/app-arch/tar/tar-1.29-r1.ebuild new file mode 100644 index 000000000000..cc4cfe9bcbef --- /dev/null +++ b/app-arch/tar/tar-1.29-r1.ebuild @@ -0,0 +1,80 @@ +# 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-r2.ebuild b/app-arch/tar/tar-1.29-r2.ebuild new file mode 100644 index 000000000000..722e7f9b5f0d --- /dev/null +++ b/app-arch/tar/tar-1.29-r2.ebuild @@ -0,0 +1,80 @@ +# 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-upstream.patch" #598334 +) + +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 new file mode 100644 index 000000000000..fdb89dd461c7 --- /dev/null +++ b/app-arch/tar/tar-1.29-r3.ebuild @@ -0,0 +1,81 @@ +# 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 ~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 +} -- cgit v1.2.3