[scsi-target-utils] 1.0.22

Sun Dec 4 05:51:42 UTC 2011

commit 377ad4a98fbdb4e0bdeccb3bc9afb67bb46d6324
Author: Andy Grover <agrover at redhat.com>
Date:   Sat Dec 3 21:51:14 2011 -0800

    1.0.22
    
    Signed-off-by: Andy Grover <agrover at redhat.com>

 .gitignore                                     |    1 +
 scsi-target-utils-dynamic-link-iser.patch      |   20 ++++++++--------
 scsi-target-utils-hack-check-for-eventfd.patch |   29 ------------------------
 scsi-target-utils-remove-xsltproc-check.patch  |   14 +++++-----
 scsi-target-utils.spec                         |   19 ++++++++++-----
 sources                                        |    2 +-
 6 files changed, 31 insertions(+), 54 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index b577e21..9d7c97a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /tgt-1.0.18.tar.gz
 /v1.0.20
 /v1.0.21
+/v1.0.22
diff --git a/scsi-target-utils-dynamic-link-iser.patch b/scsi-target-utils-dynamic-link-iser.patch
index 6da85b5..4d2ce1e 100644
--- a/scsi-target-utils-dynamic-link-iser.patch
+++ b/scsi-target-utils-dynamic-link-iser.patch
@@ -1,4 +1,4 @@
-commit 1aa20610d4a3afc22e9a0b24efa4bbb7b02dfab2
+commit c0a5cbe14901da201e555745c0f1fce866d3f16f
 Author: Andy Grover <agrover at redhat.com>
 Date:   Wed Sep 28 11:21:38 2011 -0700
 
@@ -15,7 +15,7 @@ Date:   Wed Sep 28 11:21:38 2011 -0700
     Signed-off-by: Andy Grover <agrover at redhat.com>
 
 diff --git a/usr/Makefile b/usr/Makefile
-index e15ff6a..b8ab805 100644
+index 13f6cf8..95d2995 100644
 --- a/usr/Makefile
 +++ b/usr/Makefile
 @@ -1,4 +1,5 @@
@@ -24,9 +24,9 @@ index e15ff6a..b8ab805 100644
  
  ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),)
  CFLAGS += -DUSE_SIGNALFD
-@@ -13,11 +14,6 @@ TGTD_OBJS += $(addprefix iscsi/, conn.o param.o session.o \
- 		isns.o)
- TGTD_OBJS += bs_rdwr.o bs_aio.o
+@@ -19,11 +20,6 @@ TGTD_OBJS += bs_aio.o
+ LIBS += -laio
+ endif
  
 -ifneq ($(ISCSI_RDMA),)
 -TGTD_OBJS += iscsi/iser.o iscsi/iser_text.o
@@ -36,7 +36,7 @@ index e15ff6a..b8ab805 100644
  INCLUDES += -I.
  
  CFLAGS += -D_GNU_SOURCE
-@@ -30,9 +26,13 @@ endif
+@@ -36,9 +32,13 @@ endif
  CFLAGS += -Wall -Wstrict-prototypes -fPIC
  CFLAGS += -DTGT_VERSION=\"$(VERSION)$(EXTRAVERSION)\"
  
@@ -51,7 +51,7 @@ index e15ff6a..b8ab805 100644
  TGTD_OBJS += tgtd.o mgmt.o target.o scsi.o log.o driver.o util.o work.o \
  		parser.o spc.o sbc.o mmc.o osd.o scc.o smc.o \
  		ssc.o bs_ssc.o libssc.o \
-@@ -41,10 +41,12 @@ TGTD_OBJS += tgtd.o mgmt.o target.o scsi.o log.o driver.o util.o work.o \
+@@ -47,10 +47,12 @@ TGTD_OBJS += tgtd.o mgmt.o target.o scsi.o log.o driver.o util.o work.o \
  TGTD_DEP = $(TGTD_OBJS:.o=.d)
  
  .PHONY:all
@@ -66,7 +66,7 @@ index e15ff6a..b8ab805 100644
  
  -include $(TGTD_DEP)
  
-@@ -58,15 +60,23 @@ tgtimg: tgtimg.o libssc.o libcrc32c.o
+@@ -64,15 +66,23 @@ tgtimg: tgtimg.o libssc.o libcrc32c.o
  
  -include tgtimg.d libssc.d
  
