From dc6adf25ba6fd45e278b57817f1e5edf7d608b43 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sat, 27 May 2023 13:26:58 +0200 Subject: sys-apps/coreutils: sync with gx86 Signed-off-by: Fabian Groffen --- sys-apps/coreutils/Manifest | 2 + sys-apps/coreutils/coreutils-9.1-r2.ebuild | 20 +- sys-apps/coreutils/coreutils-9.3-r1.ebuild | 294 +++++++++++++++++++++ ...utils-9.3-cp-parents-preserve-permissions.patch | 86 ++++++ 4 files changed, 393 insertions(+), 9 deletions(-) create mode 100644 sys-apps/coreutils/coreutils-9.3-r1.ebuild create mode 100644 sys-apps/coreutils/files/coreutils-9.3-cp-parents-preserve-permissions.patch diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest index 69df2fc021..ed372cdb6a 100644 --- a/sys-apps/coreutils/Manifest +++ b/sys-apps/coreutils/Manifest @@ -1,3 +1,5 @@ DIST coreutils-9.0_p20220409-patches-01.tar.xz 6244 BLAKE2B 8ca9855680719660782931467ec70095c826e66b9850890b8cf456963f8114f63940707386b97c766172d01e55e17b7db2aa1c329208a873a76e2293b29f565f SHA512 4b43c25832122d241f33e6b4eff24bc1fa045b9ca5af45a49d22ecb1fa282986c4e4a045ef24c34b3d94fd9a2247247c42c344261e3f464d881969e6f3351d3f DIST coreutils-9.1.tar.xz 5712104 BLAKE2B f5654e4935535275615d44a56c071d1c0746af36cf4615fcc0a5a0d387af9c9023adac31f31a52e16b3d1105b9d4c0fb7ebff9b2862498849f867a866049dd6e SHA512 a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa DIST coreutils-9.1.tar.xz.sig 833 BLAKE2B e9627a066f3c67596feaa8d43d5785076230f440bacea84d8b5736e51a22787c2d5df1f3e2cd8523d01fb7b468933d3c17fce3cb1fbefef322a0e0d820b81842 SHA512 9f0766531afd4faa3e2c337730f61db55605cf06729e9c61f644594883732c2e0b1ddb0005b492be309c53e6f45b8ff875398163a48699d52517ea49e9bdbc91 +DIST coreutils-9.3.tar.xz 5808696 BLAKE2B 11502cd2dbeef150d0d4cece2546bf6b835941b94456c258f6058338f0477f22e68e88934d075b08fe51ee4d1c0c50cb23d8084ac06a457d6e8975f01643b1cd SHA512 242271f212a6860bdc6c8d7e5c4f85ce66c1b48ef781aca9daa56e0fe7c2b7809ef72b4392120219fe5b687637c83ce89ceef8bb35f6274f43f8f968a6901694 +DIST coreutils-9.3.tar.xz.sig 833 BLAKE2B c45ae10ff706907ae65d31228e432f7d6f34acbdb733bf521437d9e2fc75828a59da9d432d894a1ed8b7341f7e15d0e8d4e816e209c799b75c14d0ec055bfdf2 SHA512 522a2072f8ef940228ccdd856a4041c3c16b98e309168ccf2066fe7c1013685ba6cdea8a7317dfa1f4507b37ca016ecedaf54438d4a5007927b0e1a8fd223eb5 diff --git a/sys-apps/coreutils/coreutils-9.1-r2.ebuild b/sys-apps/coreutils/coreutils-9.1-r2.ebuild index 19d468c871..0807fff2b9 100644 --- a/sys-apps/coreutils/coreutils-9.1-r2.ebuild +++ b/sys-apps/coreutils/coreutils-9.1-r2.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 # Try to keep an eye on Fedora's packaging: https://src.fedoraproject.org/rpms/coreutils -# The upstream coreutils maintianers also maintain the package in Fedora and may +# The upstream coreutils maintainers also maintain the package in Fedora and may # backport fixes which we want to pick up. -PYTHON_COMPAT=( python3_{8..10} ) +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 @@ -25,6 +25,7 @@ if [[ ${PV} == *_p* ]] ; then else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" + KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi @@ -116,13 +117,14 @@ src_prepare() { -e "/src_libstdbuf_so_LDFLAGS = -shared/s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/libexec/coreutils/libstdbuf.dylib:" \ Makefile.in \ || die + + sed -i \ + -e "s/libstdbuf\\.so/libstdbuf$(get_libname)/" \ + src/stdbuf.c \ + Makefile.in \ + configure \ + || die fi - sed -i \ - -e "s/libstdbuf\\.so/libstdbuf$(get_libname)/" \ - src/stdbuf.c \ - Makefile.in \ - configure \ - || die # Since we've patched many .c files, the make process will try to # re-build the manpages by running `./bin --help`. When doing a diff --git a/sys-apps/coreutils/coreutils-9.3-r1.ebuild b/sys-apps/coreutils/coreutils-9.3-r1.ebuild new file mode 100644 index 0000000000..1d0172656a --- /dev/null +++ b/sys-apps/coreutils/coreutils-9.3-r1.ebuild @@ -0,0 +1,294 @@ +# 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="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +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-cp-parents-preserve-permissions.patch b/sys-apps/coreutils/files/coreutils-9.3-cp-parents-preserve-permissions.patch new file mode 100644 index 0000000000..c8f2a9bb49 --- /dev/null +++ b/sys-apps/coreutils/files/coreutils-9.3-cp-parents-preserve-permissions.patch @@ -0,0 +1,86 @@ +https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=c6b1fe43474b48a6bf5793e11cc1d0d6e895fdf4 + +From c6b1fe43474b48a6bf5793e11cc1d0d6e895fdf4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?P=C3=A1draig=20Brady?= +Date: Wed, 3 May 2023 17:01:37 +0100 +Subject: cp: -p --parents: fix failure to preserve permissions for absolute + paths + +* src/cp.c (re_protect): Ensure copy_acl() is passed an absolute path. +* tests/cp/cp-parents.sh: Add a test case. +* NEWS: Mention the bug. +Fixes https://bugs.gnu.org/63245 +--- a/src/cp.c ++++ b/src/cp.c +@@ -296,15 +296,19 @@ regular file.\n\ + when done. */ + + static bool +-re_protect (char const *const_dst_name, int dst_dirfd, char const *dst_relname, ++re_protect (char const *const_dst_name, int dst_dirfd, char const *dst_fullname, + struct dir_attr *attr_list, const struct cp_options *x) + { + struct dir_attr *p; + char *dst_name; /* A copy of CONST_DST_NAME we can change. */ +- char *src_name; /* The source name in 'dst_name'. */ ++ char *src_name; /* The relative source name in 'dst_name'. */ ++ char *full_src_name; /* The full source name in 'dst_name'. */ + + ASSIGN_STRDUPA (dst_name, const_dst_name); +- src_name = dst_name + (dst_relname - const_dst_name); ++ full_src_name = dst_name + (dst_fullname - const_dst_name); ++ src_name = full_src_name; ++ while (*src_name == '/') ++ src_name++; + + for (p = attr_list; p; p = p->next) + { +@@ -347,7 +351,7 @@ re_protect (char const *const_dst_name, int dst_dirfd, char const *dst_relname, + + if (x->preserve_mode) + { +- if (copy_acl (src_name, -1, dst_name, -1, p->st.st_mode) != 0) ++ if (copy_acl (full_src_name, -1, dst_name, -1, p->st.st_mode) != 0) + return false; + } + else if (p->restore_mode) +@@ -687,6 +691,7 @@ do_copy (int n_files, char **file, char const *target_directory, + bool parent_exists = true; /* True if dir_name (dst_name) exists. */ + struct dir_attr *attr_list; + char *arg_in_concat = NULL; ++ char *full_arg_in_concat = NULL; + char *arg = file[i]; + + /* Trailing slashes are meaningful (i.e., maybe worth preserving) +@@ -719,6 +724,7 @@ do_copy (int n_files, char **file, char const *target_directory, + (x->verbose ? "%s -> %s\n" : NULL), + &attr_list, &new_dst, x)); + ++ full_arg_in_concat = arg_in_concat; + while (*arg_in_concat == '/') + arg_in_concat++; + } +@@ -747,7 +753,7 @@ do_copy (int n_files, char **file, char const *target_directory, + new_dst, x, ©_into_self, NULL); + + if (parents_option) +- ok &= re_protect (dst_name, target_dirfd, arg_in_concat, ++ ok &= re_protect (dst_name, target_dirfd, full_arg_in_concat, + attr_list, x); + } + +--- a/tests/cp/cp-parents.sh ++++ b/tests/cp/cp-parents.sh +@@ -66,4 +66,10 @@ p=$(ls -ld g/sym/b/c|cut -b-10); case $p in drwxr-xr-x);; *) fail=1;; esac + cp --parents --no-preserve=mode np/b/file np_dest/ || fail=1 + p=$(ls -ld np_dest/np|cut -b-10); case $p in drwxr-xr-x);; *) fail=1;; esac + ++# coreutils 9.1-9.3 inclusive would fail to copy acls for absolute dirs ++mkdir dest || framework_failure_ ++if test -f /bin/ls; then ++ cp -t dest --parents -p /bin/ls || fail=1 ++fi ++ + Exit $fail +-- +cgit v1.1 -- cgit v1.2.3-18-g5258