Rebased to version 1.18.0

Added patch to fix gcc7 warnings

.gitignore

@@ -1,3 +1,4 @@
 /libiscsi-1.9.0.tar.gz
 /libiscsi-1.11.0.tar.gz
 /1.15.0.tar.gz
+/1.18.0.tar.gz

0012-bump-soname.patch

@@ -1,16 +0,0 @@
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 66c02dd..828001a 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -10,9 +10,9 @@ if !HAVE_LIBGCRYPT
- libiscsi_la_SOURCES += md5.c
- endif
- 
--SOCURRENT=3
-+SOCURRENT=4
- SOREVISON=11
--SOAGE=1
-+SOAGE=0
- libiscsi_la_LDFLAGS = \
- 	-version-info $(SOCURRENT):$(SOREVISON):$(SOAGE) -bindir $(bindir) \
- 	-no-undefined -export-symbols libiscsi.syms

0020-reconnect-fix.patch

@@ -1,31 +0,0 @@
-From fd5471960f8f0556efae2c9539867fb3c1ca0882 Mon Sep 17 00:00:00 2001
-From: Paolo Bonzini <pbonzini@redhat.com>
-Date: Wed, 2 Apr 2014 12:44:04 +0200
-Subject: [PATCH] libiscsi: fix dangling pointer for outqueue_current
-
-The outqueue_current PDU might also be in waitpdu if it does not have
-ISCSI_PDU_DELETE_WHEN_SENT.  Because outqueue_current is freed after
-the waitpdu list, we need to ensure it is kept up to date when a PDU
-is freed.  This can happen in many places (reconnect, defer_reconnect,
-cancel) so just do it in iscsi_free_pdu.
-
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
----
- lib/pdu.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/lib/pdu.c b/lib/pdu.c
-index 89b15c2..4db5f27 100644
---- a/lib/pdu.c
-+++ b/lib/pdu.c
-@@ -147,6 +147,10 @@ iscsi_free_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu)
- 	}
- 	pdu->indata.data = NULL;
- 
-+	if (iscsi->outqueue_current == pdu) {
-+		iscsi->outqueue_current = NULL;
-+	}
-+
- 	iscsi_sfree(iscsi, pdu);
- }
- 

fix-gcc7-warnings.patch

@@ -0,0 +1,35 @@
+upstream commits 854e37aab7d7d2093a0a6620a3257b8f2a1d405c
+and fb45f0343e3de45f2bc7516591d36c7466c2184e
+
+diff --git a/test-tool/iscsi-support.c b/test-tool/iscsi-support.c
+index cbadf85..20993d4 100644
+--- a/test-tool/iscsi-support.c
++++ b/test-tool/iscsi-support.c
+@@ -2931,16 +2931,17 @@ void populate_ident_tgt_desc(unsigned char *buf, struct scsi_device *dev)
+ 
+         for (desig = inq_di->designators; desig; desig = desig->next) {
+                 switch (desig->designator_type) {
+-                        case SCSI_DESIGNATOR_TYPE_VENDOR_SPECIFIC:
+-                        case SCSI_DESIGNATOR_TYPE_T10_VENDORT_ID:
+-                        case SCSI_DESIGNATOR_TYPE_EUI_64:
+-                        case SCSI_DESIGNATOR_TYPE_NAA:
+-                                if (prev_type <= desig->designator_type) {
+-                                        tgt_desig = desig;
+-                                        prev_type = desig->designator_type;
+-                                }
+-                        default:
+-                                continue;
++                case SCSI_DESIGNATOR_TYPE_VENDOR_SPECIFIC:
++                case SCSI_DESIGNATOR_TYPE_T10_VENDORT_ID:
++                case SCSI_DESIGNATOR_TYPE_EUI_64:
++                case SCSI_DESIGNATOR_TYPE_NAA:
++                        if (prev_type <= desig->designator_type) {
++                                tgt_desig = desig;
++                                prev_type = desig->designator_type;
++                        }
++                        continue;
++                default:
++                        continue;
+                 }
+         }
+         if (tgt_desig == NULL) {

libiscsi.spec

@@ -1,13 +1,19 @@
 Name: libiscsi
 Summary: iSCSI client library
+<<<<<<< HEAD
 Version: 1.15.0
 Release: 5%{?dist}
+=======
+Version: 1.18.0
+Release: 1%{?dist}
+>>>>>>> Rebased to version 1.18.0
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: https://github.com/sahlberg/%{name}
 
 Source: https://github.com/sahlberg/%{name}/archive/%{version}.tar.gz
-Patch13: 0013-disable-ld_iscsi.patch
+Patch1: disable-ld_iscsi.patch
+Patch2: fix-gcc7-warnings.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -30,7 +36,7 @@ a network.
 
 %prep
 %setup -q
-%patch13 -p1
+%autopatch -p1
 
 %build
 sh autogen.sh
@@ -97,6 +103,10 @@ The libiscsi-devel package includes the header files for libiscsi.
 %{_libdir}/pkgconfig/libiscsi.pc
 
 %changelog
+* Tue Oct 03 2017 Paolo Bonzini <pbonzini@redhat.com> - 1.18.0-1
+- Rebased to version 1.18.0
+- Added patch to fix gcc7 warnings
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 

sources

@@ -1,2 +1 @@
-a2a9ab4800e86f448a819ac950ece80c  libiscsi-1.11.0.tar.gz
-fbc8df75dc76d9c8aebbf55ad35b4dd4  1.15.0.tar.gz
+SHA512 (1.18.0.tar.gz) = 9869fd86f8ba237d71256b16d0f94ef69fb67fac315bb7a596c4d8d6ed3abba710edf9b5f5a27f5777f7b5d2feb33c09764c27a4e6c56e38dd2566836cffe36e