Adding glibc2.4 patch for old version wrt bug #126259

Package-Manager: portage-2.1_pre10-r3

4 files changed, 37 insertions, 13 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 876d1a1de3be..d1a196ae715f 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.179 2006/05/06 13:18:56 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.180 2006/05/06 13:49:41 jokey Exp $
+
+  06 May 2006; Markus Ullmann <jokey@gentoo.org>
+  +files/openldap-2.1.30-glibc24.patch, openldap-2.2.28-r4.ebuild:
+  Adding glibc2.4 patch for old version wrt bug #126259
 
   06 May 2006; Markus Ullmann <jokey@gentoo.org> openldap-2.3.21-r1.ebuild:
   Modified Version-Tag checker and added some skip option wrt bug #132246
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 391f8be3635c..bc6affc993cc 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -45,6 +45,10 @@ AUX openldap-2.1.30-db40.patch 718 RMD160 13d21287d7ad881ba28d42deea507dbe973a0d
 MD5 c58db81c8d7084a9abf48747134da0a8 files/openldap-2.1.30-db40.patch 718
 RMD160 13d21287d7ad881ba28d42deea507dbe973a0d5b files/openldap-2.1.30-db40.patch 718
 SHA256 4c68a8b052968dd9b7fc823144fd3f2b0b1d686ce5d8899d27ad3e8d99301cc2 files/openldap-2.1.30-db40.patch 718
+AUX openldap-2.1.30-glibc24.patch 376 RMD160 eccf72b0d4eb6fff0de91889e735bf5ff3bc07f4 SHA1 2199dc3138a3d6877d43360fc89ccf99913f494a SHA256 8310792c201d98e2b2a55d62882098726633bfbc8ddef6af1cf3a5a1485612d1 size 376
+MD5 624d84051bd96193e20f66bbb112b85f files/openldap-2.1.30-glibc24.patch 376
+RMD160 eccf72b0d4eb6fff0de91889e735bf5ff3bc07f4 files/openldap-2.1.30-glibc24.patch 376
+SHA256 8310792c201d98e2b2a55d62882098726633bfbc8ddef6af1cf3a5a1485612d1 files/openldap-2.1.30-glibc24.patch 376
 AUX openldap-2.1.30-m4_underquoted.patch 3916 RMD160 8190e85d91c3f6e64ceed786581615c765176a4d SHA1 0b63f3b5f082dddf56841513802d97c0e0edbab0 SHA256 b48f5a56ce2f26d117d8ca491bb22229fc25d05808bef1c1fabc98b5164d87d0 size 3916
 MD5 a240004c097944335b15bcb489661c2c files/openldap-2.1.30-m4_underquoted.patch 3916
 RMD160 8190e85d91c3f6e64ceed786581615c765176a4d files/openldap-2.1.30-m4_underquoted.patch 3916
@@ -133,10 +137,10 @@ EBUILD openldap-2.2.28-r3.ebuild 13717 RMD160 841dd06f816c4d266a638ef9e056fe48dd
 MD5 d4c182a4f028e7ad79cfc127f3a2632d openldap-2.2.28-r3.ebuild 13717
 RMD160 841dd06f816c4d266a638ef9e056fe48ddacd698 openldap-2.2.28-r3.ebuild 13717
 SHA256 45465cbe50c9815d4bb251c90ce9fcd528774a3b7b7272c7a57e95c77b620a36 openldap-2.2.28-r3.ebuild 13717
-EBUILD openldap-2.2.28-r4.ebuild 14856 RMD160 cee7261ad9b819187e0a96e4db57ac33f7cc9567 SHA1 ab2d7657adc476d5cb7eb156d1c0c999799caaad SHA256 da400cd6cf66d08911b831a71507c86827ac924521cd9d384bb93fcae489acf5 size 14856
-MD5 bfbb723e1d3af9439454c3e320feb0d0 openldap-2.2.28-r4.ebuild 14856
-RMD160 cee7261ad9b819187e0a96e4db57ac33f7cc9567 openldap-2.2.28-r4.ebuild 14856
-SHA256 da400cd6cf66d08911b831a71507c86827ac924521cd9d384bb93fcae489acf5 openldap-2.2.28-r4.ebuild 14856
+EBUILD openldap-2.2.28-r4.ebuild 15039 RMD160 877596a4decb66f573a27d037e44cccc0e2f16f8 SHA1 689a6f63a98593fd93a3d058aa0985aa795458c3 SHA256 e657a90c473a982dd42ed088c2ccd8ad1c3c7d58f06415f2c7670e907f6e8c62 size 15039
+MD5 e93204fdc9325e31a07f8c3a435f087b openldap-2.2.28-r4.ebuild 15039
+RMD160 877596a4decb66f573a27d037e44cccc0e2f16f8 openldap-2.2.28-r4.ebuild 15039
+SHA256 e657a90c473a982dd42ed088c2ccd8ad1c3c7d58f06415f2c7670e907f6e8c62 openldap-2.2.28-r4.ebuild 15039
 EBUILD openldap-2.3.21-r1.ebuild 13339 RMD160 c26aa553cbdded6cac522d7c47ab33704a4a7590 SHA1 43ecedc2300a61d621a68616a2b38b98157b3637 SHA256 74c6332477466ab8e1cd46a844c087f68c11aeb181b185f89535b4777e0c08f8 size 13339
 MD5 b153178085f6f9eedc149fc8f63fedf7 openldap-2.3.21-r1.ebuild 13339
 RMD160 c26aa553cbdded6cac522d7c47ab33704a4a7590 openldap-2.3.21-r1.ebuild 13339
