Add sys-apps/util-linux-2.30.2-r1

3 files changed, 354 insertions, 0 deletions

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 2291ef43..e7096200 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,8 +1,10 @@
 AUX runuser-l.pamd 187 SHA256 82b5b8b7ea33cad20acee9fe4f35988ef9b6a3e1ffe5c6e4490694b6411730db SHA512 f67d2150b322ef8127dabe26a2192ab85774243b145c238780fd3a1177162abe719ed0f40c5af5054491b1bcd83c8bad57176560ea724027329c880d975c6b99 WHIRLPOOL d98de31b6e1fe08d0ebea406aafde88c5ffca6903f28b3811c02a12530785c062d5b5ab61c45ae9a89732a09239d79cd6d1f6cdcdb0d9fcb20741a584adc7be6
 AUX runuser.pamd 265 SHA256 651906b1ad611df07d40e87e7524a6c07220126fb82875aa0fa119a46f47a6e4 SHA512 9489573d8c39ae90739488855b6b3b6f1c2fc060a50f608a162681326f45dd3cad5a0c7d0b85fbf6e1f23c60465f598963572cb667f0d21ef39eed4e828700a1 WHIRLPOOL 70d7f41ddfacd65eb2362d480bf9559fbef2a92fecc191bc1f55ee9770eb1c7e4626ae83d21daec07c818902796121524f14d864dd97916f81a94b616dabebef
+AUX util-linux-2.32_rc2-umount_completion.patch 1157 SHA256 82c396eda9a09c378f7aa97aa4b53df4b6fa8d68db35988eba184c982a436f89 SHA512 6f5311ea43495bb0b0da180e77044124c8fbeb3a3791182871afd562a7bfa4799184faf7a43f34845ddf11611412df342826679169f55831f43c2f256fb6c799 WHIRLPOOL 747d9c0791b949611cab5761db0a32f5b739388137455a95e96de92f4c12901559fe67162eab9b538cdafaaf616a0f30813b6f4b22b8f3fc04c5371741b5dceb
 DIST util-linux-2.26.2.tar.xz 3863868 SHA256 0e29bda142528a48a0a953c39ff63093651a4809042e1790fbd6aa8663fd9666 SHA512 1cb8e2f32882b3f496d31c250a45cfb61bedb79f7a2802b358c23134d4257fa9bc9cde8888cfa1aaba12109f82b93345c6dc0bec2d11629ffa084f2a4476a91b WHIRLPOOL 699ff057f9930fe53f44090817c64ffe089345e7aba4c836e18cd3d2088881add805640b0e41b8d60bc08e3632be919025417feb9c2ddda454c87821a59122ed
 DIST util-linux-2.28.2.tar.xz 4149700 SHA256 b89d37146f20bede93a42c847bce881a17e6dbd8066ff2db2bee733fa409f0cd SHA512 ac1c2d4c92bbc4eabed464cb0334c1d9b21e58df0f07f0b26e7adcfa188879de8632d195b65a4358c5e11e14ac6e09a1c6206265bbf1fab4ce122414bee7e940 WHIRLPOOL 1735e33620dba30cc1f42e60b707adb72234006b7fea242ac98c389295617bd0225563bcffa76b9d0753dfa100775dd9a2b73614843645ce667db5536842e308
 DIST util-linux-2.30.2.tar.xz 4442624 SHA256 7b5be5489e9b5b7177832836467aba1c87bf0e9bcbcb5a6f35d76cd4782589dc SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d WHIRLPOOL 771d2af788241db337be1e11be499d42b67ec86fa43da2eb161914194d1f002e95d9080793117a4b58a57691df8677ac59e9356ae2da7076ca48188c185a1843
 EBUILD util-linux-2.26.2.ebuild 5786 SHA256 ecf73387c533560f845f7c3dc2b137114f9f021fa9e07abc97292dc956621258 SHA512 b233d51f95dd8ca28d472f82803c98fd688d2d5ec121a6e2a95dea8abd5075d5273bdcda3f11333962b10231181328a39251eed30244b4abb9420e165fd59d0e WHIRLPOOL c96ad1005d2c5b9619438fe5c8fb05b87691bc1bc24893997f7a5dcbe6ec8c505083b87c2dd33e82863a6ab48ebb7e830fd4ac18475821a1124f0cc04bf5a070
 EBUILD util-linux-2.28.2.ebuild 8217 SHA256 7075e4f497f55e52cab59745705c1d93ce029394afee6679c8826a6ed89e56fb SHA512 867ead33097e0d3007bbf68a6d7fe5cac1fcbddf16dee120c5cdf1c3480ea08f174f03f257017a4767e611415dfdd413a3699a168930b065246369f691966a78 WHIRLPOOL 2c5f706f96310d26be7a4fd98114a8b0d27daa043b140abc43e03673b8775b48bb4677528693fae58fdae28d231ae0c7495681a81da17fdd73273ce1c225c3e0
