summaryrefslogtreecommitdiff
path: root/app-arch/cpio
diff options
context:
space:
mode:
Diffstat (limited to 'app-arch/cpio')
-rw-r--r--app-arch/cpio/Manifest10
-rw-r--r--app-arch/cpio/cpio-2.13-r5.ebuild55
-rw-r--r--app-arch/cpio/cpio-2.14.ebuild2
-rw-r--r--app-arch/cpio/cpio-2.15.ebuild2
-rw-r--r--app-arch/cpio/files/cpio-2.13-fix-no-absolute-filenames-revert-CVE-2015-1197-handling.patch47
-rw-r--r--app-arch/cpio/files/cpio-2.13-sysmacros-glibc-2.26.patch42
-rw-r--r--app-arch/cpio/files/cpio-2.13-wincompatible-function-pointer-types.patch23
7 files changed, 4 insertions, 177 deletions
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 072d9f8908c7..1bb726325623 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -1,13 +1,7 @@
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 1449 BLAKE2B 7f57aa4c5f5c23bd78a35bd6aa9511d04fbfe37e76101c46eb76a0ed3d4fbd8d072e922d7a6131b6cd6173570dabb6cfcc412f91eaf4806dde296f6365c3f229 SHA512 219804608cd7d9cc7f3535cb071639845ea8dd6ab1f17c0fa11601030835a5445c93120b09efa55fd84c0d57635b01feded8430ca1eeeac154ddc1d960a9a5b0
-AUX cpio-2.13-wincompatible-function-pointer-types.patch 747 BLAKE2B 9145485db928d5fa1451d110dbf4a05253ac1e59b93e9089041e81276987fbe28f272ebae8964a29b0038f832340d44e184c6db9b9b1b8349ca8aefa512268d3 SHA512 24eac288b2c3a9afb07163d8aca14c80652b5fe7da66c6390c9ec16afe931c7398817ecb3d12cb8ff9152b3d181a1e031a3aba2b13f3ba4340846ea77be7d3f4
AUX cpio-2.14-sysmacros-glibc-2.26.patch 1429 BLAKE2B fa2d83eee1c281eb391577e4837e15b6c58628c7eedb5429e61e26f601735c6bcebc2336824d54e60b534f9a904f9a1431912931a5c7872957effd941daccbe7 SHA512 3e0df053cd5f893e6495c6f46bf84381336491633a78a4b8d26893a3c73778fbc7d12a2cc2daeeed28f25053ab6833a9463a2fc110f7b4c24034b5bb5ba9d3e6
-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
DIST cpio-2.14.tar.bz2 1521004 BLAKE2B f2fa9f5bc39cd91f4755fdf27f43cff4d1c1f098639502689a01314762ad686bf357a1eda7f92e4c802e6e8335548ca31fc789cea056ef685c558892ddcbebd1 SHA512 2dc93a81e31b6fb7ff9976243d22ca7a84bb396c7ad09e0abfb5d5efae1164ebb319fb89be45045797f8c604b3e3d2ea0746e3cfe559aa86282ea4ec9a17da28
DIST cpio-2.15.tar.bz2 1651320 BLAKE2B ca2aae6a00239be7aff5558a2e62b4fb4b43c2ed7f4d7a23699c958ae10b348c4ebf39233f0dd0242cba895fdac4d0ff3b4e56fefa0b1afe3db41eb6916e0b23 SHA512 e3c3d0344d13d540887198ee5d6209a9254ed34b87c3b3cabe6dc3ce22ef94d3f380bb60d3395eee44e4b0ec8460b957032c6251f101b4a9fbc5951a701aadff
-EBUILD cpio-2.13-r5.ebuild 1470 BLAKE2B b386190f7ae374d4f85397ee78e2709238781b68b254aa41241bec7badf05e8e50a27f2991488289c6673ec4f1b252cbfdac725e99336121e2a55f31ea4cb17b SHA512 a1fd85b530866ab34a315fa76755acc65d5334eb1be32904e31e99ebec97ceac94737cdbc28d2df11f0c919d85f9c48ebe5d3b0d6980942cd4e262f2520883c3
-EBUILD cpio-2.14.ebuild 1144 BLAKE2B 950b9b3535c5aa8453a118a54163983856defac3ffe1ee21ec7fe58430cf86e6aa5eaae5b6ba2221a2bac660ff979bee0e5cab02a2b0aadf715ef295bd203d93 SHA512 5eb0e4509993eeedf8a8d156d63b641bd0004d9c4b695f89a2c25d78703202d812d48e6bf942c2ba8146abdb34ffc1dc457d0fd42fc2ac05daf7232febab84ac
-EBUILD cpio-2.15.ebuild 1205 BLAKE2B f61c1fe85507500a8a13c8bfdceda93ab70583125b4469c5be6c4d55179dfde6184a7522aa52ae74fe601751df18d4910393dbe51702108215f1944c7960cbb6 SHA512 9721b13886db4d63942047f40b17f5e77b141a1e47d4ced128ce3c538028d31c59ae5d9be96a6f621ad11595d28a6e35a3e882e020f22cc2dbf0db1be3862327
+EBUILD cpio-2.14.ebuild 1138 BLAKE2B cdfae5181fc922bede50db55313ea46e697c730b246f897529b35e8df1e75f3f064282aee89829d27b75bd8a616c8fce329775e2e6999cdd9af7fab4d1892d6f SHA512 f6038593d5a67d4c0c306c4acd5c455f37660abbf15f83df54f623ec29a31e2343691d735c0f51a3d8028eed9e0c8446571ec5f1736b64c3e4c90fc3f151387a
+EBUILD cpio-2.15.ebuild 1199 BLAKE2B c42180e9df5408861f8813530e7df59917ee19632202962865babd250476abd3d6fb92973f24c23b8a78f72c1cfce1dfbfda5f6a3ea0121d6d4e8303b4059e89 SHA512 a9e379c65a747419c6990915e71bc96b74fdee8e7fd394f24d850b1726e9210ec2a1a5b3e1220412aa7fc595045fdc0abc63939593dfdcaeb7a014b11e2fba72
MISC metadata.xml 328 BLAKE2B f8b8bff5b160351a92837553de20eda1da31a6c0594c1118e1f71b3cd19d9ea8d3420bdce943d83644f5ffc234950f95fb9229a213660767dc5281120085b26f SHA512 08e1c6a03b894946bf6332bf46c8a7534ed0998777b30cb9eecb9c746bb333b65fb41dfeeb6938cbc08d0ad0a303d752ea70a6a6a6ae2c5c2935b2b4e4d9928f
diff --git a/app-arch/cpio/cpio-2.13-r5.ebuild b/app-arch/cpio/cpio-2.13-r5.ebuild
deleted file mode 100644
index 6eb8fef26047..000000000000
--- a/app-arch/cpio/cpio-2.13-r5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-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
- "${FILESDIR}"/${PN}-2.13-wincompatible-function-pointer-types.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/cpio/cpio-2.14.ebuild b/app-arch/cpio/cpio-2.14.ebuild
index 3e229fd5d932..498f8ce59e68 100644
--- a/app-arch/cpio/cpio-2.14.ebuild
+++ b/app-arch/cpio/cpio-2.14.ebuild
@@ -11,7 +11,7 @@ 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="nls"
PDEPEND="
diff --git a/app-arch/cpio/cpio-2.15.ebuild b/app-arch/cpio/cpio-2.15.ebuild
index fe1d24ebc861..19bc36cde4ff 100644
--- a/app-arch/cpio/cpio-2.15.ebuild
+++ b/app-arch/cpio/cpio-2.15.ebuild
@@ -11,7 +11,7 @@ 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="nls"
PDEPEND="
diff --git a/app-arch/cpio/files/cpio-2.13-fix-no-absolute-filenames-revert-CVE-2015-1197-handling.patch b/app-arch/cpio/files/cpio-2.13-fix-no-absolute-filenames-revert-CVE-2015-1197-handling.patch
deleted file mode 100644
index 326489a54943..000000000000
--- a/app-arch/cpio/files/cpio-2.13-fix-no-absolute-filenames-revert-CVE-2015-1197-handling.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://sources.debian.org/patches/cpio/2.13%2Bdfsg-7.1/revert-CVE-2015-1197-handling.patch/
-https://bugs.gentoo.org/700020
-
-From: Chris Lamb <lamby@debian.org>
-Date: Sat, 1 Feb 2020 13:36:37 +0100
-Subject: Fix a regression in handling of CVE-2015-1197 &
- --no-absolute-filenames.
-
-See:
-
- * https://bugs.debian.org/946267
- * https://bugs.debian.org/946469
-
-This reverts (most of): https://git.savannah.gnu.org/cgit/cpio.git/diff/?id=45b0ee2b407913c533f7ded8d6f8cbeec16ff6ca&id2=3177d660a4c62a6acb538b0f7c54ba423698889a
---- a/src/copyin.c
-+++ b/src/copyin.c
-@@ -646,8 +646,6 @@ copyin_link (struct cpio_file_stat *file_hdr, int in_file_des)
- link_name = xstrdup (file_hdr->c_tar_linkname);
- }
-
-- cpio_safer_name_suffix (link_name, true, !no_abs_paths_flag, false);
--
- res = UMASKED_SYMLINK (link_name, file_hdr->c_name,
- file_hdr->c_mode);
- if (res < 0 && create_dir_flag)
---- a/tests/testsuite
-+++ b/tests/testsuite
-@@ -2787,7 +2787,7 @@ read at_status <"$at_status_file"
- #AT_START_14
- at_fn_group_banner 14 'CVE-2015-1197.at:17' \
- "CVE-2015-1197 (--no-absolute-filenames for symlinks)" ""
--at_xfail=no
-+at_xfail=yes
- (
- $as_echo "14. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
---- a/tests/CVE-2015-1197.at
-+++ b/tests/CVE-2015-1197.at
-@@ -15,6 +15,7 @@
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- AT_SETUP([CVE-2015-1197 (--no-absolute-filenames for symlinks)])
-+AT_XFAIL_IF([true])
- AT_CHECK([
- tempdir=$(pwd)/tmp
- mkdir $tempdir
diff --git a/app-arch/cpio/files/cpio-2.13-sysmacros-glibc-2.26.patch b/app-arch/cpio/files/cpio-2.13-sysmacros-glibc-2.26.patch
deleted file mode 100644
index 90e7bc77bd9b..000000000000
--- a/app-arch/cpio/files/cpio-2.13-sysmacros-glibc-2.26.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/am/ax_compile_check_rettype.m4
-+++ b/am/ax_compile_check_rettype.m4
-@@ -70,6 +70,9 @@ AC_CACHE_VAL(AC_CV_NAME,
- [for ac_type in char short int long "long long" $4
- do
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include <sys/sysmacros.h>
-+#endif
- #include <sys/types.h>
- $3
- ]], [[switch (0) case 0: case (sizeof ($1($2)) == sizeof ($ac_type)):;]])], [AC_CV_NAME=$ac_type])
---- a/configure.ac
-+++ b/configure.ac
-@@ -39,14 +39,11 @@ AC_C_PROTOTYPES
- AC_SYS_LARGEFILE
-
- AC_TYPE_SIGNAL
--AC_HEADER_MAJOR
- AC_C_CONST
- AC_TYPE_UID_T
- AC_CHECK_TYPE(gid_t, int)
- AC_HEADER_STDC
- AC_HEADER_DIRENT
--AC_COMPILE_CHECK_RETTYPE([major], [0])
--AC_COMPILE_CHECK_RETTYPE([minor], [0])
-
- AC_CHECK_FUNCS([fchmod fchown])
- # This is needed for mingw build
-@@ -67,7 +64,11 @@ AC_ARG_ENABLE(mt,
-
- AM_CONDITIONAL([CPIO_MT_COND], [test "$enable_mt" = yes])
-
--AC_CHECK_HEADERS([unistd.h stdlib.h string.h fcntl.h pwd.h grp.h sys/io/trioctl.h utmp.h getopt.h locale.h libintl.h sys/wait.h utime.h locale.h process.h sys/ioctl.h])
-+AC_CHECK_HEADERS([unistd.h stdlib.h string.h fcntl.h pwd.h grp.h sys/io/trioctl.h utmp.h getopt.h locale.h libintl.h sys/wait.h utime.h locale.h process.h sys/ioctl.h sys/sysmacros.h])
-+
-+AC_HEADER_MAJOR
-+AC_COMPILE_CHECK_RETTYPE([major], [0])
-+AC_COMPILE_CHECK_RETTYPE([minor], [0])
-
- AC_CHECK_DECLS([errno, getpwnam, getgrnam, getgrgid, strdup, strerror, getenv, atoi, exit], , , [
- #include <stdio.h>
diff --git a/app-arch/cpio/files/cpio-2.13-wincompatible-function-pointer-types.patch b/app-arch/cpio/files/cpio-2.13-wincompatible-function-pointer-types.patch
deleted file mode 100644
index 4f2dc3153656..000000000000
--- a/app-arch/cpio/files/cpio-2.13-wincompatible-function-pointer-types.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/880373
-https://savannah.gnu.org/bugs/index.php?63349
-https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=0cc39712803ade7b2d4b89c36b143dad72404063
-
-From 0cc39712803ade7b2d4b89c36b143dad72404063 Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno@clisp.org>
-Date: Sun, 18 Oct 2020 14:37:13 +0200
-Subject: obstack: Fix a clang warning.
-
-* lib/obstack.c (print_and_abort): Mark as __attribute_noreturn__.
---- a/gnu/obstack.c
-+++ b/gnu/obstack.c
-@@ -326,7 +326,7 @@ int obstack_exit_failure = EXIT_FAILURE;
- # include <libio/iolibio.h>
- # endif
-
--static _Noreturn void
-+static __attribute_noreturn__ void
- print_and_abort (void)
- {
- /* Don't change any of these strings. Yes, it would be possible to add
---
-cgit v1.1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 04:24:44 +0000