Bug #266654: Fix LPK compile under uclibc due to missing include statement thanks to Bertrand Jacquin <beber@meleeweb.net>.

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

5 files changed, 29 insertions, 6 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 783a8103907b..322310a9271c 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,12 @@
 # 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.351 2009/05/18 06:29:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.352 2009/05/18 09:04:18 robbat2 Exp $
+
+  18 May 2009; Robin H. Johnson <robbat2@gentoo.org>
+  openssh-5.2_p1-r1.ebuild, openssh-5.2_p1-r2.ebuild,
+  +files/openssh-5.2p1-ldap-stdargs.diff:
+  Bug #266654: Fix LPK compile under uclibc due to missing include statement
+  thanks to Bertrand Jacquin <beber@meleeweb.net>.
 
   18 May 2009; Robin H. Johnson <robbat2@gentoo.org>
   openssh-5.2_p1-r2.ebuild:
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index bf38f0f6e3b1..e780bfb71a9a 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -9,6 +9,7 @@ AUX openssh-5.1_p1-ldap-hpn-glue.patch 1666 RMD160 5fbcc5c60f9a8f44967c258749e23
 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-5.2p1-ldap-stdargs.diff 252 RMD160 7bf89a0946446b43ce3026b7b01a9a4c637f388a SHA1 7b62038dc3060b1e77df213c85874ba80acd8f64 SHA256 97281375efa33e9ce70a55bfa95b6b426208175e7e3ff493012bc25d9b012f45
 AUX sshd.confd 396 RMD160 029680b2281961130a815ef599750c4fc4e84987 SHA1 23c283d0967944b6125be26ed4628f49abf586b2 SHA256 29c6d57ac3ec6018cadc6ba6cd9b90c9ed46e20049b970fdcc68ee2481a2ee41
 AUX sshd.pam 294 RMD160 1d4499a7de54188e51e87a240ec7a1b3b1af583d SHA1 4cd17fb40793fa9ca77ac93698129f2c8cafd7b8 SHA256 f01cc51c624b21a815fb6c0be35edc590e2e6f8a5ffbdcabc220a9630517972f
 AUX sshd.pam_include.2 156 RMD160 c4f6ba6e3a705eef63e571189e28de71e7d61178 SHA1 1223f7a43a5e124521d48852b2d23bb8ba0a788f SHA256 166136e27d653e0bf481a6ca79fecb7d9fa2fc3d597d041f97df595f65a8193c
@@ -29,7 +30,7 @@ DIST openssh-lpk-5.2p1-0.3.11.patch.gz 18116 RMD160 2ff9bdff19e0854a96063be1e058
 EBUILD openssh-5.0_p1-r2.ebuild 5232 RMD160 3b0247e5b71cb12720f8746dfa9f7d50c0f55f06 SHA1 eafb35830abcc0458c73ba7a73530e21a0c64290 SHA256 fa8f82eafb1d7d9d4b876855735b1e4d042d961c44cbcab1586e52ffdda9f59d
 EBUILD openssh-5.1_p1-r2.ebuild 5465 RMD160 64e7b382e6a1c664b4e6ad6d93199dc8ed1985e6 SHA1 e42626794f7af0f265073d1b89a96852b5af8cbb SHA256 0cddb635f824087f3c6d39738a990b6cccc263d8ce33983f5f01b937250bbdcf
 EBUILD openssh-5.1_p1-r3.ebuild 5735 RMD160 4ce7ec18877d6bec6f5370a00ef82790ad87dbd9 SHA1 63e87f68db66e7b5dc39f08317d05284faeb9219 SHA256 acec83baf78e4ac4cb2fa3c2a5064ae00164581b0d8c1aba43e7dc5cec0cddde
