gentoo auto-resync : 28:12:2022 - 02:11:45

6 files changed, 2 insertions, 125 deletions

diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 3767d94e8d5b..7fba9d3d8f35 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -1,12 +1,7 @@
-AUX cpio-2.12-gcc-10.patch 740 BLAKE2B b129aff7f1c61305ba6b05e57d265439aea3b7da0761788e1a8e2594d903ae1458f757379284a41909765368dc0fad7e960e3a5f7509603f01fcd23c3cef0b1a SHA512 9b86cc1c7dd45333e5e0ceda52ccdb95d93f0be6e6f90bc11ff80a510fd8f707d3ce2b07173b020fcb96202343e06544ec5bf694a42c638313f0195f2a7493fc
-AUX cpio-2.12-name-overflow.patch 404 BLAKE2B f15aaffd716a6dca8b00f0831cd3bfa8971ca8beee6eb04b6ad3974c0d2770ac23669839b348013974ee827affb7b943d4dfa1be8d29b0b77c8ebea5e01791df SHA512 725468331dbb24e37333f9f56d8f295a7e521dd855f97993a2f62bf6b3a8f44d924b868ad5315dd90706ac28fcbb0b7da4c30e77ad5f401e7c5543410cc42f7a
 AUX cpio-2.12-non-gnu-compilers.patch 223 BLAKE2B e5ba3da0c1dc23199e52c3782d3a11504b075b1216d20cd8643591abdc3a69afe1db254800327ece8f07f83438756d88c5c10c606b4e14c76a309941dc4ed1f9 SHA512 369efc3393affdb91191ab7a55a6dd3a1157ddfa294bd9a4763cc63e6df72af3a7ab614234d69e327edf14a97e4fb800aee32a379ade73c0f80b0dd8ecf33f03
 AUX cpio-2.13-fix-no-absolute-filenames-revert-CVE-2015-1197-handling.patch 1505 BLAKE2B 77be2bbd0df1b7b44e7517aedd4393d5b4cdb5e90508fa45aa961efe32b4061beaf43b23798908c714aa23a252e914402b22a494d0d6def0a4dc8294b8f84418 SHA512 a60cbfb3cc418d9d45e226e6da4c857176ce0517e829e288ffa7dd85b8fcca1c0a7c0ae0e0eab14fdb438be742f2625aa1c3169a41d1fa05c5e3cd426f270687
 AUX cpio-2.13-sysmacros-glibc-2.26.patch 413 BLAKE2B 3114697d3543abf2d1e8eb8a6443cd094cb378a185dd2e48d917d7cbb395a5bc2c2c1dd8207cc2b383f1118b01077a8f2d2f579466c811b41d1e392fda5ce0f9 SHA512 d709e9373a868681a3b9c5a9ad7c8df667df758162dbc0c701ed0826fd478d84f2fc92b21fb56e9366fc19d9816f64fc475df5e1a5a8b2ac790c89f561b121e4
-DIST cpio-2.12.tar.bz2 1258605 BLAKE2B 4b6d42a1d8aaeaa980cab5894b2e264451e96a108f2c3aa89d3e6fde0bff338e026ee233ebd7c8cf41f3c926d42d38b866778244db774055736ca8792889e160 SHA512 0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120
 DIST cpio-2.13-CVE-2021-38185.patch.xz 7844 BLAKE2B e338950e03c3eed3b4288435c9c75af8f0c3497b43680be4ee347e628db7cfac616b437a848094bf82cfc2c7f29d59b388bf0f6368b3b99770022e3f9533be11 SHA512 4d2cafefcd1ae9d86cb5171de2896799713490dfd9ed27d3dce0886fa4588c8df2b16ad8508a5dbb9155c9de6e40b6d1083bdb4774d967193a270a1dcbe37a33
 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 1463 BLAKE2B 949dd8cd32aba41a42f15802198ca70ffeef9c0d7edde1d436f3955bb634a37e93be6b2f765ce1a5d53bbac8e5c077aadcbd646c06414ea4e84802790e70888a SHA512 16de4bda8284dd9660814d5468c7bbdfe06a8e9b45a97c64104f069937479a6293d0199dced76517ac89608091fe7c66efd5fc072da05a5c958503fdd99df7f7
