Hello community, here is the log from the commit of package open-iscsi for openSUSE:Factory checked in at 2013-12-03 14:26:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-11-17 20:20:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.open-iscsi.new/open-iscsi.changes 2013-12-03 14:26:44.000000000 +0100 @@ -1,0 +2,20 @@ +Mon Dec 2 14:46:25 PST 2013 - [email protected] + +- Dropped this patch from OBS; moved to github repostiory: + open-iscsi-2.0-873.patch + + The following patches updated to use new linux git + requirements for longer hash values in patches, but not + functionally changed: + open-iscsi-openSUSE-12.3-first-merge.diff.bz2 + open-iscsi-sles11-sp2-latest.diff.bz2 + open-iscsi-sles11-sp2-update.diff.bz2 + open-iscsi-sles11-sp3-flash-update.diff.bz2 + open-iscsi-sles11-sp3-general-updates-1.diff.bz2 + open-iscsi-sles11-sp3-iscsiuio-update.diff.bz2 + + This patch was also changed to absorb changes from + open-iscsi-2.0-873.patch: + open-iscsi-openSUSE-Factory-first-merge.diff.bz2 + +------------------------------------------------------------------- Old: ---- open-iscsi-2.0-873.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.zEDIFO/_old 2013-12-03 14:26:45.000000000 +0100 +++ /var/tmp/diff_new_pack.zEDIFO/_new 2013-12-03 14:26:45.000000000 +0100 @@ -43,7 +43,6 @@ Patch5: %{name}-sles11-sp3-general-updates-1.diff.bz2 Patch6: %{name}-openSUSE-12.3-first-merge.diff.bz2 Patch7: %{name}-openSUSE-Factory-first-merge.diff.bz2 -Patch10: open-iscsi-2.0-873.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -80,7 +79,6 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch10 -p1 %build %{__make} OPTFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -DLOCK_DIR=\\\"/etc/iscsi\\\"" user ++++++ open-iscsi-openSUSE-12.3-first-merge.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.zEDIFO/_old 2013-12-03 14:26:45.000000000 +0100 +++ /var/tmp/diff_new_pack.zEDIFO/_new 2013-12-03 14:26:45.000000000 +0100 @@ -1,5 +1,5 @@ diff --git a/etc/initd/initd.suse b/etc/initd/initd.suse -index 6f4e2c3..9090138 100644 +index 6f4e2c3e541c..9090138a7238 100644 --- a/etc/initd/initd.suse +++ b/etc/initd/initd.suse @@ -5,9 +5,9 @@ @@ -60,7 +60,7 @@ RETVAL=1 fi diff --git a/etc/mkinitrd/mkinitrd-setup.sh b/etc/mkinitrd/mkinitrd-setup.sh -index a3dc8f1..ae35ca7 100644 +index a3dc8f1a531f..ae35ca7970f7 100644 --- a/etc/mkinitrd/mkinitrd-setup.sh +++ b/etc/mkinitrd/mkinitrd-setup.sh @@ -23,7 +23,7 @@ function check_iscsi() @@ -205,7 +205,7 @@ # In case target port was not defined via command line, assign default port save_var TargetPort 3260 diff --git a/include/iscsi_err.h b/include/iscsi_err.h -index aabea4e..de54497 100644 +index aabea4ea8011..de5449727799 100644 --- a/include/iscsi_err.h +++ b/include/iscsi_err.h @@ -62,6 +62,8 @@ enum { @@ -218,7 +218,7 @@ /* Always last. Indicates end of error code space */ ISCSI_MAX_ERR_VAL, diff --git a/rpm/build_rpm b/rpm/build_rpm -index 02d770c..773f00e 100755 +index 02d770c9e18f..773f00e6bd70 100755 --- a/rpm/build_rpm +++ b/rpm/build_rpm @@ -9,14 +9,15 @@ @@ -264,7 +264,7 @@ # and patch them into the spec file as "Patch$NEXT_PATCH" if (( $uncommitted_changes )) ; then diff --git a/rpm/open-iscsi.changes b/rpm/open-iscsi.changes -index 6450133..35da303 100644 +index 64501332aa08..35da303d2e0c 100644 --- a/rpm/open-iscsi.changes +++ b/rpm/open-iscsi.changes @@ -1,4 +1,17 @@ @@ -286,7 +286,7 @@ - Adds support to be able to use isns discovery and diff --git a/rpm/open-iscsi.spec b/rpm/open-iscsi.spec -index c321684..b08b688 100644 +index c3216844b489..b08b6884e731 100644 --- a/rpm/open-iscsi.spec +++ b/rpm/open-iscsi.spec @@ -15,21 +15,20 @@ @@ -392,7 +392,7 @@ %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/setup-iscsi.sh diff --git a/usr/Makefile b/usr/Makefile -index 86220f1..8125b55 100644 +index 86220f1a4c75..8125b55e220e 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -61,7 +61,7 @@ iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o @@ -405,7 +405,7 @@ rm -f *.o $(PROGRAMS) .depend $(LIBSYS) diff --git a/usr/iscsi_util.c b/usr/iscsi_util.c -index adc31a4..22491c4 100644 +index adc31a46537e..22491c44bc43 100644 --- a/usr/iscsi_util.c +++ b/usr/iscsi_util.c @@ -31,6 +31,7 @@ @@ -426,7 +426,7 @@ strerror(errno)); diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c -index 84d5a27..5030894 100644 +index 84d5a272ec96..50308942c0cc 100644 --- a/usr/iscsiadm.c +++ b/usr/iscsiadm.c @@ -1235,6 +1235,7 @@ sw_discovery: @@ -438,7 +438,7 @@ } diff --git a/utils/fwparam_ibft/fw_entry.c b/utils/fwparam_ibft/fw_entry.c -index b6f05c1..1256227 100644 +index b6f05c14e5aa..125622758d47 100644 --- a/utils/fwparam_ibft/fw_entry.c +++ b/utils/fwparam_ibft/fw_entry.c @@ -36,6 +36,7 @@ ++++++ open-iscsi-openSUSE-Factory-first-merge.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.zEDIFO/_old 2013-12-03 14:26:45.000000000 +0100 +++ /var/tmp/diff_new_pack.zEDIFO/_new 2013-12-03 14:26:45.000000000 +0100 @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index c0fe0da..634aece 100644 +index c0fe0daa3214..634aece5a28a 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,7 @@ mandir = $(prefix)/share/man @@ -45,7 +45,7 @@ $(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi/ifaces $(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi/ifaces diff --git a/etc/iscsid.conf b/etc/iscsid.conf -index 1ae9091..5ee596d 100644 +index 1ae909150aa2..5ee596d14edb 100644 --- a/etc/iscsid.conf +++ b/etc/iscsid.conf @@ -14,13 +14,13 @@ @@ -64,9 +64,53 @@ ############################# # NIC/HBA and driver settings +diff --git a/etc/mkinitrd/mkinitrd-boot.sh b/etc/mkinitrd/mkinitrd-boot.sh +index 561c75eaba0f..0d61bf3cd14a 100644 +--- a/etc/mkinitrd/mkinitrd-boot.sh ++++ b/etc/mkinitrd/mkinitrd-boot.sh +@@ -1,7 +1,10 @@ + #!/bin/bash + #%stage: device + #%depends: network +-#%programs: /sbin/iscsid /sbin/iscsiadm /sbin/iscsiuio ++#%programs: mkdir ++#%programs: rm ++#%programs: /sbin/iscsid ++#%programs: /sbin/iscsiadm + #%modules: iscsi_tcp crc32c scsi_transport_iscsi iscsi_ibft bnx2i + #%if: "$root_iscsi" -o "$TargetAddress" + # +@@ -87,7 +90,6 @@ echo "InitiatorName=$InitiatorName" > /etc/iscsi/initiatorname.iscsi + unset iSCSI_warning_InitiatorName + + echo "Starting iSCSI daemon" +-/sbin/iscsiuio + /sbin/iscsid -n + + if [ -d /sys/firmware/ibft/initiator ] ; then +diff --git a/etc/mkinitrd/mkinitrd-stop.sh b/etc/mkinitrd/mkinitrd-stop.sh +index 393a410971a3..a099c60eb86d 100644 +--- a/etc/mkinitrd/mkinitrd-stop.sh ++++ b/etc/mkinitrd/mkinitrd-stop.sh +@@ -2,6 +2,8 @@ + # + #%stage: setup + #%provides: killprogs ++#%programs: kill ++#%programs: pidof + # + #%if: "$root_iscsi" + #%dontshow +@@ -19,6 +21,4 @@ + # kill iscsid, will be restarted from the real root + iscsi_pid=$(pidof iscsid) + [ "$iscsi_pid" ] && kill -TERM $iscsi_pid +-# Same goes for iscsiuio +-iscsiuio_pid=$(pidof iscsiuio) + [ "$iscsiuio_pid" ] && kill -TERM $iscsiuio_pid diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service new file mode 100644 -index 0000000..664d3aa +index 000000000000..664d3aa6100f --- /dev/null +++ b/etc/systemd/iscsi.service @@ -0,0 +1,16 @@ @@ -88,7 +132,7 @@ +WantedBy=remote-fs.target diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service new file mode 100644 -index 0000000..127e56a +index 000000000000..127e56a70572 --- /dev/null +++ b/etc/systemd/iscsid.service @@ -0,0 +1,12 @@ @@ -106,7 +150,7 @@ +WantedBy=multi-user.target diff --git a/etc/systemd/iscsid.socket b/etc/systemd/iscsid.socket new file mode 100644 -index 0000000..58a8d12 +index 000000000000..58a8d1239996 --- /dev/null +++ b/etc/systemd/iscsid.socket @@ -0,0 +1,9 @@ @@ -120,7 +164,7 @@ +[Install] +WantedBy=sockets.target diff --git a/rpm/build_rpm b/rpm/build_rpm -index 773f00e..3e920be 100755 +index 773f00e6bd70..3e920be6dbe4 100755 --- a/rpm/build_rpm +++ b/rpm/build_rpm @@ -9,14 +9,15 @@ @@ -163,21 +207,181 @@ # and patch them into the spec file as "Patch$NEXT_PATCH" if (( $uncommitted_changes )) ; then diff --git a/rpm/open-iscsi.changes b/rpm/open-iscsi.changes -index 35da303..1434616 100644 +index 35da303d2e0c..324c2a2f9bda 100644 --- a/rpm/open-iscsi.changes +++ b/rpm/open-iscsi.changes -@@ -1,4 +1,9 @@ +@@ -1,4 +1,93 @@ ------------------------------------------------------------------- ++Mon Dec 2 14:46:25 PST 2013 - [email protected] ++ ++- Dropped this patch from OBS; moved to github repostiory: ++ open-iscsi-2.0-873.patch ++ ++ The following patches updated to use new linux git ++ requirements for longer hash values in patches, but not ++ functionally changed: ++ open-iscsi-openSUSE-12.3-first-merge.diff.bz2 ++ open-iscsi-sles11-sp2-latest.diff.bz2 ++ open-iscsi-sles11-sp2-update.diff.bz2 ++ open-iscsi-sles11-sp3-flash-update.diff.bz2 ++ open-iscsi-sles11-sp3-general-updates-1.diff.bz2 ++ open-iscsi-sles11-sp3-iscsiuio-update.diff.bz2 ++ ++ This patch was also changed to absorb changes from ++ open-iscsi-2.0-873.patch: ++ open-iscsi-openSUSE-Factory-first-merge.diff.bz2 ++ ++------------------------------------------------------------------- ++Thu Nov 14 22:59:40 UTC 2013 - [email protected] ++ ++- install the iscsistart utility which is required by dracut ++ ++------------------------------------------------------------------- ++Fri Oct 4 16:07:47 CEST 2013 - [email protected] ++ ++- Remove usage of iscsiuio from mkinitrd scripts ++- Add programs tags to mkinitrd scripts ++ open-iscsi-2.0-873.patch ++ ++------------------------------------------------------------------- +Fri Sep 27 14:23:10 PDT 2013 - [email protected] + +- add support for systemd integration (bnc#827654) ++ open-iscsi-openSUSE-Factory-first-merge.diff.bz2 ++ ++------------------------------------------------------------------- ++Wed Jul 3 15:01:50 UTC 2013 - [email protected] ++ ++- moved the open-iscsi branch to the SLES 11 SP3 codebase. ++ ++ Update coalesces and drops patches: ++ iscsi-gen-initiatorname.sh ++ open-iscsi-2.0-870-rc1-static.patch ++ open-iscsi-2.0-870-rc1.tar.bz2 ++ open-iscsi-add-error-msg-to-log.c ++ open-iscsi-add-mkinitrd-scriptlets ++ open-iscsi-add-rhel5-compat ++ open-iscsi-add-sles10-compat ++ open-iscsi-allow-onboot-for-loginall ++ open-iscsi-beta5-kernel-patch-update ++ open-iscsi.changes ++ open-iscsi-cxgb3i-support ++ open-iscsi-error-check-in-db-lock-creation ++ open-iscsi-fix-sysfs-get-value-null.patch ++ open-iscsi-fixup-onboot-for-loginall ++ open-iscsi-fw-crash-on-ppc ++ open-iscsi-fwparam_ppc-string-overflow ++ open-iscsi-header.patch ++ open-iscsi-initiator-compile-warning ++ open-iscsi-install-mkinitrd-scriptlets ++ open-iscsi-iscsid-adjust-settings ++ open-iscsi-iscsi_discovery-doc-fixes ++ open-iscsi-load-ibft-before-reading-sys-firmware ++ open-iscsi-login-retry-update ++ open-iscsi-no-pid-file ++ open-iscsi-option-no-pid-file ++ open-iscsi-remove-dump-char ++ open-iscsi-remove-trailing-tilde ++ open-iscsi-rm-unused-variable ++ open-iscsi-set-LOCK_DIR-during-compilation ++ open-iscsi.spec ++ open-iscsi-start-target-before-initiator ++ open-iscsi-support-non-root-boot-volume.patch ++ open-iscsi-suse-build-fixes ++ open-iscsi-sync-modules-with-2.6.27 ++ open-iscsi-update-init-script ++ open-iscsi-update-suse-init-scripts ++ ++- New patches: ++ open-iscsi-openSUSE-12.3-first-merge.diff.bz2 ++ open-iscsi-sles11-sp2-latest.diff.bz2 ++ open-iscsi-sles11-sp2-update.diff.bz2 ++ open-iscsi-sles11-sp3-flash-update.diff.bz2 ++ open-iscsi-sles11-sp3-general-updates-1.diff.bz2 ++ open-iscsi-sles11-sp3-iscsiuio-update.diff.bz2 + +------------------------------------------------------------------- Wed Jun 5 15:53:34 PDT 2013 - [email protected] - check return from nice() correctly (bnc#807936) +@@ -35,6 +124,14 @@ Fri Apr 5 11:04:21 PDT 2013 - [email protected] + flash (bnc#810208) + + ------------------------------------------------------------------- ++Thu Mar 14 13:19:32 PDT 2013 - [email protected] ++ ++- Add open-iscsi-support-non-root-boot-volume.patch: handle non- ++ root boot-time iscsi volumes (bnc#630434) ++- Add open-iscsi-fix-sysfs-get-value-null.patch: accept "(null)" ++ password as meaning no password, when using sysfs (bnc#766300) ++ ++------------------------------------------------------------------- + Mon Mar 11 15:20:47 PDT 2013 - [email protected] + + - Updated iscsiuio to latest (bnc#769125) +@@ -105,6 +202,11 @@ Fri Nov 4 09:15:52 CET 2011 - [email protected] + - Stop iscsiuio when run inside initrd (bnc#728095) + + ------------------------------------------------------------------- ++Thu Oct 27 09:25:02 UTC 2011 - [email protected] ++ ++- Rename init scripts (bnc#661401). ++ ++------------------------------------------------------------------- + Mon Oct 24 09:13:19 CEST 2011 - [email protected] + + - Update iscsiuio to 0.7.0.14f (bnc#687392) +@@ -166,6 +268,11 @@ Tue Jun 21 15:09:46 CEST 2011 - [email protected] + - Include scripts for automated build + + ------------------------------------------------------------------- ++Mon Jun 6 09:20:29 UTC 2011 - [email protected] ++ ++- Fix build with newer glibc. ++ ++------------------------------------------------------------------- + Wed Feb 2 11:32:12 CET 2011 - [email protected] + + - Fix the following issues: +@@ -289,6 +396,11 @@ Wed Nov 18 10:33:27 CET 2009 - [email protected] + - Read initiatorname correctly from sysfs (bnc#541882) + + ------------------------------------------------------------------- ++Tue Nov 3 19:09:35 UTC 2009 - [email protected] ++ ++- updated patches to apply with fuzz=0 ++ ++------------------------------------------------------------------- + Wed Aug 19 12:58:13 CEST 2009 - [email protected] + + - Synchronize startup settings (bnc#514273) +@@ -296,11 +408,24 @@ Wed Aug 19 12:58:13 CEST 2009 - [email protected] + - Do not use temp file in iscsi_discovery (bnc#528711) + + ------------------------------------------------------------------- ++Sun Jun 21 14:36:45 CEST 2009 - [email protected] ++ ++- build with fno-strict-aliasing ++- do not use static libc, this does not work in reality, use ++ of getaddrinfo(3) requires shared libraries at runtime ++ ++------------------------------------------------------------------- + Tue Feb 10 10:56:19 CET 2009 - [email protected] + + - search_ibft() might crash when no iBFT is found (bnc#471475) + + ------------------------------------------------------------------- ++Mon Jan 26 11:51:54 CET 2009 - [email protected] ++ ++- change fillup call from "-Y" to "-y" the boot script has ++ been present in this package for long enough (SLES10-GA) ++ ++------------------------------------------------------------------- + Thu Jan 22 13:41:40 CET 2009 - [email protected] + + - Fix relogin retry handling (bnc#466846) diff --git a/rpm/open-iscsi.spec b/rpm/open-iscsi.spec -index b08b688..f0dfcb8 100644 +index b08b6884e731..124db14b823d 100644 --- a/rpm/open-iscsi.spec +++ b/rpm/open-iscsi.spec @@ -21,12 +21,16 @@ BuildRequires: bison @@ -224,15 +428,17 @@ make DESTDIR=${RPM_BUILD_ROOT} install_initd_suse # rename open-iscsi service to iscsid for openSUSE mv ${RPM_BUILD_ROOT}/etc/init.d/boot.open-iscsi \ -@@ -88,6 +99,7 @@ mv ${RPM_BUILD_ROOT}/etc/init.d/open-iscsi \ +@@ -88,25 +99,43 @@ mv ${RPM_BUILD_ROOT}/etc/init.d/open-iscsi \ # create rc shortcut [ -d ${RPM_BUILD_ROOT}/usr/sbin ] || mkdir -p ${RPM_BUILD_ROOT}/usr/sbin ln -sf ../../etc/init.d/iscsid ${RPM_BUILD_ROOT}/usr/sbin/rciscsid +%endif (cd ${RPM_BUILD_ROOT}/etc; ln -sf iscsi/iscsid.conf iscsid.conf) touch ${RPM_BUILD_ROOT}/etc/iscsi/initiatorname.iscsi ++install -m 0755 usr/iscsistart %{buildroot}/sbin -@@ -96,17 +108,33 @@ touch ${RPM_BUILD_ROOT}/etc/iscsi/initiatorname.iscsi + %clean + [ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT} %post [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup @@ -267,7 +473,7 @@ %files %defattr(-,root,root) -@@ -116,10 +144,16 @@ fi +@@ -116,10 +145,16 @@ fi %dir /etc/iscsi/ifaces %config /etc/iscsi/ifaces/iface.example /etc/iscsid.conf @@ -286,7 +492,7 @@ %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/setup-iscsi.sh diff --git a/usr/iscsid_req.c b/usr/iscsid_req.c -index 5a4a645..a91efe4 100644 +index 5a4a645889f8..a91efe402ac6 100644 --- a/usr/iscsid_req.c +++ b/usr/iscsid_req.c @@ -118,7 +118,7 @@ static int ipc_connect(int *fd, char *unix_sock_name) @@ -320,7 +526,7 @@ return ISCSI_SUCCESS; diff --git a/usr/mgmt_ipc.c b/usr/mgmt_ipc.c -index 5c39c2e..87bd346 100644 +index 5c39c2e0897a..87bd346990b5 100644 --- a/usr/mgmt_ipc.c +++ b/usr/mgmt_ipc.c @@ -39,25 +39,33 @@ @@ -391,7 +597,7 @@ mgmt_ipc_close(int fd) { diff --git a/usr/mgmt_ipc.h b/usr/mgmt_ipc.h -index 7d8ce72..55972ed 100644 +index 7d8ce72b9771..55972ed793a1 100644 --- a/usr/mgmt_ipc.h +++ b/usr/mgmt_ipc.h @@ -112,6 +112,7 @@ typedef int mgmt_ipc_fn_t(struct queue_task *); ++++++ open-iscsi-sles11-sp2-latest.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.zEDIFO/_old 2013-12-03 14:26:45.000000000 +0100 +++ /var/tmp/diff_new_pack.zEDIFO/_new 2013-12-03 14:26:45.000000000 +0100 @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index ba588e5..c0fe0da 100644 +index ba588e567264..c0fe0daa3214 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,7 @@ install: install_programs install_doc install_etc \ @@ -12,7 +12,7 @@ install_programs: $(PROGRAMS) $(SCRIPTS) $(INSTALL) -d $(DESTDIR)$(sbindir) diff --git a/etc/iscsid.conf b/etc/iscsid.conf -index fcb4696..1ae9091 100644 +index fcb4696f8524..1ae909150aa2 100644 --- a/etc/iscsid.conf +++ b/etc/iscsid.conf @@ -20,7 +20,7 @@ @@ -34,7 +34,7 @@ # open-iscsi can create a session and bind it to a NIC/HBA. # To set this up see the example iface config file. diff --git a/rpm/build_rpm b/rpm/build_rpm -index 744cae8..f749471 100755 +index 744cae8e7f30..f749471d4a32 100755 --- a/rpm/build_rpm +++ b/rpm/build_rpm @@ -4,15 +4,18 @@ @@ -117,7 +117,7 @@ echo "$RPM src rpm copied to $DESTDIR" diff --git a/rpm/open-iscsi.changes b/rpm/open-iscsi.changes -index 5f26692..9efeb58 100644 +index 5f26692f59e9..9efeb58a0f19 100644 --- a/rpm/open-iscsi.changes +++ b/rpm/open-iscsi.changes @@ -1,4 +1,15 @@ @@ -137,7 +137,7 @@ - Updated open-iscsi to version 2.0.873 (bnc#751056) diff --git a/rpm/open-iscsi.spec b/rpm/open-iscsi.spec -index 0ca0e39..2e103f5 100644 +index 0ca0e394c625..2e103f59c9ea 100644 --- a/rpm/open-iscsi.spec +++ b/rpm/open-iscsi.spec @@ -26,13 +26,15 @@ Group: Productivity/Networking/Other ++++++ open-iscsi-sles11-sp2-update.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.zEDIFO/_old 2013-12-03 14:26:45.000000000 +0100 +++ /var/tmp/diff_new_pack.zEDIFO/_new 2013-12-03 14:26:45.000000000 +0100 @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index 36ebd2d..ba588e5 100644 +index 36ebd2d1be13..ba588e567264 100644 --- a/Makefile +++ b/Makefile @@ -125,7 +125,7 @@ install_iface: $(IFACEFILES) @@ -26,7 +26,7 @@ fi diff --git a/doc/iscsiadm.8 b/doc/iscsiadm.8 -index 7c209f6..9e1376d 100644 +index 7c209f6cd374..9e1376d89b76 100644 --- a/doc/iscsiadm.8 +++ b/doc/iscsiadm.8 @@ -14,7 +14,7 @@ iscsiadm \- open-iscsi administration utility @@ -39,7 +39,7 @@ \fBiscsiadm\fR \-m host [ \-P printlevel ] [ \-H hostno|MAC ] [ -C chap [ -o operation ] [ -v chap_tbl_idx ] ] diff --git a/include/iscsi_if.h b/include/iscsi_if.h -index dad9fd8..fe91c6f 100644 +index dad9fd878ce6..fe91c6ffa751 100644 --- a/include/iscsi_if.h +++ b/include/iscsi_if.h @@ -409,6 +409,7 @@ enum iscsi_err { @@ -51,7 +51,7 @@ /* diff --git a/iscsiuio/README b/iscsiuio/README -index 513bdbd..a7b91eb 100644 +index 513bdbd3b446..a7b91eb2b184 100644 --- a/iscsiuio/README +++ b/iscsiuio/README @@ -1,14 +1,14 @@ @@ -301,7 +301,7 @@ +Note: If the bnx2i and cnic drivers are unloaed, then iscsiuio will also +need to be restarted so that it can determine the iscsid version. diff --git a/iscsiuio/RELEASE.TXT b/iscsiuio/RELEASE.TXT -index 282ec5e..5b3823e 100644 +index 282ec5eb3120..5b3823ec08b9 100644 --- a/iscsiuio/RELEASE.TXT +++ b/iscsiuio/RELEASE.TXT @@ -1,7 +1,7 @@ @@ -537,7 +537,7 @@ ======================================================= Fixes diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac -index 91558c9..f9b921d 100644 +index 91558c900dd2..f9b921d16380 100644 --- a/iscsiuio/configure.ac +++ b/iscsiuio/configure.ac @@ -1,19 +1,19 @@ @@ -574,7 +574,7 @@ AC_ARG_WITH(iscsid-version, diff --git a/iscsiuio/docs/iscsiuio.8 b/iscsiuio/docs/iscsiuio.8 -index 1f82afb..5ed8881 100644 +index 1f82afb7c8e0..5ed8881d8b51 100644 --- a/iscsiuio/docs/iscsiuio.8 +++ b/iscsiuio/docs/iscsiuio.8 @@ -3,9 +3,9 @@ @@ -590,7 +590,7 @@ .\" NAME part .\" diff --git a/iscsiuio/include/config.h b/iscsiuio/include/config.h -index 0ce9b40..cb6e0db 100644 +index 0ce9b4057d59..cb6e0db07839 100644 --- a/iscsiuio/include/config.h +++ b/iscsiuio/include/config.h @@ -60,6 +60,9 @@ typedef struct iface_rec { @@ -604,7 +604,7 @@ * TODO: we may have to make this bigger and interconnect * specific for infinniband diff --git a/iscsiuio/include/iscsi_if.h b/iscsiuio/include/iscsi_if.h -index a9ac145..1944abd 100644 +index a9ac14532a36..1944abd0c36f 100644 --- a/iscsiuio/include/iscsi_if.h +++ b/iscsiuio/include/iscsi_if.h @@ -207,6 +207,7 @@ struct iscsi_uevent { @@ -625,7 +625,7 @@ } __attribute__ ((aligned (sizeof(uint64_t)))); diff --git a/iscsiuio/src/apps/dhcpc/dhcpc.c b/iscsiuio/src/apps/dhcpc/dhcpc.c -index 88d75c3..afec601 100644 +index 88d75c30aa5e..afec601c987d 100644 --- a/iscsiuio/src/apps/dhcpc/dhcpc.c +++ b/iscsiuio/src/apps/dhcpc/dhcpc.c @@ -334,7 +334,7 @@ static PT_THREAD(handle_dhcp(struct uip_stack *ustack)) @@ -656,7 +656,7 @@ PT_INIT(&s->pt); diff --git a/iscsiuio/src/apps/dhcpc/dhcpv6.c b/iscsiuio/src/apps/dhcpc/dhcpv6.c -index b7ae631..273cce0 100644 +index b7ae631c7f32..273cce0e82e5 100644 --- a/iscsiuio/src/apps/dhcpc/dhcpv6.c +++ b/iscsiuio/src/apps/dhcpc/dhcpv6.c @@ -86,10 +86,6 @@ int dhcpv6_do_discovery(pDHCPV6_CONTEXT dhcpv6_context) @@ -683,7 +683,7 @@ (char __FAR__ *)dhcpv6_context->our_mac_addr, sizeof(MAC_ADDR)); pkt_len += sizeof(DHCPV6_OPT_CLIENT_ID) + sizeof(DHCPV6_OPT_HDR); diff --git a/iscsiuio/src/apps/dhcpc/dhcpv6.h b/iscsiuio/src/apps/dhcpc/dhcpv6.h -index 917cf35..d8e03e5 100644 +index 917cf35bb7b1..d8e03e5dc6a1 100644 --- a/iscsiuio/src/apps/dhcpc/dhcpv6.h +++ b/iscsiuio/src/apps/dhcpc/dhcpv6.h @@ -164,7 +164,7 @@ typedef struct DHCPV6_OPT_CLIENT_ID { @@ -696,7 +696,7 @@ } DHCPV6_OPT_CLIENT_ID, *pDHCPV6_OPT_CLIENT_ID; diff --git a/iscsiuio/src/uip/ipv6.c b/iscsiuio/src/uip/ipv6.c -index 594495a..5a62c7a 100644 +index 594495ae1491..5a62c7a17668 100644 --- a/iscsiuio/src/uip/ipv6.c +++ b/iscsiuio/src/uip/ipv6.c @@ -38,6 +38,7 @@ @@ -806,7 +806,7 @@ } diff --git a/iscsiuio/src/uip/ipv6.h b/iscsiuio/src/uip/ipv6.h -index 167f5f6..ed2f3a4 100644 +index 167f5f69383b..ed2f3a40b52d 100644 --- a/iscsiuio/src/uip/ipv6.h +++ b/iscsiuio/src/uip/ipv6.h @@ -343,7 +343,8 @@ int ipv6_add_prefix_entry(pIPV6_CONTEXT ipv6_context, @@ -820,7 +820,7 @@ int ipv6_get_default_router_ip_addrs(pIPV6_CONTEXT ipv6_context, pIPV6_ADDR ip_addr); diff --git a/iscsiuio/src/uip/ipv6_ndpc.c b/iscsiuio/src/uip/ipv6_ndpc.c -index 6d101ce..a41d54a 100644 +index 6d101cee52a3..a41d54aae799 100644 --- a/iscsiuio/src/uip/ipv6_ndpc.c +++ b/iscsiuio/src/uip/ipv6_ndpc.c @@ -65,6 +65,7 @@ static PT_THREAD(handle_ndp(struct uip_stack *ustack, int force)) @@ -992,7 +992,7 @@ *(int *)out = ipv6_ip_in_arp_table(ipv6c, (pIPV6_ADDR) ((pNDPC_REQPTR)in)->ipv6, diff --git a/iscsiuio/src/uip/uip.c b/iscsiuio/src/uip/uip.c -index 9c79e07..d03b92e 100644 +index 9c79e079c162..d03b92e24282 100644 --- a/iscsiuio/src/uip/uip.c +++ b/iscsiuio/src/uip/uip.c @@ -1403,8 +1403,6 @@ void uip_process(struct uip_stack *ustack, u8_t flag) @@ -1014,7 +1014,7 @@ tcp_ipv4_hdr->proto = UIP_PROTO_TCP; uip_ip4addr_copy(tcp_ipv4_hdr->srcipaddr, ustack->hostaddr); diff --git a/iscsiuio/src/uip/uip.h b/iscsiuio/src/uip/uip.h -index 2b5f88c..ccac680 100644 +index 2b5f88c41ad6..ccac680ad8f3 100644 --- a/iscsiuio/src/uip/uip.h +++ b/iscsiuio/src/uip/uip.h @@ -1031,6 +1031,7 @@ extern u16_t uip_urglen, uip_surglen; @@ -1068,7 +1068,7 @@ #define UIP_SUPPORT_IPv6_DISABLED 0x02 u8_t enable_IPv6; diff --git a/iscsiuio/src/uip/uip_arp.c b/iscsiuio/src/uip/uip_arp.c -index 321281c..9dd02a1 100644 +index 321281ca0385..9dd02a121da7 100644 --- a/iscsiuio/src/uip/uip_arp.c +++ b/iscsiuio/src/uip/uip_arp.c @@ -265,11 +265,14 @@ uip_arp_arpin(nic_interface_t * nic_iface, @@ -1090,7 +1090,7 @@ break; case const_htons(ARP_REPLY): diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index 1b611b9..2c934b0 100644 +index 1b611b9f3f76..2c934b0e59f1 100644 --- a/iscsiuio/src/unix/iscsid_ipc.c +++ b/iscsiuio/src/unix/iscsid_ipc.c @@ -70,20 +70,34 @@ struct iscsid_options { @@ -1925,7 +1925,7 @@ errno, strerror(errno)); goto error; diff --git a/iscsiuio/src/unix/libs/bnx2.c b/iscsiuio/src/unix/libs/bnx2.c -index 7bcc1b3..0708232 100644 +index 7bcc1b357505..07082320e9b9 100644 --- a/iscsiuio/src/unix/libs/bnx2.c +++ b/iscsiuio/src/unix/libs/bnx2.c @@ -383,6 +383,17 @@ static CNIC_VLAN_STRIPPING_MODE bnx2_strip_vlan_enabled(bnx2_t * bp) @@ -2199,7 +2199,7 @@ return -EAGAIN; } diff --git a/iscsiuio/src/unix/libs/bnx2x.c b/iscsiuio/src/unix/libs/bnx2x.c -index 56cd481..e2ccc82 100644 +index 56cd48176e2f..e2ccc8259c54 100644 --- a/iscsiuio/src/unix/libs/bnx2x.c +++ b/iscsiuio/src/unix/libs/bnx2x.c @@ -288,11 +288,12 @@ static void bnx2x_set_drv_version_unknown(bnx2x_t * bp) @@ -2628,7 +2628,7 @@ break; diff --git a/iscsiuio/src/unix/libs/bnx2x.h b/iscsiuio/src/unix/libs/bnx2x.h -index 8e923b9..b758179 100644 +index 8e923b93cc2c..b75817949051 100644 --- a/iscsiuio/src/unix/libs/bnx2x.h +++ b/iscsiuio/src/unix/libs/bnx2x.h @@ -467,6 +467,18 @@ struct client_init_general_data { @@ -2651,7 +2651,7 @@ (IS_E1H_OFFSET ? (0x1000 + (port * 0x680) + (client_id * 0x40)) \ : (0x4000 + (port * 0x360) + (client_id * 0x30))) diff --git a/iscsiuio/src/unix/libs/cnic.c b/iscsiuio/src/unix/libs/cnic.c -index 92f0221..37672a1 100644 +index 92f0221fea8b..37672a1c46f8 100644 --- a/iscsiuio/src/unix/libs/cnic.c +++ b/iscsiuio/src/unix/libs/cnic.c @@ -125,6 +125,7 @@ static int cnic_arp_send(nic_t * nic, nic_interface_t * nic_iface, int fd, @@ -2985,7 +2985,7 @@ LOG_DEBUG(PFX "%s: unknown ip_addr_len: %d size dropping ", nic->log_name, path->ip_addr_len); diff --git a/iscsiuio/src/unix/libs/cnic.h b/iscsiuio/src/unix/libs/cnic.h -index 738deb8..679dab8 100644 +index 738deb87d3e3..679dab8a1dab 100644 --- a/iscsiuio/src/unix/libs/cnic.h +++ b/iscsiuio/src/unix/libs/cnic.h @@ -48,6 +48,7 @@ int cnic_nl_open(); @@ -2998,7 +2998,7 @@ #endif /* __CNIC_NL_H__ */ diff --git a/iscsiuio/src/unix/nic.c b/iscsiuio/src/unix/nic.c -index 5a21b5b..7ed9e14 100644 +index 5a21b5b6105f..7ed9e14e0fba 100644 --- a/iscsiuio/src/unix/nic.c +++ b/iscsiuio/src/unix/nic.c @@ -64,6 +64,7 @@ @@ -4335,7 +4335,7 @@ pthread_exit(NULL); } diff --git a/iscsiuio/src/unix/nic.h b/iscsiuio/src/unix/nic.h -index 782af42..c902252 100644 +index 782af42382ba..c902252a44d9 100644 --- a/iscsiuio/src/unix/nic.h +++ b/iscsiuio/src/unix/nic.h @@ -67,6 +67,8 @@ extern struct nic_lib_handle *nic_lib_list; @@ -4471,7 +4471,7 @@ uint32_t subvendor, uint32_t subdevice, nic_lib_handle_t ** handle, diff --git a/iscsiuio/src/unix/nic_id.c b/iscsiuio/src/unix/nic_id.c -index 4eb48d6..2ef3ca0 100644 +index 4eb48d66a94c..2ef3ca080a4a 100644 --- a/iscsiuio/src/unix/nic_id.c +++ b/iscsiuio/src/unix/nic_id.c @@ -282,17 +282,12 @@ int get_bus_slot_func_num(nic_t * nic, @@ -4497,7 +4497,7 @@ } diff --git a/iscsiuio/src/unix/nic_nl.c b/iscsiuio/src/unix/nic_nl.c -index 9154757..6633990 100644 +index 9154757d8239..663399012ccc 100644 --- a/iscsiuio/src/unix/nic_nl.c +++ b/iscsiuio/src/unix/nic_nl.c @@ -83,20 +83,6 @@ const static struct sockaddr_nl dest_addr = { @@ -5078,7 +5078,7 @@ LOG_DEBUG(PFX "Pulled nl event"); } diff --git a/iscsiuio/src/unix/nic_utils.c b/iscsiuio/src/unix/nic_utils.c -index 3b71ef3..0a3a6c4 100644 +index 3b71ef3bc5f0..0a3a6c4703ac 100644 --- a/iscsiuio/src/unix/nic_utils.c +++ b/iscsiuio/src/unix/nic_utils.c @@ -208,6 +208,7 @@ int nic_discover_iscsi_hosts() @@ -5515,7 +5515,7 @@ path, file_size, strerror(ferror(fp))); free(*raw); diff --git a/iscsiuio/src/unix/nic_utils.h b/iscsiuio/src/unix/nic_utils.h -index ff76f6b..6c57701 100644 +index ff76f6b79efc..6c5770187be8 100644 --- a/iscsiuio/src/unix/nic_utils.h +++ b/iscsiuio/src/unix/nic_utils.h @@ -67,7 +67,9 @@ void nic_fill_ethernet_header(nic_interface_t * nic_iface, @@ -5530,7 +5530,7 @@ void persist_all_nic_iface(nic_t * nic); diff --git a/iscsiuio/src/unix/nic_vlan.c b/iscsiuio/src/unix/nic_vlan.c -index 4f8f551..90a6244 100644 +index 4f8f55120adb..90a62442d1f7 100644 --- a/iscsiuio/src/unix/nic_vlan.c +++ b/iscsiuio/src/unix/nic_vlan.c @@ -332,7 +332,8 @@ int find_vlans_using_phy_interface(struct vlan_handle *handle, @@ -5544,7 +5544,7 @@ return 0; diff --git a/iscsiuio/src/unix/packet.c b/iscsiuio/src/unix/packet.c -index 3a8c368..2f87586 100644 +index 3a8c368677db..2f8758672740 100644 --- a/iscsiuio/src/unix/packet.c +++ b/iscsiuio/src/unix/packet.c @@ -70,7 +70,7 @@ struct packet *alloc_packet(size_t max_buf_size, size_t priv_size) @@ -5582,7 +5582,7 @@ + pthread_mutex_unlock(&nic->free_packet_queue_mutex); +} diff --git a/iscsiuio/src/unix/packet.h b/iscsiuio/src/unix/packet.h -index 3638297..b81b477 100644 +index 3638297b0569..b81b477fc40c 100644 --- a/iscsiuio/src/unix/packet.h +++ b/iscsiuio/src/unix/packet.h @@ -69,6 +69,7 @@ typedef struct packet { @@ -5594,7 +5594,7 @@ #endif /* __PACKET_H__ */ diff --git a/rpm/build_rpm b/rpm/build_rpm -index cbfd100..744cae8 100755 +index cbfd1003897a..744cae8e7f30 100755 --- a/rpm/build_rpm +++ b/rpm/build_rpm @@ -4,8 +4,9 @@ @@ -5629,7 +5629,7 @@ git show $BRANCH:rpm/$RPM.spec > $DESTDIR/$RPM.spec git show $BRANCH:rpm/$RPM.changes > $DESTDIR/$RPM.changes diff --git a/rpm/open-iscsi.changes b/rpm/open-iscsi.changes -index 2e21afc..5f26692 100644 +index 2e21afc6bc7b..5f26692f59e9 100644 --- a/rpm/open-iscsi.changes +++ b/rpm/open-iscsi.changes @@ -1,4 +1,10 @@ @@ -5644,7 +5644,7 @@ - iscsiadm: Return correct error when login fails (bnc#715071) diff --git a/rpm/open-iscsi.spec b/rpm/open-iscsi.spec -index 27ab050..0ca0e39 100644 +index 27ab050554f1..0ca0e394c625 100644 --- a/rpm/open-iscsi.spec +++ b/rpm/open-iscsi.spec @@ -25,17 +25,14 @@ License: GPL v2 or later @@ -5678,7 +5678,7 @@ %build %{__make} OPTFLAGS="${RPM_OPT_FLAGS} -DLOCK_DIR=\\\"/etc/iscsi\\\" -DOFFLOAD_BOOT_SUPPORTED" user diff --git a/usr/Makefile b/usr/Makefile -index 673b7f1..b31b74f 100644 +index 673b7f1c9678..b31b74fc5c73 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -20,7 +20,7 @@ ifeq ($(OSNAME),Linux) @@ -5691,7 +5691,7 @@ ifeq ($(OSNAME),FreeBSD) IPC_CFLAGS= diff --git a/usr/idbm.c b/usr/idbm.c -index 4d30aa9..7ea70c5 100644 +index 4d30aa9d8810..7ea70c5b6e66 100644 --- a/usr/idbm.c +++ b/usr/idbm.c @@ -248,6 +248,8 @@ idbm_recinfo_node(node_rec_t *r, recinfo_t *ri) @@ -5704,7 +5704,7 @@ * svn 780 compat: older versions used node.transport_name and * rec->transport_name diff --git a/usr/iface.c b/usr/iface.c -index 3a9582e..076699c 100644 +index 3a9582e855cf..076699c8866d 100644 --- a/usr/iface.c +++ b/usr/iface.c @@ -43,6 +43,8 @@ @@ -5776,7 +5776,7 @@ struct iface_rec *primary; int count; diff --git a/usr/iface.h b/usr/iface.h -index 01f7074..df57dcb 100644 +index 01f70747dadd..df57dcb41e1e 100644 --- a/usr/iface.h +++ b/usr/iface.h @@ -53,6 +53,9 @@ extern int iface_setup_from_boot_context(struct iface_rec *iface, @@ -5790,7 +5790,7 @@ int iface_all); extern int iface_build_net_config(struct iface_rec *iface_primary, diff --git a/usr/initiator.c b/usr/initiator.c -index 79ca32c..2db11bd 100644 +index 79ca32c04f8d..2db11bd43661 100644 --- a/usr/initiator.c +++ b/usr/initiator.c @@ -48,6 +48,7 @@ @@ -5826,7 +5826,7 @@ session->notify_qtask = qtask; session_conn_reopen(&session->conn[0], qtask, diff --git a/usr/initiator_common.c b/usr/initiator_common.c -index ef6820c..4d6d2f9 100644 +index ef6820c59c16..4d6d2f93baa0 100644 --- a/usr/initiator_common.c +++ b/usr/initiator_common.c @@ -596,6 +596,11 @@ int iscsi_host_set_net_params(struct iface_rec *iface, @@ -5842,7 +5842,7 @@ log_warning("Could not brining up netdev %s. Try running " "'ifup %s' first if login fails.", netdev, netdev); diff --git a/usr/iscsi_util.c b/usr/iscsi_util.c -index 5e3420e..adc31a4 100644 +index 5e3420e03878..adc31a46537e 100644 --- a/usr/iscsi_util.c +++ b/usr/iscsi_util.c @@ -60,7 +60,8 @@ int oom_adjust(void) @@ -5856,7 +5856,7 @@ strerror(errno)); diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c -index 8f9de05..7f5578d 100644 +index 8f9de058b097..7f5578d9ff27 100644 --- a/usr/iscsiadm.c +++ b/usr/iscsiadm.c @@ -129,7 +129,7 @@ iscsiadm -m node [ -hV ] [ -d debug_level ] [ -P printlevel ] [ -L all,manual,au @@ -5878,7 +5878,7 @@ "allowed/supported", rc); rc = ISCSI_ERR_INVAL; diff --git a/usr/iscsid_req.c b/usr/iscsid_req.c -index 0902011..5a4a645 100644 +index 090201129fc3..5a4a645889f8 100644 --- a/usr/iscsid_req.c +++ b/usr/iscsid_req.c @@ -22,6 +22,7 @@ @@ -6051,7 +6051,7 @@ + return 0; +} diff --git a/usr/iscsid_req.h b/usr/iscsid_req.h -index 68f5256..8b8d6e4 100644 +index 68f52567600d..8b8d6e4980bc 100644 --- a/usr/iscsid_req.h +++ b/usr/iscsid_req.h @@ -32,5 +32,7 @@ extern int iscsid_req_by_rec_async(int cmd, struct node_rec *rec, int *fd); @@ -6063,7 +6063,7 @@ #endif diff --git a/usr/session_mgmt.c b/usr/session_mgmt.c -index ec1f43a..deee5af 100644 +index ec1f43a37f10..deee5af71058 100644 --- a/usr/session_mgmt.c +++ b/usr/session_mgmt.c @@ -178,12 +178,12 @@ int iscsi_login_portal(void *data, struct list_head *list, struct node_rec *rec) @@ -6082,7 +6082,7 @@ } diff --git a/usr/transport.c b/usr/transport.c -index e6e3dfc..7d213f0 100644 +index e6e3dfc23dd1..7d213f0d257a 100644 --- a/usr/transport.c +++ b/usr/transport.c @@ -35,6 +35,7 @@ @@ -6102,7 +6102,7 @@ struct iscsi_transport_template be2iscsi = { diff --git a/usr/transport.h b/usr/transport.h -index 672561b..5dcf872 100644 +index 672561b017f7..5dcf872dd213 100644 --- a/usr/transport.h +++ b/usr/transport.h @@ -35,6 +35,9 @@ struct iscsi_transport_template { @@ -6116,7 +6116,7 @@ /* represents data path provider */ diff --git a/usr/version.h b/usr/version.h -index a090522..2a0a66c 100644 +index a090522f5127..2a0a66c31696 100644 --- a/usr/version.h +++ b/usr/version.h @@ -6,7 +6,7 @@ ++++++ open-iscsi-sles11-sp3-flash-update.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.zEDIFO/_old 2013-12-03 14:26:45.000000000 +0100 +++ /var/tmp/diff_new_pack.zEDIFO/_new 2013-12-03 14:26:45.000000000 +0100 @@ -1,5 +1,5 @@ diff --git a/README b/README -index 7364b2d..2f56688 100644 +index 7364b2d56a39..2f56688c2af3 100644 --- a/README +++ b/README @@ -401,6 +401,29 @@ Usage: iscsiadm [OPTION] @@ -90,7 +90,7 @@ ================ diff --git a/doc/iscsiadm.8 b/doc/iscsiadm.8 -index 9e1376d..d426e0e 100644 +index 9e1376d89b76..d426e0eb54e9 100644 --- a/doc/iscsiadm.8 +++ b/doc/iscsiadm.8 @@ -16,7 +16,7 @@ iscsiadm \- open-iscsi administration utility @@ -183,7 +183,7 @@ iSCSI defines 3 discovery types: SendTargets, SLP, and iSNS. diff --git a/include/iscsi_if.h b/include/iscsi_if.h -index fe91c6f..4331579 100644 +index fe91c6ffa751..43315793595d 100644 --- a/include/iscsi_if.h +++ b/include/iscsi_if.h @@ -68,8 +68,14 @@ enum iscsi_uevent_e { @@ -413,7 +413,7 @@ enum iscsi_host_param { ISCSI_HOST_PARAM_HWADDRESS, diff --git a/rpm/build_rpm b/rpm/build_rpm -index 8409da0..a5f0d9e 100755 +index 8409da0967b4..a5f0d9edff82 100755 --- a/rpm/build_rpm +++ b/rpm/build_rpm @@ -8,7 +8,8 @@ BRANCH="sles11-sp3" @@ -454,7 +454,7 @@ echo "$RPM src rpm copied to $DESTDIR" diff --git a/rpm/open-iscsi.spec b/rpm/open-iscsi.spec -index 2e103f5..520337d 100644 +index 2e103f59c9ea..520337d62e09 100644 --- a/rpm/open-iscsi.spec +++ b/rpm/open-iscsi.spec @@ -1,7 +1,7 @@ @@ -518,7 +518,7 @@ %config /etc/iscsi/ifaces/iface.example /etc/iscsid.conf diff --git a/usr/Makefile b/usr/Makefile -index b31b74f..86220f1 100644 +index b31b74fc5c73..86220f1a4c75 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -40,7 +40,7 @@ SYSDEPS_SRCS = $(wildcard ../utils/sysdeps/*.o) @@ -532,7 +532,7 @@ diff --git a/usr/flashnode.c b/usr/flashnode.c new file mode 100644 -index 0000000..da1392a +index 000000000000..da1392affc4c --- /dev/null +++ b/usr/flashnode.c @@ -0,0 +1,609 @@ @@ -1147,7 +1147,7 @@ +} diff --git a/usr/flashnode.h b/usr/flashnode.h new file mode 100644 -index 0000000..c1de9cc +index 000000000000..c1de9ccc3544 --- /dev/null +++ b/usr/flashnode.h @@ -0,0 +1,127 @@ @@ -1279,7 +1279,7 @@ + struct iovec *iovs); +#endif diff --git a/usr/idbm.c b/usr/idbm.c -index 7ea70c5..6e2ae41 100644 +index 7ea70c5b6e66..6e2ae416835f 100644 --- a/usr/idbm.c +++ b/usr/idbm.c @@ -94,6 +94,17 @@ static struct idbm *db; @@ -1497,7 +1497,7 @@ { if (strchr(rec->conn[0].address, '.')) diff --git a/usr/idbm.h b/usr/idbm.h -index 245f046..5e4038d 100644 +index 245f0464adc7..5e4038d907ff 100644 --- a/usr/idbm.h +++ b/usr/idbm.h @@ -27,6 +27,7 @@ @@ -1541,7 +1541,7 @@ + #endif /* IDBM_H */ diff --git a/usr/idbm_fields.h b/usr/idbm_fields.h -index 358d014..179dda8 100644 +index 358d014321ba..179dda8306c8 100644 --- a/usr/idbm_fields.h +++ b/usr/idbm_fields.h @@ -126,4 +126,67 @@ @@ -1613,7 +1613,7 @@ + #endif diff --git a/usr/initiator.c b/usr/initiator.c -index 2db11bd..1de2596 100644 +index 2db11bd43661..1de25965f653 100644 --- a/usr/initiator.c +++ b/usr/initiator.c @@ -999,7 +999,7 @@ static void session_scan_host(struct iscsi_session *session, int hostno, @@ -1636,7 +1636,7 @@ /* * ok we were in_login and now we got the notification that we are diff --git a/usr/iscsi_ipc.h b/usr/iscsi_ipc.h -index db5f1f0..b6665cb 100644 +index db5f1f04f425..b6665cbbf996 100644 --- a/usr/iscsi_ipc.h +++ b/usr/iscsi_ipc.h @@ -145,6 +145,19 @@ struct iscsi_ipc { @@ -1660,7 +1660,7 @@ #endif /* ISCSI_IPC_H */ diff --git a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c -index 123dde3..c0ead0d 100644 +index 123dde3f8fd1..c0ead0d7a474 100644 --- a/usr/iscsi_sysfs.c +++ b/usr/iscsi_sysfs.c @@ -29,6 +29,7 @@ @@ -1938,7 +1938,7 @@ * session is not passed in, then the ifacename will not be set. And * if the session is not passed in then iname will only be set for diff --git a/usr/iscsi_sysfs.h b/usr/iscsi_sysfs.h -index 2b15d78..d130d36 100644 +index 2b15d787a3ef..d130d361b356 100644 --- a/usr/iscsi_sysfs.h +++ b/usr/iscsi_sysfs.h @@ -31,6 +31,7 @@ struct iscsi_conn; @@ -1980,7 +1980,7 @@ extern char *iscsi_sysfs_get_blockdev_from_lun(int hostno, int target, int sid); diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c -index 7f5578d..df76df9 100644 +index 7f5578d9ff27..df76df9a9650 100644 --- a/usr/iscsiadm.c +++ b/usr/iscsiadm.c @@ -53,6 +53,7 @@ @@ -2524,7 +2524,7 @@ log_error("Invalid Sub Mode"); break; diff --git a/usr/netlink.c b/usr/netlink.c -index c43f686..c07fe3c 100644 +index c43f6866f1b6..c07fe3c894d0 100644 --- a/usr/netlink.c +++ b/usr/netlink.c @@ -1252,6 +1252,169 @@ static int kdelete_chap(uint64_t transport_handle, uint32_t host_no, ++++++ open-iscsi-sles11-sp3-general-updates-1.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.zEDIFO/_old 2013-12-03 14:26:45.000000000 +0100 +++ /var/tmp/diff_new_pack.zEDIFO/_new 2013-12-03 14:26:45.000000000 +0100 @@ -1,5 +1,5 @@ diff --git a/etc/initd/boot.suse b/etc/initd/boot.suse -index e8a12e9..c65f3b3 100644 +index e8a12e95ab54..c65f3b33eb7b 100644 --- a/etc/initd/boot.suse +++ b/etc/initd/boot.suse @@ -36,18 +36,23 @@ iscsi_load_iscsiuio() @@ -43,7 +43,7 @@ ;; stop|restart|reload) diff --git a/etc/mkinitrd/mkinitrd-setup.sh b/etc/mkinitrd/mkinitrd-setup.sh -index d8c5691..a3dc8f1 100644 +index d8c569187154..a3dc8f1a531f 100644 --- a/etc/mkinitrd/mkinitrd-setup.sh +++ b/etc/mkinitrd/mkinitrd-setup.sh @@ -2,77 +2,138 @@ @@ -241,7 +241,7 @@ + + diff --git a/rpm/build_rpm b/rpm/build_rpm -index a5f0d9e..02d770c 100755 +index a5f0d9edff82..02d770c9e18f 100755 --- a/rpm/build_rpm +++ b/rpm/build_rpm @@ -1,6 +1,11 @@ @@ -384,7 +384,7 @@ echo "$RPM src rpm copied to $DESTDIR" diff --git a/rpm/open-iscsi.changes b/rpm/open-iscsi.changes -index 9efeb58..6450133 100644 +index 9efeb58a0f19..64501332aa08 100644 --- a/rpm/open-iscsi.changes +++ b/rpm/open-iscsi.changes @@ -1,8 +1,30 @@ @@ -442,7 +442,7 @@ - iscsiadm: Return correct error when login fails (bnc#715071) diff --git a/rpm/open-iscsi.spec b/rpm/open-iscsi.spec -index 520337d..c321684 100644 +index 520337d62e09..c3216844b489 100644 --- a/rpm/open-iscsi.spec +++ b/rpm/open-iscsi.spec @@ -37,6 +37,7 @@ Patch1: %{name}-sles11-sp2-update.diff.bz2 @@ -462,7 +462,7 @@ %build %{__make} OPTFLAGS="${RPM_OPT_FLAGS} -DLOCK_DIR=\\\"/etc/iscsi\\\" -DOFFLOAD_BOOT_SUPPORTED" user diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c -index df76df9..84d5a27 100644 +index df76df9a9650..84d5a272ec96 100644 --- a/usr/iscsiadm.c +++ b/usr/iscsiadm.c @@ -1133,17 +1133,55 @@ do_software_sendtargets(discovery_rec_t *drec, struct list_head *ifaces, ++++++ open-iscsi-sles11-sp3-iscsiuio-update.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.zEDIFO/_old 2013-12-03 14:26:45.000000000 +0100 +++ /var/tmp/diff_new_pack.zEDIFO/_new 2013-12-03 14:26:45.000000000 +0100 @@ -1,5 +1,5 @@ diff --git a/rpm/build_rpm b/rpm/build_rpm -index f749471..8409da0 100755 +index f749471d4a32..8409da0967b4 100755 --- a/rpm/build_rpm +++ b/rpm/build_rpm @@ -4,9 +4,11 @@ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
