Fix building with GLIBC 2.10+ wrt #274107.

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

4 files changed, 43 insertions, 17 deletions

diff --git a/net-mail/metamail/ChangeLog b/net-mail/metamail/ChangeLog
index 748fcc38d8d7..31ba2b10fa70 100644
--- a/net-mail/metamail/ChangeLog
+++ b/net-mail/metamail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/metamail
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/metamail/ChangeLog,v 1.37 2008/08/19 14:56:15 dberkholz Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/metamail/ChangeLog,v 1.38 2009/08/07 09:10:23 ssuominen Exp $
+
+  07 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  metamail-2.7.53.3.ebuild, +files/metamail-2.7.53.3-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #274107.
 
   19 Aug 2008; Donnie Berkholz <dberkholz@gentoo.org>;
   metamail-2.7.45.3-r1.ebuild, metamail-2.7.53.3.ebuild:
diff --git a/net-mail/metamail/Manifest b/net-mail/metamail/Manifest
index 18eb07c414b6..d31248f73aaa 100644
--- a/net-mail/metamail/Manifest
+++ b/net-mail/metamail/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX metamail-2.7.45.3-CVE-2006-0709.patch 1900 RMD160 36717abc5bb938a03d143f82c8870e376e4fb426 SHA1 811d0c31cc6be6dbbba0e35a21c0d6c9eda61e5f SHA256 cd5363d62d3f277c5d13694b364177230976c2abca508d8adbcaf1d4d520fc3a
+AUX metamail-2.7.53.3-glibc-2.10.patch 718 RMD160 a0167f5cc06796e26d47467d68ca3eef6ebc7872 SHA1 71f5ddb786ad9fec7ff0c4d86c6910ebdcc4c763 SHA256 0601ebad8d25aea2a24cd8debe36f6f4dae14b5a2e2508efc116449c2d562af3
 DIST metamail_2.7-45.3.diff.gz 337924 RMD160 b3643b36aa973a620c83a7ab2f7a826643dbc612 SHA1 a32b5e311ac00f1b49d3b8cfc90b334eb191302a SHA256 4708d439000c2c05dea91b8ed184aa06dbba037c14e880154f54ad57eef9e5e4
 DIST metamail_2.7-53.diff.gz 322363 RMD160 8d8878463288f6bac0016fc101230208386961f9 SHA1 678a6efadd9fccc8e4c4d0b5c012aa05434241ff SHA256 43c14331ded498ea0b5adb2367bb18ddd879f161dccb89e879952110a5f151b4
 DIST mm2.7.tar.Z 262881 RMD160 ae322cad0653140cbe7f0148ce48757df98c26b0 SHA1 8f213baec9b17c05bcb066f616977a561757d7a6 SHA256 9c0281bdce32a7d3e61c1e3c703a748acb5d216d082a718efa316f68b9808a96
 EBUILD metamail-2.7.45.3-r1.ebuild 1140 RMD160 330db47a957399d202992513dbe36d099c9a167d SHA1 e4a7a1f090fcbf4782c71210d145ea26da7d664e SHA256 f954987d3a06486cc51d12a167a864f4e2cfc9b061c15ccdd53e982431846367
-EBUILD metamail-2.7.53.3.ebuild 1216 RMD160 8ffcea80f863c5ec80ff92589e7a55726eaf28f5 SHA1 7c0e2658ba9fe39cfc043bc09d641cc609a3755f SHA256 29f4ea5575ade346a9a1f989ba7d9789f97d857d4622bfd52fc40969c77b1d56
-MISC ChangeLog 5058 RMD160 70281b550650f02bd4f44c8a695e8d0985f82699 SHA1 98e12247b5a7c7a6b33a5e4295e04a16a4326c8d SHA256 9ac1f68f4472cb49e4084d38a0605418c4587a7250865b04cdfacac51f8237cf
+EBUILD metamail-2.7.53.3.ebuild 1258 RMD160 cc4ce90020055f726855d19382018c703aebf769 SHA1 6dc0a62e045e857d784bf8392a033f4bfc2c0119 SHA256 154128a0c02196cc30bb4503b4c21235d427d5a3eba69bc2546ecafe59f22834
+MISC ChangeLog 5229 RMD160 a5bbddb1b7593bb29132e47323c90f56b64eb9c8 SHA1 46d4c0a5dc8adafe614c3faae9759bbfe18caaf8 SHA256 7cf2b1b7f73d009c452c8828cdc67b00ecffb73515a65f906ce3d7b27aab7fdd
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiq3w8ACgkQXVaO67S1rtuxpgCdGF1kRsNxzrlgyr7+yON0LCDE
-pgoAoM6wf9tua88XOjvt9J4qIIe/d9F/
-=mq6o
------END PGP SIGNATURE-----
diff --git a/net-mail/metamail/files/metamail-2.7.53.3-glibc-2.10.patch b/net-mail/metamail/files/metamail-2.7.53.3-glibc-2.10.patch
new file mode 100644
index 000000000000..7da331adbbf8
--- /dev/null
+++ b/net-mail/metamail/files/metamail-2.7.53.3-glibc-2.10.patch
@@ -0,0 +1,30 @@
+diff -ur mm2.7.orig/src/metamail/uue.c mm2.7/src/metamail/uue.c
+--- mm2.7.orig/src/metamail/uue.c	1993-07-28 21:31:02.000000000 +0300
++++ mm2.7/src/metamail/uue.c	2009-08-07 12:09:35.000000000 +0300
+@@ -30,7 +30,7 @@
+ }
+ 
+ 
+-getline (buf, size, fp)
++get_line (buf, size, fp)
+ char *buf;
+ int size;
+ FILE *fp;
+@@ -70,7 +70,7 @@
+     char buf[63];
+ 
+     while (1) {
+-	if (getline (buf, sizeof buf, infp) < 0) {
++	if (get_line (buf, sizeof buf, infp) < 0) {
+ 	    fprintf (stderr, "Premature EOF!\n");
+ 	    return;
+ 	}
+@@ -82,7 +82,7 @@
+ 	}
+     }	
+     while (1) {
+-	if (getline (buf, sizeof buf, infp) < 0) {
++	if (get_line (buf, sizeof buf, infp) < 0) {
+ 	    fprintf (stderr, "Premature EOF!\n");
+ 	    return;
+ 	}
diff --git a/net-mail/metamail/metamail-2.7.53.3.ebuild b/net-mail/metamail/metamail-2.7.53.3.ebuild
index 90cfa137e79a..e1b4ed7d4a81 100644
--- a/net-mail/metamail/metamail-2.7.53.3.ebuild
+++ b/net-mail/metamail/metamail-2.7.53.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/metamail/metamail-2.7.53.3.ebuild,v 1.2 2008/08/19 14:56:15 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/metamail/metamail-2.7.53.3.ebuild,v 1.3 2009/08/07 09:10:23 ssuominen Exp $
 
 WANT_AUTOCONF="2.5"
 
@@ -25,13 +25,14 @@ DEPEND="sys-libs/ncurses
 RDEPEND="app-misc/mime-types
 	sys-apps/debianutils"
 
-S="${WORKDIR}"/mm${MY_PV}/src
+S=${WORKDIR}/mm${MY_PV}/src
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${WORKDIR}"/metamail_${DEB_PV}.diff
 	epatch "${FILESDIR}"/${PN}-2.7.45.3-CVE-2006-0709.patch
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
 	eautoreconf
 	chmod +x "${S}"/configure
 }