-EBUILD openssh-5.2_p1-r1.ebuild 6963 RMD160 47f302cdcb0a88797c25566c9fbba17666015607 SHA1 eb129a186d764adb599637e0ceb5a40aa0ef5798 SHA256 fa9f4839ef14b76b8ec2f8355465831bd7c0f98323e4bef7dbe2a8a81bbf6513
-EBUILD openssh-5.2_p1-r2.ebuild 8132 RMD160 1bf7ff0219076cf881f5e702ab8172c29e748af8 SHA1 2084075671242320d001915d902e07fb584acbe4 SHA256 67cdc7817da3303b57074c9f20e1f216ab555a9097ca80f4eec11e373eaea84d
-MISC ChangeLog 54867 RMD160 187d16ef5c29ecedf6d4b5363e592e55be7499b1 SHA1 309c4b0e1be64403a15acd2fc70344d9d99b59c7 SHA256 f66a8da286f60dbb06d0ff43a81cdd878c3e3f73624e7a0a91d43d0871bdfa83
+EBUILD openssh-5.2_p1-r1.ebuild 7046 RMD160 8116a694be2749acf19012071d92f43cff658b16 SHA1 15ce1638bba34e4afe76cc2ca2521e1e85a1c452 SHA256 24c99d66fe28e60f350864a91edef40f1c342b8330639197f6238e4cfe273ca9
+EBUILD openssh-5.2_p1-r2.ebuild 8215 RMD160 365822c26b90450a1525817019e7c4319040b575 SHA1 baa90a2dc9564d8f61e7d136455005ec2aaf6b29 SHA256 81a47a843703d495f3ca4b880903da0797e6e5780c39687997f7772d5e229434
+MISC ChangeLog 55145 RMD160 1de035ca7e74536e24e7872a9df1095cd674ac3c SHA1 4c3ec95443ad20665238bf8abbf310d673f8356e SHA256 87601888dadd18ca3066b7e99d2ee4e6ded1bc93df9944ad93fed3286c1e302b
 MISC metadata.xml 1641 RMD160 b5ae0d7b86c8dcb36414bc31da6fd22a807ced0b SHA1 31923a9db53fcad2b9cca72c39e733376bf6c501 SHA256 d34bb27c9f775ce973246c2a6b32ccd17d300de562920afbdd47312056cd8946
diff --git a/net-misc/openssh/files/openssh-5.2p1-ldap-stdargs.diff b/net-misc/openssh/files/openssh-5.2p1-ldap-stdargs.diff
new file mode 100644
index 000000000000..346d52719877
--- /dev/null
+++ b/net-misc/openssh/files/openssh-5.2p1-ldap-stdargs.diff
@@ -0,0 +1,10 @@
+--- ldapauth.c.orig	2009-04-18 18:06:38.000000000 +0200
++++ ldapauth.c	2009-04-18 18:06:11.000000000 +0200
+@@ -31,6 +31,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
++#include <stdarg.h>
+ 
+ #include "ldapauth.h"
+ #include "log.h"
diff --git a/net-misc/openssh/openssh-5.2_p1-r1.ebuild b/net-misc/openssh/openssh-5.2_p1-r1.ebuild
index 9957b21bd4f0..b66d9b161214 100644
--- a/net-misc/openssh/openssh-5.2_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-5.2_p1-r1.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.2_p1-r1.ebuild,v 1.10 2009/04/12 22:39:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r1.ebuild,v 1.11 2009/05/18 09:04:18 robbat2 Exp $
 
 inherit eutils flag-o-matic multilib autotools pam
 
@@ -92,6 +92,9 @@ src_unpack() {
 			epatch "${DISTDIR}"/${LDAP_PATCH}
 			# Not needed anymore of 0.3.11. Merged into the main patch.
 			#epatch "${FILESDIR}"/${PN}-5.1_p1-ldap-hpn-glue.patch
+
+			# Fixup per bug #266654
+			epatch "${FILESDIR}"/${PN}-5.2p1-ldap-stdargs.diff
 		fi
 		#epatch "${DISTDIR}"/openssh-5.0p1-gsskex-20080404.patch #115553 #216932
 	else
diff --git a/net-misc/openssh/openssh-5.2_p1-r2.ebuild b/net-misc/openssh/openssh-5.2_p1-r2.ebuild
index 311058173082..3a226891e8c9 100644
--- a/net-misc/openssh/openssh-5.2_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-5.2_p1-r2.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.2_p1-r2.ebuild,v 1.9 2009/05/18 06:29:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild,v 1.10 2009/05/18 09:04:18 robbat2 Exp $
 
 inherit eutils flag-o-matic multilib autotools pam
 
@@ -94,6 +94,9 @@ src_unpack() {
 			epatch "${DISTDIR}"/${LDAP_PATCH}
 			# Not needed anymore of 0.3.11. Merged into the main patch.
 			#epatch "${FILESDIR}"/${PN}-5.1_p1-ldap-hpn-glue.patch
+
+			# Fixup per bug #266654
+			epatch "${FILESDIR}"/${PN}-5.2p1-ldap-stdargs.diff
 		fi
 		#epatch "${DISTDIR}"/openssh-5.0p1-gsskex-20080404.patch #115553 #216932
 	else