Fix building with recent glibc wrt #334077 by "fkhp".

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

4 files changed, 32 insertions, 4 deletions

diff --git a/sys-block/open-iscsi/ChangeLog b/sys-block/open-iscsi/ChangeLog
index ad6a85108adc..3a95b906ced8 100644
--- a/sys-block/open-iscsi/ChangeLog
+++ b/sys-block/open-iscsi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-block/open-iscsi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.29 2010/03/31 23:19:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.30 2010/08/24 13:48:01 ssuominen Exp $
+
+  24 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  open-iscsi-2.0.871.3.ebuild, +files/open-iscsi-2.0.871.3-glibc212.patch:
+  Fix building with recent glibc wrt #334077 by "fkhp".
 
   31 Mar 2010; Robin H. Johnson <robbat2@gentoo.org>
   open-iscsi-2.0.871-r1.ebuild, open-iscsi-2.0.871.3.ebuild:
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 78a68910eb64..4c251778fa57 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -4,12 +4,13 @@ AUX iscsid-2.0.871-r1.init.d 2916 RMD160 8a596eaf43e9c708b92b948d73a7d6385854dd3
 AUX iscsid-conf.d 314 RMD160 de4885dcc1ed6440ea385b7b234deeaa9cb18478 SHA1 57b899e74027252f5686c0bf28aafbda6f669132 SHA256 673bf4744efc3276d372587c996270821d39dcdc0bf27a13691ea6b0e814b6d0
 AUX iscsid-init.d 2784 RMD160 92f19340add0cf178c451fb143d5871381e70480 SHA1 ce1be0f5e7e0b7f40371b9fb12f283ca713e295b SHA256 8ff8f100a6058d31605de54b1f210d5293c4b7441973e5793f42f67cac4fed30
 AUX open-iscsi-2.0.871-makefile-cleanup.patch 1205 RMD160 04f60526916cd9a707e4c3158c6cb7edc7da4169 SHA1 be59e170705927b1b3dffd07329a1a20d067e8df SHA256 8412850ea40dd7b5bacbae18c760ef305df36dbaa507d9618555e32c8e8e2ae6
+AUX open-iscsi-2.0.871.3-glibc212.patch 413 RMD160 d860af37c820da0dfca039b548a4392c1d94a617 SHA1 1930a6a8d3712db8f827794717132cb79a589e14 SHA256 e8904176278a437f26b9f6e62377c5c018fa7cae31ead28a1651b8ab7b4b951c
 DIST open-iscsi-2.0-870.3.tar.gz 301242 RMD160 f3be0aeaa7b2988a794983bc6d88511026605b13 SHA1 bc8253558b1a6b0c12ec0fbb0f01d6cb56d39395 SHA256 8ca6708895b17424efe20a4f6cbdf32ea44c40e7d9faa0f9c44bd720bae715ec
 DIST open-iscsi-2.0-871.tar.gz 330514 RMD160 f996d9145bc3727394f1a4999f430bd5ea5c2a0d SHA1 968baf16d4094fb9842bc04b0fe8109103356252 SHA256 bcea8746ae82f2ada7bc05d2aa59bcda1ca0d5197f05f2e16744aae59f0a7dcb
 DIST open-iscsi-2.0.871.3.tar.gz 331617 RMD160 496c25c10bfd6da5d363b9f2b9b28eeb53906109 SHA1 a21a0cec752466e631469eb7d73ac72b427bda6d SHA256 2aefded8bcc854acaa7d9df9455408484d894e2bed407ebfeb95bb07773fab53
 EBUILD open-iscsi-2.0.870.3-r1.ebuild 3058 RMD160 7cca1692b8ee288e2c04e66bdb06935b5d6b70c4 SHA1 263017243b71cbd37001dd546aaa34b46b8a33c7 SHA256 d01d147e91894ce4ec23b5d9d6ebe7aa8a09c983c3e5738b4674837eed976613
 EBUILD open-iscsi-2.0.871-r1.ebuild 2578 RMD160 0a1d8eabc21be85e189c3d8844bc9254d02fb379 SHA1 a4b14ee9a3c9b753fa5762040d24ea1e631dc2c3 SHA256 fb378d858070ecc6610da7db4e342ab7f52da132f7a40457f5406b58a61ed7fe
-EBUILD open-iscsi-2.0.871.3.ebuild 2524 RMD160 6f090896199c7391e3fe4f7a387762e36e03e67c SHA1 036bba29e42ac4338c438f1b6527f86f040b456c SHA256 20642f40fda3f8e4f2ceedd349523464f770f9913eacc7b717e026855c062a70
+EBUILD open-iscsi-2.0.871.3.ebuild 2568 RMD160 9bee710c03a84cd00f43607b6d022949bd69f271 SHA1 f8198b1fc3a5fd5774e9a024ebecfc4635430bcb SHA256 b01e4a67eb5e1dfa06f5e6a368ecac22ff1af2a64f0ab0739089f0900288cc0b
 EBUILD open-iscsi-2.0.871.ebuild 3149 RMD160 1999c962be1a5c8ac5da72703ba206faa30bda1e SHA1 d4742fd50339c3e62c06e67edb058dfa5f9bbd33 SHA256 00f70a8e3f1efeb0db97ec5a0e12ef42fe59e6c92ea0a7478107b7f72e75f644
-MISC ChangeLog 6684 RMD160 1940d0697a6a6580651e6a7caac6a831732a4227 SHA1 6beca7b75ed2b463a0ea14d56bf3def61fd3f36a SHA256 5fa73d7d90697eee425db94b235c2655dbc8262f64baee7157ce5ae5c3713164
+MISC ChangeLog 6872 RMD160 0b8d3370c477cb85b2b8be48b4c59a60d7f140d4 SHA1 16b19abfac52362a9d755cd28f637fde73c43122 SHA256 349d86205e55e97d443ddff40ad9c0083f1263df1456d2de9adccc69e89f1825
 MISC metadata.xml 366 RMD160 e6901bcc9954fa2e7ebdc201be3f117f2769d11e SHA1 2f12a23a3bd4a33409183a32a99708dc4ce236e4 SHA256 023a201ecaa94699b402156f02c08c416e6eed0584f2096152605f3bef5df31a
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.871.3-glibc212.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.871.3-glibc212.patch
new file mode 100644
index 000000000000..b6f752b3d2ca
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.871.3-glibc212.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/334077
+
+--- usr/iscsid.c
++++ usr/iscsid.c
+@@ -29,6 +29,7 @@
+ #include <signal.h>
+ #include <sys/mman.h>
+ #include <sys/utsname.h>
++#include <sys/stat.h>
+ 
+ #include "iscsid.h"
+ #include "mgmt_ipc.h"
+--- usr/iscsi_sysfs.c
++++ usr/iscsi_sysfs.c
+@@ -22,6 +22,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <dirent.h>
++#include <sys/stat.h>
+ 
+ #include "log.h"
+ #include "initiator.h"
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild
index ad2f53306f6e..953611fcf31e 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild,v 1.2 2010/03/31 23:19:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild,v 1.3 2010/08/24 13:48:01 ssuominen Exp $
 
 EAPI=2
 inherit versionator linux-info eutils flag-o-matic
@@ -40,6 +40,7 @@ src_prepare() {
 	export EPATCH_OPTS="-d${S}"
 	epatch "${FILESDIR}"/CVE-2009-1297.patch
 	epatch "${FILESDIR}"/${PN}-2.0.871-makefile-cleanup.patch
+	epatch "${FILESDIR}"/${P}-glibc212.patch
 }
 
 src_compile() {