new version

5 files changed, 73 insertions, 4 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 3b9d57b0a735..481fe396d079 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/sudo
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.28 2004/11/11 23:15:15 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.29 2004/11/13 09:44:29 taviso Exp $
+
+  13 Nov 2004; Tavis Ormandy <taviso@gentoo.org> files/sudoers:
+  new release
 
 *sudo-1.6.8_p1-r2 (11 Nov 2004)
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 3877bb1f2d0e..dd48d52b61fe 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -3,8 +3,9 @@ MD5 0e0016865e514e87266db998b33bd851 sudo-1.6.6.ebuild 877
 MD5 10739407a2bc68ce76fe7e694e3cbd73 sudo-1.6.8_p1.ebuild 1053
 MD5 81fb337f88166432ab3ab058a6f9df0e sudo-1.6.8_p1-r1.ebuild 1433
 MD5 8c94167c21e8ef1c80a87dd4a7d448bf sudo-1.6.7_p5-r1.ebuild 1371
+MD5 0f185b7b157c9e687deea2c4066a57e9 sudo-1.6.8_p2.ebuild 1508
 MD5 c4364dcfd263577598949e28a081203a sudo-1.6.7_p5.ebuild 976
-MD5 42569f9df316909f79f5ddd7802a21a8 ChangeLog 3539
+MD5 78d85591fd8253aa45e7c7a8e7980d7b ChangeLog 3618
 MD5 0209e0398b74dcb8dfd570e1fa4d8b56 sudo-1.6.8_p1-r2.ebuild 1552
 MD5 a5463236fbb98e4ee6b1a0faba8c9c52 files/sudo 135
 MD5 ea5d9d51e647a2dbd410d952019ff19b files/digest-sudo-1.6.7_p5-r1 64
@@ -13,9 +14,10 @@ MD5 703a1c523c89153f9bf6f11be6b65778 files/digest-sudo-1.6.8_p1-r1 64
 MD5 703a1c523c89153f9bf6f11be6b65778 files/digest-sudo-1.6.8_p1-r2 64
 MD5 0b50aabedf9bb326893b5f1c333e46b2 files/sudo-skeychallengeargs.diff 567
 MD5 d3a1edd41e6a44e7dae35d250aea266e files/digest-sudo-1.6.6 62
-MD5 3ec686ddc0fb74ee3a84e182e23ceb96 files/sudoers 854
+MD5 5a53154802d130d3ea39a324290c7515 files/sudoers 841
 MD5 46618a1b8f9dd4b3d35476c1e63217b0 files/sudo-1.6.8_p1-suid_fix.patch 434
 MD5 b906eb71f7564707384cfa9fc80c1b5f files/sudo-1.6.7_p5-strip-bash-functions.diff 1101
 MD5 4362800877ccb8e27de5437707d8a954 files/sudo-strip-bash-functions.diff 1335
 MD5 ea5d9d51e647a2dbd410d952019ff19b files/digest-sudo-1.6.7_p5 64
 MD5 703a1c523c89153f9bf6f11be6b65778 files/digest-sudo-1.6.8_p1 64
+MD5 2a0f63ce27c6d8b9d304ece23ca43a5e files/digest-sudo-1.6.8_p2 64
diff --git a/app-admin/sudo/files/digest-sudo-1.6.8_p2 b/app-admin/sudo/files/digest-sudo-1.6.8_p2
new file mode 100644
index 000000000000..dbbec6e4d5f7
--- /dev/null
+++ b/app-admin/sudo/files/digest-sudo-1.6.8_p2
@@ -0,0 +1 @@
+MD5 03b92a99b37f22351f4bae5119dabe3d sudo-1.6.8p2.tar.gz 583690
diff --git a/app-admin/sudo/files/sudoers b/app-admin/sudo/files/sudoers
index 2c5913d3998c..3f981b1a5e0f 100644
--- a/app-admin/sudo/files/sudoers
+++ b/app-admin/sudo/files/sudoers
@@ -19,7 +19,7 @@ Defaults	env_reset
 # Defaults:%wheel	!env_reset
 
 # Allow people in group users to export specific variables
-# Defaults:%users	env_keep=POSIXLY_CORRECT
+# Defaults:%users	env_keep=TZ
 
 # Runas alias specification
 
diff --git a/app-admin/sudo/sudo-1.6.8_p2.ebuild b/app-admin/sudo/sudo-1.6.8_p2.ebuild
new file mode 100644
index 000000000000..f389dbae74bb
--- /dev/null
+++ b/app-admin/sudo/sudo-1.6.8_p2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.6.8_p2.ebuild,v 1.1 2004/11/13 09:44:29 taviso Exp $
+
+inherit gnuconfig eutils
+
+#
+# TODO: Fix support for krb4 and krb5
+#
+
+DESCRIPTION="Allows certain users/groups to run commands as root"
+HOMEPAGE="http://www.sudo.ws/"
+SRC_URI="ftp://ftp.sudo.ws/pub/sudo/${P/_/}.tar.gz"
+
+LICENSE="Sudo"
+SLOT="0"
+KEYWORDS="-*"
+#KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
+IUSE="pam skey"
+
+DEPEND="pam? ( >=sys-libs/pam-0.73-r1 )
+	skey? ( >=app-admin/skey-1.1.5-r1 )"
+
+S=${WORKDIR}/${P/_/}
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	gnuconfig_update
+
+	epatch ${FILESDIR}/${PN}-1.6.8_p1-suid_fix.patch
+	use skey && epatch ${FILESDIR}/${PN}-skeychallengeargs.diff
+}
+
+src_compile() {
+	econf \
+		--with-all-insults \
+		--disable-path-info \
+		--with-env-editor \
+		`use_with pam` \
+		`use_with skey` \
+		|| die "econf failed"
+	emake || die
+}
+
+src_install() {
+	einstall || die
+	dodoc BUGS CHANGES HISTORY PORTING README RUNSON TODO \
+		TROUBLESHOOTING UPGRADE sample.*
+	insinto /etc/pam.d
+	doins ${FILESDIR}/sudo
+
+	insinto /etc
+	doins ${FILESDIR}/sudoers
+	fperms 0440 /etc/sudoers
+}
+
+pkg_postinst() {
+	use skey && use pam && {
+		 ewarn "sudo will not use skey authentication when compiled with"
+		 ewarn "pam support. to allow users to authenticate with one time"
+		 ewarn "passwords, you should unset the pam USE flag for sudo."
+	}
+}