Add patch from Fedora to build with glibc-2.10. Closes bug #270645.

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

4 files changed, 33 insertions, 5 deletions

diff --git a/sys-block/partimage/ChangeLog b/sys-block/partimage/ChangeLog
index a0cef892937f..48ab3ec1b68f 100644
--- a/sys-block/partimage/ChangeLog
+++ b/sys-block/partimage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-block/partimage
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.39 2009/03/08 22:02:16 josejx Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.40 2009/05/22 16:38:16 flameeyes Exp $
+
+  22 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  partimage-0.6.7.ebuild, +files/partimage-0.6.7+glibc-2.10.patch:
+  Add patch from Fedora to build with glibc-2.10. Closes bug #270645.
 
   08 Mar 2009; Joseph Jezak <josejx@gentoo.org> partimage-0.6.7.ebuild:
   Marked ppc stable for bug #261081.
diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest
index cba5f2f92f74..35693efc7769 100644
--- a/sys-block/partimage/Manifest
+++ b/sys-block/partimage/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX partimage-0.6.4-1-lib64.patch 2483 RMD160 20b936037e223a02237bbc45b4c037fc1e571c51 SHA1 219a6d4524908360722b25a7eb7e619238a562ff SHA256 22686caa9919b9c0f8f248d033cce400bdf004a7cbaa1773d9e4c20dc212dfb9
 AUX partimage-0.6.4-LP64-fixes.patch 1773 RMD160 3a2e1d4d69794aaa4311b716c4a418350774707f SHA1 a76a3af0a0ca6b56e3ad58e8111cda88bf7757c3 SHA256 1f4ad532e1edc0c5772290fde3ed0285e5c09caecd786216c92f78fab2c4075b
 AUX partimage-0.6.4-chown.patch 1660 RMD160 3fc66b6aa0b045a3d184f12c6347be5ef192e602 SHA1 1f77af2bc459b539b767915f19c48b880326b1c0 SHA256 34b851e54dbf4f713b7ecb0d626668556911f8240010b1b86bd3e9c924c0e079
@@ -26,6 +29,7 @@ AUX partimage-0.6.6-dont-discard-error-message-in-batch-mode.patch 2213 RMD160 8
 AUX partimage-0.6.6-gui.diff 1164 RMD160 b4252dd6e46612b11bf04f64c75c30c19e776c57 SHA1 b819b37f618bea057b3f121369b1afa2f35dc355 SHA256 816c324c8ea827a6c2508d0b6c4ef6605cc55b957edbca47c6dff8cf29d8a6a2
 AUX partimage-0.6.6-not_install_info.patch 937 RMD160 2360cebf931845f6b5d08eb56e4be3df92826a74 SHA1 a6936e9715d88a9705d4238a489de3b2a70672a4 SHA256 ab21eec9e177ae799df0739cc6215cd5538dacaaad6e535376938d351db82002
 AUX partimage-0.6.6-thread-privilege-fix.patch 1301 RMD160 77ef2aa3202731205acebb8ea58faeccb930363a SHA1 2ae3782574f6dc57a7e7aa8e6b6cb55cf1c275fc SHA256 29c49a8ca43fcf3ad0f842d836cb353bf8e3f7420a7b9fbfd8a1b9885fd14daf
+AUX partimage-0.6.7+glibc-2.10.patch 508 RMD160 5ca573128b60940635e0dcfcb8e4c3125b2306cc SHA1 19427559cb31db2afe28b244b6e6e707ecea91dc SHA256 908850e484ad51c127fb745723dd606cf49edf931ad137be5ebc7c4d10f6be30
 AUX partimage-0.6.7-chown.patch 1888 RMD160 0db2de481cddd206eb47fa8ef4ee37c01c6fe777 SHA1 b66ab9d3a28400a0fe2329ec38c9b9ab4b814784 SHA256 4e07de0f3b8f182bd16d5f45f0f56be2158524492936cf47891db8714cdb0f4e
 AUX partimage-0.6.7-datadir-path.patch 673 RMD160 4ba52dcfc6857026864a5fc460dd978164d0b967 SHA1 03e485c794a9ca24fb85e41d8dba2af8a9cc0abb SHA256 84bbb66c69cbd183bb326e17da2a0b7540690c5f1435903d9e5e7ae4c4cbc820
 AUX partimage-0.6.7-gcc43.patch 1299 RMD160 1541906226f8000eb140bd76c553ab3257e80441 SHA1 e717c7ce64f4e3e06a0f03a26e39e2e0ddaee41a SHA256 91dd330641d28f1bcb5a22a57618249a4f4e5350b0837b2636ef48abfa64443f
