mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 12:16:41 +02:00
app-arch/cpio: Sync with Gentoo
It's from Gentoo commit 5f3aae3b1196484405b16d3954149c2eacbf0192.
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
d35954ca15
commit
069ca8163f
@ -1,4 +1,2 @@
|
||||
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
|
||||
|
||||
@ -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 ~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
|
||||
}
|
||||
@ -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
|
||||
@ -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>
|
||||
@ -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
|
||||
Loading…
x
Reference in New Issue
Block a user