5 files changed, 146 insertions, 0 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index d9d808354406..cc98254e5464 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 8daff37d7c3c..7d5b37c39e02 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -8,4 +8,5 @@ DIST cpio-2.13-CVE-2021-38185.patch.xz 7844 BLAKE2B e338950e03c3eed3b4288435c9c7
 DIST cpio-2.13.tar.bz2 1354559 BLAKE2B 45d77723acb55f15c8574ab5a2fdff6fb1767629d177dd3416b0268e9f82ee6bdd11b4fa591ef020efccbdc3f4918cf77263169da1a0f6422dfe1a9712295778 SHA512 459398e69f7f48201c04d1080218c50f75edcf114ffcbb236644ff6fcade5fcc566929bdab2ebe9be5314828d6902e43b348a8adf28351df978c8989590e93a3
 EBUILD cpio-2.12-r1.ebuild 828 BLAKE2B dbb7332b54ed751015b8e17c687f088344244543447ddd6f7bd1c66caf0af578f4fe96a8fa0389009aafff3fec0f9a433334dd4c4b047ff9bc0ef675542d2ef9 SHA512 803b31960635ce881ec7c2ce3a3f4e7176899d000c8e30c7a00ab9597c1c09a291e2f6b157226d41e527be740b9b54c7f1655641c52e395351611db7b61944cd
 EBUILD cpio-2.13-r3.ebuild 1364 BLAKE2B 0928510f98e6ad7ad51c7c0de3f488284f59d9c5716806f185bdd252ceaa9e3c1930de501c5ef5f1a17629b0c8347965d6a19b5cbf80dc4831415b82d12ab1ac SHA512 8fc572c47585462e46ea60a8aab904494b1fe5075117115736d479c21c3e9e875355d00e6544f337fb3265e66677af38ee63f32859130f083bcd6d682c98ca78
+EBUILD cpio-2.13-r4.ebuild 1466 BLAKE2B b14dbc5d23d939c834b05a5b0ea54952dc8653214155dfed2ce7af983586506e73facf69be57a12a8d1e053329d19cae960680b46bfb35b37a3b133c819d6527 SHA512 5c87510aecf424983389cd33e33630574fb5a933102602131b4dccd1a774cecbe66ca790f0ee782e29551136a161869f6568e3fc2bfe5a5cff550bd37200fa53
 MISC metadata.xml 328 BLAKE2B f8b8bff5b160351a92837553de20eda1da31a6c0594c1118e1f71b3cd19d9ea8d3420bdce943d83644f5ffc234950f95fb9229a213660767dc5281120085b26f SHA512 08e1c6a03b894946bf6332bf46c8a7534ed0998777b30cb9eecb9c746bb333b65fb41dfeeb6938cbc08d0ad0a303d752ea70a6a6a6ae2c5c2935b2b4e4d9928f
