Add patch by Mark Wagner to fix skey support #69741 by Thomas Matthijs.

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 2ad1e9f6abe7dfd7dea0bb435439327526cc8d8d..fde0ddb63a2ccd1424e35e850ae96dd39f179370 100644 (file)
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.75 2004/10/29 02:59:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.76 2004/11/02 02:21:28 vapier Exp $
+
+  01 Nov 2004; Mike Frysinger <vapier@gentoo.org> shadow-4.0.5.ebuild, 
+  +files/shadow-4.0.5-skey.patch:
+  Add patch by Mark Wagner to fix skey support #69741 by Thomas Matthijs.
 
   28 Oct 2004; Mike Frysinger <vapier@gentoo.org> shadow-4.0.4.1-r4.ebuild,
   shadow-4.0.5.ebuild, +files/shadow-4.0.4.1-passwd-typo.patch:

diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 65a5d5d83c5947da805b164727fb9b67dd5cd978..45fdd6aa9fdc0da5d7592fb9cbdda4a0df270544 100644 (file)
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 45f252469142b03dec4a9a581c3df5a2 ChangeLog 14412
+MD5 4146c74cbcd3fbbb047ec635c2c78aca ChangeLog 14593
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 23ef7363bf5ffa1d0f3343ff2a618e5d shadow-4.0.4.1-r4.ebuild 5943
-MD5 d612d0da474849d68dfa53c55d50e200 shadow-4.0.5.ebuild 4902
+MD5 74b8f9665c93a2a9f36abeb43e4ff293 shadow-4.0.5.ebuild 4991
 MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r4 67
 MD5 2d2faa6b9a837f9319de52a780485743 files/securetty 243
 MD5 058f760e522ab65e270293003805fe61 files/shadow-4.0.4.1-userdel-missing-brackets.patch 380
@@ -12,6 +12,7 @@ MD5 a99f871c88548d503bad935d2aa6f412 files/shadow-4.0.4.1-nls-manpages.patch 355
 MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5 66
 MD5 c31db5c71b0cdfca75346abc2887aa02 files/shadow-4.0.5-nls-manpages.patch 362
 MD5 38ab75648a10b5d49d2aaffab77d787e files/shadow-4.0.5-login.defs.patch 753
+MD5 636f233fa173a998195016c3808173d4 files/shadow-4.0.5-skey.patch 395
 MD5 aaf16ddabef285df169e37254b13561c files/shadow-4.0.4.1-selinux.diff 4296
 MD5 201f1321262da41ccd1a0283216ae9a7 files/shadow-4.0.4.1-su-pam_open_session.patch 4886
 MD5 bb55107c3a9354ef2d1977547fdb5a83 files/shadow-4.0.4.1-useradd-manpage-update.patch 958
@@ -29,7 +30,7 @@ MD5 1baa646400c4a596290e9d4b9e1c09b2 files/pam.d/system-auth-1.1 491
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBhk3iHTu7gpaalycRAgHJAKDc+hUE84uLI9YGiSl4zObcTnkr4QCg8ORn
-gxokEtTOewJjafE2/Fy0mG0=
-=8bZL
+iD8DBQFBhu9LHTu7gpaalycRAiAvAJ9DIxHcSKVO0gXKLOaDuS6aJsUvNgCfSxQT
+5S/BPe2sfT4MGjfCzke/5z4=
+=t0it
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/shadow/files/shadow-4.0.5-skey.patch b/sys-apps/shadow/files/shadow-4.0.5-skey.patch
new file mode 100644 (file)
index 0000000..14626b0
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.5-skey.patch
@@ -0,0 +1,11 @@
+--- shadow-4.0.5.orig/lib/pwauth.c     2004-11-01 12:14:40.254524181 -0800
++++ shadow-4.0.5/lib/pwauth.c  2004-11-01 12:15:13.426532987 -0800
+@@ -152,7 +152,7 @@
+        * If there is no SKEY information we default to not using SKEY.
+        */
+ 
+-      if (skeychallenge (&skey, user, challenge_info) == 0)
++      if (skeychallenge (&skey, user, challenge_info, sizeof(challenge_info)) == 0)
+               use_skey = 1;
+ #endif
+ 

diff --git a/sys-apps/shadow/shadow-4.0.5.ebuild b/sys-apps/shadow/shadow-4.0.5.ebuild
index 6d49fa2dda05b7bfbe5849890115996f5ff4e22a..5d2b34bb7b39f8ca91ca4c33799968c29e0b7f84 100644 (file)
--- a/sys-apps/shadow/shadow-4.0.5.ebuild
+++ b/sys-apps/shadow/shadow-4.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.5.ebuild,v 1.4 2004/11/01 14:52:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.5.ebuild,v 1.5 2004/11/02 02:21:28 vapier Exp $
 
 inherit eutils libtool gnuconfig flag-o-matic
 
@@ -49,6 +49,9 @@ src_unpack() {
        # fix small graphical typo in passwd.1 #68150
        epatch ${FILESDIR}/shadow-4.0.4.1-passwd-typo.patch
 
+       # skeychallenge call needs updating #69741
+       epatch ${FILESDIR}/shadow-${PV}-skey.patch
+
        # Allows shadow configure detect newer systems properly
        gnuconfig_update
        elibtoolize