Hello community, here is the log from the commit of package open-iscsi for openSUSE:Factory checked in at 2016-04-30 23:23:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-iscsi (Old) and /work/SRC/openSUSE:Factory/.open-iscsi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-iscsi" Changes: -------- --- /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi.changes 2016-01-23 01:15:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.open-iscsi.new/open-iscsi.changes 2016-04-30 23:23:20.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Apr 13 17:06:42 UTC 2016 - [email protected] + +- Ported 3 changes from SLE 12 that are not upstream, but + are needed here, as there are in SLE: + * Fixed systemd start of iscsi.service (bsc#897565) + * iscsiuio: ARP table too small when switches involve + * Discovery via non-tcp transport needs IPC set. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi-Factory-latest.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.eWf2A4/_old 2016-04-30 23:23:21.000000000 +0200 +++ /var/tmp/diff_new_pack.eWf2A4/_new 2016-04-30 23:23:21.000000000 +0200 @@ -1480,7 +1480,7 @@ [ "$iscsiuio_pid" ] && kill -TERM $iscsiuio_pid diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service new file mode 100644 -index 000000000000..0239ef6936a5 +index 000000000000..7aa655f1f32d --- /dev/null +++ b/etc/systemd/iscsi.service @@ -0,0 +1,15 @@ @@ -1492,7 +1492,7 @@ + +[Service] +Type=oneshot -+ExecStart=/sbin/iscsiadm -m node --loginall=automatic ++ExecStart=-/sbin/iscsiadm -m node --loginall=automatic +ExecStop=/sbin/iscsiadm -m node --logoutall=automatic +SuccessExitStatus=21 +RemainAfterExit=true @@ -8837,7 +8837,7 @@ + context->flags |= IPV6_FLAGS_DISABLE_DHCPV6; } diff --git a/iscsiuio/src/uip/ipv6.h b/iscsiuio/src/uip/ipv6.h -index 167f5f69383b..bc63762ebc55 100644 +index 167f5f69383b..35864377d9f3 100644 --- a/iscsiuio/src/uip/ipv6.h +++ b/iscsiuio/src/uip/ipv6.h @@ -1,5 +1,6 @@ @@ -9203,7 +9203,8 @@ + struct ipv6_addr default_router; + struct ipv6_prefix_entry *addr_list; u8_t hop_limit; - #define UIP_ARPTAB_SIZE 8 +-#define UIP_ARPTAB_SIZE 8 ++#define UIP_ARPTAB_SIZE 16 struct uip_stack *ustack; #define MAX_MCADDR_TABLE 5 @@ -11869,7 +11870,7 @@ return 0; } diff --git a/iscsiuio/src/uip/uipopt.h b/iscsiuio/src/uip/uipopt.h -index c91ec54c2876..946fce284926 100644 +index c91ec54c2876..bcc8949b8f16 100644 --- a/iscsiuio/src/uip/uipopt.h +++ b/iscsiuio/src/uip/uipopt.h @@ -53,7 +53,6 @@ @@ -11898,6 +11899,15 @@ /** * \name UDP configuration options * @{ +@@ -342,7 +341,7 @@ + #ifdef UIP_CONF_ARPTAB_SIZE + #define UIP_ARPTAB_SIZE UIP_CONF_ARPTAB_SIZE + #else +-#define UIP_ARPTAB_SIZE 8 ++#define UIP_ARPTAB_SIZE 16 + #endif + + /** @@ -356,7 +355,7 @@ /** @} */ @@ -20854,11 +20864,20 @@ echo "$RPM src rpm copied to $DESTDIR" diff --git a/rpm/open-iscsi.changes b/rpm/open-iscsi.changes -index 2e21afc6bc7b..ac5ff5f591f4 100644 +index 2e21afc6bc7b..140df4d6d0c5 100644 --- a/rpm/open-iscsi.changes +++ b/rpm/open-iscsi.changes -@@ -1,4 +1,467 @@ +@@ -1,4 +1,476 @@ ------------------------------------------------------------------- ++Wed Apr 13 17:06:42 UTC 2016 - [email protected] ++ ++- Ported 3 changes from SLE 12 that are not upstream, but ++ are needed here, as there are in SLE: ++ * Fixed systemd start of iscsi.service (bsc#897565) ++ * iscsiuio: ARP table too small when switches involve ++ * Discovery via non-tcp transport needs IPC set. ++ ++------------------------------------------------------------------- +Thu Jan 14 23:56:07 UTC 2016 - [email protected] + +- Synced with current upstream as of today, which included 29 @@ -20900,7 +20919,7 @@ + * Allow setting host params to return EAGAIN errors. + +------------------------------------------------------------------- -+Thu Jan 07 01:39:10 UTC 16 - [email protected] ++Thu Jan 07 01:39:10 UTC 2016 - [email protected] + +- Removing creation of the open-isns RPM, since it + is now created in its own package @@ -21325,7 +21344,7 @@ Fri Dec 9 15:09:01 CET 2011 - [email protected] - iscsiadm: Return correct error when login fails (bnc#715071) -@@ -40,6 +503,11 @@ Fri Nov 4 09:15:52 CET 2011 - [email protected] +@@ -40,6 +512,11 @@ Fri Nov 4 09:15:52 CET 2011 - [email protected] - Stop iscsiuio when run inside initrd (bnc#728095) ------------------------------------------------------------------- @@ -21337,7 +21356,7 @@ Mon Oct 24 09:13:19 CEST 2011 - [email protected] - Update iscsiuio to 0.7.0.14f (bnc#687392) -@@ -101,6 +569,11 @@ Tue Jun 21 15:09:46 CEST 2011 - [email protected] +@@ -101,6 +578,11 @@ Tue Jun 21 15:09:46 CEST 2011 - [email protected] - Include scripts for automated build ------------------------------------------------------------------- @@ -21349,7 +21368,7 @@ Wed Feb 2 11:32:12 CET 2011 - [email protected] - Fix the following issues: -@@ -224,6 +697,11 @@ Wed Nov 18 10:33:27 CET 2009 - [email protected] +@@ -224,6 +706,11 @@ Wed Nov 18 10:33:27 CET 2009 - [email protected] - Read initiatorname correctly from sysfs (bnc#541882) ------------------------------------------------------------------- @@ -21361,7 +21380,7 @@ Wed Aug 19 12:58:13 CEST 2009 - [email protected] - Synchronize startup settings (bnc#514273) -@@ -231,11 +709,24 @@ Wed Aug 19 12:58:13 CEST 2009 - [email protected] +@@ -231,11 +718,24 @@ Wed Aug 19 12:58:13 CEST 2009 - [email protected] - Do not use temp file in iscsi_discovery (bnc#528711) ------------------------------------------------------------------- @@ -23091,7 +23110,7 @@ log_error("Cannot start conn %d:%d (err %d)", session->id, conn->id, rc); diff --git a/usr/discoveryd.c b/usr/discoveryd.c -index de080ea2c271..f5359c741efe 100644 +index de080ea2c271..1955ce9062d6 100644 --- a/usr/discoveryd.c +++ b/usr/discoveryd.c @@ -40,11 +40,11 @@ @@ -23155,6 +23174,18 @@ isns_function_name(function)); isns_message_release(msg); continue; +@@ -1034,11 +1034,6 @@ static void __do_st_disc_and_login(struct discovery_rec *drec) + drec->u.sendtargets.reopen_max = 0; + + iface_link_ifaces(&setup_ifaces); +- /* +- * disc code assumes this is not set and wants to use +- * the userspace IO code. +- */ +- ipc = NULL; + + rc = idbm_bind_ifaces_to_nodes(discovery_sendtargets, drec, + &setup_ifaces, &rec_list); diff --git a/usr/event_poll.c b/usr/event_poll.c index f36fec162bf0..209ee0280c0a 100644 --- a/usr/event_poll.c
