Add USE=caps to control `setpriv` #469102 by Arfrever Frehtes Taifersar Arahesis.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

5 files changed, 41 insertions, 28 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 63402d47cd51..183cb35af4b8 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.428 2013/05/04 09:23:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.429 2013/05/08 22:32:07 vapier Exp $
+
+  08 May 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml,
+  util-linux-2.23.ebuild, util-linux-9999.ebuild:
+  Add USE=caps to control `setpriv` #469102 by Arfrever Frehtes Taifersar
+  Arahesis.
 
   04 May 2013; Samuli Suominen <ssuominen@gentoo.org> util-linux-2.23.ebuild:
   Block version of app-shells/bash-completion with conflicting "rtcwake"
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index bed96b37641f..f03fe770a502 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -35,18 +35,24 @@ EBUILD util-linux-2.21.ebuild 3463 SHA256 10524af8156aa643a6f7525914c96971cbb640
 EBUILD util-linux-2.22.1.ebuild 3163 SHA256 e142c265d715fe8d33dce299ed31dde0906e29c3a4da8232e6df27b36bcb480b SHA512 03befb5575bc40afbff8fa5a9fe7ef67d69a80616b94307716bcf4836c55c498cd2a5e7570a2de939cc4ce095d032bb57a1dbfd1309cce446d081702c4c5318d WHIRLPOOL 16e330454b32f01b1391e59c2e140cea464d137826c79c52073c5df5a031db87f2ee25d1c8b37ac450deacd96d035896be7889dd19e7f4c23efe702836d8b294
 EBUILD util-linux-2.22.2.ebuild 3289 SHA256 5447c9aec9f4a281a0829e3d34f57e48f13eb21e8b3ca2dbd51c302e12416743 SHA512 5dbc3b3a4eb118b21d99b9a2d0d0868a54d70fe6c9b450783b072e765f24240215aa73f4aae9d431796d693efa52d3f8d87e2823505917efaeb50af67d7f57ab WHIRLPOOL d16ce5aeb4d8f693c2aa5c14ae48d9fd70d0aed3dbdfd08426c45cea6b39666654d4dd016ecaf5f8ff5f9d502ac777f606e499b229e5a487f46e8c55cd84594e
 EBUILD util-linux-2.22.ebuild 3147 SHA256 67fa123550783ffe22964256ddbdb927fce64b320a0f67fe0c5ed945cfff3668 SHA512 93ed7ff470dcddf4a15c22b22d7e9bbb716492939fcef6b5e16299f604ce39b3c44154082246f91541fff8f1e375b5015744fc2789d84afad95175317b28bd0b WHIRLPOOL b1ac0d2ddfbe7bdd24c718cfaa735f3703586c38b06d5d0e1885031625e4aaa5842f66f232d70c35a0aec9ce7b4ed6f393c293029a06143e18f389e142cd3238
