From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Thu, 14 Feb 2008 14:55:06 +0000 (+0000)
Subject: Make skey and pam USE flags conflict and result in an error out, as the configure... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1cbe03baaffa429d50de923ba4f77491f10f61c2;p=gentoo.git

Make skey and pam USE flags conflict and result in an error out, as the configure now does not enable pam and skey to be enabled together anymore.
Package-Manager: portage-2.1.4.4
---

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 828a9165588d..3516dafa4848 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/sudo
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.110 2008/02/12 10:29:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.111 2008/02/14 14:55:06 flameeyes Exp $
+
+  14 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> sudo-1.6.9_p12.ebuild:
+  Make skey and pam USE flags conflict and result in an error out, as the
+  configure now does not enable pam and skey to be enabled together anymore.
 
   12 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> -sudo-1.6.8_p9.ebuild,
   -sudo-1.6.8_p9-r2.ebuild, -sudo-1.6.8_p11.ebuild, -sudo-1.6.8_p12.ebuild,
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 3c6060e8e02d..2d30a24182d8 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -9,13 +9,13 @@ AUX sudoers 1612 RMD160 f61c372791112feecae7e0a762a9aa9f30285099 SHA1 b27d644dcd
 DIST sudo-1.6.8p12.tar.gz 585643 RMD160 d7ff9f18ca0973615258c2e975300b94567451d5 SHA1 a79631e9e1c0d0d3f2aa88ae685628e5fde61982 SHA256 56f7d86032538a4a98d90af3742903a09ba16d6db82b593e4a47605f87fa581a
 DIST sudo-1.6.9p12.tar.gz 581936 RMD160 fe07ead5c328b35fc0c84946d71469f4620ddd06 SHA1 c2b07c68d2026fb3e7786b2c9a8fb0c519a830f8 SHA256 d25c7a04f0db65c4a4e587df337fb6c4bd5165155d7ab64e8b00a89f745dd4aa
 EBUILD sudo-1.6.8_p12-r1.ebuild 6670 RMD160 a51207174765e05ba2afead1e15b3d8ddc4a925f SHA1 a797a7d888fb1de1ce08d0b51ed4f67b60619e61 SHA256 d03b6198b3dff76669c5129b8e2c1e05f8c8b9c28ce4c682de063aad5d1effc4
-EBUILD sudo-1.6.9_p12.ebuild 6071 RMD160 b2a050069f318600984157d039e3c86f38f9b6aa SHA1 8ac14446ffc10d8c919a61b9235994f045480eb6 SHA256 b929c6eb65ecd38d08ba8682e25c7c7a94357a6fc8d7c5705b4471b3804635df
-MISC ChangeLog 14684 RMD160 622769f4bd84d62855a06cee442e6635e5f48f9c SHA1 bda16579afbd165ee9a96ec1bc78fe4a21269093 SHA256 d3b28848eb5a383d96b0fbcd96a55a690e69d4f25caccaa574357bb84026d944
+EBUILD sudo-1.6.9_p12.ebuild 5892 RMD160 822122445a709f31a2b4892b5927e6031e310f0e SHA1 cbab5f22266800a875e7fdefa3d22d9bf4074ac3 SHA256 c91cccbecbbb0148acf4b2c1fdd13b31f72f60c61270399f69af4398e3ef5835
+MISC ChangeLog 14912 RMD160 c90efcf09b57c4647003df0ff86a70890ab62421 SHA1 2bba45eebbbeafd327855d9d1b85e078c36fb5c0 SHA256 9f0bee26da45f8f1f35bf99196c52e5593c6fd861020749a0d076709cfadf663
 MISC metadata.xml 501 RMD160 74dd36daa51d7ad5ce1659f0279e1245cd1ef4bc SHA1 e447d21dc61ee4a6de8cc0f66aa28aa422d9990a SHA256 5f399b83a90977486ff92847caa884d16f8b71705fd0d2203acb35f56c9a6db6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHsXUgAiZjviIA2XgRAlTqAKCb+Q0UdFoFy6s7gjQWPEkq+n2tywCgjNHB
-cavE/Aex/Y1kn1n9R1Pv4oI=
-=jDA6
+iD8DBQFHtFZPAiZjviIA2XgRAlt6AKC1pECR4rDRgAWnqMUKO40arIRp+QCdFsBx
+GtTEmzJDAptwmwgGD7rK+K0=
+=iukC
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sudo/sudo-1.6.9_p12.ebuild b/app-admin/sudo/sudo-1.6.9_p12.ebuild
index 23d519e42186..aeaf3e563b56 100644
--- a/app-admin/sudo/sudo-1.6.9_p12.ebuild
+++ b/app-admin/sudo/sudo-1.6.9_p12.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.6.9_p12.ebuild,v 1.1 2008/02/12 10:14:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.6.9_p12.ebuild,v 1.2 2008/02/14 14:55:06 flameeyes Exp $
 
-inherit eutils pam flag-o-matic
+inherit eutils pam flag-o-matic confutils
 
 DESCRIPTION="Allows users or groups to run commands as other users"
 HOMEPAGE="http://www.sudo.ws/"
@@ -24,6 +24,10 @@ DEPEND="${RDEPEND} sys-devel/bison"
 
 S=${WORKDIR}/${P/_/}
 
+pkg_setup() {
+	confutils_use_conflict skey pam
+}
+
 src_unpack() {
 	unpack ${A}; cd "${S}"
 
@@ -180,12 +184,6 @@ rmpath() {
 }
 
 pkg_postinst() {
-	use skey && use pam && {
-		ewarn "sudo will not use skey authentication when compiled with"
-		ewarn "pam support."
-		ewarn "To allow users to authenticate with one time passwords,"
-		ewarn "you should unset the pam USE flag for sudo."
-	}
 	use ldap && {
 		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
 	}