From a3d0fcb6d239631f19e03e704ff80c8bbfb6a70b Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 9 Jun 2023 09:29:33 +0100 Subject: sys-apps/coreutils: backport fix for old kernels + copy_file_range Closes: https://bugs.gentoo.org/907474 Signed-off-by: Sam James --- sys-apps/coreutils/coreutils-9.3-r2.ebuild | 273 +++++++++++++++++++++ .../coreutils-9.3-old-kernel-copy_file_range.patch | 89 +++++++ 2 files changed, 362 insertions(+) create mode 100644 sys-apps/coreutils/coreutils-9.3-r2.ebuild create mode 100644 sys-apps/coreutils/files/coreutils-9.3-old-kernel-copy_file_range.patch (limited to 'sys-apps/coreutils') diff --git a/sys-apps/coreutils/coreutils-9.3-r2.ebuild b/sys-apps/coreutils/coreutils-9.3-r2.ebuild new file mode 100644 index 000000000000..a85afed513e4 --- /dev/null +++ b/sys-apps/coreutils/coreutils-9.3-r2.ebuild @@ -0,0 +1,273 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Try to keep an eye on Fedora's packaging: https://src.fedoraproject.org/rpms/coreutils +# The upstream coreutils maintainers also maintain the package in Fedora and may +# backport fixes which we want to pick up. +# +# Also recommend subscribing to the coreutils and bug-coreutils MLs. + +PYTHON_COMPAT=( python3_{9..11} ) +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc +inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig + +MY_PATCH="${PN}-9.0_p20220409-patches-01" +DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)" +HOMEPAGE="https://www.gnu.org/software/coreutils/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/coreutils.git" + inherit git-r3 +elif [[ ${PV} == *_p* ]] ; then + # Note: could put this in devspace, but if it's gone, we don't want + # it in tree anyway. It's just for testing. + MY_SNAPSHOT="$(ver_cut 1-2).18-ffd62" + SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz" + SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )" + S="${WORKDIR}"/${PN}-${MY_SNAPSHOT} +else + SRC_URI=" + mirror://gnu/${PN}/${P}.tar.xz + verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig ) + " + + KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux" +fi + +SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="acl caps gmp hostname kill multicall nls +openssl selinux +split-usr static test vanilla xattr" +RESTRICT="!test? ( test )" + +LIB_DEPEND=" + acl? ( sys-apps/acl[static-libs] ) + caps? ( sys-libs/libcap ) + gmp? ( dev-libs/gmp:=[static-libs] ) + openssl? ( dev-libs/openssl:=[static-libs] ) + xattr? ( sys-apps/attr[static-libs] ) +" +RDEPEND=" + !static? ( ${LIB_DEPEND//\[static-libs]} ) + selinux? ( sys-libs/libselinux ) + nls? ( virtual/libintl ) +" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" +BDEPEND=" + app-arch/xz-utils + dev-lang/perl + test? ( + dev-lang/perl + dev-perl/Expect + dev-util/strace + ${PYTHON_DEPS} + ) + verify-sig? ( sec-keys/openpgp-keys-coreutils ) +" +RDEPEND+=" + hostname? ( !sys-apps/net-tools[hostname] ) + kill? ( + !sys-apps/util-linux[kill] + !sys-process/procps[kill] + ) + !app-misc/realpath + ! "${ww}" + #!${EPREFIX}/bin/sh + exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@" + EOF + chmod a+rx "${ww}" || die + done + } + mkwrap mount umount + + addwrite /dev/full + #export RUN_EXPENSIVE_TESTS="yes" + #export FETISH_GROUPS="portage wheel" + env PATH="${T}/mount-wrappers:${PATH}" gl_public_submodule_commit= \ + emake -k check VERBOSE=yes +} + +src_install() { + default + + insinto /etc + newins src/dircolors.hin DIR_COLORS + + if use split-usr ; then + cd "${ED}"/usr/bin || die + dodir /bin + + # Move critical binaries into /bin (required by FHS) + local fhs="cat chgrp chmod chown cp date dd df echo false ln ls + mkdir mknod mv pwd rm rmdir stty sync true uname" + mv ${fhs} ../../bin/ || die "Could not move FHS bins!" + + if use hostname ; then + mv hostname ../../bin/ || die + fi + + if use kill ; then + mv kill ../../bin/ || die + fi + + # Move critical binaries into /bin (common scripts) + # (Why are these required for booting?) + local com="basename chroot cut dir dirname du env expr head mkfifo + mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" + mv ${com} ../../bin/ || die "Could not move common bins!" + + # Create a symlink for uname in /usr/bin/ since autotools require it. + # (Other than uname, we need to figure out why we are + # creating symlinks for these in /usr/bin instead of leaving + # the files there in the first place...) + local x + for x in ${com} uname ; do + dosym ../../bin/${x} /usr/bin/${x} + done + fi +} + +pkg_postinst() { + ewarn "Make sure you run 'hash -r' in your active shells." + ewarn "You should also re-source your shell settings for LS_COLORS" + ewarn " changes, such as: source /etc/profile" +} diff --git a/sys-apps/coreutils/files/coreutils-9.3-old-kernel-copy_file_range.patch b/sys-apps/coreutils/files/coreutils-9.3-old-kernel-copy_file_range.patch new file mode 100644 index 000000000000..27767e312500 --- /dev/null +++ b/sys-apps/coreutils/files/coreutils-9.3-old-kernel-copy_file_range.patch @@ -0,0 +1,89 @@ +https://bugs.gentoo.org/907474 + +From 87b95c17dc8611f9483b966d052eefc930f43927 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Mon, 5 Jun 2023 22:04:37 -0700 +Subject: [PATCH] copy-file-range: support building for older kernels + +* m4/copy-file-range.m4 (gl_FUNC_COPY_FILE_RANGE): +Remove static check, to support the dubious practice of +building for platforms that predate the build platform. +On working kernels this adds an extra syscall the first time +that copy_file_range is used. Problem reported for Gentoo by +Sam James . +--- a/m4/copy-file-range.m4 ++++ b/m4/copy-file-range.m4 +@@ -39,21 +39,9 @@ AC_DEFUN([gl_FUNC_COPY_FILE_RANGE], + + case $host_os in + linux*) +- AC_CACHE_CHECK([whether copy_file_range is known to work], +- [gl_cv_copy_file_range_known_to_work], +- [AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include +- ]], +- [[#if LINUX_VERSION_CODE < KERNEL_VERSION (5, 3, 0) +- #error "copy_file_range is buggy" +- #endif +- ]])], +- [gl_cv_copy_file_range_known_to_work=yes], +- [gl_cv_copy_file_range_known_to_work=no])]) +- if test "$gl_cv_copy_file_range_known_to_work" = no; then +- REPLACE_COPY_FILE_RANGE=1 +- fi;; ++ # See copy-file-range.c comment re pre-5.3 Linux kernel bugs. ++ # We should be able to remove this hack in 2025. ++ REPLACE_COPY_FILE_RANGE=1;; + esac + fi + ]) + +--- a/configure ++++ b/configure +@@ -39903,42 +39903,9 @@ printf "%s\n" "#define HAVE_COPY_FILE_RANGE 1" >>confdefs.h + + case $host_os in + linux*) +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether copy_file_range is known to work" >&5 +-printf %s "checking whether copy_file_range is known to work... " >&6; } +-if test ${gl_cv_copy_file_range_known_to_work+y} +-then : +- printf %s "(cached) " >&6 +-else case e in #( +- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- +-int +-main (void) +-{ +-#if LINUX_VERSION_CODE < KERNEL_VERSION (5, 3, 0) +- #error "copy_file_range is buggy" +- #endif +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : +- gl_cv_copy_file_range_known_to_work=yes +-else case e in #( +- e) gl_cv_copy_file_range_known_to_work=no ;; +-esac +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +-esac +-fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_copy_file_range_known_to_work" >&5 +-printf "%s\n" "$gl_cv_copy_file_range_known_to_work" >&6; } +- if test "$gl_cv_copy_file_range_known_to_work" = no; then +- REPLACE_COPY_FILE_RANGE=1 +- fi;; ++ # See copy-file-range.c comment re pre-5.3 Linux kernel bugs. ++ # We should be able to remove this hack in 2025. ++ REPLACE_COPY_FILE_RANGE=1;; + esac + fi + -- cgit v1.2.3-65-gdbad