@@ -93,7 +93,7 @@ index e15ff6a..b8ab805 100644
 -	rm -f *.[od] $(PROGRAMS) iscsi/*.[od] ibmvio/*.[od] fc/*.[od]
 +	rm -f *.[od] $(PROGRAMS) *.so iscsi/*.[od] ibmvio/*.[od] fc/*.[od]
 diff --git a/usr/tgtd.c b/usr/tgtd.c
-index 30d5e9d..a9b2027 100644
+index b5d7ec3..dc09cfa 100644
 --- a/usr/tgtd.c
 +++ b/usr/tgtd.c
 @@ -35,6 +35,7 @@
@@ -104,7 +104,7 @@ index 30d5e9d..a9b2027 100644
  
  #include "list.h"
  #include "tgtd.h"
-@@ -411,6 +412,9 @@ static int lld_init(char *args)
+@@ -420,6 +421,9 @@ static int lld_init(char *args)
  {
  	int i, err, nr;
  
diff --git a/scsi-target-utils-remove-xsltproc-check.patch b/scsi-target-utils-remove-xsltproc-check.patch
index c52dc2f..1e6f704 100644
--- a/scsi-target-utils-remove-xsltproc-check.patch
+++ b/scsi-target-utils-remove-xsltproc-check.patch
@@ -1,4 +1,4 @@
-commit eeb34a60b18c48e9ee8adc473e10a13ca9a3d705
+commit ad75a57863efcbf264ef44c5643e64c5bad84cb9
 Author: Andy Grover <agrover at redhat.com>
 Date:   Wed Nov 2 22:15:32 2011 -0700
 
@@ -11,12 +11,12 @@ Date:   Wed Nov 2 22:15:32 2011 -0700
     Signed-off-by: Andy Grover <agrover at redhat.com>
 
 diff --git a/doc/Makefile b/doc/Makefile
-index 0a822a6..acc17f2 100644
+index 4370fb2..54d5a09 100644
 --- a/doc/Makefile
 +++ b/doc/Makefile
-@@ -29,35 +29,38 @@ install: $(MANPAGES) $(DOCS)
- .PHONY: clean
- clean:
+@@ -32,35 +32,38 @@ clean:
+ 	rm -f $(XMLMAN) $(XMLHTML)
+ 	rmdir manpages htmlpages
  
 +STYLEMAN = /usr/share/sgml/docbook/xsl-stylesheets-1.76.1/manpages/docbook.xsl
 +STYLEHTML = /usr/share/sgml/docbook/xsl-stylesheets-1.76.1/html/docbook.xsl
@@ -61,5 +61,5 @@ index 0a822a6..acc17f2 100644
 -	-test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
 +	$(XSLTPROC) -o $@ $(STYLEHTML) $<
  
- xmlman: $(XMLMAN)
- 
+ manpages/tgt-setup-lun.8: tgt-setup-lun.8.xml
+ 	-test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
diff --git a/scsi-target-utils.spec b/scsi-target-utils.spec
index 934d907..6de1238 100644
--- a/scsi-target-utils.spec
+++ b/scsi-target-utils.spec
@@ -1,6 +1,6 @@
 Name:           scsi-target-utils
-Version:        1.0.21
-Release:        5%{?dist}
+Version:        1.0.22
+Release:        1%{?dist}
 Summary:        The SCSI target daemon and utility programs
 
 Group:          System Environment/Daemons
@@ -11,9 +11,8 @@ Source1:        tgtd.init
 Source2:        sysconfig.tgtd
 Source3:        targets.conf
 Patch0:         scsi-target-utils-redhatify-docs.patch
-Patch1:         scsi-target-utils-hack-check-for-eventfd.patch
-Patch2:         scsi-target-utils-remove-xsltproc-check.patch
-Patch3:         scsi-target-utils-dynamic-link-iser.patch
+Patch1:         scsi-target-utils-remove-xsltproc-check.patch
+Patch2:         scsi-target-utils-dynamic-link-iser.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,11 +42,10 @@ Extensions for RDMA (ISER) to scsi-target-utils.
 
 
 %prep
-%setup -q -n fujita-tgt-1626488
+%setup -q -n fujita-tgt-3e216c9
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__sed} -i -e 's|-g -O2 -Wall|%{optflags}|' Makefile
@@ -115,6 +113,13 @@ fi
 
 
 %changelog
+* Sat Dec 3 2011 Andy Grover <agrover at redhat.com> - 1.0.22-1
+- New upstream release
+- Remove patch scsi-target-utils-hack-check-for-eventfd.patch,
+    upstream now checks for eventfd support
+- Refresh scsi-target-utils-dynamic-link-iser.patch
+- Refresh scsi-target-utils-remove-xsltproc-check.patch
+
 * Thu Nov 3 2011 Andy Grover <agrover at redhat.com> - 1.0.21-5
 - iser subpackage requires base package
 
diff --git a/sources b/sources
index c475e3d..c3be2f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39d152838bfedfea785e176c821fd1e9  v1.0.21
+30488e12d3d3289ea892fcfbb42c410b  v1.0.22
