add env_reset to the default

7 files changed, 174 insertions, 2 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 34e206c0567e..3b9d57b0a735 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,12 @@
 # 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.27 2004/09/17 19:44:33 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.28 2004/11/11 23:15:15 taviso Exp $
+
+*sudo-1.6.8_p1-r2 (11 Nov 2004)
+
+  11 Nov 2004; Tavis Ormandy <taviso@gentoo.org> +files/sudoers,
+  +sudo-1.6.7_p5-r2.ebuild, +sudo-1.6.8_p1-r2.ebuild:
+  env_reset has been added to the Defaults in the default sudoers file.
 
 *sudo-1.6.8_p1-r1 (17 Sep 2004)
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 17b704411676..500cc14f516f 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,14 +1,19 @@
+MD5 0f610d24209cdeaa1334fdba75bfd726 sudo-1.6.7_p5-r2.ebuild 1439
 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 c4364dcfd263577598949e28a081203a sudo-1.6.7_p5.ebuild 976
-MD5 49c40763497aee0f4d5d04f8a40c2596 ChangeLog 3314
+MD5 42569f9df316909f79f5ddd7802a21a8 ChangeLog 3539
+MD5 12798f99839d9dedd0cd74db02d23fa7 sudo-1.6.8_p1-r2.ebuild 1501
 MD5 a5463236fbb98e4ee6b1a0faba8c9c52 files/sudo 135
 MD5 ea5d9d51e647a2dbd410d952019ff19b files/digest-sudo-1.6.7_p5-r1 64
+MD5 ea5d9d51e647a2dbd410d952019ff19b files/digest-sudo-1.6.7_p5-r2 64
 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 46618a1b8f9dd4b3d35476c1e63217b0 files/sudo-1.6.8_p1-suid_fix.patch 434
 MD5 ea5d9d51e647a2dbd410d952019ff19b files/digest-sudo-1.6.7_p5 64
 MD5 703a1c523c89153f9bf6f11be6b65778 files/digest-sudo-1.6.8_p1 64
diff --git a/app-admin/sudo/files/digest-sudo-1.6.7_p5-r2 b/app-admin/sudo/files/digest-sudo-1.6.7_p5-r2
new file mode 100644
index 000000000000..2875abeb053d
--- /dev/null
+++ b/app-admin/sudo/files/digest-sudo-1.6.7_p5-r2
@@ -0,0 +1 @@
+MD5 55d503e5c35bf1ea83d38244e0242aaf sudo-1.6.7p5.tar.gz 349785
diff --git a/app-admin/sudo/files/digest-sudo-1.6.8_p1-r2 b/app-admin/sudo/files/digest-sudo-1.6.8_p1-r2
new file mode 100644
index 000000000000..c0f172fb962e
--- /dev/null
+++ b/app-admin/sudo/files/digest-sudo-1.6.8_p1-r2
@@ -0,0 +1 @@
+MD5 7fa9649f327d2e92eb1a73da537759d5 sudo-1.6.8p1.tar.gz 583464
diff --git a/app-admin/sudo/files/sudoers b/app-admin/sudo/files/sudoers
new file mode 100644
index 000000000000..2c5913d3998c
--- /dev/null
+++ b/app-admin/sudo/files/sudoers
@@ -0,0 +1,37 @@
+# sudoers file.
+#
+# This file MUST be edited with the 'visudo' command as root.
+#
+# See the sudoers man page for the details on how to write a sudoers file.
+#
+
+# Host alias specification
+
+# User alias specification
+
+# Cmnd alias specification
+
+# Defaults specification
+
+# Reset environment by default
+Defaults	env_reset
+# Uncomment to allow people in group wheel to export variables
+# Defaults:%wheel	!env_reset
+
+# Allow people in group users to export specific variables
+# Defaults:%users	env_keep=POSIXLY_CORRECT
+
+# Runas alias specification
+
+# User privilege specification
+root	ALL=(ALL) ALL
+
+# Uncomment to allow people in group wheel to run all commands
+# %wheel	ALL=(ALL)	ALL
+
+# Same thing without a password
+# %wheel	ALL=(ALL)	NOPASSWD: ALL
+
+# Samples
+# %users  ALL=/sbin/mount /cdrom,/sbin/umount /cdrom
+# %users  localhost=/sbin/shutdown -h now
diff --git a/app-admin/sudo/sudo-1.6.7_p5-r2.ebuild b/app-admin/sudo/sudo-1.6.7_p5-r2.ebuild
new file mode 100644
index 000000000000..6c07d96a6fa2
--- /dev/null
+++ b/app-admin/sudo/sudo-1.6.7_p5-r2.ebuild
@@ -0,0 +1,59 @@
+# 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.7_p5-r2.ebuild,v 1.1 2004/11/11 23:15:15 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="~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}
+	gnuconfig_update ${S}
+	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."
+	}
+}
diff --git a/app-admin/sudo/sudo-1.6.8_p1-r2.ebuild b/app-admin/sudo/sudo-1.6.8_p1-r2.ebuild
new file mode 100644
index 000000000000..3749a8dba87c
--- /dev/null
+++ b/app-admin/sudo/sudo-1.6.8_p1-r2.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_p1-r2.ebuild,v 1.1 2004/11/11 23:15:15 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}/${P}-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."
+	}
+}