mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-09 22:16:58 +02:00
sys-apps/coreutils: Sync with Gentoo
It's from Gentoo commit 941cbe454bc58735a04ac0bbcc83167cd9fd8aa8.
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
fb937f0364
commit
cba40ff06d
@ -1,10 +1,8 @@
|
||||
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
|
||||
DIST coreutils-9.1.tar.xz 5712104 BLAKE2B f5654e4935535275615d44a56c071d1c0746af36cf4615fcc0a5a0d387af9c9023adac31f31a52e16b3d1105b9d4c0fb7ebff9b2862498849f867a866049dd6e SHA512 a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa
|
||||
DIST coreutils-9.1.tar.xz.sig 833 BLAKE2B e9627a066f3c67596feaa8d43d5785076230f440bacea84d8b5736e51a22787c2d5df1f3e2cd8523d01fb7b468933d3c17fce3cb1fbefef322a0e0d820b81842 SHA512 9f0766531afd4faa3e2c337730f61db55605cf06729e9c61f644594883732c2e0b1ddb0005b492be309c53e6f45b8ff875398163a48699d52517ea49e9bdbc91
|
||||
DIST coreutils-9.3.tar.xz 5808696 BLAKE2B 11502cd2dbeef150d0d4cece2546bf6b835941b94456c258f6058338f0477f22e68e88934d075b08fe51ee4d1c0c50cb23d8084ac06a457d6e8975f01643b1cd SHA512 242271f212a6860bdc6c8d7e5c4f85ce66c1b48ef781aca9daa56e0fe7c2b7809ef72b4392120219fe5b687637c83ce89ceef8bb35f6274f43f8f968a6901694
|
||||
DIST coreutils-9.3.tar.xz.sig 833 BLAKE2B c45ae10ff706907ae65d31228e432f7d6f34acbdb733bf521437d9e2fc75828a59da9d432d894a1ed8b7341f7e15d0e8d4e816e209c799b75c14d0ec055bfdf2 SHA512 522a2072f8ef940228ccdd856a4041c3c16b98e309168ccf2066fe7c1013685ba6cdea8a7317dfa1f4507b37ca016ecedaf54438d4a5007927b0e1a8fd223eb5
|
||||
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.4_p20240323.tar.xz 5975332 BLAKE2B c319b3f639f49f2074082722096464304ba48e01f5d118a8b955a77086ec7f508c3dd80cd5732c2983f776af4cd3936e79da4f748682a3d5a67aceb0a862709a SHA512 915eb9428a98412542eab937a168ef5ccbd65246ac9e9e3dfba90210ecba53eb512a6b7c9c11de4bedd28c99a22a5ce445a94ff1cde79452f9eeb407725ce6f7
|
||||
DIST coreutils-9.4_p20240323.tar.xz.sig 833 BLAKE2B 24575deb0e58e3dceb7e719f03923539de8d0d1b2a4543bb54c886c1086d5d80bbc7a7164e58b4cc504a9749a8642f33bc4a11de5ce29503fa1ac20dec4b33f5 SHA512 16948e6f0698f17e65463a62a36bf5deea350547d1452d8e790ab051ea04b8e7467cda4d2c69e210d46b7b2fc6252e0a87fffb474636156677a2eb1aece6d67f
|
||||
DIST coreutils-9.5-patches.tar.xz 5912 BLAKE2B 873fbe1a60f8f8034b3d35796146765ce388952d649c32dc81ca0e4c2823c9f2f00b69bc5cb3af686434867459b6dc378fb9a6d59563d28b87c3ee1eceeedbb3 SHA512 4b4ad356615d046b8d67ea35b789f887a787ab01ece3234f6344518aef33cd30ca364fef5d85e11acfdb24003114c16ffdab82922fb135d5425fbcd541064a76
|
||||
|
||||
@ -1,250 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
# Try to keep an eye on Fedora's packaging: https://src.fedoraproject.org/rpms/coreutils
|
||||
# The upstream coreutils maintainers also maintain the package in Fedora and may
|
||||
# backport fixes which we want to pick up.
|
||||
|
||||
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.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 +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"
|
||||
|
||||
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-rename-simple-backups.patch
|
||||
)
|
||||
|
||||
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)
|
||||
$(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() {
|
||||
# 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 COREUTILS_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"
|
||||
}
|
||||
@ -1,272 +0,0 @@
|
||||
# Copyright 1999-2024 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.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-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"
|
||||
|
||||
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() {
|
||||
local PATCHES=(
|
||||
# Upstream patches
|
||||
"${FILESDIR}"/${P}-cp-parents-preserve-permissions.patch
|
||||
"${FILESDIR}"/${P}-old-kernel-copy_file_range.patch
|
||||
)
|
||||
|
||||
if ! use vanilla && [[ -d "${WORKDIR}"/patch ]] ; then
|
||||
PATCHES+=( "${WORKDIR}"/patch )
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
# Just for ${P}-old-kernel-copy_file_range.patch
|
||||
touch aclocal.m4 configure.ac Makefile.in gnulib-tests/Makefile.in configure || die
|
||||
|
||||
# Since we've patched many .c files, the make process will try to
|
||||
# re-build the manpages by running `./bin --help`. When doing a
|
||||
# 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"
|
||||
$(usex 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() {
|
||||
# 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 COREUTILS_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"
|
||||
}
|
||||
@ -33,7 +33,7 @@ else
|
||||
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"
|
||||
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 )"
|
||||
@ -82,7 +82,13 @@ RDEPEND+="
|
||||
!net-mail/base64
|
||||
!sys-apps/mktemp
|
||||
!<app-forensics/tct-1.18-r1
|
||||
!<net-fs/netatalk-2.0.3-r4"
|
||||
!<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
|
||||
@ -112,6 +118,7 @@ src_prepare() {
|
||||
# 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
|
||||
@ -187,15 +194,6 @@ src_configure() {
|
||||
}
|
||||
|
||||
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
|
||||
@ -220,10 +218,44 @@ src_test() {
|
||||
mkwrap mount umount
|
||||
|
||||
addwrite /dev/full
|
||||
#export RUN_EXPENSIVE_TESTS="yes"
|
||||
#export COREUTILS_GROUPS="portage wheel"
|
||||
env PATH="${T}/mount-wrappers:${PATH}" gl_public_submodule_commit= \
|
||||
emake -k check VERBOSE=yes
|
||||
|
||||
#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
|
||||
|
||||
# bug #910640
|
||||
tests/tty/tty-eof.pl
|
||||
)
|
||||
|
||||
# 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() {
|
||||
|
||||
@ -82,7 +82,13 @@ RDEPEND+="
|
||||
!net-mail/base64
|
||||
!sys-apps/mktemp
|
||||
!<app-forensics/tct-1.18-r1
|
||||
!<net-fs/netatalk-2.0.3-r4"
|
||||
!<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
|
||||
@ -186,15 +192,6 @@ src_configure() {
|
||||
}
|
||||
|
||||
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
|
||||
@ -219,10 +216,44 @@ src_test() {
|
||||
mkwrap mount umount
|
||||
|
||||
addwrite /dev/full
|
||||
#export RUN_EXPENSIVE_TESTS="yes"
|
||||
#export COREUTILS_GROUPS="portage wheel"
|
||||
env PATH="${T}/mount-wrappers:${PATH}" gl_public_submodule_commit= \
|
||||
emake -k check VERBOSE=yes
|
||||
|
||||
#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
|
||||
|
||||
# bug #910640
|
||||
tests/tty/tty-eof.pl
|
||||
)
|
||||
|
||||
# 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() {
|
||||
|
||||
@ -13,7 +13,7 @@ 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.0_p20220409-patches-01"
|
||||
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/"
|
||||
|
||||
@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then
|
||||
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"
|
||||
MY_SNAPSHOT="$(ver_cut 1-2).170-7b206"
|
||||
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}
|
||||
@ -33,7 +33,7 @@ else
|
||||
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"
|
||||
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 )"
|
||||
@ -82,7 +82,13 @@ RDEPEND+="
|
||||
!net-mail/base64
|
||||
!sys-apps/mktemp
|
||||
!<app-forensics/tct-1.18-r1
|
||||
!<net-fs/netatalk-2.0.3-r4"
|
||||
!<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
|
||||
@ -107,21 +113,17 @@ src_unpack() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# TODO: past 2025, we may need to add our own hack for bug #907474.
|
||||
local PATCHES=(
|
||||
# Upstream patches
|
||||
"${FILESDIR}"/${P}-cp-parents-preserve-permissions.patch
|
||||
"${FILESDIR}"/${P}-old-kernel-copy_file_range.patch
|
||||
)
|
||||
|
||||
if ! use vanilla && [[ -d "${WORKDIR}"/patch ]] ; then
|
||||
PATCHES+=( "${WORKDIR}"/patch )
|
||||
if ! use vanilla && [[ -d "${WORKDIR}"/${MY_PATCH} ]] ; then
|
||||
PATCHES+=( "${WORKDIR}"/${MY_PATCH} )
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
# Just for ${P}-old-kernel-copy_file_range.patch
|
||||
touch aclocal.m4 configure.ac Makefile.in gnulib-tests/Makefile.in configure || die
|
||||
|
||||
# Since we've patched many .c files, the make process will try to
|
||||
# re-build the manpages by running `./bin --help`. When doing a
|
||||
# cross-compile, we can't do that since 'bin' isn't a native bin.
|
||||
@ -139,10 +141,9 @@ src_prepare() {
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# On alpha at least, gnulib (as of 9.3) can't seem to figure out we need
|
||||
# _F_O_B=64: https://debbugs.gnu.org/64123
|
||||
append-lfs-flags
|
||||
|
||||
# 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})"
|
||||
@ -152,7 +153,7 @@ src_configure() {
|
||||
# hostname - net-tools
|
||||
--enable-install-program="arch,$(usev hostname),$(usev kill)"
|
||||
--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
|
||||
$(usex caps '' --disable-libcap)
|
||||
$(usev !caps --disable-libcap)
|
||||
$(use_enable nls)
|
||||
$(use_enable acl)
|
||||
$(use_enable multicall single-binary)
|
||||
@ -190,15 +191,6 @@ src_configure() {
|
||||
}
|
||||
|
||||
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
|
||||
@ -223,10 +215,44 @@ src_test() {
|
||||
mkwrap mount umount
|
||||
|
||||
addwrite /dev/full
|
||||
#export RUN_EXPENSIVE_TESTS="yes"
|
||||
#export COREUTILS_GROUPS="portage wheel"
|
||||
env PATH="${T}/mount-wrappers:${PATH}" gl_public_submodule_commit= \
|
||||
emake -k check VERBOSE=yes
|
||||
|
||||
#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
|
||||
|
||||
# bug #910640
|
||||
tests/tty/tty-eof.pl
|
||||
)
|
||||
|
||||
# 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() {
|
||||
@ -13,7 +13,7 @@ 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"
|
||||
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/"
|
||||
|
||||
@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then
|
||||
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"
|
||||
MY_SNAPSHOT="$(ver_cut 1-2).170-7b206"
|
||||
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}
|
||||
@ -82,7 +82,13 @@ RDEPEND+="
|
||||
!net-mail/base64
|
||||
!sys-apps/mktemp
|
||||
!<app-forensics/tct-1.18-r1
|
||||
!<net-fs/netatalk-2.0.3-r4"
|
||||
!<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
|
||||
@ -185,15 +191,6 @@ src_configure() {
|
||||
}
|
||||
|
||||
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
|
||||
@ -218,10 +215,44 @@ src_test() {
|
||||
mkwrap mount umount
|
||||
|
||||
addwrite /dev/full
|
||||
#export RUN_EXPENSIVE_TESTS="yes"
|
||||
#export COREUTILS_GROUPS="portage wheel"
|
||||
env PATH="${T}/mount-wrappers:${PATH}" gl_public_submodule_commit= \
|
||||
emake -k check VERBOSE=yes
|
||||
|
||||
#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
|
||||
|
||||
# bug #910640
|
||||
tests/tty/tty-eof.pl
|
||||
)
|
||||
|
||||
# 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() {
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
https://src.fedoraproject.org/rpms/coreutils/raw/f672fec4364e71c6e5a30d4026d6bdb7cf332eed/f/gnulib-simple-backup-fix.patch
|
||||
https://bugs.gnu.org/55029
|
||||
|
||||
commit 7347caeb9d902d3fca2c11f69a55a3e578d93bfe
|
||||
Author: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Wed Apr 20 19:34:57 2022 -0700
|
||||
|
||||
backupfile: fix bug when renaming simple backups
|
||||
|
||||
* lib/backupfile.c (backupfile_internal): Fix bug when RENAME
|
||||
and when doing simple backups. Problem reported by Steve Ward in:
|
||||
https://bugs.gnu.org/55029
|
||||
|
||||
--- a/lib/backupfile.c
|
||||
+++ b/lib/backupfile.c
|
||||
@@ -332,7 +332,7 @@ backupfile_internal (int dir_fd, char const *file,
|
||||
return s;
|
||||
|
||||
DIR *dirp = NULL;
|
||||
- int sdir = AT_FDCWD;
|
||||
+ int sdir = dir_fd;
|
||||
idx_t base_max = 0;
|
||||
while (true)
|
||||
{
|
||||
@@ -371,10 +371,9 @@ backupfile_internal (int dir_fd, char const *file,
|
||||
if (! rename)
|
||||
break;
|
||||
|
||||
- int olddirfd = sdir < 0 ? dir_fd : sdir;
|
||||
- idx_t offset = sdir < 0 ? 0 : base_offset;
|
||||
+ idx_t offset = backup_type == simple_backups ? 0 : base_offset;
|
||||
unsigned flags = backup_type == simple_backups ? 0 : RENAME_NOREPLACE;
|
||||
- if (renameatu (olddirfd, file + offset, sdir, s + offset, flags) == 0)
|
||||
+ if (renameatu (sdir, file + offset, sdir, s + offset, flags) == 0)
|
||||
break;
|
||||
int e = errno;
|
||||
if (! (e == EEXIST && extended))
|
||||
|
||||
@ -1,86 +0,0 @@
|
||||
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?= <P@draigBrady.com>
|
||||
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
|
||||
@ -1,89 +0,0 @@
|
||||
https://bugs.gentoo.org/907474
|
||||
|
||||
From 87b95c17dc8611f9483b966d052eefc930f43927 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Mon, 5 Jun 2023 22:04:37 -0700
|
||||
Subject: [PATCH] copy-file-range: support building for older kernels
|
||||
|
||||
* m4/copy-file-range.m4 (gl_FUNC_COPY_FILE_RANGE):
|
||||
Remove static check, to support the dubious practice of
|
||||
building for platforms that predate the build platform.
|
||||
On working kernels this adds an extra syscall the first time
|
||||
that copy_file_range is used. Problem reported for Gentoo by
|
||||
Sam James <https://bugs.gnu.org/63850>.
|
||||
--- a/m4/copy-file-range.m4
|
||||
+++ b/m4/copy-file-range.m4
|
||||
@@ -39,21 +39,9 @@ AC_DEFUN([gl_FUNC_COPY_FILE_RANGE],
|
||||
|
||||
case $host_os in
|
||||
linux*)
|
||||
- AC_CACHE_CHECK([whether copy_file_range is known to work],
|
||||
- [gl_cv_copy_file_range_known_to_work],
|
||||
- [AC_COMPILE_IFELSE(
|
||||
- [AC_LANG_PROGRAM(
|
||||
- [[#include <linux/version.h>
|
||||
- ]],
|
||||
- [[#if LINUX_VERSION_CODE < KERNEL_VERSION (5, 3, 0)
|
||||
- #error "copy_file_range is buggy"
|
||||
- #endif
|
||||
- ]])],
|
||||
- [gl_cv_copy_file_range_known_to_work=yes],
|
||||
- [gl_cv_copy_file_range_known_to_work=no])])
|
||||
- if test "$gl_cv_copy_file_range_known_to_work" = no; then
|
||||
- REPLACE_COPY_FILE_RANGE=1
|
||||
- fi;;
|
||||
+ # See copy-file-range.c comment re pre-5.3 Linux kernel bugs.
|
||||
+ # We should be able to remove this hack in 2025.
|
||||
+ REPLACE_COPY_FILE_RANGE=1;;
|
||||
esac
|
||||
fi
|
||||
])
|
||||
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -39903,42 +39903,9 @@ printf "%s\n" "#define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
|
||||
|
||||
case $host_os in
|
||||
linux*)
|
||||
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether copy_file_range is known to work" >&5
|
||||
-printf %s "checking whether copy_file_range is known to work... " >&6; }
|
||||
-if test ${gl_cv_copy_file_range_known_to_work+y}
|
||||
-then :
|
||||
- printf %s "(cached) " >&6
|
||||
-else case e in #(
|
||||
- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
-/* end confdefs.h. */
|
||||
-#include <linux/version.h>
|
||||
-
|
||||
-int
|
||||
-main (void)
|
||||
-{
|
||||
-#if LINUX_VERSION_CODE < KERNEL_VERSION (5, 3, 0)
|
||||
- #error "copy_file_range is buggy"
|
||||
- #endif
|
||||
-
|
||||
- ;
|
||||
- return 0;
|
||||
-}
|
||||
-_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"
|
||||
-then :
|
||||
- gl_cv_copy_file_range_known_to_work=yes
|
||||
-else case e in #(
|
||||
- e) gl_cv_copy_file_range_known_to_work=no ;;
|
||||
-esac
|
||||
-fi
|
||||
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
|
||||
-esac
|
||||
-fi
|
||||
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_copy_file_range_known_to_work" >&5
|
||||
-printf "%s\n" "$gl_cv_copy_file_range_known_to_work" >&6; }
|
||||
- if test "$gl_cv_copy_file_range_known_to_work" = no; then
|
||||
- REPLACE_COPY_FILE_RANGE=1
|
||||
- fi;;
|
||||
+ # See copy-file-range.c comment re pre-5.3 Linux kernel bugs.
|
||||
+ # We should be able to remove this hack in 2025.
|
||||
+ REPLACE_COPY_FILE_RANGE=1;;
|
||||
esac
|
||||
fi
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
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
|
||||
Loading…
Reference in New Issue
Block a user