fixing #33315

5 files changed, 34 insertions, 22 deletions

diff --git a/app-admin/skey/ChangeLog b/app-admin/skey/ChangeLog
index 87d607ec8de3..ebc7663046e0 100644
--- a/app-admin/skey/ChangeLog
+++ b/app-admin/skey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/skey
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/skey/ChangeLog,v 1.8 2003/11/06 14:32:47 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/skey/ChangeLog,v 1.9 2003/11/12 21:39:29 taviso Exp $
+
+  12 Nov 2003; Tavis Ormandy <taviso@gentoo.org> skey-1.1.5-r1.ebuild,
+  files/skey-1.1.5-gentoo.diff.gz, files/skey-login_name_max.diff:
+  Fixing #33315, glibc 2.2.x does not define LOGIN_NAME_MAX.
 
   06 Nov 2003; Tavis Ormandy <taviso@gentoo.org> skey-1.1.5-r1.ebuild,
   files/skey-1.1.5-gentoo.diff.gz:
diff --git a/app-admin/skey/Manifest b/app-admin/skey/Manifest
index 2032f3501f79..9a02d20e7650 100644
--- a/app-admin/skey/Manifest
+++ b/app-admin/skey/Manifest
@@ -1,7 +1,8 @@
-MD5 491450d4ae316b42b0fc9751b8d92b2d skey-1.1.5-r1.ebuild 3071
+MD5 5aa8881a18f594cc2cba27f934e42467 skey-1.1.5-r1.ebuild 2565
 MD5 ad1d53a17715de477a11dca0e341128d skey-1.1.5.ebuild 1922
-MD5 7072146eef3b1240f9bea78a3dcd5968 ChangeLog 1514
+MD5 29b9d489c2466dae6364ee43776f8ced ChangeLog 1714
 MD5 fb946a077c4e2ae03befc41f3a095b39 metadata.xml 1425
-MD5 de0fadbe58a6e4e78dbedde30c6caf92 files/skey-1.1.5-gentoo.diff.gz 37410
+MD5 391bb645d15da426828492d5add5dc9b files/skey-1.1.5-gentoo.diff.gz 37615
 MD5 b643729f459d2fd7dba814e88bab8f92 files/digest-skey-1.1.5-r1 117
 MD5 bc72b21ce3e5fcbcb1e728c0cc55702a files/digest-skey-1.1.5 117
+MD5 2bc2fd632a13d33a3832ec3bf2449c1b files/skey-login_name_max.diff 386
diff --git a/app-admin/skey/files/skey-1.1.5-gentoo.diff.gz b/app-admin/skey/files/skey-1.1.5-gentoo.diff.gz
index f4961ad0ca16..b74e9016606c 100644
--- a/app-admin/skey/files/skey-1.1.5-gentoo.diff.gz
+++ b/app-admin/skey/files/skey-1.1.5-gentoo.diff.gz
diff --git a/app-admin/skey/files/skey-login_name_max.diff b/app-admin/skey/files/skey-login_name_max.diff
new file mode 100644
index 000000000000..b9725aa0ccb2
--- /dev/null
+++ b/app-admin/skey/files/skey-login_name_max.diff
@@ -0,0 +1,15 @@
+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/app-admin/skey/skey-1.1.5-r1.ebuild b/app-admin/skey/skey-1.1.5-r1.ebuild
index 23d8ae5a557b..886dcc5bba19 100644
--- a/app-admin/skey/skey-1.1.5-r1.ebuild
+++ b/app-admin/skey/skey-1.1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/skey/skey-1.1.5-r1.ebuild,v 1.6 2003/11/06 17:51:19 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/skey/skey-1.1.5-r1.ebuild,v 1.7 2003/11/12 21:39:29 taviso Exp $
 
 inherit flag-o-matic ccc eutils
 
@@ -24,25 +24,17 @@ DEPEND="${RDEPEND}"
 S=${WORKDIR}/${P}
 
 src_unpack() {
-
-	# ive ported some updates to this s/key implementation from NetBSD to Linux. 
-	# some other changes i've made include
-	# 	- replaced many of the uses of strcat/strcpy to strncat/strncpy.
-	# 	- removed a lot of multi-line string literals in preparation of gcc3.3.
-	# 	- removed some of the crazier syntax, like casting all function calls to
-	#		void, whats up with that? :)
-	#	- killing rmd160 support
-	#	- removed skeyaudit and replaced it with a simple shell script 
-	#	- providing a shared library, so dynamic linking should be possible.
-	#	- using manpages from NetBSD, which are of better quality.
-	#	- be a little bit more reasonable about password security..do we really have
-	#		to force people to have digits in there?
-	#	- hacked in support for shadow passwords.
-	#	- added friendly warnings from cracklib.
-	#	- some other misc. stuff.
-	# (05 Nov 2003) -taviso@gentoo.org
 	unpack ${A}
+
+	# 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
 	cd ${S}; epatch ${FILESDIR}/skey-1.1.5-gentoo.diff.gz
+
+	# glibc 2.2.x does not define LOGIN_NAME_MAX #33315
+	# 	(12 Nov 2003) -taviso@gentoo.org
+	cd ${S}; epatch ${FILESDIR}/skey-login_name_max.diff
 }
 
 src_compile() {