8 files changed, 22 insertions, 268 deletions
diff --git a/sys-auth/skey/ChangeLog b/sys-auth/skey/ChangeLog
index 651166bc448d..a7a855ac0738 100644
--- a/sys-auth/skey/ChangeLog
+++ b/sys-auth/skey/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/skey
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/skey/ChangeLog,v 1.23 2012/03/25 15:43:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/skey/ChangeLog,v 1.24 2012/03/25 19:05:55 ulm Exp $
+
+  25 Mar 2012; Ulrich Müller <ulm@gentoo.org> -skey-1.1.5-r7.ebuild,
+  -files/skey-1.1.5-binary-search.patch, -files/skey-1.1.5-bind-now.patch,
+  -files/skey-1.1.5-fPIC.patch, -files/skey-1.1.5-otp.diff,
+  -files/skey-login_name_max.diff:
+  Remove old.
 
   25 Mar 2012; Raúl Porcel <armin76@gentoo.org> skey-1.1.5-r8.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #402041
diff --git a/sys-auth/skey/Manifest b/sys-auth/skey/Manifest
index 22139a1441ef..ece753923f1d 100644
--- a/sys-auth/skey/Manifest
+++ b/sys-auth/skey/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX skey-1.1.5-binary-search.patch 802 RMD160 aa708c92eb005469232e8ad5f77b1717638854b2 SHA1 f8043cc8b81b29ea10e83cf6a2c89e96825223e8 SHA256 1c0b10479017434f5705baa55664f221ff80e8ed295b71b868f382a0a58938c4
-AUX skey-1.1.5-bind-now.patch 566 RMD160 201059b7ae654f8f12ddd3ffb33c9e2f2311a49d SHA1 ba3be6a9e8da72addc38258e07421d7b18209419 SHA256 febd27580f39bfaf8feb9b172fc144a0becd088afa02dbe96e2cb7474c9a4ef5
-AUX skey-1.1.5-fPIC.patch 271 RMD160 11ba3e2eb2e8407c5e995f0ab102b08765f6b4ba SHA1 3c8efacdc4c1beb98361cc673506ad64c159dba3 SHA256 e3e7e7d0607a1e55f3b51fa322c0f4e2a8c18f691d3743f46c62f13378a131f9
-AUX skey-1.1.5-otp.diff 1437 RMD160 1b8b362e7c31161e3c88730f74b941b83bbba165 SHA1 be2a685faa723662c2df6232eca36547f9463765 SHA256 b8391d0310e5d22ca303ddd13ecdb306b036bc4622e496c516c0c7b54f4540a4
-AUX skey-login_name_max.diff 386 RMD160 44bc80938601c1140658d5ed343bad982e1c6ca4 SHA1 8510f9dcaec2952347da4933f22984d9d816b27b SHA256 d6652f9ba5cc358108ddfaa2f9dd7093e02a1adba4e360a1e6ad1a42a415a0dd
-DIST skey-1.1.5-gentoo.diff.gz 37614 RMD160 997002ac7e2481ec5158db3b2c7280bc80d5c95b SHA1 ea2611abefdd4a13621478a09f5771fc83ab58b6 SHA256 1f4cb9d403c2cd054a451f4d790cbeac68d31f11d0df1588c2bfb769137444a2
 DIST skey-1.1.5-patches-2.tar.xz 32836 RMD160 a3177eecfae3cb7957a1987c12cd84f79b5c286f SHA1 008299287844313f4ce94ae9fc371cc186839393 SHA256 e55ea1250b2608b8f145f6de5bc62aee7ad1d98634a9a72ef8614e286d9f802c
 DIST skey-1.1.5.tar.bz2 61911 RMD160 33d97cbcd6dbc91bdca5b27056d51d1f5d06b68d SHA1 d55fb286098900cdf3eb6b174a720a06c722312a SHA256 e21bcb7c618c0bc87a72d8f0f097d7517fffa4e881a0f295ee1ce2a7dccf4aef
-EBUILD skey-1.1.5-r7.ebuild 3450 RMD160 d9be7678c1b210010e083839949b7546f621d2e6 SHA1 08c08b834799a586b81621d7273be33beea09986 SHA256 a70f51ed959b1e922988736d81f85f685d92381c379b9040bdfa5511e11a67d5
 EBUILD skey-1.1.5-r8.ebuild 2023 RMD160 68b8e37bee509a89a9adf14990d49b77d824bca2 SHA1 c5e5235e190d8d5de81ef05207d5fe518b96b0db SHA256 044ccd276cad931a5896eeec87cd2f66420ca0ea6e044fd496fb4a9ec6b3d6cc
