summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-10-28 20:46:28 +0100
committerSam James <sam@gentoo.org>2022-10-28 20:50:06 +0100
commit24d4d2dd323e325558c80024d65d7e19a02397ed (patch)
treec50f6dddd7230ee5df3983fe745cbfc2bac1f972 /sys-apps
parentsys-apps/attr: sync live (diff)
downloadgentoo-24d4d2dd323e325558c80024d65d7e19a02397ed.tar.gz
gentoo-24d4d2dd323e325558c80024d65d7e19a02397ed.tar.bz2
gentoo-24d4d2dd323e325558c80024d65d7e19a02397ed.zip
sys-apps/coreutils: drop 9.0-r2, 9.1
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/coreutils/Manifest2
-rw-r--r--sys-apps/coreutils/coreutils-9.0-r2.ebuild239
-rw-r--r--sys-apps/coreutils/coreutils-9.1.ebuild244
-rw-r--r--sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch35
-rw-r--r--sys-apps/coreutils/files/coreutils-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch130
5 files changed, 0 insertions, 650 deletions
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index d48998b486f0..7ea8df983e96 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,7 +1,5 @@
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.tar.xz 5612752 BLAKE2B 59617cd25fd4c70f51bfbef851bd83e73f9c9ba5c11eb539f7f75c0184d55832e004b28e9268fb8064db145cb071ead2b9c0c3346bc35a11934ffe1b15bf17ac SHA512 9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03
-DIST coreutils-9.0.tar.xz.sig 833 BLAKE2B 1393f60361524e0a6eab5631aada50ee4124bd0e9ff3020b7593914a888f0edaec78339caee28847e85e1a1af6ea519ab9fad208db605f0c6b8a4e7ab19853a8 SHA512 1a368c92ddb57f386c188ef72f1edad7e217c983c296f9be0d27ffbaa673bf2f004c321fbaff8ae6cdebf6ffef402e3e8c69e6c8e30aca988e0ea38f2296cf30
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
diff --git a/sys-apps/coreutils/coreutils-9.0-r2.ebuild b/sys-apps/coreutils/coreutils-9.0-r2.ebuild
deleted file mode 100644
index f759f70394f0..000000000000
--- a/sys-apps/coreutils/coreutils-9.0-r2.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc
-inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
-
-PATCH="${PN}-8.30-patches-01"
-DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
-HOMEPAGE="https://www.gnu.org/software/coreutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
- !vanilla? (
- mirror://gentoo/${PATCH}.tar.xz
- https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz
- )
- verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="acl caps gmp hostname kill multicall nls 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] )
- 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
- !<sys-apps/util-linux-2.13
- !<sys-apps/sandbox-2.10-r4
- !sys-apps/stat
- !net-mail/base64
- !sys-apps/mktemp
- !<app-forensics/tct-1.18-r1
- !<net-fs/netatalk-2.0.3-r4"
-
-pkg_setup() {
- if use test ; then
- python-any-r1_pkg_setup
- fi
-}
-
-src_unpack() {
- if use verify-sig ; then
- # Needed for downloaded patch (which is unsigned, which is fine)
- verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
- fi
-
- default
-}
-
-src_prepare() {
- local PATCHES=(
- # Upstream patches
- "${FILESDIR}"/${P}-fix-chmod-symlink-exit.patch
- )
-
- if ! use vanilla ; then
- PATCHES+=( "${WORKDIR}"/patch )
- PATCHES+=( "${FILESDIR}"/${PN}-8.32-sandbox-env-test.patch )
- PATCHES+=( "${FILESDIR}"/${PN}-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch )
- fi
-
- default
-
- # Since we've patched many .c files, the make process will try to
- # re-build the manpages by running `./bin --help`. When doing a
- # cross-compile, we can't do that since 'bin' isn't a native bin.
- #
- # Also, it's not like we changed the usage on any of these things,
- # so let's just update the timestamps and skip the help2man step.
- set -- man/*.x
- touch ${@/%x/1} || die
-
- # Avoid perl dep for compiled in dircolors default (bug #348642)
- if ! has_version dev-lang/perl ; then
- touch src/dircolors.h || die
- touch ${@/%x/1} || die
- fi
-}
-
-src_configure() {
- local myconf=(
- --with-packager="Gentoo"
- --with-packager-version="${PVR} (p${PATCH_VER:-0})"
- --with-packager-bug-reports="https://bugs.gentoo.org/"
- # kill/uptime - procps
- # groups/su - shadow
- # hostname - net-tools
- --enable-install-program="arch,$(usev hostname),$(usev kill)"
- --enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
- --enable-largefile
- $(usex caps '' --disable-libcap)
- $(use_enable nls)
- $(use_enable acl)
- $(use_enable multicall single-binary)
- $(use_enable xattr)
- $(use_with gmp libgmp)
- )
-
- if use gmp ; then
- myconf+=( --with-libgmp-prefix="${ESYSROOT}"/usr )
- fi
-
- if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
- # bug #311569
- export fu_cv_sys_stat_statfs2_bsize=yes
- # bug #416629
- export gl_cv_func_realpath_works=yes
- fi
-
- # bug #409919
- export gl_cv_func_mknod_works=yes
-
- if use static ; then
- append-ldflags -static
- # bug #321821
- sed -i '/elf_sys=yes/s:yes:no:' configure || die
- fi
-
- if ! use selinux ; then
- # bug #301782
- export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
- fi
-
- econf "${myconf[@]}"
-}
-
-src_test() {
- # Known to fail with FEATURES=usersandbox (bug #439574):
- # - tests/du/long-from-unreadable.sh} (bug #413621)
- # - tests/rm/deep-2.sh (bug #413621)
- # - tests/dd/no-allocate.sh (bug #629660)
- if has usersandbox ${FEATURES} ; then
- ewarn "You are emerging ${P} with 'usersandbox' enabled." \
- "Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
- fi
-
- # Non-root tests will fail if the full path isn't
- # accessible to non-root users
- chmod -R go-w "${WORKDIR}" || die
- chmod a+rx "${WORKDIR}" || die
-
- # coreutils tests like to do `mount` and such with temp dirs,
- # so make sure:
- # - /etc/mtab is writable (bug #265725)
- # - /dev/loop* can be mounted (bug #269758)
- mkdir -p "${T}"/mount-wrappers || die
- mkwrap() {
- local w ww
- for w in "${@}" ; do
- ww="${T}/mount-wrappers/${w}"
- cat <<-EOF > "${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}" \
- emake -j1 -k check
-}
-
-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.1.ebuild b/sys-apps/coreutils/coreutils-9.1.ebuild
deleted file mode 100644
index f91b65f9f59f..000000000000
--- a/sys-apps/coreutils/coreutils-9.1.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-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} == *_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).193-54bec"
- 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 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] )
- 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
- !<sys-apps/util-linux-2.13
- !<sys-apps/sandbox-2.10-r4
- !sys-apps/stat
- !net-mail/base64
- !sys-apps/mktemp
- !<app-forensics/tct-1.18-r1
- !<net-fs/netatalk-2.0.3-r4"
-
-pkg_setup() {
- if use test ; then
- python-any-r1_pkg_setup
- fi
-}
-
-src_unpack() {
- if use verify-sig ; then
- # Needed for downloaded patch (which is unsigned, which is fine)
- verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
- fi
-
- default
-}
-
-src_prepare() {
- local PATCHES=(
- # Upstream patches
- )
-
- if ! use vanilla ; then
- PATCHES+=( "${WORKDIR}"/patch )
- fi
-
- default
-
- # Since we've patched many .c files, the make process will try to
- # re-build the manpages by running `./bin --help`. When doing a
- # cross-compile, we can't do that since 'bin' isn't a native bin.
- #
- # Also, it's not like we changed the usage on any of these things,
- # so let's just update the timestamps and skip the help2man step.
- set -- man/*.x
- touch ${@/%x/1} || die
-
- # Avoid perl dep for compiled in dircolors default (bug #348642)
- if ! has_version dev-lang/perl ; then
- touch src/dircolors.h || die
- touch ${@/%x/1} || die
- fi
-}
-
-src_configure() {
- local myconf=(
- --with-packager="Gentoo"
- --with-packager-version="${PVR} (p${PATCH_VER:-0})"
- --with-packager-bug-reports="https://bugs.gentoo.org/"
- # kill/uptime - procps
- # groups/su - shadow
- # hostname - net-tools
- --enable-install-program="arch,$(usev hostname),$(usev kill)"
- --enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
- --enable-largefile
- $(usex caps '' --disable-libcap)
- $(use_enable nls)
- $(use_enable acl)
- $(use_enable multicall single-binary)
- $(use_enable xattr)
- $(use_with gmp libgmp)
- )
-
- if use gmp ; then
- myconf+=( --with-libgmp-prefix="${ESYSROOT}"/usr )
- fi
-
- if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
- # bug #311569
- export fu_cv_sys_stat_statfs2_bsize=yes
- # bug #416629
- export gl_cv_func_realpath_works=yes
- fi
-
- # bug #409919
- export gl_cv_func_mknod_works=yes
-
- if use static ; then
- append-ldflags -static
- # bug #321821
- sed -i '/elf_sys=yes/s:yes:no:' configure || die
- fi
-
- if ! use selinux ; then
- # bug #301782
- export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
- fi
-
- econf "${myconf[@]}"
-}
-
-src_test() {
- # Known to fail with FEATURES=usersandbox (bug #439574):
- # - tests/du/long-from-unreadable.sh} (bug #413621)
- # - tests/rm/deep-2.sh (bug #413621)
- # - tests/dd/no-allocate.sh (bug #629660)
- if has usersandbox ${FEATURES} ; then
- ewarn "You are emerging ${P} with 'usersandbox' enabled." \
- "Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
- fi
-
- # Non-root tests will fail if the full path isn't
- # accessible to non-root users
- chmod -R go-w "${WORKDIR}" || die
- chmod a+rx "${WORKDIR}" || die
-
- # coreutils tests like to do `mount` and such with temp dirs,
- # so make sure:
- # - /etc/mtab is writable (bug #265725)
- # - /dev/loop* can be mounted (bug #269758)
- mkdir -p "${T}"/mount-wrappers || die
- mkwrap() {
- local w ww
- for w in "${@}" ; do
- ww="${T}/mount-wrappers/${w}"
- cat <<-EOF > "${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}" 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.0-fix-chmod-symlink-exit.patch b/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch
deleted file mode 100644
index 25b2b72bcb80..000000000000
--- a/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=e8b56ebd536e82b15542a00c888109471936bfda
-https://lists.gnu.org/archive/html/bug-coreutils/2021-09/msg00031.html
-(and https://lists.gnu.org/archive/html/bug-coreutils/2021-09/msg00035.html)
-
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Fri, 24 Sep 2021 20:57:41 +0100
-Subject: chmod: fix exit status when ignoring symlinks
-
-* src/chmod.c: Reorder enum so CH_NOT_APPLIED
-can be treated as a non error.
-* tests/chmod/ignore-symlink.sh: A new test.
-* tests/local.mk: Reference the new test.
-* NEWS: Mention the bug fix.
-Fixes https://bugs.gnu.org/50784
---- a/src/chmod.c
-+++ b/src/chmod.c
-@@ -44,8 +44,8 @@ struct change_status
- enum
- {
- CH_NO_STAT,
-- CH_NOT_APPLIED,
- CH_FAILED,
-+ CH_NOT_APPLIED,
- CH_NO_CHANGE_REQUESTED,
- CH_SUCCEEDED
- }
-@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent)
- if ( ! recurse)
- fts_set (fts, ent, FTS_SKIP);
-
-- return CH_NO_CHANGE_REQUESTED <= ch.status;
-+ return CH_NOT_APPLIED <= ch.status;
- }
-
- /* Recursively change the modes of the specified FILES (the last entry
diff --git a/sys-apps/coreutils/files/coreutils-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch b/sys-apps/coreutils/files/coreutils-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch
deleted file mode 100644
index e77766cbfe3a..000000000000
--- a/sys-apps/coreutils/files/coreutils-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From cbb451b63faee375415691c1abc8a6fd3e1677a9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Sat, 12 Feb 2022 22:54:07 +0100
-Subject: [PATCH] dircolors: consider COLORTERM as well as TERM env vars
-
-COLORTERM is an environment used usually to expose truecolor support in
-terminal emulators. Therefore support matches on that in addition
-to TERM. Also set the default COLORTERM match pattern so that
-we apply colors if COLORTERM is any value.
-
-This implicitly supports a terminal like "foot"
-without a need for an explicit TERM entry.
-
-* NEWS: Mention the new feature.
-* src/dircolors.c (main): Match COLORTERM like we do for TERM.
-* src/dircolors.hin: Add default config to match any COLORTERM.
-* tests/misc/dircolors.pl: Add test cases.
----
-Backported from coreutils 75c9fc6740e93dba95f63a1e5e92bd5cf17f1743.
-See also https://lists.gnu.org/archive/html/coreutils/2022-02/msg00019.html
-
- NEWS | 3 +++
- src/dircolors.c | 15 ++++++++++++++-
- src/dircolors.hin | 7 +++++--
- tests/misc/dircolors.pl | 14 ++++++++++++++
- 4 files changed, 36 insertions(+), 3 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index f2fbcbb..646c132 100644
---- a/NEWS
-+++ b/NEWS
-@@ -64,6 +64,9 @@ GNU coreutils NEWS -*- outline -*-
- on (1024*5) buffer boundaries
- [bug introduced in coreutils-8.31]
-
-+ dircolors will now also match COLORTERM in addition to TERM environment
-+ variables. The default config will apply colors with any COLORTERM set.
-+
- ** Changes in behavior
-
- cp and install now default to copy-on-write (COW) if available.
-diff --git a/src/dircolors.c b/src/dircolors.c
-index b765ded..64ff665 100644
---- a/src/dircolors.c
-+++ b/src/dircolors.c
-@@ -243,6 +243,7 @@ dc_parse_stream (FILE *fp, char const *filename)
- size_t input_line_size = 0;
- char const *line;
- char const *term;
-+ char const *colorterm;
- bool ok = true;
-
- /* State for the parser. */
-@@ -253,6 +254,11 @@ dc_parse_stream (FILE *fp, char const *filename)
- if (term == NULL || *term == '\0')
- term = "none";
-
-+ /* Also match $COLORTERM. */
-+ colorterm = getenv ("COLORTERM");
-+ if (colorterm == NULL)
-+ colorterm = ""; /* Doesn't match default "?*" */
-+
- while (true)
- {
- char *keywd, *arg;
-@@ -299,10 +305,17 @@ dc_parse_stream (FILE *fp, char const *filename)
- else if (state != ST_TERMSURE)
- state = ST_TERMNO;
- }
-+ else if (c_strcasecmp (keywd, "COLORTERM") == 0)
-+ {
-+ if (fnmatch (arg, colorterm, 0) == 0)
-+ state = ST_TERMSURE;
-+ else if (state != ST_TERMSURE)
-+ state = ST_TERMNO;
-+ }
- else
- {
- if (state == ST_TERMSURE)
-- state = ST_TERMYES; /* Another TERM can cancel */
-+ state = ST_TERMYES; /* Another {COLOR,}TERM can cancel. */
-
- if (state != ST_TERMNO)
- {
-diff --git a/src/dircolors.hin b/src/dircolors.hin
-index b5d6452..6d2d3a4 100644
---- a/src/dircolors.hin
-+++ b/src/dircolors.hin
-@@ -8,8 +8,11 @@
- # The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
- # slackware version of dircolors) are recognized but ignored.
-
--# Below are TERM entries, which can be a glob patterns, to match
--# against the TERM environment variable to determine if it is colorizable.
-+# Global config options can be specified before TERM or COLORTERM entries
-+
-+# Below are TERM or COLORTERM entries, which can be glob patterns, which
-+# restrict following config to systems with matching environment variables.
-+COLORTERM ?*
- TERM Eterm
- TERM ansi
- TERM *color*
-diff --git a/tests/misc/dircolors.pl b/tests/misc/dircolors.pl
-index 2c57104..464acfd 100755
---- a/tests/misc/dircolors.pl
-+++ b/tests/misc/dircolors.pl
-@@ -42,6 +42,20 @@ my @Tests =
- ['term-4', '-b', {IN => "TERM N*match\nowt 40;33\n"},
- {OUT => "LS_COLORS='';\nexport LS_COLORS\n"}],
-
-+ ['print-clash1', '-p', '--print-ls',
-+ {ERR => "dircolors: options --print-database and --print-ls-colors " .
-+ "are mutually exclusive\n" .
-+ "Try 'dircolors --help' for more information.\n"},
-+ {EXIT => 1}],
-+ ['print-clash2', '-b', '--print-database',
-+ {ERR => "dircolors: the options to output non shell syntax,\n" .
-+ "and to select a shell syntax are mutually exclusive\n" .
-+ "Try 'dircolors --help' for more information.\n"},
-+ {EXIT => 1}],
-+
-+ ['print-ls-colors', '--print-ls-colors', {IN => "OWT 40;33\n"},
-+ {OUT => "\x1B[40;33mtw\t40;33\x1B[0m\n"}],
-+
- # CAREFUL: always specify the -b option, unless explicitly testing
- # for csh syntax output.
- );
---
-2.34.1
-