[gentoo-commits] gentoo-x86 commit in app-admin/sudo: sudo-1.6.9_p12.ebuild ChangeLog

[Diego Petteno (flameeyes)]

flameeyes    08/02/14 14:55:06

  Modified:             sudo-1.6.9_p12.ebuild ChangeLog
  Log:
  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.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.2                  app-admin/sudo/sudo-1.6.9_p12.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/sudo/sudo-1.6.9_p12.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/sudo/sudo-1.6.9_p12.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/sudo/sudo-1.6.9_p12.ebuild?r1=1.1&r2=1.2

Index: sudo-1.6.9_p12.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.6.9_p12.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sudo-1.6.9_p12.ebuild	12 Feb 2008 10:14:16 -0000	1.1
+++ sudo-1.6.9_p12.ebuild	14 Feb 2008 14:55:06 -0000	1.2
@@ -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 @@
 
 S=${WORKDIR}/${P/_/}
 
+pkg_setup() {
+	confutils_use_conflict skey pam
+}
+
 src_unpack() {
 	unpack ${A}; cd "${S}"
 
@@ -180,12 +184,6 @@
 }
 
 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."
 	}



1.111                app-admin/sudo/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/sudo/ChangeLog?rev=1.111&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/sudo/ChangeLog?rev=1.111&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/sudo/ChangeLog?r1=1.110&r2=1.111

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- ChangeLog	12 Feb 2008 10:29:46 -0000	1.110
+++ ChangeLog	14 Feb 2008 14:55:06 -0000	1.111
@@ -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@g.o> 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@g.o> -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,



-- 
gentoo-commits@l.g.o mailing list