Hello community,
here is the log from the commit of package open-iscsi for openSUSE:Factory
checked in at 2015-03-12 16:38:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2014-12-08
16:56:03.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.open-iscsi.new/open-iscsi.changes
2015-03-12 16:38:03.000000000 +0100
@@ -1,0 +2,14 @@
+Mon Mar 9 21:29:30 UTC 2015 - ldun...@suse.com
+
+- Supply strings for newly-added error numbers
+- Allow "again" errors from transport in some cases
+ (bsc#903729)
+
+-------------------------------------------------------------------
+Fri Mar 6 23:41:12 UTC 2015 - p.drou...@gmail.com
+
+- Do not depend on fillup and insserv if the package build with
+ systemd support; it's redundant
+- Remove obsolete %clean and AUTHORS sections
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ open-iscsi.spec ++++++
--- /var/tmp/diff_new_pack.t7uuvo/_old 2015-03-12 16:38:04.000000000 +0100
+++ /var/tmp/diff_new_pack.t7uuvo/_new 2015-03-12 16:38:04.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package open-iscsi
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,12 +27,13 @@
BuildRequires: openssl-devel
%if 0%{?suse_version} >= 1230
BuildRequires: systemd
+%else
+PreReq: %fillup_prereq %insserv_prereq
%endif
%if 0%{?suse_version} >= 1320
BuildRequires: suse-module-tools
%endif
Url: http://www.open-iscsi.org
-PreReq: %fillup_prereq %insserv_prereq
Version: 2.0.873
Release: 0
%{?systemd_requires}
@@ -65,12 +66,6 @@
The user space Open-iSCSI consists of a daemon process called iscsid,
and a management utility iscsiadm.
-
-
-Authors:
---------
- open-is...@googlegroups.com
-
%package -n open-isns
Summary: Linux iSNS server
Group: Productivity/Networking/Other
@@ -84,10 +79,6 @@
The implementation is still somewhat incomplete, but I am releasing
it for your reading pleasure.
-Authors:
---------
- Olaf Kirch <o...@suse.de>
-
%package -n iscsiuio
Summary: Linux Broadcom NetXtremem II iscsi server
Group: Productivity/Networking/Other
@@ -108,11 +99,6 @@
The communication to the driver is done via Userspace I/O (Kernel module name
'uio').
-Authors:
---------
- Eddie Wai <eddie....@broadcom.com>
- Benjamin Li <be...@broadcom.com>
-
%prep
%setup -n %{name}-2.0-%{iscsi_release}
%patch1 -p1
@@ -157,9 +143,6 @@
# install firewall file for isns server
install -vD %{S:1} %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/isns
-%clean
-[ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf
${RPM_BUILD_ROOT}
-
%post
%if 0%{?suse_version} < 1320
[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
@@ -196,9 +179,10 @@
%endif
%preun
-%{stop_on_removal iscsid}
%if 0%{?suse_version} >= 1230
%{service_del_preun iscsid.socket iscsid.service iscsi.service}
+%else
+%{stop_on_removal iscsid}
%endif
%post -n open-isns
@@ -217,9 +201,10 @@
%endif
%preun -n open-isns
-%{stop_on_removal isnsd isnsdd}
%if 0%{?suse_version} >= 1230
%{service_del_preun isnsd.socket isnsd.service}
+%else
+%{stop_on_removal isnsd isnsdd}
%endif
%post -n iscsiuio
@@ -238,9 +223,10 @@
%endif
%preun -n iscsiuio
-%{stop_on_removal iscsiuio}
%if 0%{?suse_version} >= 1230
%{service_del_preun iscsiuio.socket iscsiuio.service}
+%else
+%{stop_on_removal iscsiuio}
%endif
%files
@@ -255,7 +241,7 @@
%{_unitdir}/iscsid.service
%{_unitdir}/iscsid.socket
%{_unitdir}/iscsi.service
-/usr/lib/systemd/system-generators/ibft-rule-generator
+%{_libexecdir}/systemd/system-generators/ibft-rule-generator
%else
%config /etc/init.d/iscsid
%config /etc/init.d/boot.iscsid-early
++++++ open-iscsi-Factory-latest.diff.bz2 ++++++
--- /var/tmp/diff_new_pack.t7uuvo/_old 2015-03-12 16:38:04.000000000 +0100
+++ /var/tmp/diff_new_pack.t7uuvo/_new 2015-03-12 16:38:04.000000000 +0100
@@ -18783,11 +18783,31 @@
+# space separated list of allowed UDP broadcast ports
+BROADCAST="isns"
diff --git a/rpm/open-iscsi.changes b/rpm/open-iscsi.changes
-index 2e21afc6bc7b..770389bc724d 100644
+index 2e21afc6bc7b..7898cc51ff34 100644
--- a/rpm/open-iscsi.changes
+++ b/rpm/open-iscsi.changes
-@@ -1,4 +1,345 @@
+@@ -1,4 +1,365 @@
-------------------------------------------------------------------
++Mon Mar 9 21:29:30 UTC 2015 - ldun...@suse.com
++
++- Supply strings for newly-added error numbers
++- Allow "again" errors from transport in some cases
++ (bsc#903729)
++
++-------------------------------------------------------------------
++Fri Mar 6 23:41:12 UTC 2015 - p.drou...@gmail.com
++
++- Do not depend on fillup and insserv if the package build with
++ systemd support; it's redundant
++- Remove obsolete %clean and AUTHORS sections
++
++-------------------------------------------------------------------
++Fri Dec 5 22:54:32 UTC 2014 - ldun...@suse.com
++
++- Fixed spec file to support dracut on newers versions (bsc#893578)
++- Also cleaned up spec file a bit for rpmlint
++
++-------------------------------------------------------------------
+Tue Nov 25 13:44:28 PST 2014 - ldun...@suse.com
+
+- Fixed spec file: db-devel < 5, to fix SLE 12 and SP3 builds
@@ -19132,7 +19152,7 @@
Fri Dec 9 15:09:01 CET 2011 - h...@suse.de
- iscsiadm: Return correct error when login fails (bnc#715071)
-@@ -40,6 +381,11 @@ Fri Nov 4 09:15:52 CET 2011 - h...@suse.de
+@@ -40,6 +401,11 @@ Fri Nov 4 09:15:52 CET 2011 - h...@suse.de
- Stop iscsiuio when run inside initrd (bnc#728095)
-------------------------------------------------------------------
@@ -19144,7 +19164,7 @@
Mon Oct 24 09:13:19 CEST 2011 - h...@suse.de
- Update iscsiuio to 0.7.0.14f (bnc#687392)
-@@ -101,6 +447,11 @@ Tue Jun 21 15:09:46 CEST 2011 - h...@suse.de
+@@ -101,6 +467,11 @@ Tue Jun 21 15:09:46 CEST 2011 - h...@suse.de
- Include scripts for automated build
-------------------------------------------------------------------
@@ -19156,7 +19176,7 @@
Wed Feb 2 11:32:12 CET 2011 - mweckbec...@suse.de
- Fix the following issues:
-@@ -224,6 +575,11 @@ Wed Nov 18 10:33:27 CET 2009 - h...@suse.de
+@@ -224,6 +595,11 @@ Wed Nov 18 10:33:27 CET 2009 - h...@suse.de
- Read initiatorname correctly from sysfs (bnc#541882)
-------------------------------------------------------------------
@@ -19168,7 +19188,7 @@
Wed Aug 19 12:58:13 CEST 2009 - h...@suse.de
- Synchronize startup settings (bnc#514273)
-@@ -231,11 +587,24 @@ Wed Aug 19 12:58:13 CEST 2009 - h...@suse.de
+@@ -231,11 +607,24 @@ Wed Aug 19 12:58:13 CEST 2009 - h...@suse.de
- Do not use temp file in iscsi_discovery (bnc#528711)
-------------------------------------------------------------------
@@ -19194,7 +19214,7 @@
- Fix relogin retry handling (bnc#466846)
diff --git a/rpm/open-iscsi.spec b/rpm/open-iscsi.spec
-index 27ab050554f1..8fe23e7ecb2a 100644
+index 27ab050554f1..4270a8e71685 100644
--- a/rpm/open-iscsi.spec
+++ b/rpm/open-iscsi.spec
@@ -1,7 +1,7 @@
@@ -19202,11 +19222,11 @@
# spec file for package open-iscsi
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
-+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
++# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
-@@ -15,27 +15,35 @@
+@@ -15,27 +15,36 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -19215,6 +19235,9 @@
Name: open-iscsi
-BuildRequires: autoconf bison db-devel openssl-devel flex
+-Url: http://www.open-iscsi.org
+-License: GPL v2 or later
+-Group: Productivity/Networking/Other
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: bison
@@ -19225,13 +19248,7 @@
+BuildRequires: openssl-devel
+%if 0%{?suse_version} >= 1230
+BuildRequires: systemd
-+%endif
-+%if 0%{?suse_version} >= 1320
-+BuildRequires: suse-module-tools
-+%endif
- Url: http://www.open-iscsi.org
--License: GPL v2 or later
--Group: Productivity/Networking/Other
++%else
PreReq: %fillup_prereq %insserv_prereq
-AutoReqProv: on
-Version: 2.0.872
@@ -19240,6 +19257,11 @@
-Obsoletes: linux-iscsi
-Recommends: logrotate
-%define iscsi_release 872
++%endif
++%if 0%{?suse_version} >= 1320
++BuildRequires: suse-module-tools
++%endif
++Url: http://www.open-iscsi.org
+Version: 2.0.873
+Release: 0
+%{?systemd_requires}
@@ -19257,9 +19279,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
-@@ -63,14 +71,55 @@ Authors:
- --------
- open-is...@googlegroups.com
+@@ -57,20 +66,46 @@ processing, iSNS, SLP, Radius, etc.
+ The user space Open-iSCSI consists of a daemon process called iscsid,
+ and a management utility iscsiadm.
+%package -n open-isns
+Summary: Linux iSNS server
@@ -19268,16 +19290,15 @@
+Release: 0
+Obsoletes: isns <= 2.1.02
+Provides: isns = 2.1.03
-+
+
+%description -n open-isns
+This is a partial implementation of iSNS, according to RFC4171.
+The implementation is still somewhat incomplete, but I am releasing
+it for your reading pleasure.
-+
-+Authors:
-+--------
-+ Olaf Kirch <o...@suse.de>
-+
+
+-Authors:
+---------
+- open-is...@googlegroups.com
+%package -n iscsiuio
+Summary: Linux Broadcom NetXtremem II iscsi server
+Group: Productivity/Networking/Other
@@ -19297,12 +19318,7 @@
+This utility will provide the ARP and DHCP functionality for the iSCSI
offload.
+The communication to the driver is done via Userspace I/O (Kernel module name
+'uio').
-+
-+Authors:
-+--------
-+ Eddie Wai <eddie....@broadcom.com>
-+ Benjamin Li <be...@broadcom.com>
-+
+
%prep
%setup -n %{name}-2.0-%{iscsi_release}
%patch1 -p1
@@ -19316,7 +19332,7 @@
cd iscsiuio
touch NEWS
touch AUTHORS
-@@ -80,48 +129,186 @@ make CFLAGS="${RPM_OPT_FLAGS}"
+@@ -80,48 +115,186 @@ make CFLAGS="${RPM_OPT_FLAGS}"
%install
make DESTDIR=${RPM_BUILD_ROOT} install_user
@@ -19341,6 +19357,9 @@
+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)
+-
+-%clean
+-[ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf
${RPM_BUILD_ROOT}
+touch ${RPM_BUILD_ROOT}/etc/iscsi/initiatorname.iscsi
+install -m 0755 usr/iscsistart %{buildroot}/sbin
+make DESTDIR=${RPM_BUILD_ROOT} -C utils/open-isns install
@@ -19351,9 +19370,6 @@
+# install firewall file for isns server
+install -vD %{S:1} %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/isns
- %clean
- [ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf
${RPM_BUILD_ROOT}
-
%post
+%if 0%{?suse_version} < 1320
[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
@@ -19392,9 +19408,10 @@
%preun
-%{stop_on_removal open-iscsi}
-+%{stop_on_removal iscsid}
+%if 0%{?suse_version} >= 1230
+%{service_del_preun iscsid.socket iscsid.service iscsi.service}
++%else
++%{stop_on_removal iscsid}
+%endif
+
+%post -n open-isns
@@ -19413,9 +19430,10 @@
+%endif
+
+%preun -n open-isns
-+%{stop_on_removal isnsd isnsdd}
+%if 0%{?suse_version} >= 1230
+%{service_del_preun isnsd.socket isnsd.service}
++%else
++%{stop_on_removal isnsd isnsdd}
+%endif
+
+%post -n iscsiuio
@@ -19434,9 +19452,10 @@
+%endif
+
+%preun -n iscsiuio
-+%{stop_on_removal iscsiuio}
+%if 0%{?suse_version} >= 1230
+%{service_del_preun iscsiuio.socket iscsiuio.service}
++%else
++%{stop_on_removal iscsiuio}
+%endif
%files
@@ -19457,7 +19476,7 @@
+%{_unitdir}/iscsid.service
+%{_unitdir}/iscsid.socket
+%{_unitdir}/iscsi.service
-+/usr/lib/systemd/system-generators/ibft-rule-generator
++%{_libexecdir}/systemd/system-generators/ibft-rule-generator
+%else
+%config /etc/init.d/iscsid
+%config /etc/init.d/boot.iscsid-early
@@ -20201,10 +20220,25 @@
char hwaddress[ISCSI_HWADDRESS_BUF_SIZE];
char transport_name[ISCSI_TRANSPORT_NAME_MAXLEN];
diff --git a/usr/discovery.c b/usr/discovery.c
-index afce6c04ebb5..635ec8d9403d 100644
+index afce6c04ebb5..6fe875600a76 100644
--- a/usr/discovery.c
+++ b/usr/discovery.c
-@@ -1403,6 +1403,17 @@ redirect_reconnect:
+@@ -1111,7 +1111,13 @@ static int iscsi_create_leading_conn(struct
iscsi_session *session)
+ if (rc) {
+ log_error("Could not set host net params (err %d)\n",
+ rc);
+- rc = ISCSI_ERR_INTERNAL;
++ /*
++ * if a transport returns ISCSI_ERR_AGAIN, pass
++ * that on, otherwise all unexpected errors
++ * are bad
++ */
++ if (rc != ISCSI_ERR_AGAIN)
++ rc = ISCSI_ERR_INTERNAL;
+ goto close_ipc;
+ }
+
+@@ -1403,6 +1409,17 @@ redirect_reconnect:
iscsi_copy_operational_params(&session->conn[0], &config->session_conf,
&config->conn_conf);
@@ -20222,7 +20256,7 @@
if ((session->t->caps & CAP_LOGIN_OFFLOAD))
goto start_conn;
-@@ -1509,8 +1520,8 @@ redirect_reconnect:
+@@ -1509,8 +1526,8 @@ redirect_reconnect:
return 0;
start_conn:
@@ -23937,6 +23971,19 @@
rc = host_set_param(t, session->hostno,
ISCSI_HOST_PARAM_IPADDRESS,
iface->ipaddress, ISCSI_STRING);
+diff --git a/usr/iscsi_err.c b/usr/iscsi_err.c
+index 4fe1c53adce0..11e034857e3d 100644
+--- a/usr/iscsi_err.c
++++ b/usr/iscsi_err.c
+@@ -51,6 +51,8 @@ static char *iscsi_err_msgs[] = {
+ /* 26 */ "iSNS registration failed",
+ /* 27 */ "operation not supported",
+ /* 28 */ "device or resource in use",
++ /* 29 */ "operation failed but retry may succeed",
++ /* 30 */ "unknown discovery type",
+ };
+
+ char *iscsi_err_to_str(int err)
diff --git a/usr/iscsi_ipc.h b/usr/iscsi_ipc.h
index db5f1f04f425..5087b5c6343d 100644
--- a/usr/iscsi_ipc.h
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
