Hello community, here is the log from the commit of package open-iscsi for openSUSE:Factory checked in at 2018-09-05 13:48:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-iscsi (Old) and /work/SRC/openSUSE:Factory/.open-iscsi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-iscsi" Wed Sep 5 13:48:15 2018 rev:74 rq:633203 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi.changes 2018-06-05 12:49:32.853031733 +0200 +++ /work/SRC/openSUSE:Factory/.open-iscsi.new/open-iscsi.changes 2018-09-05 13:48:16.538229467 +0200 @@ -1,0 +2,14 @@ +Tue Sep 4 17:35:55 UTC 2018 - ldun...@suse.com + +- Use libkmod instead of running modprobe (bsc#1106685), updating + the spec file, and: + * open-iscsi-SUSE-latest.diff.bz2 + +------------------------------------------------------------------- +Fri Aug 31 16:15:47 UTC 2018 - ldun...@suse.com + +- iscsiuio: limit retries on dhcpv6 (bsc#1106694 and bsc#1105916), + updating: + * open-iscsi-SUSE-latest.diff.bz2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.f2bXdb/_old 2018-09-05 13:48:17.826231628 +0200 +++ /var/tmp/diff_new_pack.f2bXdb/_new 2018-09-05 13:48:17.838231648 +0200 @@ -21,7 +21,7 @@ Version: 2.0.876 Release: 0 Summary: Linux Open-iSCSI Software Initiator -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Networking/Other Url: http://www.open-iscsi.com Source: %{name}-2.0.%{iscsi_release}.tar.bz2 @@ -32,6 +32,7 @@ BuildRequires: db-devel < 5 BuildRequires: fdupes BuildRequires: flex +BuildRequires: libkmod-devel BuildRequires: libmount-devel BuildRequires: libtool BuildRequires: make @@ -105,7 +106,7 @@ %patch1 -p1 %build -make %{?_smp_mflags} OPTFLAGS="%{optflags} -fno-strict-aliasing -DOFFLOAD_BOOT_SUPPORTED -DLOCK_DIR=\\\"%{_sysconfdir}/iscsi\\\"" LDFLAGS="" user +make %{?_smp_mflags} OPTFLAGS="%{optflags} -fno-strict-aliasing -DOFFLOAD_BOOT_SUPPORTED -DUSE_KMOD -I/usr/include/kmod -DLOCK_DIR=\\\"%{_sysconfdir}/iscsi\\\"" LDFLAGS="-lkmod" user cd iscsiuio touch AUTHORS NEWS autoreconf --install ++++++ open-iscsi-SUSE-latest.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.f2bXdb/_old 2018-09-05 13:48:17.858231681 +0200 +++ /var/tmp/diff_new_pack.f2bXdb/_new 2018-09-05 13:48:17.862231688 +0200 @@ -92,6 +92,35 @@ }; /* iSCSI port state */ +diff --git a/iscsiuio/src/uip/ipv6_ndpc.c b/iscsiuio/src/uip/ipv6_ndpc.c +index a396cb784bd3..bb07c1dd64ff 100644 +--- a/iscsiuio/src/uip/ipv6_ndpc.c ++++ b/iscsiuio/src/uip/ipv6_ndpc.c +@@ -134,6 +134,7 @@ wait_rtr: + } while (!(ipv6c->flags & IPV6_FLAGS_ROUTER_ADV_RECEIVED)); + + LOG_DEBUG("%s: ndpc_handle got rtr adv", s->nic->log_name); ++ s->retry_count = 0; + + no_rtr_adv: + s->state = NDPC_STATE_RTR_ADV; +@@ -200,9 +201,13 @@ wait_dhcp: + } else { + /* Static IPv6 */ + if (ustack->ip_config == IPV6_CONFIG_DHCP) { +- LOG_DEBUG("%s: ndpc_handle DHCP failed", +- s->nic->log_name); +- PT_RESTART(&s->pt); ++ s->retry_count++; ++ if (s->retry_count > DHCPV6_NUM_OF_RETRY) { ++ LOG_DEBUG("%s: ndpc_handle DHCP failed", ++ s->nic->log_name); ++ } else { ++ PT_RESTART(&s->pt); ++ } + } + staticv6: + ipv6_disable_dhcpv6(ipv6c); diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c index d4322350fcf6..2acac485af72 100644 --- a/iscsiuio/src/unix/iscsid_ipc.c @@ -217,6 +246,28 @@ n = scandir(sys_scsi_host_dir_path, &namelist, _scan_filter_skip_dot, alphasort); +diff --git a/usr/Makefile b/usr/Makefile +index 438bba57a6e2..f541d7cb0362 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -60,14 +60,14 @@ all: $(PROGRAMS) + + iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ + iscsid.o session_mgmt.o discoveryd.o mntcheck.o +- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount $(ISCSI_LIB) ++ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -lisns -lcrypto -lrt -lmount $(ISCSI_LIB) + + iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o mntcheck.o +- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(ISCSI_LIB) ++ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -lisns -lcrypto -lmount $(ISCSI_LIB) + + iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ + iscsistart.o statics.o +- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB) ++ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -lrt $(ISCSI_LIB) + + clean: + rm -f *.o $(PROGRAMS) .depend $(LIBSYS) diff --git a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c index 0cc55b97bde9..a5106945006a 100644 --- a/usr/iscsi_sysfs.c