-EBUILD util-linux-2.23.ebuild 3330 SHA256 c4d17acbdda7b0fe6237ac47801a72809d8ab9becbb40be709848ff356baaf2a SHA512 079a1aef64580893d1438ad830c8665d58da2199a9405af270d7c42a0730a2d57cee665f4db17b62cbe14a8b68cc750bb37928094eca713f1a5301a61e968147 WHIRLPOOL 79767743bf017cdeb929c45add08f993b0bdb3874c208731be17909dece41654e33bd2ae4a3354c6f96d756319dfec20d7d9623eb056d98f0144fb10d05849da
-EBUILD util-linux-9999.ebuild 3299 SHA256 7564b6b4ac873246d911e26ce42d71d51ac9049d486e2e782657ae72c2a846f8 SHA512 2ca53dccfa0b8c39a94774e8da29e90547d15fd934311f3b53786e2a240f283b6177fd309906e676bd80f84517199a4c7aa0abf7e606c51971465904f28fc4d1 WHIRLPOOL a58ffe0d3a4e15ca2ce253c2feb12d82e1609736bbb6e2f89ad8f93ddcc6248e6d8ced04dfa53f6a779f0408e9dc711309617a1fedf4b54dafd20e522465a26b
-MISC ChangeLog 65805 SHA256 a0cd62be1c649177ce0bf77a2674e558fb376c1610d08b858406cf74a72e3298 SHA512 b883a4f4a0eb1149ccf14250523178470de795967837fbd1424e62343ca5dd6da17d0a129d6f2b33742d0c05fe624f78c08b347104d97dc365d02346b54286c4 WHIRLPOOL 0497413cee0eb8f40efb5e17829a8efde99a7a9ab633e0db5e2b37379a439b4a278ae8146dea1febfb1ac38aa6f99d81fbba3562729dc18651381b79671504d9
-MISC metadata.xml 994 SHA256 c8caa72e6854f1ee1a8b5bde850e4596388aa7b76d37b0700f5497959acd4608 SHA512 0d5b390b10df4cc4de6fa28eac59c4f23fd8bb7b9f11962c0e0eadc43a2b63b7f175a060d2f8dcbb30184cee3fc5138b527fd28d3ed2dff8b1e43f1b5d284cf0 WHIRLPOOL 73466cdadc85a6cf663b1fd253e1aad2e6edfe50b6b603f39f41ab362c84e087002b2c66af071c4ed6112bbccda16a429edf5fc4036af7eb7f17639235c338ab
+EBUILD util-linux-2.23.ebuild 3393 SHA256 b4a256fb297c657c06b7708848f887a7cc6238ac87b6f1afea990bfc993c3de7 SHA512 9e6081da539ee17ed8f47b5913b22b5cfbbe6689893f2fcc8dc3f69a2e3c19c145ac54227db43b5e56bb5374f63cf625b910f71df953bc974eee3a4439056dbd WHIRLPOOL 0e2b2223c56b278a1d62189e5325171d5846d0b4ce916544600551808ffd9071e12af8ed4d8a2ef412c49f46fcaaabd7a8f19f3b1e705dfee01b5269a2bad4cd
+EBUILD util-linux-9999.ebuild 3394 SHA256 73527a7477126b8742c4ca619c349e5f50ebedfd009cce050f9c172f9050f247 SHA512 bf4715eba8b576b70e1fc20e0df0f302149221a0ec19adb71796871e1a94a612f50e629ef6e61c74335a0fbed12386e9ba8dab04c858889fcd73c7b50912b538 WHIRLPOOL 4533a268dc5e524bca868bb96b59b0d6021e66eb2bb6bc5d0db115cabb8a4899f5b57e0f13b6af6a1193f125e345e6f3b6e0f7f5ffdaef430dc089a4f24b87af
+MISC ChangeLog 66003 SHA256 880c0425c25b058ff276b94942bcb96bb7df5b49ecacb3411db0fd683510ce25 SHA512 d7170baaacc4c1e2a49c0d83f90f45e7586c21031aa79038dfdee08f667be2f25bfd493f34924119c6214432758a84b6434da8f9a70a305cc7e9bed10b2e9817 WHIRLPOOL cba8b5042452e08a7bfa7ddf8d1af1c35edab269cb31ecdca550e7986e3f7a736a457a17a5a311ed93e0e4f32e0c10230025d4cb5684de4c2b71ab4a63c7a5c5
+MISC metadata.xml 1079 SHA256 68e6c0bc2a127e5f7595d93a1f83abde357e911d4e92b61272e20fb38491bd18 SHA512 16ebf2ea38d79d21a94328d7d415e9751d9e1a56249a32ed6bab1b85c9b177f7d78ed9d9d937a8d8249d3d3cd51f39355b16d929049d214bb9e54656db91df30 WHIRLPOOL 4af098ee9a00f9c564f48dad2313f2e5bb41ac3fe5c6b097639584cf7109dda17460a1fed537c49c626d5fe24a9161a0fc9530b8849fc41d939e3f59921067c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRhNN3AAoJEEdUh39IaPFNBGgH/2lWWPS4XGH91QIeexlLNPP0
-1GRQC5mzvFMdgmKIUbjIzUmwQ0DltlCmiZBhfrzNPVxQVIa6Hsl0cnyv+yLJIz6T
-CVDTsaGYP7YV+RlSCfcfBrb1WU6d8yZulFxyR+Spanx6YtdlObnpd3WELtP61YdP
-ENl1WhZRvfESbLSlNhsGvHQy7Qy4xliKrsrF3x3vIsq7cMQPKw4WocfLpM0IreOw
-dRyu9rbaOfFVZpfbDgciDEZNvKwCfg6C0H/2LaIfM9HQ4NsJBvkDuQ/rA1zMpvP/
-sdCNBlHKk9z2QOl3UYFZS/9IP5zW/T+mg7tTPk+y9QXYgQiz8PySIqhe4oYhcjg=
-=uLMT
+iQIcBAEBCAAGBQJRitJvAAoJELEHsLL7fEFWaAcQAMB6LFxqZzclvpB9dVqidiw3
+2V7pB2Ms55hlr5Qq0zRs9JDA/8HqnqFluDSVdAAam50gzzZ5ZV55XgxgZcCkCRVv
+ZgjExt0JpJdp6XnqmfM8FJTFx5w2JiKEX7ocw7fxSGG50sfTaNTKL5XJyYbUlvRi
+CawWJk+8f04nqNnrqF539XL9xRYrDpfGI9kqWcQsVoz/7km0iKoCQYa04g32CaNS
+FN2Iijq7FsyaK11H+TBiqiwvzyctM3V3+VBMvBS4USiM1fwzlXOLKRvMfdPCILWf
+Cwni7MOvvY7HGvK3ueqA4LBU2uN5E8bItOLdnKn1z6ufWJfPmxg8FdlHP3UbeSc0
+ECB47OBp3yoCIPPKLlNLUsqEVykA4DYl6dvKM25hWvBY4QOrAJQqW/z1UExFmIUG
+356J84MKDcISXct/ngOpR4XWM1x313PvIzLTL0m0eshZH8mdFJh0/QuOT5uv2Bix
+Xpfasr1bBK9OMaD9O8Z57izR5nWRmXMgNfwG6FKrHqUdefrEAlvC+YJtbFr1C3wm
+4zTWdmvNliQJZ8e/+dhVe8vIoIY7jJZukQat0Mz52dTjfjTaZkTIjtyqvAcykTh8
+sIWc1CI1BYrwEjcPb/vo6D2PG1Kkx0ee4hm0TDnf2NBMeEqEVXhWG9TFnP4omSx1
+izGmeJ1EeB21gViRPoGw
+=8q39
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
index 65b39ab71583..b710692dbcb7 100644
--- a/sys-apps/util-linux/metadata.xml
+++ b/sys-apps/util-linux/metadata.xml
@@ -7,6 +7,7 @@
 		<name>Dane Smith</name>
 	</maintainer>
 <use>
