From 4e777c0133d093c9c8b992c92e0f244e2055bf71 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 May 2023 05:29:57 +0100 Subject: gentoo auto-resync : 05:05:2023 - 05:29:57 --- sys-apps/coreutils/Manifest | 10 +- sys-apps/coreutils/coreutils-9.1-r2.ebuild | 2 +- sys-apps/coreutils/coreutils-9.2-r2.ebuild | 2 +- sys-apps/coreutils/coreutils-9.3-r1.ebuild | 269 +++++++++++++++++++++ sys-apps/coreutils/coreutils-9.3.ebuild | 2 +- sys-apps/coreutils/coreutils-9999.ebuild | 4 +- ...utils-9.3-cp-parents-preserve-permissions.patch | 86 +++++++ 7 files changed, 367 insertions(+), 8 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 (limited to 'sys-apps/coreutils') diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest index a67a2f3b9fee..e0c6e15ad0ba 100644 --- a/sys-apps/coreutils/Manifest +++ b/sys-apps/coreutils/Manifest @@ -3,6 +3,7 @@ AUX coreutils-8.32-sandbox-env-test.patch 1958 BLAKE2B 570f62115f0853abb35290174 AUX coreutils-9.1-fix-rename-simple-backups.patch 1343 BLAKE2B b284b2b7d33fe7650a4ac8723ca5566e819cd4f4740394cc549562a03fe7ed95d29cfb688a9e5513edcea1f9d5f7b72f1a530f9bf5093ad4dc6534a494e9f91c SHA512 900128c08b096c39302193855fdbb980c54597acf3349b9014ced500e344b7f47438722342e3a7d68f8c4588632769a11165c5c06796993d3b9aca019de8468a AUX coreutils-9.2-cksum-result-reporting.patch 2601 BLAKE2B 934e21d41fa93074aca8395bcb860c8bce6ac6de18120bcac728d67c0731242aa8163c411468caf7e64f71c731095e3e8070e5889d2fd93945a53ef50e31b831 SHA512 f1cb22d77d4b4c50f85e94153418cc6b774eeefc8955df725a4370844c8ceeb17ae0b3844269455ae36d23328a2faae1c5c762891384ea6f7eae46e89c291218 AUX coreutils-9.2-cp-reflink-auto-fallback.patch 5690 BLAKE2B d0fe6e930a83675c7490c46edf16236d1c58edf734ec292df9148f13923e7467ae84dc3eb8c61789b4c4365dae537a32071b9db14e118f1171fe34b59c089d93 SHA512 d30aee98d9fe60e28534ffd388cb6a6911ffa751f2b03cd5d2339ccdd41cf512099afd9e67137da1690d489948faf1ed265ae1f6875379b558a25e9eee5a214f +AUX coreutils-9.3-cp-parents-preserve-permissions.patch 3436 BLAKE2B de9fa1038b34ec2134c39758840e5a619ed5b3e60ebd9ad280e3e1a117f76143ccec852f74ac8da3f29604e8bdc92dcc134a19da756b759fb15d5bc632dda74c SHA512 e19afd35150c188a4ad14844463181f391ab6fbc9b4b812677df693f6181045f3dc63c42f2755e19f03bc2a608d041f3e0943537bc9d783b03819ce9928a962b DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145 DIST coreutils-9.0_p20220409-patches-01.tar.xz 6244 BLAKE2B 8ca9855680719660782931467ec70095c826e66b9850890b8cf456963f8114f63940707386b97c766172d01e55e17b7db2aa1c329208a873a76e2293b29f565f SHA512 4b43c25832122d241f33e6b4eff24bc1fa045b9ca5af45a49d22ecb1fa282986c4e4a045ef24c34b3d94fd9a2247247c42c344261e3f464d881969e6f3351d3f @@ -13,8 +14,9 @@ DIST coreutils-9.2.tar.xz.sig 833 BLAKE2B 225f6ea9d6c2a2b0e47093b6c10d648b8d847d DIST coreutils-9.3.tar.xz 5808696 BLAKE2B 11502cd2dbeef150d0d4cece2546bf6b835941b94456c258f6058338f0477f22e68e88934d075b08fe51ee4d1c0c50cb23d8084ac06a457d6e8975f01643b1cd SHA512 242271f212a6860bdc6c8d7e5c4f85ce66c1b48ef781aca9daa56e0fe7c2b7809ef72b4392120219fe5b687637c83ce89ceef8bb35f6274f43f8f968a6901694 DIST coreutils-9.3.tar.xz.sig 833 BLAKE2B c45ae10ff706907ae65d31228e432f7d6f34acbdb733bf521437d9e2fc75828a59da9d432d894a1ed8b7341f7e15d0e8d4e816e209c799b75c14d0ec055bfdf2 SHA512 522a2072f8ef940228ccdd856a4041c3c16b98e309168ccf2066fe7c1013685ba6cdea8a7317dfa1f4507b37ca016ecedaf54438d4a5007927b0e1a8fd223eb5 EBUILD coreutils-8.32-r1.ebuild 5968 BLAKE2B ae5871d55509dbcd48c3f8b33938edfffca3a48bc2b422546b1bd818e7830b877af08f51605ba0d68299ea63d1f6d8246301223cfa5a29620619cd209cbaa1f5 SHA512 363adf232d9b3d158ec7535e84263286961e3e870ecdee3215162e398125999ccf2d1b76d065a7223d58d04ccd75fd65ab33cf409e155fb2788ca0defdc5094a -EBUILD coreutils-9.1-r2.ebuild 7114 BLAKE2B 3a80919e840546badf681b0672fcad68e2ac0d9a29586e7a8fd712a11484057364ae015c21b92bfef404f6a9c094d828852d915754bae61ace060c0c6853290e SHA512 77c948b54e48907df14a9ac67b5ed1a36cb11acf709fdf009674b90e878c1efc6b4c449d7f4efcc39110f04692c8c274acc3fa32e242f196b0d8bddb27b963a7 -EBUILD coreutils-9.2-r2.ebuild 7602 BLAKE2B fab330146b115909182404d078e5929ba954eef08177bc0280f2440d892db89327806ac6a41c376928454a02423f718af22024134b852482017f066a4ea3e318 SHA512 23bdc7fd9c60a404cab98cda770b0889a6b749b829b74e83e8c7de32e454290a0d9cccf235cfd36f7a76fff03283185402f854c90db9ce1a98147f4fc71776a1 -EBUILD coreutils-9.3.ebuild 7478 BLAKE2B 49acdcbf00c12c0cb0fb26b76c4b78dd164deeb40c5accd7c120124c020513b85ccd7dd3c1290f0d4b5c22afeae4af86798acdb1d8867aed2c2436b753eaf974 SHA512 af9619b2f3ff02404eb1fe26814183b92ee75742b7bff3f4c9c27053b2b8bb9a88e568e32007bb6649336a1bbca2638541e9cb1243bc50ebb82f118923e6c463 -EBUILD coreutils-9999.ebuild 7479 BLAKE2B bc1fe0715e31676f62ebbfc8863ded02f72f361e15025f2216777265491b19e8baf29588b89b96e43f8ba4c1669f23f95085333124ee35eabafa32b359333d58 SHA512 25b3a52a7529dacaa5db5babb17d77dd92dcaaea8d9d6831e403a0bcf1157d7935521e1994530c71035cc98fd9439c6a12000c564d0305f055eff8112513ec50 +EBUILD coreutils-9.1-r2.ebuild 7114 BLAKE2B 6f52424f7e9f065d56dacc6fbbee0ac279289b2604a0b964267c5cfa05dbe881b14811ad6a3194bbd072701f1213df2f59320c0999a2d32c21722d521f297f4a SHA512 172d981fb9297862b6b2a8b69f549973fd04ea5e25a7375255ccf40b619054f599b6fe971161e687a5d868449b40f421511e83c7551b24262b200a1c2f790236 +EBUILD coreutils-9.2-r2.ebuild 7602 BLAKE2B 858fd03a8ff42630b11bdd4a3c26d195d40ec93073fed28ee309475731c2ff054e54f3580ca17a536b88751293e26cd95cb82130431b963cd2d0abf5e6167faf SHA512 2934bf8602114f68e10f5f72c24b4e0cb07e95ab1d24f738b208754d3d58df21f0d72b1d01ba29897827bf9f961bd6536e1f3190a5a79d91839909e955812a53 +EBUILD coreutils-9.3-r1.ebuild 7608 BLAKE2B 19b7f1d073dacb96aaeaff25cc8db449d63e42bfdcbecefd287cd9cbf8334fc222f61bd68ca43d5c49774d1384048e20719abc9821689a9a5e5b86f0b5e74b3c SHA512 c6e3253cc53fc55d35ce2ccb6cfd4d54dd0850f28491e84c4efc95a0a97bece54c8b90e66811058c5efe4e348bb5818d566a86bd313698409de90f4fca97add2 +EBUILD coreutils-9.3.ebuild 7478 BLAKE2B 8e857aeeb4a557ade9a6a85eb88814a414ba9f1a5c99efafd859c87cf644d21eac3592c033b505564ac54c0b827184faa295a2a7632fa2270a9c6225b790ce1f SHA512 7ec70783e2c978f6591ac16d1b137677e2927b961053a3e3e66a40dc5f9e576d9fbfae27f07f79110d3a2c4d93017ce92e3b32358e94cf5fe0509258ca2e4112 +EBUILD coreutils-9999.ebuild 7550 BLAKE2B a169a42a5e795e8cfb568d05c9744a46e687627bcc905178f5d0f5ee977f4a5c661a6cfe6f46c7dbaa04ab941f49de950af4546d22daf8ccd66e83a0df667c88 SHA512 cfb15372aa67eff7c67fee803b9d53500205e9d2e093cc9495e09fc48b453894ff183536d984b3ffc0fef25244f5285ebbf598ebeb3c74fe8bf35de0a99c0a7e MISC metadata.xml 1043 BLAKE2B db071746d60a62e435bfd6e297641411320b61a5716dc631150e5a3a19bcd49cc6121d2a404b8875d6927ad0114f28d33e2b21edb3bab49559d50fdc26b056f6 SHA512 65149d4bf9b16f7e1800fe8d9e23fa466307ff3f009e06f3736b4f55bce27ba74bc6d1547e0b2f06dcebfcba0f2d21ef3efdd4073ed4e525a2ebdc6e62190119 diff --git a/sys-apps/coreutils/coreutils-9.1-r2.ebuild b/sys-apps/coreutils/coreutils-9.1-r2.ebuild index 08dc284676e9..4cdfdc3f3bed 100644 --- a/sys-apps/coreutils/coreutils-9.1-r2.ebuild +++ b/sys-apps/coreutils/coreutils-9.1-r2.ebuild @@ -4,7 +4,7 @@ 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_{9..11} ) diff --git a/sys-apps/coreutils/coreutils-9.2-r2.ebuild b/sys-apps/coreutils/coreutils-9.2-r2.ebuild index 44a34c3cc7b3..1ca5c4dd88c7 100644 --- a/sys-apps/coreutils/coreutils-9.2-r2.ebuild +++ b/sys-apps/coreutils/coreutils-9.2-r2.ebuild @@ -4,7 +4,7 @@ EAPI=8 # 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_{9..11} ) 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 000000000000..aa87f2f22ff2 --- /dev/null +++ b/sys-apps/coreutils/coreutils-9.3-r1.ebuild @@ -0,0 +1,269 @@ +# 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/coreutils-9.3.ebuild b/sys-apps/coreutils/coreutils-9.3.ebuild index b12ae88e4781..3f6b8940caed 100644 --- a/sys-apps/coreutils/coreutils-9.3.ebuild +++ b/sys-apps/coreutils/coreutils-9.3.ebuild @@ -4,7 +4,7 @@ EAPI=8 # 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_{9..11} ) diff --git a/sys-apps/coreutils/coreutils-9999.ebuild b/sys-apps/coreutils/coreutils-9999.ebuild index d19fa5ca04cb..6e3d435cba1d 100644 --- a/sys-apps/coreutils/coreutils-9999.ebuild +++ b/sys-apps/coreutils/coreutils-9999.ebuild @@ -4,8 +4,10 @@ EAPI=8 # 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. +# +# 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 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 000000000000..c8f2a9bb4956 --- /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