Fix building with gcc-4.7 wrt #420959 by Tiziano Müller

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 48 insertions, 4 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 00c3f90a8964..69c16e411d50 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.418 2012/05/27 07:22:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.419 2012/06/13 11:06:45 xarthisius Exp $
+
+  13 Jun 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/openldap-2.4.31-gcc47.patch, openldap-2.4.31-r1.ebuild:
+  Fix building with gcc-4.7 wrt #420959 by Tiziano Müller
 
 *openldap-2.4.31-r1 (27 May 2012)
 
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 3c559cac0112..cec985962f04 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX DB_CONFIG.fast.example 746 RMD160 03d179d1c58d695c442eb5e3e69c245f3c2f2358 SHA1 c76a2a9f346a733ed6617d42229b434ce723c59e SHA256 69fc9aa6e4f0b888bc02d3f75642fe1ebf9345c685257a5c1236b2e79ed56e0b
 AUX openldap-2.2.14-perlthreadsfix.patch 614 RMD160 6e868aa5a5cc4e80c0340af25d18d010b342ed15 SHA1 3bb05c7ed511e8464331619ce23064d236a5fe82 SHA256 bb719cc1fed47ff0f111c960f3295781ae6f0d9e98b4266a87751044b4bb3175
 AUX openldap-2.2.6-ntlm.patch 5011 RMD160 317f4b6dc9589826739a14a8ad7200ed287c87be SHA1 29b8e9c4835235c976f026cd5883228b77581083 SHA256 1f7e766bcafb412ec336aad7e07295d6d62d2e2a62b6804b07b06a5056102243
@@ -16,6 +19,7 @@ AUX openldap-2.4.28-contrib-smbk5pwd.patch 1621 RMD160 3708b0709210b15cc93557fbb
 AUX openldap-2.4.28-fix-dash.patch 1101 RMD160 0931b1358eda252b216883fce1bfa9f17c8527de SHA1 c23694f8590b082ee8cfc6f7d10db8bc10b1e276 SHA256 fddaad5f49cce39bf5492bb1dda10f2ce83419c48f128fe536661dde703b5d1b
 AUX openldap-2.4.28-gnutls-gcrypt.patch 340 RMD160 69c2c7527aa3723fa24c6ed1895b4f83ea105902 SHA1 af09a9e41adcc2d307c1758fc76b4cb543dac455 SHA256 26dc29a502e45f6b1003674c1ef5bc6c79b71d00fc9b2fc7a145291a314370c0
 AUX openldap-2.4.30-contrib-samba4.patch 1639 RMD160 09967f517af46ce52f6a619ec2373933f7d15192 SHA1 00ad32c75cc82d25bf924fad0e12ea668e9c8500 SHA256 f47e416d8ef21dcfde6d0ecdace27063e8b20236f5d832675aa4efe222a5a69e
+AUX openldap-2.4.31-gcc47.patch 480 RMD160 eee9064d07ea67163daab5c97c10634b8a75e5e4 SHA1 db451f6b0490f16fe961cb280c4d1226bac79d6b SHA256 6a0bef52a8681e30c4be7c11df88f5c73d2ab90f0bbbb79c550b6174d3978060
 AUX openldap-2.4.6-evolution-ntlm.patch 5161 RMD160 abbeb8b17a9011c1bfc3af3215839910a5a6b0ca SHA1 44aa771890530edd63fefa45cf6bef33202dd352 SHA256 3b79d9afaa7c76ca20c5e7aa856dea49931741a1022ae6c3bb264c38f4c22edb
 AUX slapd-confd 614 RMD160 1b1909eb2d81e380b424a9c970199d6ffe231068 SHA1 955b45e018a59d185b19ea86bccd781d3524c069 SHA256 901044908fbbbbf333f7f0f1efccd1f0e213aa1a9156b3e659eaf0a0c7fdfc89
 AUX slapd-confd-2.4.28-r1 1072 RMD160 752fa2a79adde3f7d4c0709de2cbdc4383e30504 SHA1 9da7b859d89cc400b0b27a0da94b270423ddaf97 SHA256 5bca003ec3b67c7c78519aede1d82002579006ccfecce8f87b559df719f82e92
@@ -44,7 +48,24 @@ EBUILD openldap-2.4.25.ebuild 20075 RMD160 a0650378cc144123213b8b79216fcc05a890a
 EBUILD openldap-2.4.28-r1.ebuild 21969 RMD160 7d7467e6096663dacee316b35c80c99e01c5f9ef SHA1 8aaf5097abc3998fb48187f5b4c57bba80c88629 SHA256 83db82b990d2e1583557ae2e3ea35acb4e0160a97487b70ed229d0a1cd38a069
 EBUILD openldap-2.4.28.ebuild 20767 RMD160 fcddf524946dd34317338c071f4431cd1dc85379 SHA1 38fb73e9fdb22e47e4489f58f6d065af521d3b3b SHA256 e57fbab815cc9a0e0be2c71e14f82fb69df5fd8efcbcc4b46b8930c9025b6791
 EBUILD openldap-2.4.30.ebuild 21965 RMD160 9f36c58083871843f0cab99a392ab97a5238a9b4 SHA1 4a6ecb9d19075f87c873bc6249e68957d0f9d8a8 SHA256 b95fe173bce700c0a9bfd5b991c64385f21cdb27397e696702e670ec1f894e6e
