Revbump, proxy-commiting for Craig (security bug #290631)

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

4 files changed, 44 insertions, 4 deletions

diff --git a/sys-block/open-iscsi/ChangeLog b/sys-block/open-iscsi/ChangeLog
index 126dd2aca89b..2a5f76a9a8ff 100644
--- a/sys-block/open-iscsi/ChangeLog
+++ b/sys-block/open-iscsi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-block/open-iscsi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.21 2009/09/23 20:31:26 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.22 2009/10/27 19:47:34 dertobi123 Exp $
+
+*open-iscsi-2.0.870.3-r1 (27 Oct 2009)
+
+  27 Oct 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  -open-iscsi-2.0.870.3.ebuild, +open-iscsi-2.0.870.3-r1.ebuild,
+  +files/CVE-2009-1297.patch:
+  Revbump, proxy-commiting for Craig (security bug #290631)
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org>
   open-iscsi-2.0.870.3.ebuild:
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 7c81c2e8bf97..a24e4f9a628d 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,7 +1,8 @@
+AUX CVE-2009-1297.patch 798 RMD160 e1f3411aef17b8e238928b88ebe008b2ae28c070 SHA1 55f3af418fb3eebe2b2f1ee59dc94b8a6ef0ad9a SHA256 b52320fb0e25876d7b9cd7a40e1a01246a9175822c98c3796d6e2822fda39af5
 AUX initiatorname.iscsi 1282 RMD160 6af81c25d2704e2c6bb98ff5155de91cdbd17ff7 SHA1 2d2b0a50652772e0e3a16f3a90ef5977639b97ee SHA256 4ae558522881796f67ad5915ecf38d01e64c9d9768469847adb17405404485f3
 AUX iscsid-conf.d 314 RMD160 de4885dcc1ed6440ea385b7b234deeaa9cb18478 SHA1 57b899e74027252f5686c0bf28aafbda6f669132 SHA256 673bf4744efc3276d372587c996270821d39dcdc0bf27a13691ea6b0e814b6d0
 AUX iscsid-init.d 2784 RMD160 92f19340add0cf178c451fb143d5871381e70480 SHA1 ce1be0f5e7e0b7f40371b9fb12f283ca713e295b SHA256 8ff8f100a6058d31605de54b1f210d5293c4b7441973e5793f42f67cac4fed30
 DIST open-iscsi-2.0-870.3.tar.gz 301242 RMD160 f3be0aeaa7b2988a794983bc6d88511026605b13 SHA1 bc8253558b1a6b0c12ec0fbb0f01d6cb56d39395 SHA256 8ca6708895b17424efe20a4f6cbdf32ea44c40e7d9faa0f9c44bd720bae715ec
-EBUILD open-iscsi-2.0.870.3.ebuild 3010 RMD160 6ac519f9fee22590144d34c8a59a8456f8b83b9e SHA1 9e98f3b66c927989d594f451aad6f0d6a8fb953c SHA256 4fd3c179ead42b101bef58afd464a4419837863f4c3016df820d57663eca6a09
-MISC ChangeLog 4987 RMD160 6b9b7e4a6af1b9d8477ed01c65cc73fcd6aa4690 SHA1 99fc055bc037e474fbec65df66a8987228bb35bc SHA256 4ee31c8c00de07bfe2fb504db5ef83348e403090d21acfd0264e10dde9f26ded
+EBUILD open-iscsi-2.0.870.3-r1.ebuild 3058 RMD160 7cca1692b8ee288e2c04e66bdb06935b5d6b70c4 SHA1 263017243b71cbd37001dd546aaa34b46b8a33c7 SHA256 d01d147e91894ce4ec23b5d9d6ebe7aa8a09c983c3e5738b4674837eed976613
+MISC ChangeLog 5242 RMD160 324b4d3bc6f62de81053e729f6b996644c3c27fc SHA1 e15bf10d873330f225759a39e42331007570a4f4 SHA256 83240adca2d2f8db3ba6fcc09eb7687baffeccbd71b0a6782dd45c1aadb49c46
 MISC metadata.xml 366 RMD160 e6901bcc9954fa2e7ebdc201be3f117f2769d11e SHA1 2f12a23a3bd4a33409183a32a99708dc4ce236e4 SHA256 023a201ecaa94699b402156f02c08c416e6eed0584f2096152605f3bef5df31a
diff --git a/sys-block/open-iscsi/files/CVE-2009-1297.patch b/sys-block/open-iscsi/files/CVE-2009-1297.patch
new file mode 100644
index 000000000000..d1728fff7e65
--- /dev/null
+++ b/sys-block/open-iscsi/files/CVE-2009-1297.patch
@@ -0,0 +1,31 @@
+--- utils.orig/iscsi_discovery	2009-10-26 23:09:08.000000000 +0100
++++ utils/iscsi_discovery	2009-10-26 23:11:56.000000000 +0100
+@@ -104,24 +104,22 @@
+ 
+ 	connected=0
+ 	discovered=0
+-	df=/tmp/discovered.$$
+ 
+ 	dbg "starting discovery to $ip"
+-	iscsiadm -m discovery --type sendtargets --portal ${ip}:${port} > ${df}
+-	while read portal target
++	disc="$(iscsiadm -m discovery --type sendtargets --portal ${ip}:${port})"
++	echo "${disc}" | while read portal target
+ 	do
+ 		portal=${portal%,*}
+ 		select_transport
+-	done < ${df}
++	done
+ 
+-	discovered=$(cat ${df} | wc -l)
++	discovered=$(echo "${disc}" | wc -l)
+ 	if [ ${discovered} = 0 ]; then
+ 		echo "failed to discover targets at ${ip}"
+ 		exit 2
+ 	else
+ 		echo "discovered ${discovered} targets at ${ip}"
+ 	fi
+-	/bin/rm -f ${df}
+ }
+ 
+ try_login()
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.870.3.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild
index 5d15bacbdde4..bb4fa2807f65 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.870.3.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.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/open-iscsi/open-iscsi-2.0.870.3.ebuild,v 1.3 2009/09/23 20:31:26 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild,v 1.1 2009/10/27 19:47:34 dertobi123 Exp $
 
 inherit versionator linux-mod eutils flag-o-matic
 
@@ -31,6 +31,7 @@ src_unpack() {
 	if [ $KV_PATCH -lt 15 ]; then
 		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
 	fi
+	epatch "${FILESDIR}"/CVE-2009-1297.patch
 }
 
 src_compile() {