Hello community, here is the log from the commit of package open-iscsi checked in at Sat Apr 22 01:26:56 CEST 2006. -------- --- open-iscsi/open-iscsi.changes 2006-03-22 15:28:19.000000000 +0100 +++ STABLE/open-iscsi/open-iscsi.changes 2006-04-21 10:00:33.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 21 09:50:46 CEST 2006 - hare@suse.de + +- update to svn r545 + Fixes a crash with Wasabi targets (#157463). + +------------------------------------------------------------------- New: ---- open-iscsi-545.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.oQxjCN/_old 2006-04-22 01:26:52.000000000 +0200 +++ /var/tmp/diff_new_pack.oQxjCN/_new 2006-04-22 01:26:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package open-iscsi (Version 0.5.520) +# spec file for package open-iscsi (Version 0.5.545) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,11 +17,11 @@ Group: Productivity/Networking/Other Prereq: %fillup_prereq %insserv_prereq Autoreqprov: on -Version: 0.5.520 -Release: 1 +Version: 0.5.545 +Release: 2 Provides: linux-iscsi Obsoletes: linux-iscsi -%define iscsi_release 473 +%define iscsi_release 545 Summary: Linux* Open-iSCSI Software Initiator Source: %{name}-0.5-454.tar.gz Source2: open-iscsi.sysconfig @@ -30,8 +30,9 @@ Patch2: %{name}-473.diff Patch3: %{name}-488.diff Patch4: %{name}-520.diff -Patch5: %{name}-doc-update -Patch6: %{name}-check-active-sessions-before-delete +Patch5: %{name}-545.diff +Patch6: %{name}-doc-update +Patch7: %{name}-check-active-sessions-before-delete Patch10: %{name}-git-update.diff Patch11: %{name}-reject-msg.diff Patch12: %{name}-iscsi-iname-Makefile.patch @@ -68,10 +69,10 @@ %patch2 %patch3 %patch4 -%patch5 -p1 +%patch5 %patch6 -p1 +%patch7 -p1 %patch10 -p1 -%patch11 %patch12 -p1 cp %{S:12} usr/ @@ -133,6 +134,9 @@ %doc %{_mandir}/man8/* %changelog -n open-iscsi +* Fri Apr 21 2006 - hare@suse.de +- update to svn r545 + Fixes a crash with Wasabi targets (#157463). * Wed Mar 22 2006 - hare@suse.de - Add rcopen-iscsi link (#158230) - Check for active records before deletion (#149935) ++++++ open-iscsi-545.diff ++++++ ++++ 8053 lines (skipped) ++++++ open-iscsi-check-active-sessions-before-delete ++++++ --- open-iscsi/open-iscsi-check-active-sessions-before-delete 2006-03-22 15:07:08.000000000 +0100 +++ STABLE/open-iscsi/open-iscsi-check-active-sessions-before-delete 2006-04-21 09:59:23.000000000 +0200 @@ -1,18 +1,3 @@ -diff --git a/etc/initd/initd.suse b/etc/initd/initd.suse -index 359b27c..b47b1eb 100644 ---- a/etc/initd/initd.suse -+++ b/etc/initd/initd.suse -@@ -35,7 +35,7 @@ iscsi_discovery() - - iscsi_login_all_nodes() - { -- TARGETS=$($ISCSIADM -m node | sed 's@\[\(.*\)\] .*@\1@g') -+ TARGETS=$($ISCSIADM -m node 2> /dev/null | sed 's@\[\(.*\)\] .*@\1@g') - for rec in $TARGETS; do - STARTUP=`$ISCSIADM -m node -r $rec | grep "node.conn\[0\].startup" | cut -d' ' -f3` - NODE=`$ISCSIADM -m node -r $rec | grep "node.name" | cut -d' ' -f3` -diff --git a/usr/config.h b/usr/config.h -diff --git a/usr/idbm.c b/usr/idbm.c diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c index 07922ca..873607b 100644 --- a/usr/iscsiadm.c ++++++ open-iscsi-git-update.diff ++++++ --- /var/tmp/diff_new_pack.oQxjCN/_old 2006-04-22 01:26:53.000000000 +0200 +++ /var/tmp/diff_new_pack.oQxjCN/_new 2006-04-22 01:26:53.000000000 +0200 @@ -1,7 +1,16 @@ diff --git a/etc/initd/initd.suse b/etc/initd/initd.suse -index b88beb6..359b27c 100644 +index b87bf84..13e05d3 100644 --- a/etc/initd/initd.suse +++ b/etc/initd/initd.suse +@@ -35,7 +35,7 @@ iscsi_discovery() + + iscsi_login_all_nodes() + { +- TARGETS=$($ISCSIADM -m node | sed 's@\[\(.*\)\] .*@\1@g') ++ TARGETS=$($ISCSIADM -m node 2> /dev/null | sed 's@\[\(.*\)\] .*@\1@g') + for rec in $TARGETS; do + STARTUP=`$ISCSIADM -m node -r $rec | grep "node.conn\[0\].startup" | cut -d' ' -f3` + NODE=`$ISCSIADM -m node -r $rec | grep "node.name" | cut -d' ' -f3` @@ -49,6 +49,11 @@ iscsi_login_all_nodes() iscsi_logout_all_nodes() @@ -23,7 +32,7 @@ return ${RETVAL:-0} } -@@ -90,7 +97,6 @@ case "$1" in +@@ -91,7 +98,6 @@ case "$1" in ;; stop) if iscsi_logout_all_nodes ; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...