[gentoo-commits] repo/gentoo:master commit in: app-arch/cpio/, app-arch/cpio/files/
commit: 8b78649fb457fb8cfe48aa194af9233cd3cc5cc6
Author: Sam James gentoo org>
AuthorDate: Fri May 5 02:35:30 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri May 5 02:35:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b78649f
app-arch/cpio: add 2.14
Bug: https://bugs.gentoo.org/699456
Bug: https://bugs.gentoo.org/738392
Bug: https://bugs.gentoo.org/807088
Bug: https://bugs.gentoo.org/854192
Signed-off-by: Sam James gentoo.org>
app-arch/cpio/Manifest | 1 +
app-arch/cpio/cpio-2.14.ebuild | 50 ++
.../files/cpio-2.14-sysmacros-glibc-2.26.patch | 42 ++
3 files changed, 93 insertions(+)
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 1bc147148d44..dfe669870d3e 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/app-arch/cpio/cpio-2.14.ebuild b/app-arch/cpio/cpio-2.14.ebuild
new file mode 100644
index ..1d3937b4bbab
--- /dev/null
+++ b/app-arch/cpio/cpio-2.14.ebuild
@@ -0,0 +1,50 @@
+# 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"
+
+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
+ "${FILESDIR}"/${PN}-2.14-sysmacros-glibc-2.26.patch
+)
+
+src_prepare() {
+ default
+
+ 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/files/cpio-2.14-sysmacros-glibc-2.26.patch
b/app-arch/cpio/files/cpio-2.14-sysmacros-glibc-2.26.patch
new file mode 100644
index ..e6b187c8f5c6
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.14-sysmacros-glibc-2.26.patch
@@ -0,0 +1,42 @@
+--- 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
++#endif
+ #include
+ $3
+ ]], [[switch (0) case 0: case (sizeof ($1($2)) == sizeof ($ac_type)):;]])],
[AC_CV_NAME=$ac_type])
+--- a/configure.ac
b/configure.ac
+@@ -37,14 +37,11 @@ gl_EARLY
+ AC_C_PROTOTYPES
+
+ AC_SYS_LARGEFILE
+-AC_HEADER_MAJOR
+ AC_C_CONST
+ AC_TYPE_UID_T
+ AC_CHECK_TYPE(gid_t, int)
+
+ AC_HEADER_DIRENT
+-AX_COMPILE_CHECK_RETTYPE([major], [0])
+-AX_COMPILE_CHECK_RETTYPE([minor], [0])
+
+ AC_CHECK_FUNCS([fchmod fchown])
+ # This is needed for mingw build
+@@ -65,7 +62,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
[gentoo-commits] repo/gentoo:master commit in: app-arch/cpio/, app-arch/cpio/files/
commit: e82c66c6494159d59fe2d771f8eec43748dd869b
Author: Sam James gentoo org>
AuthorDate: Tue Jan 3 03:28:36 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Jan 3 03:33:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e82c66c6
app-arch/cpio: fix build w/ clang 16
Closes: https://bugs.gentoo.org/880373
Signed-off-by: Sam James gentoo.org>
.../{cpio-2.13-r4.ebuild => cpio-2.13-r5.ebuild} | 3 ++-
...2.13-wincompatible-function-pointer-types.patch | 23 ++
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/app-arch/cpio/cpio-2.13-r4.ebuild
b/app-arch/cpio/cpio-2.13-r5.ebuild
similarity index 93%
rename from app-arch/cpio/cpio-2.13-r4.ebuild
rename to app-arch/cpio/cpio-2.13-r5.ebuild
index 79d4ada19621..b184309b5c44 100644
--- a/app-arch/cpio/cpio-2.13-r4.ebuild
+++ b/app-arch/cpio/cpio-2.13-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,6 +24,7 @@ PATCHES=(
"${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() {
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
new file mode 100644
index ..4f2dc3153656
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.13-wincompatible-function-pointer-types.patch
@@ -0,0 +1,23 @@
+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
+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
+ # 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
[gentoo-commits] repo/gentoo:master commit in: app-arch/cpio/, app-arch/cpio/files/
commit: 65dd197d2dbddb0c95bbdde6097f5cce748c1fb9
Author: Lars Wendler gentoo org>
AuthorDate: Sat Sep 12 22:59:48 2015 +
Commit: Lars Wendler gentoo org>
CommitDate: Sat Sep 12 23:00:00 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65dd197d
app-arch/cpio: Bump to version 2.12
Package-Manager: portage-2.2.20.1
Signed-off-by: Lars Wendler gentoo.org>
app-arch/cpio/Manifest | 1 +
app-arch/cpio/cpio-2.12.ebuild | 32 ++
.../cpio/files/cpio-2.12-non-gnu-compilers.patch | 11
3 files changed, 44 insertions(+)
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 3b37779..cd00f1e 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -1 +1,2 @@
DIST cpio-2.11.tar.bz2 1018483 SHA256
bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd SHA512
b6ccb3e121ea29780219d21c9cd6267c2f7b7ae72fb899bb80e1c54cc33e9eac5363443d93dbfbe37e8e8d295dad2724ac607f0543cc62797919605f68c396aa
WHIRLPOOL
3e19212f8d5c16de0d531d189fa9fc288ff90d6299c1f3f98f61e182bb0ec278705ae5021c85c7aaeab869ad36b2b3bcd11327a746cde0bf5a596049d711d9cd
+DIST cpio-2.12.tar.bz2 1258605 SHA256
70998c5816ace8407c8b101c9ba1ffd3ebbecba1f5031046893307580ec1296e SHA512
0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120
WHIRLPOOL
2990d54b0832e36239737fbd71f197b28703ec22de8dbbab57c7b97dab88a6107cf5464e4dd0bbf208f2c3d49839c7c2abe8ef68c1f2318ff7018d0b07f179fc
diff --git a/app-arch/cpio/cpio-2.12.ebuild b/app-arch/cpio/cpio-2.12.ebuild
new file mode 100644
index 000..559b65b
--- /dev/null
+++ b/app-arch/cpio/cpio-2.12.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils
+
+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 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux
~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable nls) \
+ --bindir="${EPREFIX}"/bin \
+ --with-rmt="${EPREFIX}"/usr/sbin/rmt
+}
+
+src_install() {
+ default
+}
diff --git a/app-arch/cpio/files/cpio-2.12-non-gnu-compilers.patch
b/app-arch/cpio/files/cpio-2.12-non-gnu-compilers.patch
new file mode 100644
index 000..c7fc7f9
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.12-non-gnu-compilers.patch
@@ -0,0 +1,11 @@
+--- cpio-2.12/src/cpiohdr.h
cpio-2.12/src/cpiohdr.h
+@@ -25,6 +25,8 @@
+
+ # ifdef HAVE_ATTRIB_PACKED
+ # define ATTRIB_PACKED __attribute__((packed))
++# else
++# define ATTRIB_PACKED
+ # endif
+
+ # ifdef HAVE_PRAGMA_PACK
[gentoo-commits] repo/gentoo:master commit in: app-arch/cpio/, app-arch/cpio/files/
commit: 34b312a4274fa1fe232cd72f080070fec4b13e9c
Author: Mike Frysinger gentoo org>
AuthorDate: Fri Sep 11 05:32:48 2015 +
Commit: Mike Frysinger gentoo org>
CommitDate: Fri Sep 11 05:33:47 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34b312a4
app-arch/cpio: add upstream fix for symlink-bad-length test failure #554760
app-arch/cpio/cpio-2.11-r3.ebuild | 1 +
.../files/cpio-2.11-symlink-bad-length-test.patch | 39 ++
2 files changed, 40 insertions(+)
diff --git a/app-arch/cpio/cpio-2.11-r3.ebuild
b/app-arch/cpio/cpio-2.11-r3.ebuild
index d234da8..c389789 100644
--- a/app-arch/cpio/cpio-2.11-r3.ebuild
+++ b/app-arch/cpio/cpio-2.11-r3.ebuild
@@ -20,6 +20,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-no-gets.patch #424974
epatch "${FILESDIR}"/${P}-non-gnu-compilers.patch #275295
epatch "${FILESDIR}"/${P}-security.patch #530512 #536010
+ epatch "${FILESDIR}"/${P}-symlink-bad-length-test.patch #554760
eautoreconf
}
diff --git a/app-arch/cpio/files/cpio-2.11-symlink-bad-length-test.patch
b/app-arch/cpio/files/cpio-2.11-symlink-bad-length-test.patch
new file mode 100644
index 000..7af5fe0
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.11-symlink-bad-length-test.patch
@@ -0,0 +1,39 @@
+https://lists.gnu.org/archive/html/bug-cpio/2015-06/msg1.html
+https://bugs.gentoo.org/554760
+
+this fix is squashed into 0396591026410f91f7a81b4b150bc7285d9f2278
+(as upstream doesn't seem to understand git)
+
+>From bebf9662c406d1d137a66c567d8748b489d352e7 Mon Sep 17 00:00:00 2001
+From: Pavel Raiskup
+Date: Thu, 4 Jun 2015 13:27:42 +0200
+Subject: [PATCH] tests: fix expected output for old file
+
+Thanks Victor Rodriguez. Upstream thread:
+http://lists.gnu.org/archive/html/bug-cpio/2015-06/msg0.html
+
+* tests/symlink-bad-length.at (STDOUT): Expect the year string
+'2014' is printed and not time because the file in archive is
+older than 6 months.
+* Thanks: Mention Victor.
+---
+ THANKS | 1 +
+ tests/symlink-bad-length.at | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/symlink-bad-length.at b/tests/symlink-bad-length.at
+index e1a7093..2cdc692 100644
+--- a/tests/symlink-bad-length.at
b/tests/symlink-bad-length.at
+@@ -57,7 +57,7 @@ cat stderr | grep -v \
+ echo >&2 STDERR
+ ],
+ [0],
+-[-rw-rw-r-- 1 1002910031 13 Nov 25 11:52 FILE
++[-rw-rw-r-- 1 1002910031 13 Nov 25 2014 FILE
+ ],[STDERR
+ ])
+
+--
+2.1.0
+