diff --git a/app-arch/cpio/cpio-2.13-r4.ebuild b/app-arch/cpio/cpio-2.13-r4.ebuild
new file mode 100644
index 000000000000..3876fc2daba4
--- /dev/null
+++ b/app-arch/cpio/cpio-2.13-r4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A file archival tool which can also read and write tar files"
+HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html"
+SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-CVE-2021-38185.patch.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+PDEPEND="
+	app-alternatives/cpio
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
+	"${WORKDIR}"/${P}-CVE-2021-38185.patch
+	"${FILESDIR}"/${PN}-2.13-sysmacros-glibc-2.26.patch
+	"${FILESDIR}"/${PN}-2.13-fix-no-absolute-filenames-revert-CVE-2015-1197-handling.patch
+)
+
+src_prepare() {
+	default
+
+	# Drop after 2.13 (only here for CVE patch)
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		--bindir="${EPREFIX}"/bin
+		--with-rmt="${EPREFIX}"/usr/sbin/rmt
+		# install as gcpio for better compatibility with non-GNU userland
+		--program-prefix=g
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+pkg_postinst() {
+	# ensure to preserve the symlink before app-alternatives/cpio
+	# is installed
+	if [[ ! -h ${EROOT}/bin/cpio ]]; then
+		ln -s gcpio "${EROOT}/bin/cpio" || die
+	fi
+}
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 27ec9baa8836..8ec56c0f371e 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -2,5 +2,6 @@ AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9
 DIST tar-1.34.tar.xz 2226068 BLAKE2B 741a662457509a6775338ffe5d2d84872fcf38b93ace70c8b748a81055b9b62f65a48c4e541955d08ae99e6f528509e89eacd7c799a65bcc3d017a259110c115 SHA512 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902
 DIST tar-1.34.tar.xz.sig 181 BLAKE2B 2fae91293a9dacda0374706e1f83498042a9d5224f80f6f0e14abdb914cb5a8e980f720eb4a453485844c7fe26e0525f230c0eab11c7fa89159a1a929370795c SHA512 55297f41549deee511f5b14c6b5dc7bb3d9282dad52bcc85f9dddfad24b677f989ba86387ad9b133c3698feedbd6b6cd7e9f005e8e4c89f72c80543eeceb78f7
 EBUILD tar-1.34-r1.ebuild 2217 BLAKE2B 37c22ae778857a27fa5a1d5e11842533ea3b546a073472707ed7df4f5c70f5c26554eee6b32d2d2e4dc3c3c0d6dccaf11ed8fb82464c0071df8729655f8e4e15 SHA512 eeffe0637d8a5ad354dd5f7a347dc52ebd82b8b359523da872e918d02a299771b9acd0e614e1a7aea1c138f261f66017352cf26bf93428072c94aea29528eaf8
+EBUILD tar-1.34-r2.ebuild 2345 BLAKE2B 5d3a50e4aec6ab4a2ac6e7cbc7df797a8b739df91226a5afd4a1a9f4773e4ffc7a18ba1eb18d4bf9f2da05db4cfb1ce1b44586546d1bc35e5f2e775529677f3c SHA512 8c9b2548edf438c316398207bd3ea13d157a21a6094c2c44585ae70a397619b98a4e289661d860878346ab7a681d862ac4ddcb9b5b59f6fa0764c4b31e92f386
 EBUILD tar-1.34.ebuild 1970 BLAKE2B a09388c9f7daa6a088185230d456add799c9e1aadf7c9ef96c984599fe7561de7b74ff6d265d0019fe62ed5347605413a329c65c79db4f32c16e881692013974 SHA512 c2f47fd426b78f8e077e9b08b68ab32b65fa9b4a9fb64493d171e81042b5e95455d9850b53f9a1d08c58d07bb2bdcda0b3b57ba1721ba452b5d2b0da03696787
 MISC metadata.xml 388 BLAKE2B 85aba561c0c0ad8c72d8d33f66ef6504bed7747957059c19fc5b0267b048bbddbd1112239bd4d3bcdf1c2f465018a2128e086a253253205dd7b815c11f3cc6ca SHA512 83e4c69e150b6420ab2ef4b777d930fd5e0f5cc1244bf8cd9a7cf0f867219100578a4777043fccf5f95a6a44ee264b88381d94924f4f18c80cb2ff339efbce64
diff --git a/app-arch/tar/tar-1.34-r2.ebuild b/app-arch/tar/tar-1.34-r2.ebuild
new file mode 100644
index 000000000000..5606cfb60b71
--- /dev/null
+++ b/app-arch/tar/tar-1.34-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/tar.asc
+inherit verify-sig
+
+DESCRIPTION="Use this to make tarballs :)"
+HOMEPAGE="https://www.gnu.org/software/tar/"
+SRC_URI="mirror://gnu/tar/${P}.tar.xz
+	https://alpha.gnu.org/gnu/tar/${P}.tar.xz"
+SRC_URI+=" verify-sig? (
+		mirror://gnu/tar/${P}.tar.xz.sig
+		https://alpha.gnu.org/gnu/tar/${P}.tar.xz.sig
+	)"
+
+LICENSE="GPL-3+"
+SLOT="0"
+if [[ -z "$(ver_cut 3)" ]] || [[ "$(ver_cut 3)" -lt 90 ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="acl minimal nls selinux xattr"
+
+RDEPEND="
+	acl? ( virtual/acl )
+	selinux? ( sys-libs/libselinux )
+"
+DEPEND="${RDEPEND}
+	xattr? ( elibc_glibc? ( sys-apps/attr ) )
+"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-tar )
+"
+PDEPEND="
+	app-alternatives/tar
+"
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		--enable-backup-scripts
+		--libexecdir="${EPREFIX}"/usr/sbin
+		$(use_with acl posix-acls)
+		$(use_enable nls)
+		$(use_with selinux)
+		$(use_with xattr xattrs)
+
+		# 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
+		--program-prefix=g
+	)
+
+	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# a nasty yet required piece of baggage
+	exeinto /etc
+	doexe "${FILESDIR}"/rmt
+
+	mv "${ED}"/usr/sbin/{gbackup,backup-tar} || die
+	mv "${ED}"/usr/sbin/{grestore,restore-tar} || die
+	mv "${ED}"/usr/sbin/{g,}backup.sh || die
+	mv "${ED}"/usr/sbin/{g,}dump-remind || die
+
+	if use minimal ; then
+		find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
+			-type f -a '!' -name gtar \
+			-delete || die
+	fi
+
+	if ! use minimal; then
+		dosym grmt /usr/sbin/rmt
+	fi
+	dosym grmt.8 /usr/share/man/man8/rmt.8
+}
+
+pkg_postinst() {
+	# ensure to preserve the symlink before app-alternatives/tar
+	# is installed
+	if [[ ! -h ${EROOT}/bin/tar ]]; then
+		ln -s gtar "${EROOT}/bin/tar" || die
+	fi
+}