diff options
Diffstat (limited to 'app-arch/tar')
-rw-r--r-- | app-arch/tar/Manifest | 5 | ||||
-rw-r--r-- | app-arch/tar/files/tar-1.31-remove-erroneous-abort-call.patch | 33 | ||||
-rw-r--r-- | app-arch/tar/tar-1.31-r1.ebuild | 81 | ||||
-rw-r--r-- | app-arch/tar/tar-1.32.ebuild | 2 |
4 files changed, 2 insertions, 119 deletions
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest index 82de1ad6cf15..b8eb4d4e202b 100644 --- a/app-arch/tar/Manifest +++ b/app-arch/tar/Manifest @@ -1,7 +1,4 @@ AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9880e7a934076949af54e47ee7de3f91452f2c642780e7d56619f166574633d1e4759 SHA512 2f1a9d3a522fc1f0d5385d1ea4c27da88a1c9357b866340432c6310604c01d3e328e33080ed1e951c0da6f025c3ee2a0c9f170d4b86a1d235ebb56be48fef152 -AUX tar-1.31-remove-erroneous-abort-call.patch 989 BLAKE2B 67646a590097860d692e158b41c960c6bf4372c2018d47b9f71da7972bd25afb631cd851178d0bd8eb19c26d54bfaa8f1ed42da97033d262ccfa0c0099a03daa SHA512 c4d317b9968c0638287e6dff77a7660d36e8ad4af56039146992d519d05a0f73b6a459cc88de7a4afd9909efd1bdbd3567d8b3aa67b48d89867600c1023400aa -DIST tar-1.31.tar.bz2 2946047 BLAKE2B c85c17740e4cd3e8c93d10d93b070cd80629b7f052d020c0513cdddd377f3f90e229a6fa10dfbb43e1006f8202c674f2df854b864c0947f49339a52964d65c1c SHA512 0f4d00e08d56a8f8c32aac0afa2845397efb8ad72eaa6af47334cef9612adb1a4b91406bdc2c3a2cf1b9cc8b92c12735a331e0d137b24f66703f6af6219464f6 DIST tar-1.32.tar.bz2 2947264 BLAKE2B 4e380a9a2f84a2af5130464e1b298ae6acf02ee459cbca20dd0991c2859785e5aac789d57b87b32e8b45d89985b6414af9dd37161385da9568d6030c5aa42c0e SHA512 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe3c785c1be622f520f00fcfbdf44ad1d3247866d0ecfe347a85bbfec38eb38fa1014baef566f6 -EBUILD tar-1.31-r1.ebuild 2265 BLAKE2B e2ace5e40af0143b82bb4d1fae2d20a2af9189cdb5e4973688012b9dfc7dcccc4c4c1f8643cf92c502f068be342fa2cf3c614e29c71beded3dbb51ad921c4c2d SHA512 2490769e0aa6f874024cbe35a9ed1c73872b15b296b2f5cbc0a52c953a7f71e9552a8544fd63b2ca209d34f09d6f1614e262fa05b6e55fcc50c3f8e785054da0 -EBUILD tar-1.32.ebuild 2204 BLAKE2B 6fef8c71348de57efd02718636e75accfeb469c62e46f24ac37c3e5485b4b25efffdede042b469df869570ae4984279461ad45f043154acdda553dc917f8ff20 SHA512 9e22ac8480f16ae23f91da65912c6935c62503bb515eefbcc0029307e970d42701a4fa79d45fc14d108b4cf53051415278ffbcaa8e0e41c8847311e5c6811bfc +EBUILD tar-1.32.ebuild 2199 BLAKE2B 21c7d3b5c5b44ecccba3364163267a3a29f189c9d634cef569c1ef66ee1abcaf3e33dbf9b1e23bc68f53031080b887ee743f2d58e8eb3c307c5989b394cdba82 SHA512 6ea0c6d5fcfe29feadb6b89d53726f9dc20a7f49ec38a547f42227228c63fc97f4d35aecd7900ae30c0cf22fa803bdf1c0dd4fcd3bc0a22fe05a3ea42824f6a5 MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7 diff --git a/app-arch/tar/files/tar-1.31-remove-erroneous-abort-call.patch b/app-arch/tar/files/tar-1.31-remove-erroneous-abort-call.patch deleted file mode 100644 index 9e255df57602..000000000000 --- a/app-arch/tar/files/tar-1.31-remove-erroneous-abort-call.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 85c005ee1345c342f707f3c55317daf6cb050603 Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff <gray@gnu.org.ua> -Date: Thu, 10 Jan 2019 18:18:49 +0200 -Subject: Remove erroneous abort() call - -The call was introduced by commit ccef8581. It caused tar to abort -on perfectly normal operations, like untarring archives containing -./ with the -U option, - -See http://lists.gnu.org/archive/html/bug-tar/2019-01/msg00019.html -for details. - -* src/extract.c (maybe_recoverable): Remove misplaced call to abort(). ---- - src/extract.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/extract.c b/src/extract.c -index 090b866..8276f8f 100644 ---- a/src/extract.c -+++ b/src/extract.c -@@ -787,7 +787,7 @@ maybe_recoverable (char *file_name, bool regular, bool *interdir_made) - case UNLINK_FIRST_OLD_FILES: - break; - } -- abort (); /* notreached */ -+ FALLTHROUGH; - - case ENOENT: - /* Attempt creating missing intermediate directories. */ --- -cgit v1.0-41-gc330 - diff --git a/app-arch/tar/tar-1.31-r1.ebuild b/app-arch/tar/tar-1.31-r1.ebuild deleted file mode 100644 index 72de0a507c72..000000000000 --- a/app-arch/tar/tar-1.31-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic - -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 ~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" - -LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )" - -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - nls? ( >=sys-devel/gettext-0.10.35 ) - static? ( ${LIB_DEPEND} ) - xattr? ( elibc_glibc? ( sys-apps/attr ) )" - -PATCHES=( "${FILESDIR}"/${P}-remove-erroneous-abort-call.patch ) - -src_prepare() { - default - - 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 - local myeconfargs=( - --bindir="${EPREFIX%/}"/bin - --enable-backup-scripts - --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) - ) - FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}" -} - -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.32.ebuild b/app-arch/tar/tar-1.32.ebuild index 32ae14dcc5be..1f381c8da605 100644 --- a/app-arch/tar/tar-1.32.ebuild +++ b/app-arch/tar/tar-1.32.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +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 ~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" LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )" |