Fix building with GLIBC 2.10+ wrt #277583.

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

4 files changed, 23 insertions, 15 deletions

diff --git a/net-mail/bincimap/ChangeLog b/net-mail/bincimap/ChangeLog
index 5a2e66af4309..5fee6b4d2721 100644
--- a/net-mail/bincimap/ChangeLog
+++ b/net-mail/bincimap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/bincimap
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/ChangeLog,v 1.50 2009/02/08 16:50:48 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/ChangeLog,v 1.51 2009/08/08 07:37:16 ssuominen Exp $
+
+  08 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  bincimap-1.2.13.ebuild, +files/bincimap-1.2.13-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #277583.
 
   08 Feb 2009; Markus Meier <maekke@gentoo.org> bincimap-1.2.13.ebuild:
   amd64/x86 stable, bug #245677
diff --git a/net-mail/bincimap/Manifest b/net-mail/bincimap/Manifest
index 998eaca7b785..ee2566b2078c 100644
--- a/net-mail/bincimap/Manifest
+++ b/net-mail/bincimap/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX bincimap-1.2-gcc43.patch 1750 RMD160 0f52a14c056a4ea76cdcb93a069d654d34270423 SHA1 ec98f1d1b30688e237bc1682a960fc02a0f4888b SHA256 e7894fbe54989dcff917c2b2b31dd94ef0e39997c90eadc04e2507e5756da870
 AUX bincimap-1.2.12-gentoo.diff 1438 RMD160 ca3988da8cda271a7b737528adbb0a503cd729d4 SHA1 9b360b00685668bbabef822d95a3a10cea201964 SHA256 e14792e7dc46937824cf79b692e760fef02a74c0b2fda44451f75946c8f9fb01
 AUX bincimap-1.2.13-gentoo.diff 1438 RMD160 1797ed8e70309b03aa8f7e102fb4f8ad4c3b5f0f SHA1 a037ff39c2873f918e61fac56f903820308a4956 SHA256 7c6c70dde65813a08edcad6044adc2d9c5829faaaa3bc5c7ff5c92d240c1a8d6
+AUX bincimap-1.2.13-glibc-2.10.patch 469 RMD160 c96da6eed7f6552b900a8031a6e678e87521420d SHA1 43af83a86dcf42d9443854e2acbeb1713f6d6465 SHA256 80182151e35a2f1fa5f81c6fca1439d26d24d92903a32c61ca740c6475229dcf
 DIST bincimap-1.2.12final.tar.bz2 415731 RMD160 67327046c6b4e795c916bf4a0fc2cb0af93fe7a8 SHA1 951e5fe99057dd6dea48b0233746c27f88d70380 SHA256 ffe848e1e0a12abd56bcef28f3c177a5b6687bf228f667d75b8d14f22aabf466
 DIST bincimap-1.2.13final.tar.bz2 416152 RMD160 db5821290cdc193f594181105a41e64b8c975b4e SHA1 cdbc1bf95decbe76e0a218025c351b8174b4b485 SHA256 152368a1674a521a2006b8a27ff36c4db1b8bb0cf766ab1a0ada02698fae4528
 EBUILD bincimap-1.2.12.ebuild 2447 RMD160 536561885550874980c7cd4bab071f240b4b0a8d SHA1 befc9720ac38e5da9347d8a67e1d0dbe21c0a9d5 SHA256 8ac7e86c3a7c5a98060efb4a19706c7d29e819a91f09d5c882b686213c83e240
-EBUILD bincimap-1.2.13.ebuild 2490 RMD160 231dd2967fc4148a0e02a67054fb8373df756b04 SHA1 bf1698755d3c8fad2276ac7030863dd5552b254a SHA256 9e8ffecf395fdb5da3d4ff4fbe39072560362ed6b5bdd0667f9a31c779649206
-MISC ChangeLog 7644 RMD160 a16f3263e611de12e1692c52a17f3e11071c5fab SHA1 2c2d8a1c2a3336eba0c66c6a27906d1c0ede0d40 SHA256 b77cb04d78dc2405ee841e72276c29a85ff97f79daad1a4e71adc9891b2bbbb4
+EBUILD bincimap-1.2.13.ebuild 2537 RMD160 2e951bd744bbb42c64ca14c8ffa23b362273c3f4 SHA1 f90cbde7a7eb227263b0a97a966282dc4344097e SHA256 122c48f9d94ee518b86dadbe53defbf80b90d3bd3c42135fb4ba70ad86141efe
+MISC ChangeLog 7814 RMD160 ff39e5024ffe9a880f33af9b5489bf4fecb1c83d SHA1 f4701a55fd91af9a1b42232b98dc7c08adb0e9fb SHA256 8626ed0e69ac3eaa7e8680fa40c331816daaaafcff581bac6bb0a131a75bbf59
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmPDYIACgkQkKaRLQcq0GKWbACgiQWTSspizFVFP2RsX0xzvvA/
-atEAoI5i6eukjtSnq9ohU0RKNtYMfqdq
-=ncOr
------END PGP SIGNATURE-----
diff --git a/net-mail/bincimap/bincimap-1.2.13.ebuild b/net-mail/bincimap/bincimap-1.2.13.ebuild
index 4301f10549f8..7f77fd6a4564 100644
--- a/net-mail/bincimap/bincimap-1.2.13.ebuild
+++ b/net-mail/bincimap/bincimap-1.2.13.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-mail/bincimap/bincimap-1.2.13.ebuild,v 1.8 2009/02/08 16:50:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.13.ebuild,v 1.9 2009/08/08 07:37:16 ssuominen Exp $
 
 inherit eutils
 
@@ -31,6 +31,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${P}-gentoo.diff
 	epatch "${FILESDIR}"/${PN}-1.2-gcc43.patch
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
 }
 
 src_compile() {
diff --git a/net-mail/bincimap/files/bincimap-1.2.13-glibc-2.10.patch b/net-mail/bincimap/files/bincimap-1.2.13-glibc-2.10.patch
new file mode 100644
index 000000000000..063f7a54dc3d
--- /dev/null
+++ b/net-mail/bincimap/files/bincimap-1.2.13-glibc-2.10.patch
@@ -0,0 +1,12 @@
+diff -ur bincimap-1.2.13final.orig/src/convert.h bincimap-1.2.13final/src/convert.h
+--- bincimap-1.2.13final.orig/src/convert.h	2005-02-08 22:30:22.000000000 +0200
++++ bincimap-1.2.13final/src/convert.h	2009-08-08 10:38:08.000000000 +0300
+@@ -111,7 +111,7 @@
+       unsigned char c = *i;
+       unsigned char d = *(i + 1);
+       
+-      char *t;
++      const char *t;
+       if ((t = strchr(hexchars, c)) == 0)
+ 	return "out of range";
+       n = (t - hexchars) << 4;