+	<flag name='caps'>build setpriv helper (run programs with diff capabilities)</flag>
 	<flag name='cramfs'>build mkfs/fsck helpers for cramfs filesystems</flag>
 	<flag name='cytune'>build cytune for Cyclades-Z multiport serial cards</flag>
 	<flag name='ddate'>build ddate helper (Discordian dates)</flag>
diff --git a/sys-apps/util-linux/util-linux-2.23.ebuild b/sys-apps/util-linux/util-linux-2.23.ebuild
index 6d0d4051be42..e6ff4a840a14 100644
--- a/sys-apps/util-linux/util-linux-2.23.ebuild
+++ b/sys-apps/util-linux/util-linux-2.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.23.ebuild,v 1.2 2013/05/04 09:23:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.23.ebuild,v 1.3 2013/05/08 22:32:07 vapier Exp $
 
 EAPI="3"
 
@@ -27,7 +27,7 @@ fi
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="bash-completion +cramfs cytune fdformat ncurses nls old-linux selinux slang static-libs +suid test tty-helpers udev unicode"
+IUSE="bash-completion caps +cramfs cytune fdformat ncurses nls old-linux selinux slang static-libs +suid test tty-helpers udev unicode"
 
 RDEPEND="!sys-process/schedutils
 	!sys-apps/setarch
@@ -36,6 +36,7 @@ RDEPEND="!sys-process/schedutils
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
 	!<app-shells/bash-completion-1.3-r2
+	caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib )
 	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
 	selinux? ( sys-libs/libselinux )
@@ -75,6 +76,7 @@ src_configure() {
 		--enable-agetty \
 		--with-bashcompletiondir='${datarootdir}/bash-completion' \
 		$(use_enable bash-completion) \
+		$(use_enable caps setpriv) \
 		$(use_enable cramfs) \
 		$(use_enable cytune) \
 		$(use_enable fdformat) \
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index ddf1cd5bc5e4..cf763b22f774 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.43 2013/03/28 17:49:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.44 2013/05/08 22:32:07 vapier Exp $
 
 EAPI="3"
 
@@ -27,17 +27,18 @@ fi
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="+cramfs crypt ddate ncurses nls old-linux perl selinux slang static-libs +suid test udev unicode"
+IUSE="bash-completion caps +cramfs cytune fdformat ncurses nls old-linux selinux slang static-libs +suid test tty-helpers udev unicode"
 
 RDEPEND="!sys-process/schedutils
 	!sys-apps/setarch
-	!<sys-apps/sysvinit-2.88-r4
+	!<sys-apps/sysvinit-2.88-r5
 	!sys-block/eject
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
+	!<app-shells/bash-completion-1.3-r2
+	caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib )
 	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
-	perl? ( dev-lang/perl )
 	selinux? ( sys-libs/libselinux )
 	slang? ( sys-libs/slang )
 	udev? ( virtual/udev )"
@@ -73,23 +74,26 @@ src_configure() {
 		--enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \
 		$(use_enable nls) \
 		--enable-agetty \
-		$(use_enable perl chkdupexe) \
+		--with-bashcompletiondir='${datarootdir}/bash-completion' \
+		$(use_enable bash-completion) \
+		$(use_enable caps setpriv) \
 		$(use_enable cramfs) \
-		$(use_enable ddate) \
+		$(use_enable cytune) \
+		$(use_enable fdformat) \
 		$(use_enable old-linux elvtune) \
 		--with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
 		--disable-kill \
 		--disable-last \
 		--disable-login \
-		--disable-mesg \
+		$(use_enable tty-helpers mesg) \
 		--enable-partx \
 		--enable-raw \
 		--enable-rename \
 		--disable-reset \
 		--enable-schedutils \
 		--disable-su \
-		--disable-wall \
-		--enable-write \
+		$(use_enable tty-helpers wall) \
+		$(use_enable tty-helpers write) \
 		$(use_enable suid makeinstall-chown) \
 		$(use_enable suid makeinstall-setuid) \
 		$(use_with selinux) \
@@ -107,11 +111,6 @@ src_install() {
 	gen_usr_ldscript -a blkid mount uuid
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
 	find "${ED}" -name '*.la' -delete
-
-	if use crypt ; then
-		newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die
-		newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die
-	fi
 }
 
 pkg_postinst() {