Fix building with GCC 4.4+ wrt #280988.

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

4 files changed, 22 insertions, 4 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index edf3ae0ca429..4b0881b756cf 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.346 2009/07/28 21:49:10 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.347 2009/08/10 10:32:18 ssuominen Exp $
+
+  10 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  openldap-2.4.17-r1.ebuild, +files/openldap-2.4.17-gcc44.patch:
+  Fix building with GCC 4.4+ wrt #280988.
 
   28 Jul 2009; Robin H. Johnson <robbat2@gentoo.org>
   -openldap-2.3.39-r2.ebuild, -openldap-2.3.40-r1.ebuild,
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index d941c149a516..a46e6b5190bd 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -10,6 +10,7 @@ AUX openldap-2.4.11-libldap_r.patch 515 RMD160 aa778bad59d498601bab84e215b2bcb6d
 AUX openldap-2.4.15-ppolicy.patch 418 RMD160 5b32da96fbc6002a2d464ea765ad72ebf23727f5 SHA1 cdd7c2bdfb0011561965a39f99e46cbb9f266aba SHA256 98269fa1e8a1a0e62dad9acd36fd9a33614fca9a5830d6e7e606db8eb7f85de5
 AUX openldap-2.4.17-contrib-smbk5pwd.patch 2046 RMD160 8e3834159767183535efa2144631e4cdfcd04a11 SHA1 6af3ca3f212414411e05c8766297b74573c103bc SHA256 81c146b2ee96ef03c169665f366ac25ebf93e2f1abb8ff41dc8741cb0927b813
 AUX openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch 3542 RMD160 7e17304b2b85e2dec12e0bc49b82e35443cc703e SHA1 7a25d0002581ae6f78ffe498c3e05eef0119f7a6 SHA256 31e816eb9f3b52f5f9d183f82adebff75892e45e764187e579a92204c90889cb
+AUX openldap-2.4.17-gcc44.patch 509 RMD160 07c1b8400e1b24cb8f20f2647b1354d2b28f653d SHA1 5df5a165acec74667f5989f291aedd958be56358 SHA256 33345882f601050ecaa6bb3dd7458e6b5f8e3684345847f7a53d4a1b0f514bda
 AUX slapd-confd 436 RMD160 764d5e2915d9af33fd1db2489ceac6d953750984 SHA1 a16b4674b45ac1e1c8a8f9e84ad0de519c81aa11 SHA256 1ccb8a3b78b65b125b24779dd065cf8000e2d5e4da267bb0a892e730edd2055d
 AUX slapd-initd 609 RMD160 3e1daa2bbbbec78aad265a1c4190098730a4234d SHA1 56d5f1d1f59e37bbcef2399847328c7963694f0a SHA256 840f984031b1fc84d4c6ba59c5ba0de5794be596215f0089c7739dba88d610d5
 AUX slurpd-initd 494 RMD160 9f3a06bcab2e4ce8e66783af506d26595bbbdcd2 SHA1 8ab66a984510fa91755cbcbac29883cea1435db7 SHA256 b23e010f701620ec34c39cd215891c7c0afc773341392a1e762e84166d9863ff
@@ -22,7 +23,7 @@ EBUILD openldap-2.3.41.ebuild 17739 RMD160 c3a8d5aebe0ca5e46add8ea029ef9dc88c01b
 EBUILD openldap-2.3.43-r1.ebuild 17925 RMD160 e131fd9d5f82be7365b7b02cc77e1e68fa3b752a SHA1 3861f68a838e36e961b17ebc9098c51050230021 SHA256 fbc963d685c59ead0469d52e6481393b834bdfeefe16abc0d23a796e50794a11
 EBUILD openldap-2.3.43.ebuild 17845 RMD160 14dc97d9b79dbde77f124eeeebd162b5ea61228a SHA1 46235e707a78645ddd490281e4d738a1773af676 SHA256 074ee4f990b6a08817f97381cbc59257a71ec2c9c8e6fff74839b69e1a7ac896
 EBUILD openldap-2.4.16.ebuild 15152 RMD160 54d5cced13910c8f81edc117a3dfb8db86248341 SHA1 a590c2e7aaf4a04459a76e755d26cb3747156305 SHA256 053f2dff9a03af6d2994d61fe01f637245e09744d3fc3a0bd62c7630d7004783
