Dear maintainer,

I've prepared an NMU for open-iscsi (versioned as 2.0.870~rc3-0.6) and
uploaded it to DELAYED/05. Please feel free to tell me if I
should delay it longer.

Regards.
 -- Guido
diff -u open-iscsi-2.0.870~rc3/debian/changelog open-iscsi-2.0.870~rc3/debian/changelog
--- open-iscsi-2.0.870~rc3/debian/changelog
+++ open-iscsi-2.0.870~rc3/debian/changelog
@@ -1,3 +1,11 @@
+open-iscsi (2.0.870~rc3-0.6) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * [4bfddee] Fix CVE-2009-1297 (Closes: #547011) - thanks to Colin Watson for
+    the patch
+
+ -- Guido Günther <[email protected]>  Sat, 23 Jan 2010 17:56:18 +0100
+
 open-iscsi (2.0.870~rc3-0.5) unstable; urgency=low
 
   * Non-maintainer upload to fix release goal.
only in patch2:
unchanged:
--- open-iscsi-2.0.870~rc3.orig/utils/iscsi_discovery
+++ open-iscsi-2.0.870~rc3/utils/iscsi_discovery
@@ -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()

Reply via email to