add support for skey authentication #49040

7 files changed, 147 insertions, 4 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 33b6d5b3c8ee..34e206c0567e 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,13 @@
 # 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.26 2004/09/17 16:00:30 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.27 2004/09/17 19:44:33 taviso Exp $
+
+*sudo-1.6.8_p1-r1 (17 Sep 2004)
+
+  17 Sep 2004; Tavis Ormandy <taviso@gentoo.org>
+  +files/sudo-skeychallengeargs.diff, sudo-1.6.7_p5.ebuild,
+  +sudo-1.6.8_p1-r1.ebuild, sudo-1.6.8_p1.ebuild:
+  support for skey passwords #49040
 
 *sudo-1.6.8_p1 (17 Sep 2004)
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 342c2b86236d..9e8a6038863f 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,13 @@
 MD5 0e0016865e514e87266db998b33bd851 sudo-1.6.6.ebuild 877
-MD5 10739407a2bc68ce76fe7e694e3cbd73 sudo-1.6.8_p1.ebuild 1053
-MD5 c4364dcfd263577598949e28a081203a sudo-1.6.7_p5.ebuild 976
-MD5 c8f144f9ba59014cc5387ac41e3d5f4b ChangeLog 3083
+MD5 41ce467c0278e5653a17c520b5dcd810 sudo-1.6.8_p1.ebuild 1109
+MD5 7fc3afe557ca0e4293f0f97362c63b55 sudo-1.6.8_p1-r1.ebuild 1428
+MD5 c5d9c0f63d7356391f86d12b58a8bc3c sudo-1.6.7_p5-r1.ebuild 1356
+MD5 0cecc0a61f0a79419d5f8baabcfb9414 sudo-1.6.7_p5.ebuild 1052
+MD5 e433c8c948c80b628d9408782c6e67af ChangeLog 3312
 MD5 a5463236fbb98e4ee6b1a0faba8c9c52 files/sudo 135
+MD5 ea5d9d51e647a2dbd410d952019ff19b files/digest-sudo-1.6.7_p5-r1 64
+MD5 703a1c523c89153f9bf6f11be6b65778 files/digest-sudo-1.6.8_p1-r1 64
+MD5 0b50aabedf9bb326893b5f1c333e46b2 files/sudo-skeychallengeargs.diff 567
 MD5 d3a1edd41e6a44e7dae35d250aea266e files/digest-sudo-1.6.6 62
 MD5 46618a1b8f9dd4b3d35476c1e63217b0 files/sudo-1.6.8_p1-suid_fix.patch 434
 MD5 ea5d9d51e647a2dbd410d952019ff19b files/digest-sudo-1.6.7_p5 64
diff --git a/app-admin/sudo/files/digest-sudo-1.6.7_p5-r1 b/app-admin/sudo/files/digest-sudo-1.6.7_p5-r1
new file mode 100644
index 000000000000..2875abeb053d
--- /dev/null
+++ b/app-admin/sudo/files/digest-sudo-1.6.7_p5-r1
@@ -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-r1 b/app-admin/sudo/files/digest-sudo-1.6.8_p1-r1
new file mode 100644
index 000000000000..c0f172fb962e
--- /dev/null
+++ b/app-admin/sudo/files/digest-sudo-1.6.8_p1-r1
@@ -0,0 +1 @@
+MD5 7fa9649f327d2e92eb1a73da537759d5 sudo-1.6.8p1.tar.gz 583464
diff --git a/app-admin/sudo/files/sudo-skeychallengeargs.diff b/app-admin/sudo/files/sudo-skeychallengeargs.diff
new file mode 100644
index 000000000000..3c90cfa8dbd1
--- /dev/null
+++ b/app-admin/sudo/files/sudo-skeychallengeargs.diff
@@ -0,0 +1,15 @@
+--- sudo-1.6.7p5/auth/rfc1938.c	2003-04-16 01:39:15.000000000 +0100
++++ sudo-1.6.7p5/auth/rfc1938.c.new	2004-09-17 20:01:00.996902672 +0100
+@@ -64,11 +64,7 @@
+ #if defined(HAVE_SKEY)
+ # include <skey.h>
+ # define RFC1938				skey
+-#  ifdef __NetBSD__
+-#   define rfc1938challenge(a,b,c,d)	skeychallenge((a),(b),(c),(d))
+-#  else
+-#   define rfc1938challenge(a,b,c,d)	skeychallenge((a),(b),(c))
+-#  endif
++#  define rfc1938challenge(a,b,c,d)	skeychallenge((a),(b),(c),(d))
+ # define rfc1938verify(a,b)		skeyverify((a),(b))
+ #elif defined(HAVE_OPIE)
+ # include <opie.h>
diff --git a/app-admin/sudo/sudo-1.6.7_p5-r1.ebuild b/app-admin/sudo/sudo-1.6.7_p5-r1.ebuild
new file mode 100644
index 000000000000..1a686eeb9bc0
--- /dev/null
+++ b/app-admin/sudo/sudo-1.6.7_p5-r1.ebuild
@@ -0,0 +1,55 @@
+# 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-r1.ebuild,v 1.1 2004/09/17 19:44:33 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
+}
+
+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-r1.ebuild b/app-admin/sudo/sudo-1.6.8_p1-r1.ebuild
new file mode 100644
index 000000000000..438aaa55d5d8
--- /dev/null
+++ b/app-admin/sudo/sudo-1.6.8_p1-r1.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.8_p1-r1.ebuild,v 1.1 2004/09/17 19:44:33 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
+}
+
+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."
+	}
+}