@@ -39,6 +43,13 @@ AUX servercert.cnf 1096 RMD160 8786b07466c5330254eb96e1de6f754e8a68e77f SHA1 64f
 DIST partimage-0.6.6.tar.bz2 524695 RMD160 8bad0dd706d88dee27531766daf7611d95bb0a04 SHA1 691a5bfe1637fce3d1af3a48a37b63d603c09b7f SHA256 0bf5d720094777ae0aa258a00f30cee6988c026558eea20087aa20d46b81b2bd
 DIST partimage-0.6.7.tar.bz2 628214 RMD160 e01315fe6073653c89f2dea3c19483853960d59e SHA1 c02e0db728e72277a78a1fb4140171ba8a9336cf SHA256 0b3ed41ab71a73f83a41fc12e61cd874f5d2799cbfbd1db8e39730ba8a3d6d9e
 EBUILD partimage-0.6.6.ebuild 5128 RMD160 b5e7e41b8a6913b8b5fe245ee38f08d2bd87511f SHA1 9b2dbe3caf16719b18d673502daa6539742069c0 SHA256 9ab3fc0b5168fb6d9a510b2cf86a58e76107fe430659972317722c429763e693
-EBUILD partimage-0.6.7.ebuild 4599 RMD160 075f16e8bbe9d6596acb41da994a35f8d79c47fb SHA1 ad9a1c96ffb9243e2d644d3fb3160cba24d024ad SHA256 af797484e451fd62f723c0a7bd878e592fef5d1b33a5640b5de12a89f6ae9d2b
-MISC ChangeLog 11384 RMD160 0054eaed0efaa26a611eb1137a8bb8c97e42a894 SHA1 2b7af384d23469658a614f89bc3021fa36b30f81 SHA256 625683f0455eacb4f0734615250278f7880833b31beac7cb2dbf5ae6309b4d53
+EBUILD partimage-0.6.7.ebuild 4646 RMD160 35a58288849245b5d858c09dcaa8516fff084597 SHA1 43670c6bad1d0cd44f03cebf8b4e0b0067e641ab SHA256 99fa7e6e4c3164315867d4a0ecc90ccdf3f944f809018be897ecf6f21540677d
+MISC ChangeLog 11581 RMD160 dbb14ce573edea4e579196ccba63d1a25d4331cc SHA1 f3d7a9662f3e14440d421e9f0af51b2519b1f3f5 SHA256 c5ee8b7959bc9d1e78762e4de3d5835b7f66c046ad646da74469d68ed98c6ec9
 MISC metadata.xml 332 RMD160 5854050f31d76ca8b45efac4c42acb1696b64d7a SHA1 32ca7594a52c5bf1f243af13fd043c2a4b652150 SHA256 253b4ec569d16a45a3228c8806b171ac47e8e0a645097dd075ad047a1f123652
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoW1QAACgkQAiZjviIA2XjwhQCaA7RiZvOfw8QNhM2TRFP7L8Qe
++JgAoIg6IGgsegcQkBL/VmDa3JP0h3cd
+=w+9c
+-----END PGP SIGNATURE-----
diff --git a/sys-block/partimage/files/partimage-0.6.7+glibc-2.10.patch b/sys-block/partimage/files/partimage-0.6.7+glibc-2.10.patch
new file mode 100644
index 000000000000..c8b2fed20ece
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.7+glibc-2.10.patch
@@ -0,0 +1,12 @@
+diff -Naur partimage-0.6.7/src/client/misc.cpp partimage-0.6.7-new/src/client/misc.cpp
+--- partimage-0.6.7/src/client/misc.cpp	2008-02-03 19:58:00.000000000 -0200
++++ partimage-0.6.7-new/src/client/misc.cpp	2009-02-26 12:57:45.000000000 -0300
+@@ -2372,7 +2372,7 @@
+ 
+ static char *sfdisk_line_to_partition_device(const char *line)
+ {
+-  if (char *p = strchr(line, ':')) {
++  if (const char *p = strchr(line, ':')) {
+     while (p[-1] == ' ' && p > line) p--;
+     return strndup(line, p - line);
+   } else {
diff --git a/sys-block/partimage/partimage-0.6.7.ebuild b/sys-block/partimage/partimage-0.6.7.ebuild
index 510d69812d67..99b0e8a4f2d3 100644
--- a/sys-block/partimage/partimage-0.6.7.ebuild
+++ b/sys-block/partimage/partimage-0.6.7.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/sys-block/partimage/partimage-0.6.7.ebuild,v 1.5 2009/03/08 22:02:16 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.7.ebuild,v 1.6 2009/05/22 16:38:16 flameeyes Exp $
 
 WANT_AUTOMAKE="1.10"
 
@@ -56,6 +56,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-0.6.6-disable_header_check.patch || die
 	epatch "${FILESDIR}"/${P}-datadir-path.patch || die
 	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}+glibc-2.10.patch
 }
 
 src_compile() {