Fix implicit strsep() prototype in x509 code #258795 by orlin.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 27 insertions, 8 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 5ea647536270..422b3dbf0969 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.328 2009/02/08 17:14:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.329 2009/02/14 07:46:38 vapier Exp $
+
+  14 Feb 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/openssh-5.1_p1-x509-headers.patch, openssh-5.1_p1-r3.ebuild:
+  Fix implicit strsep() prototype in x509 code #258795 by orlin.
 
   08 Feb 2009; Mike Frysinger <vapier@gentoo.org> openssh-4.4_p1-r6.ebuild,
   openssh-4.5_p1-r2.ebuild, openssh-4.6_p1-r4.ebuild,
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 637ea1a4484b..4d95caa5d9c6 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -24,6 +24,7 @@ AUX openssh-5.1_p1-better-ssp-check.patch 746 RMD160 b7facd50af120db7da8af5bfdc4
 AUX openssh-5.1_p1-escaped-banner.patch 554 RMD160 90ca69b68e774d9640fc3d9e5bac2bf1e94fd706 SHA1 fee652862c4050c3275d258791bdf9e2a12a6083 SHA256 31ca766d4bc7b5cb45546cc85ca088687b6436915d404ecc2d38bba511f4ab8d
 AUX openssh-5.1_p1-ldap-hpn-glue.patch 1666 RMD160 5fbcc5c60f9a8f44967c258749e2379295015ae2 SHA1 dfdf6fd489a1a2db4cc25d7fc49d31769d48c07d SHA256 f92037859510902f7bc7b97c92dc989614e0d2c07e5812b4d787b38892f3a6a3
 AUX openssh-5.1_p1-null-banner.patch 1411 RMD160 b3034cecc1d74973eed05c8f6ef580cab7ed1a7e SHA1 b5173ac7714c185abbc256b44a80e1dd21687f9b SHA256 7a682f19d1f60bf2c8cde330504fa22306c9ab2ed6d2b7fd455fb6d851a1f423
+AUX openssh-5.1_p1-x509-headers.patch 248 RMD160 e0085a315ac4a766527e4b44095f9520de79d7a5 SHA1 1d39aea309013ce81de4f03db569c838453176a3 SHA256 3d882e3c0701387c81b87aead5635d3d4c1962dbe78f3407cd6de73913c35824
 AUX openssh-5.1_p1-x509-hpn-glue.patch 3373 RMD160 024d7f17972907a591a067bfd0883ba0c0b297d0 SHA1 1b2ad74448c695bedee22a48d0bca879605c23d0 SHA256 0d9b10881a9207e5feec7429693b34fa56464e2c9e4fea1540d258ee2000e37a
 AUX openssh-securid-1.3.1-updates.patch 445 RMD160 b1db3dfa75f7e03d0dff41e85e285f8b749f27f0 SHA1 757a8b0c1586fdcbff0762b39a52f1b315d4b110 SHA256 11c95cc508d20c8eb1e8faa0d2b5e68346cbb93db8fb560cfa8b4d2c0d1104b3
 AUX sshd.confd 396 RMD160 029680b2281961130a815ef599750c4fc4e84987 SHA1 23c283d0967944b6125be26ed4628f49abf586b2 SHA256 29c6d57ac3ec6018cadc6ba6cd9b90c9ed46e20049b970fdcc68ee2481a2ee41
@@ -66,14 +67,14 @@ EBUILD openssh-5.0_p1-r1.ebuild 5184 RMD160 2eb4fa43b1c54fc2145cd0440e15bd26d6a4
 EBUILD openssh-5.0_p1-r2.ebuild 5232 RMD160 3b0247e5b71cb12720f8746dfa9f7d50c0f55f06 SHA1 eafb35830abcc0458c73ba7a73530e21a0c64290 SHA256 fa8f82eafb1d7d9d4b876855735b1e4d042d961c44cbcab1586e52ffdda9f59d
 EBUILD openssh-5.1_p1-r1.ebuild 5355 RMD160 de2f37ad0c89c780393962f23ffc6af917365233 SHA1 598dc4b486366be2f8a307fa0a0ae55f618665ca SHA256 724324fb7d58e8ec910dc3cbba964e49fe032516f078236ba5b7c18b863d87b2
 EBUILD openssh-5.1_p1-r2.ebuild 5465 RMD160 93d400272ebf03451cc0cba04d8709f0bcdac81b SHA1 eee5167e8a063beab018511788b803715e734b45 SHA256 f9c3da39778e8ebb408f982f571205f7c950e9854d22d5848f699338783241ba
