diff options
author | Mike Frysinger <vapier@gentoo.org> | 2004-11-02 02:21:28 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2004-11-02 02:21:28 +0000 |
commit | 170bfbb16bcb110e7dff21023d66384e63350bc0 (patch) | |
tree | 4bfe1c0a8ece96cae135974be4c194ea42eb7b97 /sys-apps | |
parent | bug #67968. (diff) | |
download | gentoo-2-170bfbb16bcb110e7dff21023d66384e63350bc0.tar.gz gentoo-2-170bfbb16bcb110e7dff21023d66384e63350bc0.tar.bz2 gentoo-2-170bfbb16bcb110e7dff21023d66384e63350bc0.zip |
Add patch by Mark Wagner to fix skey support #69741 by Thomas Matthijs.
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/shadow/ChangeLog | 6 | ||||
-rw-r--r-- | sys-apps/shadow/files/shadow-4.0.5-skey.patch | 11 | ||||
-rw-r--r-- | sys-apps/shadow/shadow-4.0.5.ebuild | 5 |
3 files changed, 20 insertions, 2 deletions
diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog index 2ad1e9f6abe7..fde0ddb63a2c 100644 --- 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/files/shadow-4.0.5-skey.patch b/sys-apps/shadow/files/shadow-4.0.5-skey.patch new file mode 100644 index 000000000000..14626b0a2330 --- /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 6d49fa2dda05..5d2b34bb7b39 100644 --- 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 |