-MISC ChangeLog 9941 RMD160 5db2681dacb51f4cbb1a624dc9c7a40bc975b775 SHA1 30d481cc8abdf843fb6e5fa5830de9f29e25d2c1 SHA256 2b7b411bbb2816a8effeb7e7f2cc8adf3c47253491d57c2dd2ac19f2be75699c
+MISC ChangeLog 10192 RMD160 cf085195a471a154e8e302b193b4d99d65124fea SHA1 934aaaf0ff600ab1c94ddcd67a2eb5c383e1c305 SHA256 6c0242d9853f47483e5208f61165164e69cdee4029b0cbf5a306c363f00e05ba
 MISC metadata.xml 1418 RMD160 5605591bbf305bca751eebb06b39d756861d5adf SHA1 4a266d05c47fbbaf1ce76245a15d5ef3b9840e50 SHA256 786262fdf7d44c395db41d8d273aa75a4aa390abd30348a2fa835e7a8eb64ffc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9vPToACgkQuQc30/atMkABcACgoB2HRFQhQ6IVi70eAlt0XfgG
-KWUAnA5S/MboKr/emcz52EPn/V1qKvzK
-=kmFg
+iQIcBAEBAgAGBQJPb21DAAoJEDxpGckxwJCBulQP/jJTmIwHud8O3UxpFEfPmpzq
+QHsTpz/1f9IC45VYU/RS+4t4yJBvPzwGoQlPnjVffh+pBqC6mqs03MJayaFvt7q3
+tF/Jr/DL2dZT9+2NT8wi0wuTlF0oK4T5celNIWGaCOazIT1IL6T2lAhIwkxlWRI9
+M5gmyNjBcIXSKqYSSoJD/OmgELSgIEOb1pA88cpHYIUG+NRybfgoqjHQqt65IQmI
+BbWMMOa9ZooaGZYq0BIdS1ALVhgSZGQnz8OT3gSVs8yiSXrcu+0NihTQ5tAQQruI
+PipUZDfj/N2cMwzrEQp5JxvrosrlD2dmuec+pNvzicgJY3wIsDD/l02GApS/uhGK
+OTUSThpKFsJZE4B0/S0Tjk9GmlROo5bu7yEY0SGlTZ6ECCA7YTxVvdDLjiIL8deA
+yoRePI8/sxJ1E09aFaMDRwK0aUwsrBTYryA3sBh6+Y45RqKLAX/phi9WNND/QN7Y
+SdcYai62GB2O6KtOYCLXAg02L+josJWW8dDEhHtecCpRhLSHH0YdAO6rebkk+Xiq
+Y668gSMxvinfZ5ya03/sCMFCETppu7gGxFgQA59I7f0ATdP5adlCa3QkPGiN432Y
+ZnIdbUYUwvZEHSEGNShHkrqEEllWn4JCyR6ehKAuFgAcRm/omYZrO8ug3Zj0Dk6v
+kqIeYQzd+LBYWyvcGCUB
+=tvZh
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/skey/files/skey-1.1.5-binary-search.patch b/sys-auth/skey/files/skey-1.1.5-binary-search.patch
deleted file mode 100644
index 47b18ba71400..000000000000
--- a/sys-auth/skey/files/skey-1.1.5-binary-search.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- skey-1.1.5-orig/put.c	2008-09-21 10:12:06.000000000 +0200
-+++ skey-1.1.5/put.c	2008-09-21 10:19:54.000000000 +0200
-@@ -2206,27 +2206,17 @@
- {
- 	int i, j;
- 
--	for (;;) {
-+	while (low <= high) {
- 		i = (low + high) / 2;
- 
- 		if ((j = strncmp(w, Wp[i], 4)) == 0)
- 			return i;			/* Found it */
--		if (high == low + 1) 
--		{
--			/* Avoid effects of integer truncation in /2 */
--			if (strncmp(w, Wp[high], 4) == 0)
--				return high;
--			else
--				return -1;
--		}
--
--		if (low >= high)
--			return -1;	/* I don't *think* this can happen... */
- 		if (j < 0)
--			high = i;	/* Search lower half */
-+			high = i - 1;	/* Search lower half */
- 		else
--			low = i;	/* Search upper half */
-+			low = i + 1;	/* Search upper half */
- 	}
-+	return -1;
- }
- 
- static void insert(char *s, int x, int start, int length)
diff --git a/sys-auth/skey/files/skey-1.1.5-bind-now.patch b/sys-auth/skey/files/skey-1.1.5-bind-now.patch
deleted file mode 100644
index a56f81e9fc30..000000000000
--- a/sys-auth/skey/files/skey-1.1.5-bind-now.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.in.orig	2005-08-19 18:14:48.000000000 -0400
-+++ Makefile.in	2005-08-19 18:15:45.000000000 -0400
-@@ -67,10 +67,10 @@
- 	${CC} -o $@ ${SKEYOBJS} ${LDFLAGS} -lskey ${LIBS}
- 
- skeyinit: libskey.so ${SKEYINITOBJS}
--	${CC} -o $@ ${SKEYINITOBJS} ${LDFLAGS} -lskey ${LIBS} 
-+	${CC} -o $@ ${SKEYINITOBJS} ${LDFLAGS} -lskey ${LIBS} -Wl,-z,now
- 
- skeyinfo: libskey.so ${SKEYINFOOBJS}
--	${CC} -o $@ ${SKEYINFOOBJS} ${LDFLAGS} -lskey ${LIBS}
-+	${CC} -o $@ ${SKEYINFOOBJS} ${LDFLAGS} -lskey ${LIBS} -Wl,-z,now
- 
- ${MANPAGES} ${SCRIPTS}::
- 	${FIXPATHSCMD} ${srcdir}/$@
diff --git a/sys-auth/skey/files/skey-1.1.5-fPIC.patch b/sys-auth/skey/files/skey-1.1.5-fPIC.patch
deleted file mode 100644
index 924cfb4582a3..000000000000
--- a/sys-auth/skey/files/skey-1.1.5-fPIC.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.in	2004-02-25 10:16:15.219448392 +0000
-+++ Makefile.in	2004-02-25 10:16:39.087583762 +0000
-@@ -50,6 +50,9 @@
- 
- ${LIBOBJS}: config.h
- 
-+${LIBOBJS}: %.o: %.c
-+	${CC} ${CFLAGS} -fPIC -c $< -o $@
-+
- libskey.a: ${LIBOBJS}
- 	${AR} rv $@ ${LIBOBJS}
- 	${RANLIB} $@
diff --git a/sys-auth/skey/files/skey-1.1.5-otp.diff b/sys-auth/skey/files/skey-1.1.5-otp.diff
deleted file mode 100644
index 33c9b3dbac23..000000000000
--- a/sys-auth/skey/files/skey-1.1.5-otp.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -Nur skey-1.1.5.orig/skey.c skey-1.1.5/skey.c
---- skey-1.1.5.orig/skey.c	2004-11-12 23:09:02.382529123 +0100
-+++ skey-1.1.5/skey.c	2004-11-12 23:23:09.864378849 +0100
-@@ -46,6 +46,17 @@
- 	char	passwd[SKEY_MAX_PW_LEN+1], key[SKEY_BINKEY_SIZE];
- 	char	buf[33], *seed, *slash, *t;
- 
-+	/* If we were called as otp-METHOD, set algorithm based on that */
-+	if ((slash = strrchr(argv[0], '/')))
-+	    slash++;
-+	else
-+	    slash = argv[0];
-+	if (strncmp(slash, "otp-", 4) == 0) {
-+		slash += 4;
-+		if (skey_set_algorithm(slash) == NULL)
-+			errx(1, "Unknown hash algorithm %s", slash);
-+	}
-+
- 	while ((i = getopt(argc, argv, "fn:p:t:x")) != -1) {
- 		switch(i) {
- 			case 'f':
-diff -Nur skey-1.1.5.orig/skey.1 skey-1.1.5/skey.1
---- skey-1.1.5.orig/skey.1	2004-11-12 23:09:02.375530148 +0100
-+++ skey-1.1.5/skey.1	2004-11-12 23:41:43.298268426 +0100
-@@ -6,7 +6,7 @@
- .Dt SKEY 1
- .Os
- .Sh NAME
--.Nm skey
-+.Nm skey, otp-md4, otp-md5, otp-sha1
- .Nd respond to an OTP challenge
- .Sh SYNOPSIS
- .Nm
-@@ -27,13 +27,24 @@
- .Pp
- .Em S/Key
- uses 64 bits of information, transformed by the
--.Tn MD4
-+.Tn MD5
- algorithm into 6 English words.
- The user supplies the words to authenticate himself to programs like
- .Xr login 1
- or
- .Xr ftpd 8 .
- .Pp
-+When
-+.Nm skey
-+is invoked as
-+.Nm otp-method ,
-+.Nm skey
-+will use
-+.Ar method
-+as the hash function where
-+.Ar method
-+is currently one of md4, md5, or sha1.
-+.Pp
- Example use of the
- .Em S/Key
- program
diff --git a/sys-auth/skey/files/skey-login_name_max.diff b/sys-auth/skey/files/skey-login_name_max.diff
deleted file mode 100644
index b9725aa0ccb2..000000000000
--- a/sys-auth/skey/files/skey-login_name_max.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ruN skey-1.1.5.orig/skeyinit.c skey-1.1.5/skeyinit.c
---- skey-1.1.5.orig/skeyinit.c	2003-11-12 21:26:49.000000000 +0000
-+++ skey-1.1.5/skeyinit.c	2003-11-12 21:28:24.000000000 +0000
-@@ -62,6 +62,11 @@
- #define SKEY_NAMELEN    4
- #endif
- 
-+/* #33315 */
-+#ifndef LOGIN_NAME_MAX
-+#define LOGIN_NAME_MAX 256
-+#endif
-+
- int	main __P((int, char **));
- 
- int main(int argc, char **argv)
diff --git a/sys-auth/skey/skey-1.1.5-r7.ebuild b/sys-auth/skey/skey-1.1.5-r7.ebuild
deleted file mode 100644
index d59dc41fba1b..000000000000
--- a/sys-auth/skey/skey-1.1.5-r7.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/skey/skey-1.1.5-r7.ebuild,v 1.14 2011/01/30 18:17:44 ulm Exp $
-
-inherit flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="Linux Port of OpenBSD Single-key Password System"
-HOMEPAGE="http://www.openbsd.org/faq/faq8.html#SKey"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		mirror://gentoo/skey-1.1.5-gentoo.diff.gz"
-
-LICENSE="BSD MIT RSA-MD4 RSA-MD5 BEER-WARE"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	sys-libs/cracklib"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# porting some updates to this skey implementation from the
-	# NetBSD project, some other updates and fixes, and the addition
-	# of some new features like shadow password and cracklib support.
-	# 	(05 Nov 2003) -taviso@gentoo.org
-	epatch "${WORKDIR}"/skey-1.1.5-gentoo.diff
-
-	# glibc 2.2.x does not define LOGIN_NAME_MAX #33315
-	# 	(12 Nov 2003) -taviso@gentoo.org
-	epatch "${FILESDIR}"/skey-login_name_max.diff
-
-	epatch "${FILESDIR}"/${P}-fPIC.patch
-	epatch "${FILESDIR}"/${P}-bind-now.patch
-
-	# allow invokation as otp-foo. #71015
-	# 	(03 Mar 2005) -taviso.
-	epatch "${FILESDIR}"/${P}-otp.diff
-
-	# fix binary search
-	epatch "${FILESDIR}"/${P}-binary-search.patch
-
-	# set the default hash function to md5, #63995
-	# 	(14 Sep 2004) -taviso
-	append-flags -DSKEY_HASH_DEFAULT=1
-
-	# skeyprune wont honour @sysconfdir@
-	sed -i \
-		-e 's:/etc/skeykeys:/etc/skey/skeykeys:g' \
-		skeyprune.pl skeyprune.8 || die
-
-	# skeyprune uses a case sensitive regex to check for zeroed entries
-	sed -i \
-		-e 's:\(if ( ! /.*/\):\1i:g' \
-		skeyprune.pl || die
-
-	# skeyinit(1) describes md4 as the default hash algorithm, which
-	# is no longer the case. #64971
-	sed -i \
-		's#\(md4\) \((the default)\), \(md5\) or \(sha1.\)#\1, \3 \2 or \4#g' \
-		skeyinit.1 || die
-
-	# skey(3): shared library is in /lib; we don't install a profiling library
-	sed -i 's:/usr\(/lib/libskey.so\):\1:;/It.*libskey_p/{N;d;}' skey.3 || die
-}
-
-src_compile() {
-	tc-export CC
-	econf --sysconfdir=/etc/skey
-	emake || die
-}
-
-src_install() {
-	doman skey.1 skeyaudit.1 skeyinfo.1 skeyinit.1 skey.3 skeyprune.8 || die
-	dobin skey skeyinit skeyinfo || die
-
-	dosym skey /usr/bin/otp-md4 || die
-	dosym skey /usr/bin/otp-sha1 || die
-	dosym skey /usr/bin/otp-md5 || die
-
-	newsbin skeyprune.pl skeyprune || die
-	newbin skeyaudit.sh skeyaudit || die
-
-	dolib.a libskey.a || die
-
-	into /
-	dolib.so libskey.so.1.1.5 libskey.so.1.1 libskey.so.1 libskey.so || die
-	gen_usr_ldscript libskey.so
-
-	insinto /usr/include
-	doins skey.h || die
-
-	keepdir /etc/skey || die
-
-	# only root needs to have access to these files.
-	fperms g-rx,o-rx /etc/skey || die
-
-	# skeyinit and skeyinfo must be suid root so users
-	# can generate their passwords.
-	fperms u+s,og-r /usr/bin/skeyinit /usr/bin/skeyinfo || die
-
-	dodoc README CHANGES
-}
-
-pkg_postinst() {
-	# do not include /etc/skey/skeykeys in the package, as quickpkg
-	# may package sensitive information.
-	# This also fixes the etc-update issue with #64974.
-
-	# skeyinit will not function if this file is not present.
-	touch /etc/skey/skeykeys
-
-	# these permissions are applied by the skey system if missing.
-	chmod 0600 /etc/skey/skeykeys
-
-	elog "For an introduction into using s/key authentication, take"
-	elog "a look at the EXAMPLES section from the skey(1) manpage."
-}