-EBUILD openldap-2.4.17-r1.ebuild 17386 RMD160 4c91f7898750b30a71eb39304966a9851b106cd6 SHA1 efb87a40cf044056779b4d412a73d4546f3e9997 SHA256 0855d056b5b2b536d5dcf614efa491821e302522de00a6eac332bc83dd169e65
+EBUILD openldap-2.4.17-r1.ebuild 17426 RMD160 e93e345e16e46042be020464a290fa37ebb9b183 SHA1 0ebd6c87ae7eb56abcf73428355a23129f7ce580 SHA256 058844706d293ecf2de9a539dbb52574c0e270908daa50ae2e3940e059377c66
 EBUILD openldap-2.4.17.ebuild 15150 RMD160 c5fec4fe19eee4138f8fa54cb24286fce2f140a4 SHA1 3266854c75d30053bbe85d2243b2f6ecbdcb750f SHA256 4c8cbfcfd36a773bc0eb8084b48ba4fdec6d5ae6483805a870642c92640e1b3f
-MISC ChangeLog 59556 RMD160 e74a7bdcdb974d038441a2e3d2700296bec523bd SHA1 aa7975545820f11a40d574a1805fc899f7d5dff3 SHA256 7794718cd8493db652b389a8c4c6e6955aafd7a25fcd65d9274beea26bd3d815
+MISC ChangeLog 59720 RMD160 cffed80d46ed5f620e4a765f8b5366d7102e19c6 SHA1 2525d1f4dcb49a48b664a7901df89e48724bea6e SHA256 a367a9a1c0bb96c5c8f2372f2439d812bdeb5503de3ae30edc9160ebc7ab07e3
 MISC metadata.xml 493 RMD160 3fd70a0f5e5b400cce6f75e477c8c9eaf0244ff8 SHA1 324691bfdc993bd6de2fff7cbfc10cfad567d32d SHA256 d23200f9c2f9e95e5fa32808c597df2951cd5e88ca9c519c9d5186bc42b0981e
diff --git a/net-nds/openldap/files/openldap-2.4.17-gcc44.patch b/net-nds/openldap/files/openldap-2.4.17-gcc44.patch
new file mode 100644
index 000000000000..aa7fe7ac35f6
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.17-gcc44.patch
@@ -0,0 +1,11 @@
+diff -ur openldap-2.4.17.orig/contrib/ldapc++/src/SaslInteractionHandler.cpp openldap-2.4.17/contrib/ldapc++/src/SaslInteractionHandler.cpp
+--- openldap-2.4.17.orig/contrib/ldapc++/src/SaslInteractionHandler.cpp	2008-04-15 02:09:26.000000000 +0300
++++ openldap-2.4.17/contrib/ldapc++/src/SaslInteractionHandler.cpp	2009-08-10 13:21:24.000000000 +0300
+@@ -13,6 +13,7 @@
+ #include <termios.h>
+ #endif
+ 
++#include <stdio.h>
+ #include <string.h>
+ #include "SaslInteractionHandler.h"
+ #include "SaslInteraction.h"
diff --git a/net-nds/openldap/openldap-2.4.17-r1.ebuild b/net-nds/openldap/openldap-2.4.17-r1.ebuild
index 329e84b0473c..5ece295f57eb 100644
--- a/net-nds/openldap/openldap-2.4.17-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.17-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-nds/openldap/openldap-2.4.17-r1.ebuild,v 1.2 2009/07/29 00:21:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.17-r1.ebuild,v 1.3 2009/08/10 10:32:18 ssuominen Exp $
 
 EAPI="2"
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
@@ -176,6 +176,8 @@ src_prepare() {
 	sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \
 		"${S}"/include/ldap_defaults.h
 
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+
 	epatch \
 		"${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch \
 		"${FILESDIR}"/${PN}-2.4.15-ppolicy.patch