[scsi-target-utils] update to 1.0.18-2

[Andy Grover]

commit f69ecab63498ed85e91d93e67ceca64eda3e4335
Author: Andy Grover <agrover at redhat.com>
Date:   Thu Sep 29 18:08:38 2011 -0700

    update to 1.0.18-2
    
    Signed-off-by: Andy Grover <agrover at redhat.com>

 scsi-target-utils-fix-segfault-on-exit.patch |   15 +++++++++++++++
 scsi-target-utils.spec                       |    8 +++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/scsi-target-utils-fix-segfault-on-exit.patch b/scsi-target-utils-fix-segfault-on-exit.patch
new file mode 100644
index 0000000..3d9771e
--- /dev/null
+++ b/scsi-target-utils-fix-segfault-on-exit.patch
@@ -0,0 +1,15 @@
+diff -Naur tgt-1.0.18-orig/usr/iscsi/iser.c tgt-1.0.18/usr/iscsi/iser.c
+--- tgt-1.0.18-orig/usr/iscsi/iser.c	2011-09-29 17:57:49.546065404 -0700
++++ tgt-1.0.18/usr/iscsi/iser.c	2011-09-29 17:58:25.663956172 -0700
+@@ -3502,8 +3502,10 @@
+ 
+ 
+ 	err = iser_ib_init();
+-	if (err)
++	if (err) {
++		iser_send_nop = 0;
+ 		return err;
++	}
+ 
+ 	if (iser_send_nop) {
+ 		nop_work.func = iser_nop_work_handler;
diff --git a/scsi-target-utils.spec b/scsi-target-utils.spec
index db87dee..41d5c2e 100644
--- a/scsi-target-utils.spec
+++ b/scsi-target-utils.spec
@@ -1,6 +1,6 @@
 Name:           scsi-target-utils
 Version:        1.0.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The SCSI target daemon and utility programs
 
 Group:          System Environment/Daemons
@@ -13,6 +13,7 @@ Source3:        targets.conf
 Patch0:         scsi-target-utils-redhatify-docs.patch
 Patch1:         scsi-target-utils-dynamic-link-iser.patch
 Patch2:         scsi-target-utils-hack-check-for-eventfd.patch
+Patch3:         scsi-target-utils-fix-segfault-on-exit.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +35,7 @@ Currently, software iSCSI targets are supported.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 pushd usr
@@ -97,6 +99,10 @@ fi
 
 
 %changelog
+* Wed Jun 29 2011 Andy Grover <agrover at redhat.com> - 1.0.18-2
+- Add patch
+  * scsi-target-utils-fix-segfault-on-exit.patch
+
 * Wed Jun 29 2011 Andy Grover <agrover at redhat.com> - 1.0.18-1
 - Update to new upstream release
 - Remove git-sync patch