@@ -145,10 +149,10 @@ EBUILD openldap-2.3.21.ebuild 12948 RMD160 afa1c92a3512191c0739115194cab97bf8019
 MD5 d5546d9d6f63b754dbf3f07a4871d041 openldap-2.3.21.ebuild 12948
 RMD160 afa1c92a3512191c0739115194cab97bf8019aef openldap-2.3.21.ebuild 12948
 SHA256 ff59e7728f5a2ac0ae8ff873ae0d04bf7941785872b467e598f6763227ec6b85 openldap-2.3.21.ebuild 12948
-MISC ChangeLog 32003 RMD160 544e6c6526aa1ceb9e278cdab7d6205ddd9ed259 SHA1 5ac7814462ecb4a638fc9124eef3178e1547cf73 SHA256 6c7b465b99b3072b7dbad091db82cc880c751feea49d31855fe374d9dcef669b size 32003
-MD5 e5182dd822aacc6593a8b4556b362b62 ChangeLog 32003
-RMD160 544e6c6526aa1ceb9e278cdab7d6205ddd9ed259 ChangeLog 32003
-SHA256 6c7b465b99b3072b7dbad091db82cc880c751feea49d31855fe374d9dcef669b ChangeLog 32003
+MISC ChangeLog 32176 RMD160 fd28ef83325dadb72757c08b03006e487701a652 SHA1 6b41f0b2151c15b026fd56fcfa0f303699e11c87 SHA256 482c1cd331755179ef0ab70a6558153f3577de8c6e05eaa8610dd6d445079bd9 size 32176
+MD5 67327593d1fb278f3e16b87db3cecab8 ChangeLog 32176
+RMD160 fd28ef83325dadb72757c08b03006e487701a652 ChangeLog 32176
+SHA256 482c1cd331755179ef0ab70a6558153f3577de8c6e05eaa8610dd6d445079bd9 ChangeLog 32176
 MISC metadata.xml 503 RMD160 7888826d012217d4828733015fc1b62d95beb1c1 SHA1 aa81832c2d31f74e3d82978b127e039955de05e6 SHA256 52d773827d4d35086b58b24837b2e90eb3479e6a1fd5cce81c60a33c912d8722 size 503
 MD5 e630c2183fdc9397de2386d887a0e252 metadata.xml 503
 RMD160 7888826d012217d4828733015fc1b62d95beb1c1 metadata.xml 503
@@ -183,7 +187,7 @@ SHA256 e00ac18f0faf58d41a73109775715224d49093c682e31cf0d3236468918974c7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEXKF0z974XjDVpbkRAmX4AKCLsyqttYU8ZfW2Rj95+nH1pop9FACfavAU
-1ZqXgzZ22Ot7vKu0nLEQS8A=
-=cCSJ
+iD8DBQFEXKilz974XjDVpbkRAmEiAJ9+fw6UqaAszK+iryl5EgdYAq4lzQCgteyy
+THwnqeaqpv60F0Q92G/jduI=
+=83K9
 -----END PGP SIGNATURE-----
diff --git a/net-nds/openldap/files/openldap-2.1.30-glibc24.patch b/net-nds/openldap/files/openldap-2.1.30-glibc24.patch
new file mode 100644
index 000000000000..6e0d8d107c91
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.1.30-glibc24.patch
@@ -0,0 +1,12 @@
+--- openldap-2.2.28/libraries/libldap/init.c	2005-01-20 18:01:01.000000000 +0100
++++ openldap-2.2.28-patch/libraries/libldap/init.c	2006-03-14 17:17:13.000000000 +0100
+@@ -553,7 +553,7 @@
+ 		if( user == NULL ) user = getenv("LOGNAME");
+ 
+ 		if( user != NULL ) {
+-			gopts->ldo_def_sasl_authcid = user;
++			gopts->ldo_def_sasl_authcid = LDAP_STRDUP(user);
+ 		}
+     }
+ #endif
+
diff --git a/net-nds/openldap/openldap-2.2.28-r4.ebuild b/net-nds/openldap/openldap-2.2.28-r4.ebuild
index 77b4dfca2b24..7ffed775e85a 100644
--- a/net-nds/openldap/openldap-2.2.28-r4.ebuild
+++ b/net-nds/openldap/openldap-2.2.28-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.28-r4.ebuild,v 1.3 2006/04/20 06:59:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.28-r4.ebuild,v 1.4 2006/05/06 13:49:41 jokey Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib libtool
 
@@ -181,6 +181,10 @@ src_unpack() {
 	EPATCH_OPTS="-p0 -d ${OLD_S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf-archived-fix.patch
 	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.28-autoconf-archived-fix.patch
 
+	# make autoconf-archive compatible
+	EPATCH_OPTS="-p1 -d ${OLD_S}" epatch ${FILESDIR}/${PN}-2.1.30-glibc24.patch
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.1.30-glibc24.patch
+
 	# add cleartext passwords backport bug #112554
 	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.28-cleartext-passwords.patch