mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-08 00:05:33 +03:00
sys-apps/coreutils: drop 9.4, 9.4-r1, 9.5, 9.6, 9.8
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
parent
c2049bd957
commit
f2c91b833a
@ -1,12 +1,4 @@
|
||||
DIST coreutils-9.4-patches.tar.xz 6756 BLAKE2B 677454409ccb629fd0efde1e15d8f9c13f208391e63a17816011e84d4ca3fb2a42c2a60853f213ade2a53c821d76fd8924c59388d160c6e7c7fa5755e1db4c68 SHA512 2025c80b5ada92bafb479c678917862be208534becd8b347d335032c6b4cc23c7b7630f15ca7dd3b5d691567cb70f3491753e29441cc54d8700cc3d966a5e743
|
||||
DIST coreutils-9.4.tar.xz 5979200 BLAKE2B 83d41c48804c1d470c0e5eed38e692bb6875436dda3f6e2c29784ad6ef563d86e8e066a050e222621b400f78ea4630b1e127d20fc9b76f12096528c42677e35d SHA512 7c55ee23b685a0462bbbd118b04d25278c902604a0dcf3bf4f8bf81faa0500dee5a7813cba6f586d676c98e520cafd420f16479619305e94ea6798d8437561f5
|
||||
DIST coreutils-9.4.tar.xz.sig 833 BLAKE2B 870f7eb28e8851f41954820c7f4f4b43a965e6650b303b79541dfdf98ca0cd52fe964d7eec72bea68066452d7ad21a01df5e4db9e5bc4c20bf26d8b416856446 SHA512 9674f783f592c4f3e5c708ff31426ac009bf132fd0005019571bf39c8a1627efb5351c6cecc7faecb1eff8fa2970318666593bffc0eda9c750159e174ef42524
|
||||
DIST coreutils-9.5-patches.tar.xz 5912 BLAKE2B 873fbe1a60f8f8034b3d35796146765ce388952d649c32dc81ca0e4c2823c9f2f00b69bc5cb3af686434867459b6dc378fb9a6d59563d28b87c3ee1eceeedbb3 SHA512 4b4ad356615d046b8d67ea35b789f887a787ab01ece3234f6344518aef33cd30ca364fef5d85e11acfdb24003114c16ffdab82922fb135d5425fbcd541064a76
|
||||
DIST coreutils-9.5.tar.xz 6007136 BLAKE2B 6fd3a77697c9e85f31415c6ad66559faf18acc7d346677a89d4a999c2027886551e78842a7283e7b3b44fe8ef2fde04ba2f88df32a7844d5f69d45bcb7a04b6f SHA512 2ca0deac4dc10a80fd0c6fd131252e99d457fd03b7bd626a6bc74fe5a0529c0a3d48ce1f5da1d3b3a7a150a1ce44f0fbb6b68a6ac543dfd5baa3e71f5d65401c
|
||||
DIST coreutils-9.5.tar.xz.sig 833 BLAKE2B 37c29984bceee0ff3bffde76712f71dbb118c228e328dc230d5c53c37da12f5ec2130e0123b97fda4a561f556c3be307fdbe1f0c21279db2c84030818386f626 SHA512 029997e0f4ee64e561853cff7c8a124f58cc891598595b44c4a46f9813b4b71c9d677464bc8a26d294e9971832f4b87c23777fea4fac6e8e30f06ad93b9957d5
|
||||
DIST coreutils-9.6-patches.tar.xz 5904 BLAKE2B 1abe214914007804362b9d7c1a7c39f07d74c51857e84484179f11bb8fa512356ee97c811ef62469aaa52db5cc90f2f7587c2dc57ed130ebbfdacc59755dcb90 SHA512 5a609b21da7c78e41184e5d7bca87da4f868975635b6e8aa4bd8f4d18c98a2fabd5b7e8ad6bf7780ca77f6d532bfa5cb1ed618e4bc32617ba2977d4b8a885b9f
|
||||
DIST coreutils-9.6.tar.xz 6134764 BLAKE2B 4070d3d272851d3e9c326df9c05ce67797d86852e7f5c26e545f987f444295f2cfca24e8569514d7b5edf8fd50318d07cb20dea4a4ce8c65b34bea0c5a9177be SHA512 398391d7f9d77e6117b750abb8711eebdd9cd2549e7846cab26884fb2dd522b6bcfb8bf7fef35a12683e213ada7f89b817bf615628628d42aee3fa3102647b28
|
||||
DIST coreutils-9.6.tar.xz.sig 833 BLAKE2B a9ea9773746d21b526e69ca2ff7637f3dcef4a921da943f281c4d16fed2d8f9eff92353e1ceafbbc8cfe4b9b23bf123bf64dcd79ff598759373c50739a5046c6 SHA512 a8e578b5e1d053b49e3e2c5dc94431d17c6a14662f459b2174cea23865ccca32e5ae5c13fedb0a8345d25269a9b98cb7f463a897c9663f9f9bcaf61e5c781378
|
||||
DIST coreutils-9.7.tar.xz 6158960 BLAKE2B e5e5f7ec26c3952eb6a25988f78d3a1f8a70cf97a2fbc7b433dfcd1721cd38e6e0a8b9cb83f854a22df325bcb5ea8c4534c5a217273762cd5d575b381db69ee8 SHA512 fe81e6ba4fb492095153d5baac1eca8f07ece0957849de746a2a858cf007893cc2ded595a31a5e5d43d13216cc44b9d74a3245d9f23221ecc8cd00f428f27414
|
||||
DIST coreutils-9.7.tar.xz.sig 833 BLAKE2B 18dee5a1b5dc1811b277748fe6ee079dc6320bc6d67e01f108415c6afe21ad0367ece46f8c6dfb0976b1e5f62ae15c2d61fba916ea232c71a1b2f66c81b983bf SHA512 48d86a19cee3c153f01f7478847f4621685c02e59942540bb20b30e314df05230817b87d0e73acd953e79fab35718e5bea57f25fe511a2c275a85ced4b317bae
|
||||
DIST coreutils-9.8.tar.xz 6234824 BLAKE2B a93e26c8dda875b11541808d82ff8d6537f521b9c44e2a9959ee8f452823a4df5aed2793ac32766e2d3f832606d7190f7f53ea5870419f585aa66429a9626d98 SHA512 7b6c420907f0e33e4aff3dd92270f8cbd3e94b2ae8cf7caa2d5d1cfd5e9958319904a6547127abd55ee63aae0316f5b1228586b2da34ea402da032e925a25e53
|
||||
|
||||
@ -1,308 +0,0 @@
|
||||
# Copyright 1999-2025 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_{10..11} )
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/coreutils.asc
|
||||
inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
|
||||
|
||||
MY_PATCH="${PN}-9.4-patches"
|
||||
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).156-b3afb"
|
||||
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 ~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-debug/strace
|
||||
dev-lang/perl
|
||||
dev-perl/Expect
|
||||
${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]
|
||||
)
|
||||
!<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
|
||||
"
|
||||
|
||||
QA_CONFIG_IMPL_DECL_SKIP=(
|
||||
# gnulib FPs (bug #898370)
|
||||
unreachable MIN alignof static_assert
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use test ; then
|
||||
python-any-r1_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
git-r3_src_unpack
|
||||
|
||||
cd "${S}" || die
|
||||
./bootstrap || die
|
||||
|
||||
sed -i -e "s:submodule-checks ?= no-submodule-changes public-submodule-commit:submodule-checks ?= no-submodule-changes:" gnulib/top/maint.mk || die
|
||||
elif 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() {
|
||||
# TODO: past 2025, we may need to add our own hack for bug #907474.
|
||||
local PATCHES=(
|
||||
# Upstream patches
|
||||
"${FILESDIR}"/${P}-gnulib-openssl-1.1.patch
|
||||
"${FILESDIR}"/${P}-CVE-2024-0684.patch
|
||||
"${FILESDIR}"/${P}-gnulib-clang-18-c23-stdckdint.patch
|
||||
)
|
||||
|
||||
if ! use vanilla && [[ -d "${WORKDIR}"/${MY_PATCH} ]] ; then
|
||||
PATCHES+=( "${WORKDIR}"/${MY_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() {
|
||||
# TODO: in future (>9.4?), we may want to wire up USE=systemd:
|
||||
# still experimental at the moment, but:
|
||||
# https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=85edb4afbd119fb69a0d53e1beb71f46c9525dd0
|
||||
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"
|
||||
$(usev !caps --disable-libcap)
|
||||
$(use_enable nls)
|
||||
$(use_enable acl)
|
||||
$(use_enable multicall single-binary)
|
||||
$(use_enable xattr)
|
||||
$(use_with gmp libgmp)
|
||||
$(use_with openssl)
|
||||
)
|
||||
|
||||
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() {
|
||||
# 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
|
||||
|
||||
#local -x RUN_EXPENSIVE_TESTS="yes"
|
||||
#local -x COREUTILS_GROUPS="portage wheel"
|
||||
local -x PATH="${T}/mount-wrappers:${PATH}"
|
||||
local -x gl_public_submodule_commit=
|
||||
|
||||
local xfail_tests=(
|
||||
# bug #629660
|
||||
#tests/dd/no-allocate.sh
|
||||
|
||||
# bug #675802
|
||||
tests/env/env-S
|
||||
tests/env/env-S.pl
|
||||
|
||||
# bug #413621 and bug #548250
|
||||
tests/du/long-from-unreadable.sh
|
||||
tests/ls/removed-directory
|
||||
tests/ls/removed-directory.sh
|
||||
tests/ls/stat-free-symlinks
|
||||
tests/ls/stat-free-symlinks.sh
|
||||
tests/rm/deep-2
|
||||
tests/rm/deep-2.sh
|
||||
|
||||
# We have a patch which fixes this (bug #259876)
|
||||
#tests/touch/not-owner
|
||||
#tests/touch/not-owner.sh
|
||||
)
|
||||
|
||||
# This test is flaky (bug #910640).
|
||||
cat > tests/tty/tty-eof.pl <<-EOF || die
|
||||
#!/usr/bin/perl
|
||||
exit 77;
|
||||
EOF
|
||||
|
||||
# We set DISABLE_HARD_ERRORS because some of the tests hard error-out
|
||||
# because of sandbox. They're skipped above but DISABLE_HARD_ERRORS is needed
|
||||
# to downgrade them to FAIL.
|
||||
emake -k check \
|
||||
VERBOSE=yes \
|
||||
DISABLE_HARD_ERRORS=yes \
|
||||
XFAIL_TESTS="${xfail_tests[*]}"
|
||||
}
|
||||
|
||||
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"
|
||||
}
|
||||
@ -1,306 +0,0 @@
|
||||
# Copyright 1999-2025 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_{10..11} )
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/coreutils.asc
|
||||
inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
|
||||
|
||||
MY_PATCH="${PN}-9.4-patches"
|
||||
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).156-b3afb"
|
||||
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 ~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-debug/strace
|
||||
dev-lang/perl
|
||||
dev-perl/Expect
|
||||
${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]
|
||||
)
|
||||
!<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
|
||||
"
|
||||
|
||||
QA_CONFIG_IMPL_DECL_SKIP=(
|
||||
# gnulib FPs (bug #898370)
|
||||
unreachable MIN alignof static_assert
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use test ; then
|
||||
python-any-r1_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
git-r3_src_unpack
|
||||
|
||||
cd "${S}" || die
|
||||
./bootstrap || die
|
||||
|
||||
sed -i -e "s:submodule-checks ?= no-submodule-changes public-submodule-commit:submodule-checks ?= no-submodule-changes:" gnulib/top/maint.mk || die
|
||||
elif 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() {
|
||||
# TODO: past 2025, we may need to add our own hack for bug #907474.
|
||||
local PATCHES=(
|
||||
# Upstream patches
|
||||
"${FILESDIR}"/${P}-gnulib-openssl-1.1.patch
|
||||
)
|
||||
|
||||
if ! use vanilla && [[ -d "${WORKDIR}"/${MY_PATCH} ]] ; then
|
||||
PATCHES+=( "${WORKDIR}"/${MY_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() {
|
||||
# TODO: in future (>9.4?), we may want to wire up USE=systemd:
|
||||
# still experimental at the moment, but:
|
||||
# https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=85edb4afbd119fb69a0d53e1beb71f46c9525dd0
|
||||
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"
|
||||
$(usev !caps --disable-libcap)
|
||||
$(use_enable nls)
|
||||
$(use_enable acl)
|
||||
$(use_enable multicall single-binary)
|
||||
$(use_enable xattr)
|
||||
$(use_with gmp libgmp)
|
||||
$(use_with openssl)
|
||||
)
|
||||
|
||||
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() {
|
||||
# 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
|
||||
|
||||
#local -x RUN_EXPENSIVE_TESTS="yes"
|
||||
#local -x COREUTILS_GROUPS="portage wheel"
|
||||
local -x PATH="${T}/mount-wrappers:${PATH}"
|
||||
local -x gl_public_submodule_commit=
|
||||
|
||||
local xfail_tests=(
|
||||
# bug #629660
|
||||
#tests/dd/no-allocate.sh
|
||||
|
||||
# bug #675802
|
||||
tests/env/env-S
|
||||
tests/env/env-S.pl
|
||||
|
||||
# bug #413621 and bug #548250
|
||||
tests/du/long-from-unreadable.sh
|
||||
tests/ls/removed-directory
|
||||
tests/ls/removed-directory.sh
|
||||
tests/ls/stat-free-symlinks
|
||||
tests/ls/stat-free-symlinks.sh
|
||||
tests/rm/deep-2
|
||||
tests/rm/deep-2.sh
|
||||
|
||||
# We have a patch which fixes this (bug #259876)
|
||||
#tests/touch/not-owner
|
||||
#tests/touch/not-owner.sh
|
||||
)
|
||||
|
||||
# This test is flaky (bug #910640).
|
||||
cat > tests/tty/tty-eof.pl <<-EOF || die
|
||||
#!/usr/bin/perl
|
||||
exit 77;
|
||||
EOF
|
||||
|
||||
# We set DISABLE_HARD_ERRORS because some of the tests hard error-out
|
||||
# because of sandbox. They're skipped above but DISABLE_HARD_ERRORS is needed
|
||||
# to downgrade them to FAIL.
|
||||
emake -k check \
|
||||
VERBOSE=yes \
|
||||
DISABLE_HARD_ERRORS=yes \
|
||||
XFAIL_TESTS="${xfail_tests[*]}"
|
||||
}
|
||||
|
||||
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"
|
||||
}
|
||||
@ -1,313 +0,0 @@
|
||||
# Copyright 1999-2025 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_{10..13} )
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/coreutils.asc
|
||||
inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
|
||||
|
||||
MY_PATCH="${PN}-9.5-patches"
|
||||
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).185-541b02"
|
||||
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 ~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-debug/strace
|
||||
dev-lang/perl
|
||||
dev-perl/Expect
|
||||
${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]
|
||||
)
|
||||
!<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
|
||||
"
|
||||
|
||||
QA_CONFIG_IMPL_DECL_SKIP=(
|
||||
# gnulib FPs (bug #898370)
|
||||
unreachable MIN alignof static_assert
|
||||
# ... and on musl
|
||||
_exit fpurge statvfs64 re_set_syntax re_compile_pattern re_search re_match
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use test ; then
|
||||
python-any-r1_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
git-r3_src_unpack
|
||||
|
||||
cd "${S}" || die
|
||||
./bootstrap || die
|
||||
|
||||
sed -i -e "s:submodule-checks ?= no-submodule-changes public-submodule-commit:submodule-checks ?= no-submodule-changes:" gnulib/top/maint.mk || die
|
||||
elif 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() {
|
||||
# TODO: past 2025, we may need to add our own hack for bug #907474.
|
||||
local PATCHES=(
|
||||
# Upstream patches
|
||||
)
|
||||
|
||||
if ! use vanilla && [[ -d "${WORKDIR}"/${MY_PATCH} ]] ; then
|
||||
PATCHES+=(
|
||||
"${WORKDIR}"/${MY_PATCH}
|
||||
"${FILESDIR}"/${PN}-9.5-skip-readutmp-test.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() {
|
||||
# TODO: in future (>9.4?), we may want to wire up USE=systemd:
|
||||
# still experimental at the moment, but:
|
||||
# https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=85edb4afbd119fb69a0d53e1beb71f46c9525dd0
|
||||
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"
|
||||
$(usev !caps --disable-libcap)
|
||||
$(use_enable nls)
|
||||
$(use_enable acl)
|
||||
$(use_enable multicall single-binary)
|
||||
$(use_enable xattr)
|
||||
$(use_with gmp libgmp)
|
||||
$(use_with openssl)
|
||||
)
|
||||
|
||||
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() {
|
||||
# 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
|
||||
|
||||
#local -x RUN_EXPENSIVE_TESTS="yes"
|
||||
#local -x COREUTILS_GROUPS="portage wheel"
|
||||
local -x PATH="${T}/mount-wrappers:${PATH}"
|
||||
local -x gl_public_submodule_commit=
|
||||
|
||||
local xfail_tests=(
|
||||
# bug #675802
|
||||
tests/env/env-S
|
||||
tests/env/env-S.pl
|
||||
|
||||
# bug #413621 and bug #548250
|
||||
tests/du/long-from-unreadable.sh
|
||||
tests/ls/removed-directory
|
||||
tests/ls/removed-directory.sh
|
||||
tests/ls/stat-free-symlinks
|
||||
tests/ls/stat-free-symlinks.sh
|
||||
tests/rm/deep-2
|
||||
tests/rm/deep-2.sh
|
||||
|
||||
# We have a patch which fixes this (bug #259876)
|
||||
#tests/touch/not-owner
|
||||
#tests/touch/not-owner.sh
|
||||
)
|
||||
|
||||
# This test is flaky (bug #629660, bug #935367).
|
||||
cat > tests/dd/no-allocate.sh <<-EOF || die
|
||||
#!/bin/sh
|
||||
exit 77;
|
||||
EOF
|
||||
|
||||
# This test is flaky (bug #910640).
|
||||
cat > tests/tty/tty-eof.pl <<-EOF || die
|
||||
#!/usr/bin/perl
|
||||
exit 77;
|
||||
EOF
|
||||
|
||||
# We set DISABLE_HARD_ERRORS because some of the tests hard error-out
|
||||
# because of sandbox. They're skipped above but DISABLE_HARD_ERRORS is needed
|
||||
# to downgrade them to FAIL.
|
||||
emake -k check \
|
||||
VERBOSE=yes \
|
||||
DISABLE_HARD_ERRORS=yes \
|
||||
XFAIL_TESTS="${xfail_tests[*]}"
|
||||
}
|
||||
|
||||
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"
|
||||
}
|
||||
@ -1,311 +0,0 @@
|
||||
# Copyright 1999-2025 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_{10..13} )
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/coreutils.asc
|
||||
inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
|
||||
|
||||
MY_PATCH="${PN}-9.6-patches"
|
||||
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).185-541b02"
|
||||
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 ~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-debug/strace
|
||||
dev-lang/perl
|
||||
dev-perl/Expect
|
||||
${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]
|
||||
)
|
||||
!<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
|
||||
"
|
||||
|
||||
QA_CONFIG_IMPL_DECL_SKIP=(
|
||||
# gnulib FPs (bug #898370)
|
||||
unreachable MIN alignof static_assert
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use test ; then
|
||||
python-any-r1_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
git-r3_src_unpack
|
||||
|
||||
cd "${S}" || die
|
||||
./bootstrap || die
|
||||
|
||||
sed -i -e "s:submodule-checks ?= no-submodule-changes public-submodule-commit:submodule-checks ?= no-submodule-changes:" gnulib/top/maint.mk || die
|
||||
elif 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() {
|
||||
# TODO: past 2025, we may need to add our own hack for bug #907474.
|
||||
local PATCHES=(
|
||||
# Upstream patches
|
||||
)
|
||||
|
||||
if ! use vanilla && [[ -d "${WORKDIR}"/${MY_PATCH} ]] ; then
|
||||
PATCHES+=( "${WORKDIR}"/${MY_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() {
|
||||
# TODO: in future (>9.4?), we may want to wire up USE=systemd:
|
||||
# still experimental at the moment, but:
|
||||
# https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=85edb4afbd119fb69a0d53e1beb71f46c9525dd0
|
||||
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"
|
||||
$(usev !caps --disable-libcap)
|
||||
$(use_enable nls)
|
||||
$(use_enable acl)
|
||||
$(use_enable multicall single-binary)
|
||||
$(use_enable xattr)
|
||||
$(use_with gmp libgmp)
|
||||
$(use_with openssl)
|
||||
)
|
||||
|
||||
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() {
|
||||
# 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
|
||||
|
||||
#local -x RUN_EXPENSIVE_TESTS="yes"
|
||||
#local -x COREUTILS_GROUPS="portage wheel"
|
||||
local -x PATH="${T}/mount-wrappers:${PATH}"
|
||||
local -x gl_public_submodule_commit=
|
||||
|
||||
local xfail_tests=()
|
||||
|
||||
if [[ -n ${SANDBOX_ACTIVE} ]]; then
|
||||
xfail_tests+=(
|
||||
# bug #629660
|
||||
# Commented out again in 9.6 as it XPASSes on linux-6.12.10
|
||||
# with sandbox-2.43 on tmpfs. Let's see if it lasts..
|
||||
#tests/dd/no-allocate.sh
|
||||
|
||||
# bug #675802
|
||||
tests/env/env-S
|
||||
tests/env/env-S.pl
|
||||
|
||||
# bug #413621 and bug #548250
|
||||
tests/du/long-from-unreadable.sh
|
||||
tests/ls/removed-directory
|
||||
tests/ls/removed-directory.sh
|
||||
tests/ls/stat-free-symlinks
|
||||
tests/ls/stat-free-symlinks.sh
|
||||
tests/rm/deep-2
|
||||
tests/rm/deep-2.sh
|
||||
|
||||
# We have a patch which fixes this (bug #259876)
|
||||
#tests/touch/not-owner
|
||||
#tests/touch/not-owner.sh
|
||||
)
|
||||
fi
|
||||
|
||||
# This test is flaky (bug #910640).
|
||||
cat > tests/tty/tty-eof.pl <<-EOF || die
|
||||
#!/usr/bin/perl
|
||||
exit 77;
|
||||
EOF
|
||||
|
||||
# We set DISABLE_HARD_ERRORS because some of the tests hard error-out
|
||||
# because of sandbox. They're skipped above but DISABLE_HARD_ERRORS is needed
|
||||
# to downgrade them to FAIL.
|
||||
emake -k check \
|
||||
VERBOSE=yes \
|
||||
DISABLE_HARD_ERRORS=yes \
|
||||
XFAIL_TESTS="${xfail_tests[*]}"
|
||||
}
|
||||
|
||||
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"
|
||||
}
|
||||
@ -1,311 +0,0 @@
|
||||
# Copyright 1999-2025 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_{11..13} )
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/coreutils.asc
|
||||
inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
|
||||
|
||||
MY_PATCH="${PN}-9.6-patches"
|
||||
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).327-71a8c"
|
||||
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 ~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 test-full 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-debug/strace
|
||||
dev-lang/perl
|
||||
dev-perl/Expect
|
||||
${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]
|
||||
)
|
||||
!<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
|
||||
"
|
||||
|
||||
QA_CONFIG_IMPL_DECL_SKIP=(
|
||||
# gnulib FPs (bug #898370)
|
||||
unreachable MIN alignof static_assert
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use test ; then
|
||||
python-any-r1_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
git-r3_src_unpack
|
||||
|
||||
cd "${S}" || die
|
||||
./bootstrap || die
|
||||
|
||||
sed -i -e "s:submodule-checks ?= no-submodule-changes public-submodule-commit:submodule-checks ?= no-submodule-changes:" gnulib/top/maint.mk || die
|
||||
elif 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() {
|
||||
# TODO: past 2025, we may need to add our own hack for bug #907474.
|
||||
local PATCHES=(
|
||||
# Upstream patches
|
||||
"${FILESDIR}"/${PN}-9.8-no-pclmul.patch
|
||||
)
|
||||
|
||||
if ! use vanilla && [[ -d "${WORKDIR}"/${MY_PATCH} ]] ; then
|
||||
PATCHES+=( "${WORKDIR}"/${MY_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() {
|
||||
# Running Valgrind in an ebuild is too unreliable. Skip such tests.
|
||||
cat <<-EOF >> init.cfg || die
|
||||
require_valgrind_()
|
||||
{
|
||||
skip_ "requires a working valgrind"
|
||||
}
|
||||
EOF
|
||||
|
||||
# TODO: in future (>9.4?), we may want to wire up USE=systemd:
|
||||
# still experimental at the moment, but:
|
||||
# https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=85edb4afbd119fb69a0d53e1beb71f46c9525dd0
|
||||
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"
|
||||
$(usev !caps --disable-libcap)
|
||||
$(use_enable nls)
|
||||
$(use_enable acl)
|
||||
$(use_enable multicall single-binary)
|
||||
$(use_enable xattr)
|
||||
$(use_with gmp libgmp)
|
||||
$(use_with openssl)
|
||||
)
|
||||
|
||||
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() {
|
||||
# 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
|
||||
|
||||
local -x RUN_{VERY_,}EXPENSIVE_TESTS=$(usex test-full yes no)
|
||||
#local -x COREUTILS_GROUPS="portage wheel"
|
||||
local -x PATH="${T}/mount-wrappers:${PATH}"
|
||||
local -x gl_public_submodule_commit=
|
||||
|
||||
local xfail_tests=()
|
||||
|
||||
if [[ -n ${SANDBOX_ACTIVE} ]]; then
|
||||
xfail_tests+=(
|
||||
# bug #629660
|
||||
# Commented out again in 9.6 as it XPASSes on linux-6.12.10
|
||||
# with sandbox-2.43 on tmpfs. Let's see if it lasts..
|
||||
#tests/dd/no-allocate.sh
|
||||
|
||||
# bug #675802
|
||||
tests/env/env-S
|
||||
tests/env/env-S.pl
|
||||
|
||||
# We have a patch which fixes this (bug #259876)
|
||||
#tests/touch/not-owner
|
||||
#tests/touch/not-owner.sh
|
||||
)
|
||||
fi
|
||||
|
||||
# This test is flaky (bug #910640).
|
||||
cat > tests/tty/tty-eof.pl <<-EOF || die
|
||||
#!/usr/bin/perl
|
||||
exit 77;
|
||||
EOF
|
||||
|
||||
# We set DISABLE_HARD_ERRORS because some of the tests hard error-out
|
||||
# because of sandbox. They're skipped above but DISABLE_HARD_ERRORS is needed
|
||||
# to downgrade them to FAIL.
|
||||
emake -k check \
|
||||
VERBOSE=yes \
|
||||
DISABLE_HARD_ERRORS=yes \
|
||||
XFAIL_TESTS="${xfail_tests[*]}"
|
||||
}
|
||||
|
||||
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"
|
||||
}
|
||||
@ -1,31 +0,0 @@
|
||||
https://bugs.gentoo.org/922474
|
||||
https://www.openwall.com/lists/oss-security/2024/01/18/2
|
||||
https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=c4c5ed8f4e9cd55a12966d4f520e3a13101637d9
|
||||
|
||||
From c4c5ed8f4e9cd55a12966d4f520e3a13101637d9 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Tue, 16 Jan 2024 13:48:32 -0800
|
||||
Subject: split: do not shrink hold buffer
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
* src/split.c (line_bytes_split): Do not shrink hold buffer.
|
||||
If it’s large for this batch it’s likely to be large for the next
|
||||
batch, and for ‘split’ it’s not worth the complexity/CPU hassle to
|
||||
shrink it. Do not assume hold_size can be bufsize.
|
||||
--- a/src/split.c
|
||||
+++ b/src/split.c
|
||||
@@ -809,10 +809,7 @@ line_bytes_split (intmax_t n_bytes, char *buf, idx_t bufsize)
|
||||
{
|
||||
cwrite (n_out == 0, hold, n_hold);
|
||||
n_out += n_hold;
|
||||
- if (n_hold > bufsize)
|
||||
- hold = xirealloc (hold, bufsize);
|
||||
n_hold = 0;
|
||||
- hold_size = bufsize;
|
||||
}
|
||||
|
||||
/* Output to eol if present. */
|
||||
--
|
||||
cgit v1.1
|
||||
@ -1,30 +0,0 @@
|
||||
https://bugs.gentoo.org/926349
|
||||
https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=67c298c36f6
|
||||
|
||||
From 67c298c36f69b6906840b7584be06b7b5f33f829 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Tue, 16 Jan 2024 17:21:08 -0800
|
||||
Subject: [PATCH] posixtm: pacify clang 18
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=utf8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Problem reported by Khem Raj in:
|
||||
https://lists.gnu.org/r/bug-gnulib/2024-01/msg00045.html
|
||||
* lib/posixtm.c (posixtime): Pacify clang 18 by converting bool to int.
|
||||
Arguably this is a bug in draft C2x, since the non-pointer args to
|
||||
ckd_add should promote just like any other expressions do;
|
||||
but thatâs not clangâs fault.
|
||||
--- a/lib/posixtm.c
|
||||
+++ b/lib/posixtm.c
|
||||
@@ -191,7 +191,7 @@ posixtime (time_t *p, const char *s, unsigned int syntax_bits)
|
||||
| (tm0.tm_min ^ tm1.tm_min)
|
||||
| (tm0.tm_sec ^ tm1.tm_sec)))
|
||||
{
|
||||
- if (ckd_add (&t, t, leapsec))
|
||||
+ if (ckd_add (&t, t, +leapsec))
|
||||
return false;
|
||||
*p = t;
|
||||
return true;
|
||||
--
|
||||
2.17.1
|
||||
@ -1,165 +0,0 @@
|
||||
https://bugs.gentoo.org/913368
|
||||
https://debbugs.gnu.org/65674
|
||||
https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=ce20e238f0b4448a098bd7c076c131edbc759764
|
||||
|
||||
From ce20e238f0b4448a098bd7c076c131edbc759764 Mon Sep 17 00:00:00 2001
|
||||
From: Bruno Haible <bruno@clisp.org>
|
||||
Date: Fri, 1 Sep 2023 12:55:30 +0200
|
||||
Subject: crypto/{sha*,md5,sm3}-buffer: Fix --with-openssl (regr. 2023-08-26).
|
||||
|
||||
Reported by Agostino Sarubbo via Sam James <sam@gentoo.org> in
|
||||
<https://lists.gnu.org/archive/html/bug-gnulib/2023-09/msg00000.html>.
|
||||
|
||||
* lib/sha1.h: Test the OpenSSL major version before attempting to
|
||||
include <openssl/configuration.h>.
|
||||
* lib/sha256.h: Likewise.
|
||||
* lib/sha512.h: Likewise.
|
||||
* lib/md5.h: Likewise.
|
||||
* lib/sm3.h: Likewise.
|
||||
--- a/lib/md5.h
|
||||
+++ b/lib/md5.h
|
||||
@@ -33,14 +33,18 @@
|
||||
# define OPENSSL_API_COMPAT 0x10101000L /* FIXME: Use OpenSSL 1.1+ API. */
|
||||
# endif
|
||||
/* If <openssl/macros.h> would give a compile-time error, don't use OpenSSL. */
|
||||
-# include <openssl/configuration.h>
|
||||
-# if (OPENSSL_CONFIGURED_API \
|
||||
- < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
|
||||
- ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
|
||||
- + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
|
||||
- + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
|
||||
-# undef HAVE_OPENSSL_MD5
|
||||
-# else
|
||||
+# include <openssl/opensslv.h>
|
||||
+# if OPENSSL_VERSION_MAJOR >= 3
|
||||
+# include <openssl/configuration.h>
|
||||
+# if (OPENSSL_CONFIGURED_API \
|
||||
+ < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
|
||||
+ ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
|
||||
+ + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
|
||||
+ + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
|
||||
+# undef HAVE_OPENSSL_MD5
|
||||
+# endif
|
||||
+# endif
|
||||
+# if HAVE_OPENSSL_MD5
|
||||
# include <openssl/md5.h>
|
||||
# endif
|
||||
# endif
|
||||
--- a/lib/sha1.h
|
||||
+++ b/lib/sha1.h
|
||||
@@ -32,14 +32,18 @@
|
||||
# define OPENSSL_API_COMPAT 0x10101000L /* FIXME: Use OpenSSL 1.1+ API. */
|
||||
# endif
|
||||
/* If <openssl/macros.h> would give a compile-time error, don't use OpenSSL. */
|
||||
-# include <openssl/configuration.h>
|
||||
-# if (OPENSSL_CONFIGURED_API \
|
||||
- < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
|
||||
- ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
|
||||
- + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
|
||||
- + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
|
||||
-# undef HAVE_OPENSSL_SHA1
|
||||
-# else
|
||||
+# include <openssl/opensslv.h>
|
||||
+# if OPENSSL_VERSION_MAJOR >= 3
|
||||
+# include <openssl/configuration.h>
|
||||
+# if (OPENSSL_CONFIGURED_API \
|
||||
+ < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
|
||||
+ ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
|
||||
+ + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
|
||||
+ + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
|
||||
+# undef HAVE_OPENSSL_SHA1
|
||||
+# endif
|
||||
+# endif
|
||||
+# if HAVE_OPENSSL_SHA1
|
||||
# include <openssl/sha.h>
|
||||
# endif
|
||||
# endif
|
||||
--- a/lib/sha256.h
|
||||
+++ b/lib/sha256.h
|
||||
@@ -31,14 +31,18 @@
|
||||
# define OPENSSL_API_COMPAT 0x10101000L /* FIXME: Use OpenSSL 1.1+ API. */
|
||||
# endif
|
||||
/* If <openssl/macros.h> would give a compile-time error, don't use OpenSSL. */
|
||||
-# include <openssl/configuration.h>
|
||||
-# if (OPENSSL_CONFIGURED_API \
|
||||
- < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
|
||||
- ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
|
||||
- + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
|
||||
- + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
|
||||
-# undef HAVE_OPENSSL_SHA256
|
||||
-# else
|
||||
+# include <openssl/opensslv.h>
|
||||
+# if OPENSSL_VERSION_MAJOR >= 3
|
||||
+# include <openssl/configuration.h>
|
||||
+# if (OPENSSL_CONFIGURED_API \
|
||||
+ < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
|
||||
+ ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
|
||||
+ + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
|
||||
+ + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
|
||||
+# undef HAVE_OPENSSL_SHA256
|
||||
+# endif
|
||||
+# endif
|
||||
+# if HAVE_OPENSSL_SHA256
|
||||
# include <openssl/sha.h>
|
||||
# endif
|
||||
# endif
|
||||
--- a/lib/sha512.h
|
||||
+++ b/lib/sha512.h
|
||||
@@ -31,14 +31,18 @@
|
||||
# define OPENSSL_API_COMPAT 0x10101000L /* FIXME: Use OpenSSL 1.1+ API. */
|
||||
# endif
|
||||
/* If <openssl/macros.h> would give a compile-time error, don't use OpenSSL. */
|
||||
-# include <openssl/configuration.h>
|
||||
-# if (OPENSSL_CONFIGURED_API \
|
||||
- < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
|
||||
- ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
|
||||
- + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
|
||||
- + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
|
||||
-# undef HAVE_OPENSSL_SHA512
|
||||
-# else
|
||||
+# include <openssl/opensslv.h>
|
||||
+# if OPENSSL_VERSION_MAJOR >= 3
|
||||
+# include <openssl/configuration.h>
|
||||
+# if (OPENSSL_CONFIGURED_API \
|
||||
+ < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
|
||||
+ ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
|
||||
+ + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
|
||||
+ + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
|
||||
+# undef HAVE_OPENSSL_SHA512
|
||||
+# endif
|
||||
+# endif
|
||||
+# if HAVE_OPENSSL_SHA512
|
||||
# include <openssl/sha.h>
|
||||
# endif
|
||||
# endif
|
||||
--- a/lib/sm3.h
|
||||
+++ b/lib/sm3.h
|
||||
@@ -40,14 +40,18 @@
|
||||
# define OPENSSL_API_COMPAT 0x10101000L /* FIXME: Use OpenSSL 1.1+ API. */
|
||||
# endif
|
||||
/* If <openssl/macros.h> would give a compile-time error, don't use OpenSSL. */
|
||||
-# include <openssl/configuration.h>
|
||||
-# if (OPENSSL_CONFIGURED_API \
|
||||
- < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
|
||||
- ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
|
||||
- + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
|
||||
- + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
|
||||
-# undef HAVE_OPENSSL_SM3
|
||||
-# else
|
||||
+# include <openssl/opensslv.h>
|
||||
+# if OPENSSL_VERSION_MAJOR >= 3
|
||||
+# include <openssl/configuration.h>
|
||||
+# if (OPENSSL_CONFIGURED_API \
|
||||
+ < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
|
||||
+ ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
|
||||
+ + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
|
||||
+ + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
|
||||
+# undef HAVE_OPENSSL_SM3
|
||||
+# endif
|
||||
+# endif
|
||||
+# if HAVE_OPENSSL_SM3
|
||||
# include <openssl/sm3.h>
|
||||
# endif
|
||||
# endif
|
||||
--
|
||||
cgit v1.1
|
||||
@ -1,13 +0,0 @@
|
||||
https://bugs.gentoo.org/935367
|
||||
--- a/gnulib-tests/test-readutmp.c
|
||||
+++ b/gnulib-tests/test-readutmp.c
|
||||
@@ -43,6 +43,9 @@ main (int argc, char *argv[])
|
||||
STRUCT_UTMP *entries;
|
||||
idx_t num_entries;
|
||||
|
||||
+ fprintf (stderr, "Skipping test: Gentoo: examines host entries, so unreliable in ebuild\n");
|
||||
+ return 77;
|
||||
+
|
||||
if (read_utmp (UTMP_FILE, &num_entries, &entries, 0) < 0)
|
||||
{
|
||||
#if READ_UTMP_SUPPORTED
|
||||
Loading…
x
Reference in New Issue
Block a user