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

(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

4 files changed, 24 insertions, 17 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/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() {