-EBUILD openssh-5.1_p1-r3.ebuild 5725 RMD160 d5a3cdb30a080671003032adcd45b26321dfec8a SHA1 25f421d6c5c6341341f9398ec4a8a88747a81c0e SHA256 21d01f1421a59ad74f85c6d18cfe08221582d03a728829f29be72bbd9df63973
+EBUILD openssh-5.1_p1-r3.ebuild 5735 RMD160 4ce7ec18877d6bec6f5370a00ef82790ad87dbd9 SHA1 63e87f68db66e7b5dc39f08317d05284faeb9219 SHA256 acec83baf78e4ac4cb2fa3c2a5064ae00164581b0d8c1aba43e7dc5cec0cddde
 EBUILD openssh-5.1_p1.ebuild 5244 RMD160 f12d52fd5154fa0ebc5c193e0568d68be7d1e647 SHA1 03e98d46871e554b80d3fc4f56c8ff96df25df50 SHA256 8f28f524e5102cf3511080e9ddd3c40b83b579f6973fb4a1e3b7e5e197c7860d
-MISC ChangeLog 51760 RMD160 8ff78c426dfe0eb4fddf62c53c7a213f309de6cc SHA1 42ce8421ef4b96cb4fd8e03db7e8a1ff4c1d4069 SHA256 74bd30bc5a92d0d2a09abeb6ec53eb5f24acc5f2ea6e44945b0dc41dbd763305
+MISC ChangeLog 51946 RMD160 467fa482b93b6d9f2f070d25a8f79ce7a9151afb SHA1 a62f47f61846a730665ce7a69db8cd979478a235 SHA256 7501e518c397cefaba566c89b368bc9fa4fe26e2dcbabbe9dd3221fd58db0588
 MISC metadata.xml 1642 RMD160 1033f840e3d22ca74174a8f3f9bbd0e71ad72300 SHA1 6f84977e0ec3cf9631bc6133e0c0c8194682b465 SHA256 dbcd0839aab61ac4e388f2e839ea7c3fa0157ef5cdd2bb81fd8f8448626ff9b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkmPEvkACgkQn/5bYzqsSmGg7gCfagEe8WKOhWAsK5UfTc7uySHt
-9fIAnA3WKWmuTUYDDNLz1DLNDj2pVcIn
-=y9Nc
+iEYEARECAAYFAkmWduMACgkQn/5bYzqsSmFKngCfTpnnYsPGOInIFPu8PhN2MW7d
+PLUAn111K+Qw8uqIHTVJvzUSqpLQnLIu
+=8tx5
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/openssh-5.1_p1-x509-headers.patch b/net-misc/openssh/files/openssh-5.1_p1-x509-headers.patch
new file mode 100644
index 000000000000..b572c2a46e13
--- /dev/null
+++ b/net-misc/openssh/files/openssh-5.1_p1-x509-headers.patch
@@ -0,0 +1,14 @@
+need strsep() prototype for 64bit systems
+
+http://bugs.gentoo.org/258795
+
+--- a/auth2-pubkey.c
++++ b/auth2-pubkey.c
+@@ -54,6 +54,7 @@
+ #endif
+ #include "monitor_wrap.h"
+ #include "ssh-x509.h"
++#include <string.h>
+ #include "misc.h"
+ 
+ /* import */
diff --git a/net-misc/openssh/openssh-5.1_p1-r3.ebuild b/net-misc/openssh/openssh-5.1_p1-r3.ebuild
index 5245aaddb139..5e365b5171ce 100644
--- a/net-misc/openssh/openssh-5.1_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-5.1_p1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.1_p1-r3.ebuild,v 1.3 2009/02/08 17:14:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.1_p1-r3.ebuild,v 1.4 2009/02/14 07:46:38 vapier Exp $
 
 inherit eutils flag-o-matic multilib autotools pam
 
@@ -74,7 +74,7 @@ src_unpack() {
 		-e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
 		pathnames.h || die
 
-	use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${PN}-5.1_p1-x509-hpn-glue.patch
+	use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${PN}-5.1_p1-x509-{headers,hpn-glue}.patch
 	use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch
 	if ! use X509 ; then
 		if [[ -n ${LDAP_PATCH} ]] && use ldap ; then