diff --git a/sdk_container/src/third_party/portage-stable/app-arch/tar/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/tar/Manifest index eeff245a6f..dc57e45b12 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/tar/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-arch/tar/Manifest @@ -1,2 +1,2 @@ -DIST tar-1.31.tar.bz2 2946047 BLAKE2B c85c17740e4cd3e8c93d10d93b070cd80629b7f052d020c0513cdddd377f3f90e229a6fa10dfbb43e1006f8202c674f2df854b864c0947f49339a52964d65c1c SHA512 0f4d00e08d56a8f8c32aac0afa2845397efb8ad72eaa6af47334cef9612adb1a4b91406bdc2c3a2cf1b9cc8b92c12735a331e0d137b24f66703f6af6219464f6 +DIST tar-1.32.90.tar.xz 2145976 BLAKE2B 95f1442da87bcbd58e0a6aad303b8c9da9179cc32a6e835d3fbe2e090ad4316e96265a54f573906b262034b92d8d3e56f3ff2609145249bd16dd4ea2a79bb601 SHA512 a42703b73ec3c1f462849469f00dd190a0164972fd2e97f128c3b559a6e9c79e87d5bbf47fca17ca9f8b6810221fbc727b6c15e38693256d9e43a2c2a2d7b593 DIST tar-1.32.tar.bz2 2947264 BLAKE2B 4e380a9a2f84a2af5130464e1b298ae6acf02ee459cbca20dd0991c2859785e5aac789d57b87b32e8b45d89985b6414af9dd37161385da9568d6030c5aa42c0e SHA512 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe3c785c1be622f520f00fcfbdf44ad1d3247866d0ecfe347a85bbfec38eb38fa1014baef566f6 diff --git a/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.31-remove-erroneous-abort-call.patch b/sdk_container/src/third_party/portage-stable/app-arch/tar/files/tar-1.31-remove-erroneous-abort-call.patch deleted file mode 100644 index 9e255df576..0000000000 --- a/sdk_container/src/third_party/portage-stable/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 -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/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.31-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.32.90.ebuild similarity index 69% rename from sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.31-r1.ebuild rename to sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.32.90.ebuild index 72de0a507c..87f3d927f1 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.31-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.32.90.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 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" +SRC_URI="mirror://gnu/tar/${P}.tar.xz + mirror://gnu-alpha/tar/${P}.tar.xz" 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" +[[ -n "$(ver_cut 3)" ]] && [[ "$(ver_cut 3)" -ge 90 ]] || \ +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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(+)] )" @@ -20,11 +21,9 @@ 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 ) +BDEPEND="nls? ( sys-devel/gettext )" src_prepare() { default @@ -40,9 +39,9 @@ src_prepare() { src_configure() { use static && append-ldflags -static local myeconfargs=( - --bindir="${EPREFIX%/}"/bin + --bindir="${EPREFIX}"/bin --enable-backup-scripts - --libexecdir="${EPREFIX%/}"/usr/sbin + --libexecdir="${EPREFIX}"/usr/sbin $(usex userland_GNU "" "--program-prefix=g") $(use_with acl posix-acls) $(use_enable nls) @@ -70,11 +69,11 @@ src_install() { dosym tar /bin/gtar fi - mv "${ED%/}"/usr/sbin/${p}backup{,-tar} || die - mv "${ED%/}"/usr/sbin/${p}restore{,-tar} || die + 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/ \ + find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \ -type f -a '!' '(' -name tar -o -name ${p}tar ')' \ -delete || die fi diff --git a/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.32.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.32.ebuild index bfcea16fbe..81267f7aa8 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.32.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.32.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~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(+)] )" @@ -38,9 +38,9 @@ src_prepare() { src_configure() { use static && append-ldflags -static local myeconfargs=( - --bindir="${EPREFIX%/}"/bin + --bindir="${EPREFIX}"/bin --enable-backup-scripts - --libexecdir="${EPREFIX%/}"/usr/sbin + --libexecdir="${EPREFIX}"/usr/sbin $(usex userland_GNU "" "--program-prefix=g") $(use_with acl posix-acls) $(use_enable nls)