[scsi-target-utils] update to 1.0.21

[Andy Grover]

commit e9a3808900ea3fcdb47f1b1f2b6ec5f675302470
Author: Andy Grover <agrover at redhat.com>
Date:   Wed Nov 2 17:35:35 2011 -0700

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

 .gitignore                                   |    1 +
 scsi-target-utils-dynamic-link-iser.patch    |   10 +++++-----
 scsi-target-utils-fix-segfault-on-exit.patch |   15 ---------------
 scsi-target-utils.spec                       |   13 ++++++++-----
 sources                                      |    2 +-
 5 files changed, 15 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a9d4ee0..b577e21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /tgt-1.0.14.tar.gz
 /tgt-1.0.18.tar.gz
 /v1.0.20
+/v1.0.21
diff --git a/scsi-target-utils-dynamic-link-iser.patch b/scsi-target-utils-dynamic-link-iser.patch
index 36069a0..cee586a 100644
--- a/scsi-target-utils-dynamic-link-iser.patch
+++ b/scsi-target-utils-dynamic-link-iser.patch
@@ -1,4 +1,4 @@
-commit 3b4a7efe0899a2c800e1842573492bacac15b01e
+commit 07182f43ec721096cded79e43a76ceea5858df5c
 Author: Andy Grover <agrover at redhat.com>
 Date:   Tue Oct 4 11:33:18 2011 -0700
 
@@ -23,7 +23,7 @@ index e15ff6a..0cc7126 100644
  
  INCLUDES += -I.
 diff --git a/usr/iscsi/iser.c b/usr/iscsi/iser.c
-index a582bdf..b2e6a4d 100644
+index 7c263f5..ce96130 100644
 --- a/usr/iscsi/iser.c
 +++ b/usr/iscsi/iser.c
 @@ -32,6 +32,8 @@
@@ -215,9 +215,9 @@ index a582bdf..b2e6a4d 100644
 +
 +
  	err = iser_ib_init();
- 	if (err)
- 		return err;
-@@ -3347,12 +3513,25 @@ static int iser_init(int index, char *args)
+ 	if (err) {
+ 		iser_send_nop = 0;
+@@ -3349,12 +3515,25 @@ static int iser_init(int index, char *args)
  	}
  
  	return 0;
diff --git a/scsi-target-utils.spec b/scsi-target-utils.spec
index c7873c2..b2f7973 100644
--- a/scsi-target-utils.spec
+++ b/scsi-target-utils.spec
@@ -1,6 +1,6 @@
 Name:           scsi-target-utils
-Version:        1.0.20
-Release:        2%{?dist}
+Version:        1.0.21
+Release:        1%{?dist}
 Summary:        The SCSI target daemon and utility programs
 
 Group:          System Environment/Daemons
@@ -13,7 +13,6 @@ 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)
 
@@ -32,11 +31,10 @@ Currently, software iSCSI targets are supported.
 
 
 %prep
-%setup -q -n fujita-tgt-a22a047
+%setup -q -n fujita-tgt-1626488
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 pushd usr
@@ -100,6 +98,11 @@ fi
 
 
 %changelog
+* Wed Nov 2 2011 Andy Grover <agrover at redhat.com> - 1.0.21-1
+* New upstream version
+  - Refresh dynamic-link-iser.patch
+  - Remove upstreamed fix-segfault-on-exit.patch
+
 * Tue Oct 25 2011 Andy Grover <agrover at redhat.com> - 1.0.20-2
 - Add missing requires lsof and sg3_utils
 
diff --git a/sources b/sources
index 879a406..c475e3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b6e7e7cd09c02cee87726c7666a0f87c  v1.0.20
+39d152838bfedfea785e176c821fd1e9  v1.0.21