From 548eb0abc2f967923cb416cb678d42f8af820f75 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Oct 03 2017 15:02:39 +0000 Subject: Rebased to version 1.18.0 Added patch to fix gcc7 warnings --- diff --git a/.gitignore b/.gitignore index 342ea6e..1a531df 100644 --- a/.gitignore +++ b/.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 diff --git a/0012-bump-soname.patch b/0012-bump-soname.patch deleted file mode 100644 index 8f08c7f..0000000 --- a/0012-bump-soname.patch +++ /dev/null @@ -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 diff --git a/0013-disable-ld_iscsi.patch b/0013-disable-ld_iscsi.patch deleted file mode 100644 index 36a5485..0000000 --- a/0013-disable-ld_iscsi.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index e1d01c6..72a5019 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -118,7 +118,7 @@ - fi - AM_CONDITIONAL(ISCSITEST, [test "$ac_cv_have_cunit" = yes -a "$enable_shared" = "yes"]) - --AM_CONDITIONAL(LD_ISCSI, [expr "(" "$host_os" : "linux" ")" "&" "$enable_shared" "=" "yes"]) -+AM_CONDITIONAL(LD_ISCSI, [false]) - - AC_CHECK_MEMBER([struct CU_SuiteInfo.pSetUpFunc], - [AC_DEFINE([HAVE_CU_SUITEINFO_PSETUPFUNC], 1, diff --git a/0020-reconnect-fix.patch b/0020-reconnect-fix.patch deleted file mode 100644 index 4608f38..0000000 --- a/0020-reconnect-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fd5471960f8f0556efae2c9539867fb3c1ca0882 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -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 ---- - 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); - } - diff --git a/disable-ld_iscsi.patch b/disable-ld_iscsi.patch new file mode 100644 index 0000000..36a5485 --- /dev/null +++ b/disable-ld_iscsi.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index e1d01c6..72a5019 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -118,7 +118,7 @@ + fi + AM_CONDITIONAL(ISCSITEST, [test "$ac_cv_have_cunit" = yes -a "$enable_shared" = "yes"]) + +-AM_CONDITIONAL(LD_ISCSI, [expr "(" "$host_os" : "linux" ")" "&" "$enable_shared" "=" "yes"]) ++AM_CONDITIONAL(LD_ISCSI, [false]) + + AC_CHECK_MEMBER([struct CU_SuiteInfo.pSetUpFunc], + [AC_DEFINE([HAVE_CU_SUITEINFO_PSETUPFUNC], 1, diff --git a/fix-gcc7-warnings.patch b/fix-gcc7-warnings.patch new file mode 100644 index 0000000..cd7282f --- /dev/null +++ b/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) { diff --git a/libiscsi.spec b/libiscsi.spec index 29e5ab8..944e21b 100644 --- a/libiscsi.spec +++ b/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 - 1.18.0-1 +- Rebased to version 1.18.0 +- Added patch to fix gcc7 warnings + * Thu Aug 03 2017 Fedora Release Engineering - 1.15.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index eeb767c..5afc660 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -a2a9ab4800e86f448a819ac950ece80c libiscsi-1.11.0.tar.gz -fbc8df75dc76d9c8aebbf55ad35b4dd4 1.15.0.tar.gz +SHA512 (1.18.0.tar.gz) = 9869fd86f8ba237d71256b16d0f94ef69fb67fac315bb7a596c4d8d6ed3abba710edf9b5f5a27f5777f7b5d2feb33c09764c27a4e6c56e38dd2566836cffe36e