diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/Manifest.gz | bin | 49691 -> 49689 bytes | |||
| -rw-r--r-- | sys-apps/coreutils/Manifest | 6 | ||||
| -rw-r--r-- | sys-apps/coreutils/coreutils-9.3_p20230826.ebuild | 272 | ||||
| -rw-r--r-- | sys-apps/coreutils/coreutils-9999.ebuild | 20 |
4 files changed, 287 insertions, 11 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex b6ba047fbbf7..376a51949a6a 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest index 817db08b44e6..2d5f429e908f 100644 --- a/sys-apps/coreutils/Manifest +++ b/sys-apps/coreutils/Manifest @@ -10,9 +10,13 @@ DIST coreutils-9.1.tar.xz 5712104 BLAKE2B f5654e4935535275615d44a56c071d1c0746af 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.3_p20230826.tar.xz 5974860 BLAKE2B fddfd36c6c3bbe0041369a7e009851056fc62da8e45b1a0a9bbb33b7d0037f251826c5b8ba10f16bf92ba79dca35d6ac475cae3899c45e2b1cfb0cfa3a3ce297 SHA512 70de2816a8fca0fb4450edec3309685263c46d46214765c4ed1f0fac600384d759d4fc191fac12e48ab9a21d72c26443398909d1f753b9f3eb4026ea2c912a21 +DIST coreutils-9.3_p20230826.tar.xz.sig 833 BLAKE2B 6b77be2c81cb0622dd3012ac314a9c00505f8220b446162d1b41257ae0652789c6caef5ecaa3f2d08da68141a12f0806d93608233eae1a7d5568e9a424de77a1 SHA512 2ac6896705abc0a7b008864316889c20ba2c4ddb650af9c80815f3a387a2e134356414526a5913bc3c5f0062ca257850fa3eb4fa20b2cc2b86c373f878986982 +DIST coreutils-9.4-patches.tar.xz 6756 BLAKE2B 677454409ccb629fd0efde1e15d8f9c13f208391e63a17816011e84d4ca3fb2a42c2a60853f213ade2a53c821d76fd8924c59388d160c6e7c7fa5755e1db4c68 SHA512 2025c80b5ada92bafb479c678917862be208534becd8b347d335032c6b4cc23c7b7630f15ca7dd3b5d691567cb70f3491753e29441cc54d8700cc3d966a5e743 EBUILD coreutils-8.32-r1.ebuild 5971 BLAKE2B df0b4420c70792707eac0b612bc8436ce46194b1c6939132fe1f98f35da8ca6ece969aadc7a40d80305805e46e61591284cd291408f50edbe428e48fc00b533b SHA512 e33271d936216c3a4d6c272f48b24b280116d9cde71e4188341abe1d45d97412effdaf635eda714edc7b0c71c2269003e00887bbfdffedb9990567896f818fa9 EBUILD coreutils-9.1-r2.ebuild 7117 BLAKE2B 5db5bc551fc63dfdb56044f31ab7e96d240075c2dbb6e062064922d9e31d8de12f87ce713067e06b91963365e7d7809150558dd6626ceb2da1a0708f64b1f770 SHA512 e3269b4dca6f1468f77aaafd0561833dc11a019463b05709f6485548610fd4040ae274258415b56d4e42d86ef3ad4914d4aced8d8a50c6002b6e95ea1f12e6a3 EBUILD coreutils-9.3-r2.ebuild 7793 BLAKE2B be5554b0d39de8ebce7918295ae8eba0a8132e0e86cb9ab48664671133198d9b3d68d0c6f9865c2e6865b4cb1e4d931cc79239ba216cddd0d06ee3483f600c1a SHA512 0d582fff70ab30368e363eaf41569fe02b7180e734d88ff4d1345cb0889cc37720c0edc3cc3a7caf685e0aef4b42c208c2c8c12eccd4100999383867d3408993 EBUILD coreutils-9.3-r3.ebuild 7930 BLAKE2B 8e8c83734bab7265d14fac68375e37a2ee8f5c24179487a38c6d25bd65e8fb0dce0182a94c59a1650b19a48bac5dee13e9fba99baa746650874df368f8717b59 SHA512 044d48420ce3efb2ade8c3dbb699b69434cc82e8983fc67bf7c93ab292a1f6b86d68f3bb64098b4fe129d081e159a1915317f8661a83e5f2a5b58b6ef968be8e -EBUILD coreutils-9999.ebuild 7689 BLAKE2B ba53dbdc7590be4727654e1a8f0fdc13b45e682c335c56bb8358fd06d261248703bbb89567c9480488c4ddfbc9faff9dc99356296775e1170219040d49beb2e8 SHA512 19025126674094fdacbc002caefadf346a98e9fc2a2255532019d7e3d110d7baa689ddfeb8caac692ff12226381e4f2eb79fb72aec882cd2b8e82f09a82ad5c1 +EBUILD coreutils-9.3_p20230826.ebuild 7830 BLAKE2B 0a845988c8a655adb8523ac81e7c81a8209c80182cdb4027855bfa9406c65a62caa6a01760d7ec5db95841164bbcf3e4a09af9bf41b856bc581ec5a56c06da63 SHA512 a5fc7d5ae1f9f9553c8343831c2070546edb31a84820d118090375ad6b883676bf9d38284f355259cb1798c0008fad90efdaa3406f87276bf17fa19596d727df +EBUILD coreutils-9999.ebuild 7830 BLAKE2B 0a845988c8a655adb8523ac81e7c81a8209c80182cdb4027855bfa9406c65a62caa6a01760d7ec5db95841164bbcf3e4a09af9bf41b856bc581ec5a56c06da63 SHA512 a5fc7d5ae1f9f9553c8343831c2070546edb31a84820d118090375ad6b883676bf9d38284f355259cb1798c0008fad90efdaa3406f87276bf17fa19596d727df MISC metadata.xml 1093 BLAKE2B 68a653fe54fc668c7f2c7c01904cfca5a071192de4370dcbba427e673f8e9ec33b5104a868a5493117ef24e277446181383140c621b105689797aec4e077b86e SHA512 bf8f2653a1a81edb6e4090b127c5660e0c5ab41a33c985dea1b5cb05c6656b04f42084ce4e561f4550c3e54630893314d3084011c673e7d5aded022be1c065d1 diff --git a/sys-apps/coreutils/coreutils-9.3_p20230826.ebuild b/sys-apps/coreutils/coreutils-9.3_p20230826.ebuild new file mode 100644 index 000000000000..4b4df6b130d5 --- /dev/null +++ b/sys-apps/coreutils/coreutils-9.3_p20230826.ebuild @@ -0,0 +1,272 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Try to keep an eye on Fedora's packaging: https://src.fedoraproject.org/rpms/coreutils +# The upstream coreutils maintainers also maintain the package in Fedora and may +# backport fixes which we want to pick up. +# +# Also recommend subscribing to the coreutils and bug-coreutils MLs. + +PYTHON_COMPAT=( python3_{10..11} ) +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc +inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig + +MY_PATCH="${PN}-9.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).147-d553ab" + SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz" + SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )" + S="${WORKDIR}"/${PN}-${MY_SNAPSHOT} +else + SRC_URI=" + mirror://gnu/${PN}/${P}.tar.xz + verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig ) + " + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" +fi + +SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="acl caps gmp hostname kill multicall nls +openssl selinux +split-usr static test vanilla xattr" +RESTRICT="!test? ( test )" + +LIB_DEPEND=" + acl? ( sys-apps/acl[static-libs] ) + caps? ( sys-libs/libcap ) + gmp? ( dev-libs/gmp:=[static-libs] ) + openssl? ( dev-libs/openssl:=[static-libs] ) + xattr? ( sys-apps/attr[static-libs] ) +" +RDEPEND=" + !static? ( ${LIB_DEPEND//\[static-libs]} ) + selinux? ( sys-libs/libselinux ) + nls? ( virtual/libintl ) +" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" +BDEPEND=" + app-arch/xz-utils + dev-lang/perl + test? ( + dev-lang/perl + dev-perl/Expect + dev-util/strace + ${PYTHON_DEPS} + ) + verify-sig? ( sec-keys/openpgp-keys-coreutils ) +" +RDEPEND+=" + hostname? ( !sys-apps/net-tools[hostname] ) + kill? ( + !sys-apps/util-linux[kill] + !sys-process/procps[kill] + ) + !app-misc/realpath + !<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() { + # 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() { + # 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" +} diff --git a/sys-apps/coreutils/coreutils-9999.ebuild b/sys-apps/coreutils/coreutils-9999.ebuild index 1edd337eadd7..4b4df6b130d5 100644 --- a/sys-apps/coreutils/coreutils-9999.ebuild +++ b/sys-apps/coreutils/coreutils-9999.ebuild @@ -9,11 +9,11 @@ EAPI=8 # # Also recommend subscribing to the coreutils and bug-coreutils MLs. -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig -MY_PATCH="${PN}-9.0_p20220409-patches-01" +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/" @@ -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).147-d553ab" 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} @@ -108,12 +108,13 @@ src_unpack() { } 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}"/patch ]] ; then - PATCHES+=( "${WORKDIR}"/patch ) + if ! use vanilla && [[ -d "${WORKDIR}"/${MY_PATCH} ]] ; then + PATCHES+=( "${WORKDIR}"/${MY_PATCH} ) fi default @@ -135,10 +136,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})" @@ -148,7 +148,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) |