commit: 35f18448ac5707b834a0e7df35c934c0bef430b7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Dec 27 23:53:21 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Dec 28 00:32:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35f18448
app-arch/cpio: drop 2.12-r1, 2.13-r3 Bug: https://bugs.gentoo.org/807088 Signed-off-by: Sam James <sam <AT> gentoo.org> app-arch/cpio/Manifest | 1 - app-arch/cpio/cpio-2.12-r1.ebuild | 26 ------------ app-arch/cpio/cpio-2.13-r3.ebuild | 50 ----------------------- app-arch/cpio/files/cpio-2.12-gcc-10.patch | 27 ------------ app-arch/cpio/files/cpio-2.12-name-overflow.patch | 15 ------- 5 files changed, 119 deletions(-) diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest index c9fcf3fa150e..1bc147148d44 100644 --- a/app-arch/cpio/Manifest +++ b/app-arch/cpio/Manifest @@ -1,3 +1,2 @@ -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 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/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 <[email protected]> -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); -