+EBUILD cpio-2.13-r4.ebuild 1458 BLAKE2B 8e25fb5922eb396d8c0168e66b04c3a152ac5051a18913b0e5e1c2beb4fc0d65049f5cd009ea4588873fa738a62ff2f17e9f5483c15d3babc30705916fb161e5 SHA512 8ed6030685afe67e1552128b95bc8685259521820c5094b94e47bc11222255d88d04f72d30ec00ef339ffdd61671e40264816c33c97f0ec3a195a72e5784f779
 MISC metadata.xml 328 BLAKE2B f8b8bff5b160351a92837553de20eda1da31a6c0594c1118e1f71b3cd19d9ea8d3420bdce943d83644f5ffc234950f95fb9229a213660767dc5281120085b26f SHA512 08e1c6a03b894946bf6332bf46c8a7534ed0998777b30cb9eecb9c746bb333b65fb41dfeeb6938cbc08d0ad0a303d752ea70a6a6a6ae2c5c2935b2b4e4d9928f
diff --git a/app-arch/cpio/cpio-2.12-r1.ebuild b/app-arch/cpio/cpio-2.12-r1.ebuild
deleted file mode 100644
index 684d6aa82dfa..000000000000
--- a/app-arch/cpio/cpio-2.12-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-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"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
-	"${FILESDIR}"/${PN}-2.12-name-overflow.patch #572428
-	"${FILESDIR}"/${PN}-2.12-gcc-10.patch #705900
-)
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--bindir="${EPREFIX}"/bin \
-		--with-rmt="${EPREFIX}"/usr/sbin/rmt
-}
diff --git a/app-arch/cpio/cpio-2.13-r3.ebuild b/app-arch/cpio/cpio-2.13-r3.ebuild
deleted file mode 100644
index a09ffc983c4c..000000000000
--- a/app-arch/cpio/cpio-2.13-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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"
-
-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[@]}"
-}
-
-src_install() {
-	default
-
-	# make cpio a symlink
-	dosym gcpio /bin/cpio
-	dosym gcpio.1 /usr/share/man/man1/cpio.1
-}
diff --git a/app-arch/cpio/cpio-2.13-r4.ebuild b/app-arch/cpio/cpio-2.13-r4.ebuild
index 148c41211c5b..79d4ada19621 100644
--- a/app-arch/cpio/cpio-2.13-r4.ebuild
+++ b/app-arch/cpio/cpio-2.13-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-CVE-2021
 
 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"
+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="
diff --git a/app-arch/cpio/files/cpio-2.12-gcc-10.patch b/app-arch/cpio/files/cpio-2.12-gcc-10.patch
deleted file mode 100644
index 9c7d7edd88f5..000000000000
--- a/app-arch/cpio/files/cpio-2.12-gcc-10.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 641d3f489cf6238bb916368d4ba0d9325a235afb Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Mon, 20 Jan 2020 07:45:39 +0200
-Subject: Minor fix * src/global.c: Remove superfluous declaration of
- program_name
-
----
- src/global.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/global.c b/src/global.c
-index fb3abe9..acf92bc 100644
---- a/src/global.c
-+++ b/src/global.c
-@@ -184,9 +184,6 @@ unsigned int warn_option = 0;
- /* Extract to standard output? */
- bool to_stdout_option = false;
- 
--/* The name this program was run with.  */
--char *program_name;
--
- /* A pointer to either lstat or stat, depending on whether
-    dereferencing of symlinks is done for input files.  */
- int (*xstat) ();
--- 
-cgit v1.2.1
-
diff --git a/app-arch/cpio/files/cpio-2.12-name-overflow.patch b/app-arch/cpio/files/cpio-2.12-name-overflow.patch
deleted file mode 100644
index f85246884c39..000000000000
--- a/app-arch/cpio/files/cpio-2.12-name-overflow.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/572428
-https://lists.gnu.org/archive/html/bug-cpio/2016-01/msg00002.html
-http://seclists.org/oss-sec/2016/q1/136
-
---- a/src/copyin.c
-+++ b/src/copyin.c
-@@ -1385,6 +1385,8 @@
- 	  break;
- 	}
- 
-+      if (file_hdr.c_namesize <= 1)
-+	file_hdr.c_name = xrealloc (file_hdr.c_name, 2);
-       cpio_safer_name_suffix (file_hdr.c_name, false, !no_abs_paths_flag,
- 			      false);
-