+EBUILD util-linux-2.30.2-r1.ebuild 9217 SHA256 fb94b5426eea625011312fddedef45a5686a865fd9794e3bd90611b011eebddf SHA512 4e2af89ac8d6a2de5389ffc57b5d39e0a42241581bd688bedee5063596d6fb5f1129dd15c09cd2c47a606569b47f7b06bc6beeaf34ed49504cbdb72801ea5c8d WHIRLPOOL ce7bb427a85da80812b4f137a82c158be8bf5fbe083f1ee45c41d191982223c2f53e400e75e9a1d2b674ad18317c8388c62612fcac69f434e1a3683b619e95f7
 EBUILD util-linux-2.30.2.ebuild 8815 SHA256 2032ac35246d82ba3c1451321a83cad984e9e748de62a65a2d438036ad58159c SHA512 13368dc0b997f001ccda5b126ae7177a8ff69a52181b078d06f22819d2800e6dc1ba49539daecf9a07d203239793f4513f6983b97fba817d8b3ffadb10198a6b WHIRLPOOL 96c558dca737fbef93398241bd7bb87be267f9b1dc6d22787dc462f42f099653e33cb618eb18d81f59a8e894435a0889cc780052d7918cf8ef567bd309c65f1f
diff --git a/sys-apps/util-linux/files/util-linux-2.32_rc2-umount_completion.patch b/sys-apps/util-linux/files/util-linux-2.32_rc2-umount_completion.patch
new file mode 100644
index 00000000..1317c56f
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.32_rc2-umount_completion.patch
@@ -0,0 +1,41 @@
+From 75f03badd7ed9f1dd951863d75e756883d3acc55 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 16 Nov 2017 16:27:32 +0100
+Subject: [PATCH] bash-completion: (umount) use findmnt, escape a space in
+ paths
+
+ # mount /dev/sdc1 /mnt/test/foo\ bar
+ # umount <tab>
+
+has to return "/mnt/test/foo\ bar".
+
+Changes:
+
+ * don't use mount | awk output, we have findmnt
+ * force compgen use \n as entries separator
+
+Addresses: https://github.com/karelzak/util-linux/issues/539
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ bash-completion/umount | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/bash-completion/umount b/bash-completion/umount
+index d76cb9fff..98c90d61a 100644
+--- a/bash-completion/umount
++++ b/bash-completion/umount
+@@ -40,9 +40,10 @@ _umount_module()
+ 			return 0
+ 			;;
+ 	esac
+-	local DEVS_MPOINTS
+-	DEVS_MPOINTS="$(mount | awk '{print $1, $3}')"
+-	COMPREPLY=( $(compgen -W "$DEVS_MPOINTS" -- $cur) )
+-	return 0
++
++	local oldifs=$IFS
++	IFS=$'\n'
++	COMPREPLY=( $( compgen -W '$(findmnt -lno TARGET | sed "s/\([[:blank:]]\)/\\\\\1/g")' -- "$cur" ) )
++	IFS=$oldifs
+ }
+ complete -F _umount_module umount
diff --git a/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild
new file mode 100644
index 00000000..01259ec7
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
+	pam python-single-r1 multilib-minimal multiprocessing systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+fi
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode abi_x86_32"
+
+# Most lib deps here are related to programs rather than our libs,
+# so we rarely need to specify ${MULTILIB_USEDEP}.
+RDEPEND="caps? ( sys-libs/libcap-ng )
+	cramfs? ( sys-libs/zlib )
+	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	slang? ( sys-libs/slang )
+	!build? ( systemd? ( sys-apps/systemd ) )
+	udev? ( virtual/libudev:= )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20150406-r2
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bc )
+	virtual/os-headers"
+RDEPEND+="
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-process/procps[kill]
+	)
+	!sys-process/schedutils
+	!sys-apps/setarch
+	!<sys-apps/sysvinit-2.88-r7
+	!<sys-libs/e2fsprogs-libs-1.41.8
+	!<sys-fs/e2fsprogs-1.41.8
+	!<app-shells/bash-completion-2.3-r2
+	!<sys-apps/s390-tools-1.36.1-r1"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.32_rc2-umount_completion.patch" #649812
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -e 's|/run/|/var/run/|' \
+		-i disk-utils/fsck.* term-utils/agetty.c misc-utils/blkid.8 \
+	|| die
+
+	# 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 [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles
+		eautoreconf
+	fi
+
+	# Undo bad ncurses handling by upstream. #601530
+	sed -i -E \
+		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
+		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
+		configure || die
+
+	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
+}
+
+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
+	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
+
+	# Options possibly enabled or disabled by stock ebuild:
+	# --disable-agetty
+	# --disable-bash-completion
+	# --enable-chfn-chsh (from sys-apps/shadow)
+	# --disable-cramfs
+	# --disable-fdformat
+	# --enable-fs-paths-extra=paths
+	# --disable-kill (from sys-process/procps)
+	# --disable-login (from sys-apps/shadow)
+	# --disable-makeinstall-chown
+	# --disable-makeinstall-setuid
+	# --disable-mesg
+	# --disable-nls
+	# --disable-nologin (from sys-apps/shadow)
+	# --disable-partx
+	# --disable-raw
+	# --disable-rename
+	# --enable-reset (from sys-libs/ncurses)
+	# --disable-schedutils
+	# --disable-setpriv
+	# --disable-su (from sys-apps/shadow)
+	# --disable-tls
+	# --disable-wall (from sys-apps/shadow)
+	# --enable-write
+
+	# Additional options now enabled:
+	# --enable-static-programs=losetup,mount,umount,fdisk,sfdisk,blkid,nsenter,unshare (all require static-libs)
+	# --enable-sulogin-emergency-mount
+
+	# Additional options which may be enabled:
+	# --enable-fs-paths-default=paths
+	# --enable-gtk-doc
+	# --enable-libmount-force-mountinfo (ignore /etc/mtab, for systemd)
+	# --enable-libuuid-force-uuidd (only with --disable-libuuid)
+	# --enable-line
+	# --enable-login-chown-vcs
+	# --enable-login-stat-mail
+	# --enable-newgrp (from sys-apps/shadow)
+	# --enable-tunelp
+	# --enable-usrdir-path (ignore PATH elements not beneath /usr, for systemd)
+	# --enable-vipw (from sys-apps/shadow)
+
+	# Default features which may be disabled:
+	# --disable-all-programs
+	# --disable-assert
+	# --disable-bfs
+	# --disable-cal
+	# --disable-chfn-chsh-password
+	# --disable-chsh-only-listed
+	# --disable-colors-default
+	# --disable-eject
+	# --disable-fallocate
+	# --disable-fsck
+	# --disable-hwclock
+	# --disable-ipcrm
+	# --disable-ipcs
+	# --disable-last
+	# --disable-libblkid
+	# --disable-libfdisk
+	# --disable-libmount
+	# --disable-libsmartcols
+	# --disable-libuuid
+	# --disable-logger
+	# --disable-losetup
+	# --disable-lslogins
+	# --disable-minix
+	# --disable-more
+	# --disable-mount
+	# --disable-mountpoint
+	# --disable-nsenter
+	# --disable-pg
+	# --disable-pg-bell
+	# --disable-pivot_root
+	# --disable-pylibmount
+	# --disable-rpath
+	# --disable-runuser
+	# --disable-setterm
+	# --disable-sulogin
+	# --disable-switch_root
+	# --disable-ul
+	# --disable-unshare
+	# --disable-use-tty-group
+	# --disable-utmpdump
+	# --disable-uuidd
+	# --disable-wdctl
+	# --disable-zramctl
+
+	local myeconfargs=(
+		--disable-chfn-chsh
+		--disable-login
+		--disable-nologin
+		--disable-reset
+		--disable-su
+		--docdir='${datarootdir}'/doc/${PF}
+		--enable-agetty
+		--enable-bash-completion
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+		--enable-line
+		--enable-partx
+		--enable-raw
+		--enable-rename
+		--enable-schedutils
+		--enable-sulogin-emergency-mount
+		--libdir='${prefix}/'"$(get_libdir)"
+		--localstatedir="${EPREFIX}/var/run"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no")
+		$(multilib_native_use_enable caps setpriv)
+		$(multilib_native_use_enable cramfs)
+		$(multilib_native_use_enable fdformat)
+		$(multilib_native_use_enable nls)
+		$(multilib_native_use_enable suid makeinstall-chown)
+		$(multilib_native_use_enable suid makeinstall-setuid)
+		$(multilib_native_use_enable tty-helpers mesg)
+		$(multilib_native_use_enable tty-helpers wall)
+		$(multilib_native_use_enable tty-helpers write)
+		$(multilib_native_use_with python)
+		$(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 unicode ncursesw)" '--without-ncursesw')
+		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+		$(tc-has-tls || echo --disable-tls)
+		$(use_enable unicode widechar)
+		$(use_enable kill)
+		$(use_enable static-libs static)
+		$(use_with selinux)
+		$(usex ncurses '' '--without-tinfo')
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		# build libraries only
+		emake -f Makefile -f - mylibs \
+			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && 
+		emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
+			install-pkgconfigDATA install-uuidincHEADERS \
+			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
+			install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
+	fi
+
+	if multilib_is_native_abi; then
+		# need the libs in /
+		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
+
+		use python && python_optimize
+	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
+
+	if use pam; then
+		newpamd "${FILESDIR}/runuser.pamd" runuser
+		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+	fi
+}
+
+pkg_postinst() {
+	if ! use tty-helpers; then
+		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The agetty util now clears the terminal by default. You"
+		elog "might want to add --noclear to your /etc/inittab lines."
+	fi
+}