diff options
Diffstat (limited to 'sys-apps/util-linux/util-linux-9999.ebuild')
| -rw-r--r-- | sys-apps/util-linux/util-linux-9999.ebuild | 132 |
1 files changed, 86 insertions, 46 deletions
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index 59eecef07674..90d69b34f877 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -1,25 +1,29 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{10..12} ) +TMPFILES_OPTIONAL=1 -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ - pam python-r1 multilib-minimal multiprocessing systemd +inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ + pam python-r1 multilib-minimal multiprocessing systemd tmpfiles MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux" + if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" inherit autotools git-r3 else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/karelzak.asc + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/karelzak.asc inherit verify-sig if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos" fi SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" @@ -28,12 +32,9 @@ fi S="${WORKDIR}/${MY_P}" -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux" - LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain" SLOT="0" -IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode" +IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode uuidd" # Most lib deps here are related to programs rather than our libs, # so we rarely need to specify ${MULTILIB_USEDEP}. @@ -55,16 +56,23 @@ RDEPEND=" rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) slang? ( sys-libs/slang ) - !build? ( systemd? ( sys-apps/systemd ) ) - udev? ( virtual/libudev:= )" + !build? ( + systemd? ( sys-apps/systemd ) + udev? ( virtual/libudev:= ) + ) +" BDEPEND=" virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( sys-devel/bc ) + nls? ( + app-text/po4a + sys-devel/gettext + ) + test? ( app-alternatives/bc ) " DEPEND=" ${RDEPEND} virtual/os-headers + acct-group/root " RDEPEND+=" hardlink? ( !app-arch/hardlink ) @@ -77,6 +85,10 @@ RDEPEND+=" !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) + uuidd? ( + acct-user/uuidd + systemd? ( virtual/tmpfiles ) + ) !net-wireless/rfkill " @@ -84,7 +96,7 @@ if [[ ${PV} == 9999 ]] ; then # Required for man-page generation BDEPEND+=" dev-ruby/asciidoctor" else - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-karelzak )" + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-karelzak-20230517 )" fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )" @@ -125,19 +137,27 @@ src_prepare() { default if use test ; then - # Prevent uuidd test failure due to socket path limit, bug #593304 - sed -i \ - -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \ - tests/ts/uuid/uuidd || die "Failed to fix uuidd test" - # Known-failing tests - # TODO: investigate these local known_failing_tests=( # Subtest 'options-maximum-size-8192' fails hardlink/options + # Fails in sandbox + # re ioctl_ns: https://github.com/util-linux/util-linux/issues/2967 + lsns/ioctl_ns + lsfd/mkfds-inotify lsfd/mkfds-symlink lsfd/mkfds-rw-character-device + # Fails with network-sandbox at least in nspawn + lsfd/option-inet + utmp/last-ipv6 + + # Flaky + rename/subdir + + # Permission issues on /dev/random + lsfd/mkfds-eventpoll + lsfd/column-xmode ) local known_failing_test @@ -145,7 +165,6 @@ src_prepare() { einfo "Removing known-failing test: ${known_failing_test}" rm tests/ts/${known_failing_test} || die done - fi if [[ ${PV} == 9999 ]] ; then @@ -156,21 +175,6 @@ src_prepare() { fi } -lfs_fallocate_test() { - # Make sure we can use fallocate with LFS, bug #300307 - cat <<-EOF > "${T}"/fallocate.${ABI}.c - #define _GNU_SOURCE - #include <fcntl.h> - main() { return fallocate(0, 0, 0, 0); } - EOF - - append-lfs-flags - - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ - || export ac_cv_func_fallocate=no - rm -f "${T}"/fallocate.${ABI}.c -} - python_configure() { local myeconfargs=( "${commonargs[@]}" @@ -190,8 +194,6 @@ python_configure() { } multilib_src_configure() { - lfs_fallocate_test - # The scanf test in a run-time test which fails while cross-compiling. # Blindly assume a POSIX setup since we require libmount, and libmount # itself fails when the scanf test fails. bug #531856 @@ -212,6 +214,8 @@ multilib_src_configure() { # configure args shared by python and non-python builds local commonargs=( + --localstatedir="${EPREFIX}/var" + --runstatedir="${EPREFIX}/run" --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" ) @@ -223,20 +227,40 @@ multilib_src_configure() { $(multilib_native_use_enable suid makeinstall-setuid) $(multilib_native_use_with readline) $(multilib_native_use_with slang) - $(multilib_native_use_with systemd) - $(multilib_native_use_with udev) $(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic') $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') $(multilib_native_use_with audit) $(tc-has-tls || echo --disable-tls) $(use_enable nls) + $(use_enable nls poman) $(use_enable unicode widechar) $(use_enable static-libs static) $(use_with ncurses tinfo) $(use_with selinux) + $(multilib_native_use_enable uuidd) + + # TODO: Wire this up (bug #931118) + --without-econf + + # TODO: Wire this up (bug #931297) + # TODO: investigate build failure w/ 2.40.1_rc1 + --disable-liblastlog2 + --disable-pam-lastlog2 ) + if use build ; then + myeconfargs+=( + --without-systemd + --without-udev + ) + else + myeconfargs+=( + $(multilib_native_use_with systemd) + $(multilib_native_use_with udev) + ) + fi + if multilib_is_native_abi ; then myeconfargs+=( --disable-chfn-chsh @@ -254,6 +278,7 @@ multilib_src_configure() { --enable-rfkill --enable-schedutils --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d $(use_enable caps setpriv) $(use_enable cramfs) $(use_enable fdformat) @@ -279,6 +304,7 @@ multilib_src_configure() { --disable-asciidoc --disable-bash-completion --without-systemdsystemunitdir + --disable-poman # build libraries --enable-libuuid @@ -286,6 +312,9 @@ multilib_src_configure() { --enable-libsmartcols --enable-libfdisk --enable-libmount + + # Support uuidd for non-native libuuid + $(use_enable uuidd libuuid-force-uuidd) ) fi @@ -296,6 +325,11 @@ multilib_src_configure() { fi } +src_configure() { + append-lfs-flags + multilib-minimal_src_configure +} + python_compile() { pushd "${BUILD_DIR}" >/dev/null || die emake all @@ -337,16 +371,14 @@ multilib_src_install() { # This needs to be called AFTER python_install call, bug #689190 emake DESTDIR="${D}" install - - if multilib_is_native_abi ; then - # Need the libs in / - gen_usr_ldscript -a blkid fdisk mount smartcols uuid - fi } multilib_src_install_all() { dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} + dosym hexdump /usr/bin/hd + newman - hd.1 <<< '.so man1/hexdump.1' + # e2fsprogs-libs didn't install .la files, and .pc work fine find "${ED}" -name "*.la" -delete || die @@ -367,6 +399,10 @@ multilib_src_install_all() { fperms u+s /bin/su fi + if use uuidd; then + newinitd "${FILESDIR}/uuidd.initd" uuidd + fi + # Note: # Bash completion for "runuser" command is provided by same file which # would also provide bash completion for "su" command. However, we don't @@ -391,4 +427,8 @@ pkg_postinst() { elog "The agetty util now clears the terminal by default. You" elog "might want to add --noclear to your /etc/inittab lines." fi + + if use systemd && use uuidd; then + tmpfiles_process uuidd-tmpfiles.conf + fi } |