diff options
Diffstat (limited to 'sys-apps/util-linux/util-linux-9999.ebuild')
| -rw-r--r-- | sys-apps/util-linux/util-linux-9999.ebuild | 261 |
1 files changed, 180 insertions, 81 deletions
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index 8f1152f9d80f..053f45a99077 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -1,31 +1,40 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) +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 - inherit git-r3 autotools EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" + inherit autotools git-r3 else - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + 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 ~arm64-macos" + fi + SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" + SRC_URI+=" verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.sign )" fi -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux" +S="${WORKDIR}/${MY_P}" 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 userland_GNU" +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}. @@ -47,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 ) @@ -69,55 +85,91 @@ RDEPEND+=" !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) + uuidd? ( + acct-user/uuidd + virtual/tmpfiles + ) !net-wireless/rfkill " -# Required for man-page generation -if [[ "${PV}" == 9999 ]] ; then - BDEPEND+=" - dev-ruby/asciidoctor - " +if [[ ${PV} == 9999 ]] ; then + # Required for man-page generation + BDEPEND+=" dev-ruby/asciidoctor" +else + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-karelzak-20230517 )" fi -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )" RESTRICT="!test? ( test )" -S="${WORKDIR}/${MY_P}" +pkg_pretend() { + if use su && ! use suid ; then + elog "su will be installed as suid despite USE=-suid (bug #832092)" + elog "To use su without suid, see e.g. Portage's suidctl feature." + fi +} + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + return + fi + + if use verify-sig ; then + mkdir "${T}"/verify-sig || die + pushd "${T}"/verify-sig &>/dev/null || die + + # Upstream sign the decompressed .tar + # Let's do it separately in ${T} then cleanup to avoid external + # effects on normal unpack. + cp "${DISTDIR}"/${MY_P}.tar.xz . || die + xz -d ${MY_P}.tar.xz || die + verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign + + popd &>/dev/null || die + rm -r "${T}"/verify-sig || die + fi + + default +} src_prepare() { default - # Prevent uuidd test failure due to socket path limit. #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" + if use test ; then + # Known-failing tests + 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 + + # Permission issues on /dev/random + lsfd/mkfds-eventpoll + lsfd/column-xmode + ) - if ! use userland_GNU ; then - # test runner is using GNU-specific xargs call - sed -i -e 's:xargs:gxargs:' tests/run.sh || die - # test requires util-linux uuidgen (which we don't build) - rm tests/ts/uuid/oids || die + local known_failing_test + for known_failing_test in "${known_failing_tests[@]}" ; do + einfo "Removing known-failing test: ${known_failing_test}" + rm tests/ts/${known_failing_test} || die + done fi if [[ ${PV} == 9999 ]] ; then po/update-potfiles eautoreconf + else + elibtoolize fi - - elibtoolize -} - -lfs_fallocate_test() { - # Make sure we can use fallocate with LFS #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() { @@ -127,14 +179,11 @@ python_configure() { --disable-bash-completion --without-systemdsystemunitdir --with-python + --enable-libblkid + --enable-libmount + --enable-pylibmount ) - if use userland_GNU ; then - myeconfargs+=( - --enable-libblkid - --enable-libmount - --enable-pylibmount - ) - fi + mkdir "${BUILD_DIR}" || die pushd "${BUILD_DIR}" >/dev/null || die ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" @@ -142,15 +191,18 @@ 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. #531856 + # itself fails when the scanf test fails. bug #531856 tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 - export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 - # Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530 + # bug #485486 + export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) + # bug #545042 + export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) + + # Undo bad ncurses handling by upstream. Fall back to pkg-config. + # bug #601530 export NCURSES6_CONFIG=false NCURSES5_CONFIG=false export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false @@ -159,6 +211,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" ) @@ -170,21 +224,41 @@ 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 ) - # build programs only on GNU, on *BSD we want libraries only - if multilib_is_native_abi && use userland_GNU ; then + + 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 --disable-login @@ -201,6 +275,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) @@ -226,19 +301,20 @@ multilib_src_configure() { --disable-asciidoc --disable-bash-completion --without-systemdsystemunitdir + --disable-poman + # build libraries --enable-libuuid --enable-libblkid --enable-libsmartcols --enable-libfdisk + --enable-libmount + + # Support uuidd for non-native libuuid + $(use_enable uuidd libuuid-force-uuidd) ) - if use userland_GNU ; then - # those libraries don't work on *BSD - myeconfargs+=( - --enable-libmount - ) - fi fi + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" if multilib_is_native_abi && use python ; then @@ -246,6 +322,11 @@ multilib_src_configure() { fi } +src_configure() { + append-lfs-flags + multilib-minimal_src_configure +} + python_compile() { pushd "${BUILD_DIR}" >/dev/null || die emake all @@ -285,30 +366,38 @@ multilib_src_install() { python_foreach_impl python_install fi - # This needs to be called AFTER python_install call (#689190) + # This needs to be called AFTER python_install call, bug #689190 emake DESTDIR="${D}" install - - if multilib_is_native_abi && use userland_GNU ; 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/*} - # e2fsprogs-libs didnt install .la files, and .pc work fine - find "${ED}" -name "*.la" -delete || die + dosym hexdump /usr/bin/hd + newman - hd.1 <<< '.so man1/hexdump.1' - if ! use userland_GNU ; then - # manpage collisions - # TODO: figure out a good way to keep them - rm "${ED}"/usr/share/man/man3/uuid* || die - fi + # e2fsprogs-libs didn't install .la files, and .pc work fine + find "${ED}" -name "*.la" -delete || die if use pam ; then + # See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt newpamd "${FILESDIR}/runuser.pamd" runuser newpamd "${FILESDIR}/runuser-l.pamd" runuser-l + + newpamd "${FILESDIR}/su-l.pamd" su-l + fi + + if use su && ! use suid ; then + # Always force suid su, even when USE=-suid, as su is useless + # for the overwhelming-majority case without suid. + # Users who wish to truly have a no-suid su can strip it out + # via e.g. Portage's suidctl or some other hook. + # See bug #832092 + fperms u+s /bin/su + fi + + if use uuidd; then + newinitd "${FILESDIR}/uuidd.initd" uuidd fi # Note: @@ -318,6 +407,12 @@ multilib_src_install_all() { # This triggers a known QA warning which we ignore for now to magically # keep bash completion for "su" command which shadow package does not # provide. + + local ver=$(tools/git-version-gen .tarballversion) + local major=$(ver_cut 1 ${ver}) + local minor=$(ver_cut 2 ${ver}) + local release=$(ver_cut 3 ${ver}) + export QA_PKGCONFIG_VERSION="${major}.${minor}.${release:-0}" } pkg_postinst() { @@ -329,4 +424,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 uuidd; then + tmpfiles_process uuidd-tmpfiles.conf + fi } |