-EBUILD openldap-2.4.31-r1.ebuild 22250 RMD160 10e7262ff2178ff4345948682f2f80ab98037398 SHA1 ffede53bc5bad1bdd89eed01cad7b924b9308ef3 SHA256 795434631ca97de0fc4ff056aff3579c83c2d4e8f32c94b67462ad0d71f2cb1a
+EBUILD openldap-2.4.31-r1.ebuild 22308 RMD160 954cca865a92c0ed7bba47966078268d1dcc778a SHA1 981dd5812e545148eb36ffa0f2c0c56359b586de SHA256 e2119da778f268dea2b6e7d43d4e4ab410cc9435c7cb1ddf757b7ff50ebca5a4
 EBUILD openldap-2.4.31.ebuild 22248 RMD160 8394e7d34abef66bd1fa57c5f1ea501d78be81b1 SHA1 bfb24dc570acc7bf7686c80d7760de69f4075cb2 SHA256 8f76f5f12a09c6031241049f882642d4b31ff21ae5fa326476390f02b48defeb
-MISC ChangeLog 73002 RMD160 c73f6f35ba69e5a2f94b6890033e59545e9ba0db SHA1 cff5b3daf9295847ac3fbfc278202fa891b241c5 SHA256 f9669b20b6cf9c943d7d18ae7a60fe3f4ba659a049b231b180f75adee1bf63dd
+MISC ChangeLog 73184 RMD160 f6a5fc1249eb4e538f2e5f2bf22fc0952c531d27 SHA1 22c4c7962269723dfc6665a8cde71b1887cf5ba9 SHA256 b26cfb4c8bbdd2835363d4aa8a1a86427339c3bf544d19be0dfa4d05319bc992
 MISC metadata.xml 556 RMD160 14eae07812da4eecd05e467d1dccf841e6e16be6 SHA1 fa4c8d1aa03dd6bb9c27a7758fbaba5355cfe590 SHA256 405d4cd6f15d8495d0c7365f7b7d6bda9b82775d7e157339f3a6e92d46eed2c8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJP2HRxAAoJEF0huFKJUZL5RkMP/1QccFsu49j8koGhnOnkrtVG
+WZvlctGzcEssP45sd2pf5CJ5vijk4AHafL75htvyjTRQ6Q6fQeXWNDo89Itu1+6u
+932XSFU0p6ehMxHNaazcyetDIgGzMLHK0K5+I+KUc3J23PwZJQinZDbYgwdS/LUn
+3+MBtPQ6FfBeOVAhFuAAHCg4JUnHkgQX3WNvRn9KHgCUHYYLvHdicSZ5Jwgbv25K
+yogMEVXyXTgEAKf+c6nBSdjn50de+MNIeTq4XcdApF4fyBKPgWtfwuEuRy8cof0i
+5q54tNnVrORQwm1A7YN1fQ15TQoMJr7X/X88j0x8HP+UGOupyfn8SKN5ZnQ5f0D4
+q2jdnIEvZRXIkACyWHf9RUGCwcPBGH8uF8Sq9nchABeysQiSBK/BvD+smTC5m8m6
+5FZ7FXqwgcWbyV5+5by/6CQoEl8PhJkGkuZGPv9W+/bJTKymiKkL+RpshC7RiK+v
+olzeNuZTfkERAeypGUkT5/+6q60e5ATZb+Ffu8npOPwC1iVyv5Y7PM2O04WH7ML7
+pubikgQDtnWfu/6UTTYHPtvCfUh30e9VJQLiWysi8Ye6IQTbyVWGYr0wpB9TEpVv
+OtVjOEUIrsud/x4AGlFTY/2mQI60tvZQec6st87T9uuq1CNSY3xDSu5nAcEN70u9
+1kf4lavDlIg/MGZnhgaB
+=o7dL
+-----END PGP SIGNATURE-----
diff --git a/net-nds/openldap/files/openldap-2.4.31-gcc47.patch b/net-nds/openldap/files/openldap-2.4.31-gcc47.patch
new file mode 100644
index 000000000000..5b6af4b29564
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.31-gcc47.patch
@@ -0,0 +1,16 @@
+Fix building with gcc-4.7
+
+https://bugs.gentoo.org/show_bug.cgi?id=420959
+http://www.openldap.org/its/index.cgi/Incoming?id=7304;page=16  #ITS 7304
+
+Patch written by Kacper Kowalik <xarthisius@gentoo.org>
+--- a/contrib/ldapc++/src/SaslInteractionHandler.cpp
++++ b/contrib/ldapc++/src/SaslInteractionHandler.cpp
+@@ -16,6 +16,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <unistd.h>
+ #include "SaslInteractionHandler.h"
+ #include "SaslInteraction.h"
+ #include "debug.h"
diff --git a/net-nds/openldap/openldap-2.4.31-r1.ebuild b/net-nds/openldap/openldap-2.4.31-r1.ebuild
index 76741fcc631b..4e587b300d9e 100644
--- a/net-nds/openldap/openldap-2.4.31-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.31-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.31-r1.ebuild,v 1.1 2012/05/27 07:22:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.31-r1.ebuild,v 1.2 2012/06/13 11:06:45 xarthisius Exp $
 
 EAPI="4"
 
@@ -260,6 +260,9 @@ src_prepare() {
 	# unbreak /bin/sh -> dash
 	epatch "${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
 
+	# bug #420959
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+
 	cd "${S}"/build
 	einfo "Making sure upstream build strip does not do stripping too early"
 	sed -i.orig \