Hello community, here is the log from the commit of package open-iscsi for openSUSE:Factory checked in at 2018-11-27 10:39:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-iscsi (Old) and /work/SRC/openSUSE:Factory/.open-iscsi.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-iscsi" Tue Nov 27 10:39:34 2018 rev:77 rq:648635 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi.changes 2018-10-25 08:10:02.596278379 +0200 +++ /work/SRC/openSUSE:Factory/.open-iscsi.new.19453/open-iscsi.changes 2018-11-27 10:39:40.568363398 +0100 @@ -1,0 +2,14 @@ +Tue Nov 13 01:48:12 UTC 2018 - [email protected] + +- Updated to latest upstream, with fixes: + * Use pkg-config in Makefiles for newer libraries. + * Merge pull request #145 from gonzoleeman/fix-i586-build-warnings + * Fix i586 build issues with string length overflow. + * iscsistart is not installed + * iscsiuio: Do not flush tx queue on each uio interrupt. + updating: + * open-iscsi-SUSE-latest.diff.bz2 + Also, update the SPEC file: no more need to specify libkmod + or libsystemd, since upstream handles that now. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.ABMgJU/_old 2018-11-27 10:39:41.064362898 +0100 +++ /var/tmp/diff_new_pack.ABMgJU/_new 2018-11-27 10:39:41.064362898 +0100 @@ -38,6 +38,7 @@ BuildRequires: make BuildRequires: open-isns-devel BuildRequires: openssl-devel +BuildRequires: pkg-config BuildRequires: suse-module-tools BuildRequires: systemd BuildRequires: systemd-devel @@ -110,7 +111,7 @@ %build [ -z "$SOURCE_DATE_EPOCH" ] || export KBUILD_BUILD_TIMESTAMP=@$SOURCE_DATE_EPOCH -make %{?_smp_mflags} OPTFLAGS="%{optflags} -fno-strict-aliasing -DOFFLOAD_BOOT_SUPPORTED -DUSE_KMOD -I/usr/include/kmod -DLOCK_DIR=\\\"%{_sysconfdir}/iscsi\\\"" LDFLAGS="-lkmod -lsystemd" user +make %{?_smp_mflags} OPTFLAGS="%{optflags} -fno-strict-aliasing -DOFFLOAD_BOOT_SUPPORTED -DLOCK_DIR=\\\"%{_sysconfdir}/iscsi\\\"" user cd iscsiuio touch AUTHORS NEWS autoreconf --install ++++++ open-iscsi-SUSE-latest.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.ABMgJU/_old 2018-11-27 10:39:41.080362882 +0100 +++ /var/tmp/diff_new_pack.ABMgJU/_new 2018-11-27 10:39:41.084362878 +0100 @@ -0,0 +1,175 @@ +diff --git a/Makefile b/Makefile +index a03b2e687440..2816803264a0 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,7 +20,8 @@ rulesdir = $(libdir)/udev/rules.d + MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 \ + iscsiuio/docs/iscsiuio.8 doc/iscsi_fw_login.8 doc/iscsi-iname.8 \ + doc/iscsistart.8 +-PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi-iname iscsiuio/src/unix/iscsiuio ++PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi-iname iscsiuio/src/unix/iscsiuio \ ++ usr/iscsistart + SCRIPTS = utils/iscsi_discovery utils/iscsi_fw_login utils/iscsi_offload \ + utils/iscsi-gen-initiatorname + INSTALL = install +diff --git a/iscsiuio/src/unix/nic.c b/iscsiuio/src/unix/nic.c +index dfc2ad0a7a7b..29c4332a3162 100644 +--- a/iscsiuio/src/unix/nic.c ++++ b/iscsiuio/src/unix/nic.c +@@ -799,9 +799,12 @@ int nic_process_intr(nic_t *nic, int discard_check) + + nic->intr_count = count; + +- LOG_DEBUG(PFX "%s: host:%d - calling clear_tx_intr from process_intr", +- nic->log_name, nic->host_no); +- (*nic->ops->clear_tx_intr) (nic); ++ if (strcmp(nic->ops->description, "qedi")) { ++ LOG_DEBUG(PFX "%s: host:%d - calling clear_tx_intr from process_intr", ++ nic->log_name, nic->host_no); ++ (*nic->ops->clear_tx_intr) (nic); ++ } ++ + ret = 1; + } + pthread_mutex_unlock(&nic->nic_mutex); +diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile +index a7fd25fb6c25..5c511d345690 100644 +--- a/libopeniscsiusr/Makefile ++++ b/libopeniscsiusr/Makefile +@@ -24,6 +24,8 @@ INCLUDE_DIR ?= $(prefix)/include + PKGCONF_DIR ?= $(LIB_DIR)/pkgconfig + MAN_DIR ?= $(prefix)/share/man + ++PKG_CONFIG = /usr/bin/pkg-config ++ + LIBISCSI_USR_DIR=$(TOPDIR)/libopeniscsiusr + + LIBISCSI_USR_VERSION_MAJOR=0 +@@ -44,6 +46,9 @@ OBJS = context.o misc.o session.o sysfs.o iface.o idbm.o node.o default.o + + CFLAGS ?= -O2 -g + CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC ++CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) ++ ++LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) + + LIBADD = + +@@ -62,7 +67,7 @@ clean: + + $(TESTS): $(LIBS) + $(TESTS): CFLAGS += -I$(TOPDIR)/libopeniscsiusr -g +-$(TESTS): LDFLAGS += $(LIBADD) -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr ++$(TESTS): LDFLAGS += $(LIBADD) + + check: $(LIBS) $(TESTS) + sudo env LD_LIBRARY_PATH=$(LIBISCSI_USR_DIR) TESTS="$(TESTS)" \ +diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c +index 7724de2668bc..055dd9a16050 100644 +--- a/libopeniscsiusr/idbm.c ++++ b/libopeniscsiusr/idbm.c +@@ -676,7 +676,7 @@ updated: + if (!passwd_done && !strcmp(#_param, name)) { \ + passwd_done = 1; \ + name = #_param "_length"; \ +- snprintf(passwd_len, 8, "%d", (int)strlen(value)); \ ++ snprintf(passwd_len, 8, "%.7d", (int)strlen(value) & 0xffff); \ + value = passwd_len; \ + goto setup_passwd_len; \ + } +diff --git a/usr/Makefile b/usr/Makefile +index f541d7cb0362..1326a444cdbd 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -32,10 +32,16 @@ IPC_OBJ=ioctl.o + endif + endif + ++PKG_CONFIG = /usr/bin/pkg-config ++ + CFLAGS ?= -O2 -g + WARNFLAGS ?= -Wall -Wstrict-prototypes + CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ + -I$(TOPDIR)/libopeniscsiusr ++CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) ++CFLAGS += $(shell $(PKG_CONFIG) --cflags libsystemd) ++LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) ++LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd) + ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr + PROGRAMS = iscsid iscsiadm iscsistart + +@@ -60,14 +66,14 @@ all: $(PROGRAMS) + + iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ + iscsid.o session_mgmt.o discoveryd.o mntcheck.o +- $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -lisns -lcrypto -lrt -lmount $(ISCSI_LIB) ++ $(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount $(LDFLAGS) $(ISCSI_LIB) + + iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o mntcheck.o +- $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -lisns -lcrypto -lmount $(ISCSI_LIB) ++ $(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(LDFLAGS) $(ISCSI_LIB) + + iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ + iscsistart.o statics.o +- $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -lrt $(ISCSI_LIB) ++ $(CC) $(CFLAGS) $^ -o $@ -lrt $(LDFLAGS) $(ISCSI_LIB) + + clean: + rm -f *.o $(PROGRAMS) .depend $(LIBSYS) +diff --git a/usr/idbm.c b/usr/idbm.c +index a0207e2d1c3b..89a6c2722ed4 100644 +--- a/usr/idbm.c ++++ b/usr/idbm.c +@@ -30,6 +30,7 @@ + #include <fcntl.h> + #include <sys/stat.h> + #include <sys/file.h> ++#include <inttypes.h> + + #include "idbm.h" + #include "idbm_fields.h" +@@ -65,7 +66,7 @@ static struct idbm *db; + #define __recinfo_int(_key, _info, _rec, _name, _show, _n, _mod) do { \ + _info[_n].type = TYPE_INT; \ + strlcpy(_info[_n].name, _key, NAME_MAXVAL); \ +- snprintf(_info[_n].value, VALUE_MAXVAL, "%d", _rec->_name); \ ++ snprintf(_info[_n].value, VALUE_MAXVAL, "%" PRIi32, _rec->_name); \ + _info[_n].data = &_rec->_name; \ + _info[_n].data_len = sizeof(_rec->_name); \ + _info[_n].visible = _show; \ +@@ -76,7 +77,7 @@ static struct idbm *db; + #define __recinfo_uint8(_key, _info, _rec, _name, _show, _n, _mod) do { \ + _info[_n].type = TYPE_UINT8; \ + strlcpy(_info[_n].name, _key, NAME_MAXVAL); \ +- snprintf(_info[_n].value, VALUE_MAXVAL, "%d", _rec->_name); \ ++ snprintf(_info[_n].value, VALUE_MAXVAL, "%" PRIu8, _rec->_name); \ + _info[_n].data = &_rec->_name; \ + _info[_n].data_len = sizeof(_rec->_name); \ + _info[_n].visible = _show; \ +@@ -87,7 +88,7 @@ static struct idbm *db; + #define __recinfo_uint16(_key, _info, _rec, _name, _show, _n, _mod) do { \ + _info[_n].type = TYPE_UINT16; \ + strlcpy(_info[_n].name, _key, NAME_MAXVAL); \ +- snprintf(_info[_n].value, VALUE_MAXVAL, "%d", _rec->_name); \ ++ snprintf(_info[_n].value, VALUE_MAXVAL, "%" PRIu16, _rec->_name); \ + _info[_n].data = &_rec->_name; \ + _info[_n].data_len = sizeof(_rec->_name); \ + _info[_n].visible = _show; \ +@@ -98,7 +99,7 @@ static struct idbm *db; + #define __recinfo_uint32(_key, _info, _rec, _name, _show, _n, _mod) do { \ + _info[_n].type = TYPE_UINT32; \ + strlcpy(_info[_n].name, _key, NAME_MAXVAL); \ +- snprintf(_info[_n].value, VALUE_MAXVAL, "%d", _rec->_name); \ ++ snprintf(_info[_n].value, VALUE_MAXVAL, "%" PRIu32, _rec->_name); \ + _info[_n].data = &_rec->_name; \ + _info[_n].data_len = sizeof(_rec->_name); \ + _info[_n].visible = _show; \ +@@ -1041,7 +1042,7 @@ updated: + if (!passwd_done && !strcmp(#_param, name)) { \ + passwd_done = 1; \ + name = #_param "_length"; \ +- snprintf(passwd_len, 8, "%d", (int)strlen(value)); \ ++ snprintf(passwd_len, 8, "%.7" PRIi32, (int)strlen(value) & 0xffff); \ + value = passwd_len; \ + goto setup_passwd_len; \ + }
