Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package open-iscsi for openSUSE:Factory
checked in at 2021-10-04 18:39:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/open-iscsi (Old)
and /work/SRC/openSUSE:Factory/.open-iscsi.new.2443 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-iscsi"
Mon Oct 4 18:39:20 2021 rev:109 rq:922447 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi.changes 2021-09-11
22:24:53.479407949 +0200
+++ /work/SRC/openSUSE:Factory/.open-iscsi.new.2443/open-iscsi.changes
2021-10-04 18:40:32.446113644 +0200
@@ -1,0 +2,8 @@
+Thu Sep 30 20:59:42 UTC 2021 - Lee Duncan <ldun...@suse.com>
+
+- Update to latest from upstream, fixing:
+ * Moving the executables from /sbin to /usr/sbin (bsc#1191054)
+ * Remove default dependencies from iscsi-init.service
+ (bsc#1187190)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ open-iscsi.spec ++++++
--- /var/tmp/diff_new_pack.WynkaF/_old 2021-10-04 18:40:32.966114488 +0200
+++ /var/tmp/diff_new_pack.WynkaF/_new 2021-10-04 18:40:32.970114495 +0200
@@ -114,17 +114,17 @@
%build
[ -z "$SOURCE_DATE_EPOCH" ] || export
KBUILD_BUILD_TIMESTAMP=@$SOURCE_DATE_EPOCH
-make %{?_smp_mflags} OPTFLAGS="%{optflags} -fno-strict-aliasing -fno-common
-DOFFLOAD_BOOT_SUPPORTED -DLOCK_DIR=\\\"%{_sysconfdir}/iscsi\\\""
LIB_DIR=%{_libdir} user
+make %{?_smp_mflags} OPTFLAGS="%{optflags} -fno-strict-aliasing -fno-common
-DOFFLOAD_BOOT_SUPPORTED -DLOCK_DIR=\\\"%{_sysconfdir}/iscsi\\\""
LIB_DIR=%{_libdir} sbindir=%{_sbindir} user
cd iscsiuio
touch AUTHORS NEWS
autoreconf --install
-%configure --sbindir=/sbin
+%configure --sbindir=%{_sbindir}
make %{?_smp_mflags} CFLAGS="%{optflags}" LIB_DIR=%{_libdir}
%install
-make DESTDIR=%{buildroot} LIB_DIR=%{_libdir} install_user
+make DESTDIR=%{buildroot} LIB_DIR=%{_libdir} sbindir=%{_sbindir} install_user
# install service files
-make DESTDIR=%{buildroot} LIB_DIR=%{_libdir} install_systemd
+make DESTDIR=%{buildroot} LIB_DIR=%{_libdir} sbindir=%{_sbindir}
install_systemd
# create rc symlinks
[ -d %{buildroot}%{_sbindir} ] || mkdir -p %{buildroot}%{_sbindir}
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsi
@@ -132,7 +132,7 @@
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsiuio
(cd %{buildroot}/etc; ln -sf iscsi/iscsid.conf iscsid.conf)
echo > %{buildroot}%{_sysconfdir}/iscsi/initiatorname.iscsi
-install -m 0755 usr/iscsistart %{buildroot}/sbin
+install -m 0755 usr/iscsistart %{buildroot}/%{_sbindir}
%make_install -C iscsiuio
# rename iscsiuio logrotate file to proper name
mv %{buildroot}%{_sysconfdir}/logrotate.d/iscsiuiolog
%{buildroot}%{_sysconfdir}/logrotate.d/iscsiuio
@@ -155,8 +155,8 @@
%preun
%service_del_preun iscsi.service iscsid.service iscsid.socket
-%post -n libopeniscsiusr0_2_0 -p /sbin/ldconfig
-%postun -n libopeniscsiusr0_2_0 -p /sbin/ldconfig
+%post -n libopeniscsiusr0_2_0 -p %{run_ldconfig}
+%postun -n libopeniscsiusr0_2_0 -p %{run_ldconfig}
%post -n iscsiuio
%service_add_post iscsiuio.service iscsiuio.socket
@@ -184,14 +184,14 @@
%{_systemdgeneratordir}/ibft-rule-generator
%{_sbindir}/rciscsi
%{_sbindir}/rciscsid
-/sbin/iscsid
-/sbin/iscsiadm
-/sbin/iscsi-iname
-/sbin/iscsistart
-/sbin/iscsi-gen-initiatorname
-/sbin/iscsi_offload
-/sbin/iscsi_discovery
-/sbin/iscsi_fw_login
+%{_sbindir}/iscsid
+%{_sbindir}/iscsiadm
+%{_sbindir}/iscsi-iname
+%{_sbindir}/iscsistart
+%{_sbindir}/iscsi-gen-initiatorname
+%{_sbindir}/iscsi_offload
+%{_sbindir}/iscsi_discovery
+%{_sbindir}/iscsi_fw_login
%doc README
%license COPYING
%{_mandir}/man8/iscsiadm.8%{ext_man}
@@ -206,8 +206,8 @@
%{_libdir}/libopeniscsiusr.so.*
%files -n iscsiuio
-/sbin/iscsiuio
-/sbin/brcm_iscsiuio
+%{_sbindir}/iscsiuio
+%{_sbindir}/brcm_iscsiuio
%{_mandir}/man8/iscsiuio.8%{ext_man}
%config %{_sysconfdir}/logrotate.d/iscsiuio
%{_unitdir}/iscsiuio.service
++++++ open-iscsi-SUSE-latest.diff.bz2 ++++++
--- /var/tmp/diff_new_pack.WynkaF/_old 2021-10-04 18:40:32.990114527 +0200
+++ /var/tmp/diff_new_pack.WynkaF/_new 2021-10-04 18:40:32.990114527 +0200
@@ -0,0 +1,87 @@
+diff --git a/Makefile b/Makefile
+index 4ccf706adcfd..dc1640ecb934 100644
+--- a/Makefile
++++ b/Makefile
+@@ -121,6 +121,10 @@ install_systemd:
+ $(INSTALL) -d $(DESTDIR)$(systemddir)/system-generators
+ $(INSTALL) -m 755 utils/ibft-rule-generator \
+ $(DESTDIR)$(systemddir)/system-generators
++ for f in $(SYSTEMDFILES); do \
++ p=$(DESTDIR)/$(systemddir)/system/$${f##*/}; \
++ sed -i -e 's:@SBINDIR@:$(sbindir):' $$p; \
++ done
+
+ install_programs: $(PROGRAMS) $(SCRIPTS)
+ $(INSTALL) -d $(DESTDIR)$(sbindir)
+diff --git a/etc/systemd/iscsi-init.service b/etc/systemd/iscsi-init.service
+index 34557bfa8a71..c1518b73f5e9 100644
+--- a/etc/systemd/iscsi-init.service
++++ b/etc/systemd/iscsi-init.service
+@@ -1,6 +1,7 @@
+ [Unit]
+ Description=One time configuration for iscsid.service
+ ConditionPathExists=!/etc/iscsi/initiatorname.iscsi
++DefaultDependencies=no
+
+ [Service]
+ Type=oneshot
+diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
+index 3d468b9f1ad7..8d30740d1b4c 100644
+--- a/etc/systemd/iscsi.service
++++ b/etc/systemd/iscsi.service
+@@ -8,11 +8,11 @@ Wants=network-online.target
+
+ [Service]
+ Type=oneshot
+-ExecStart=/sbin/iscsiadm -m node --loginall=automatic -W
+-ExecStart=/sbin/iscsiadm -m node --loginall=onboot -W
+-ExecStart=/sbin/iscsiadm -m fw -l -W
+-ExecStop=/sbin/iscsiadm -m node --logoutall=automatic
+-ExecStop=/sbin/iscsiadm -m node --logoutall=manual
++ExecStart=@SBINDIR@/iscsiadm -m node --loginall=automatic -W
++ExecStart=@SBINDIR@/iscsiadm -m node --loginall=onboot -W
++ExecStart=@SBINDIR@/iscsiadm -m fw -l -W
++ExecStop=@SBINDIR@/iscsiadm -m node --logoutall=automatic
++ExecStop=@SBINDIR@/iscsiadm -m node --logoutall=manual
+ SuccessExitStatus=21 15
+ RemainAfterExit=true
+
+diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
+index 3fd7dd35fcdc..e2a50d371ebe 100644
+--- a/etc/systemd/iscsid.service
++++ b/etc/systemd/iscsid.service
+@@ -10,7 +10,7 @@ Requires=iscsi-init.service
+ [Service]
+ Type=notify
+ NotifyAccess=main
+-ExecStart=/sbin/iscsid -f
++ExecStart=@SBINDIR@/iscsid -f
+ KillMode=mixed
+ Restart=on-failure
+
+diff --git a/etc/systemd/iscsiuio.service b/etc/systemd/iscsiuio.service
+index 42daeb90a832..efbfa4fdeb53 100644
+--- a/etc/systemd/iscsiuio.service
++++ b/etc/systemd/iscsiuio.service
+@@ -12,7 +12,7 @@ Wants=remote-fs-pre.target
+ [Service]
+ Type=notify
+ NotifyAccess=main
+-ExecStart=/sbin/iscsiuio -f
++ExecStart=@SBINDIR@/iscsiuio -f
+ KillMode=mixed
+ Restart=on-failure
+
+diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c
+index b2524ed5f46b..6f57e457d78c 100644
+--- a/libopeniscsiusr/idbm.c
++++ b/libopeniscsiusr/idbm.c
+@@ -996,7 +996,7 @@ static void _idbm_node_rec_link(struct iscsi_node *node,
struct idbm_rec *recs,
+
+ /* use the interface name passed in, if any */
+ if (iface_name)
+- strncpy((*node).iface.name, iface_name, ISCSI_MAX_IFACE_LEN);
++ strncpy((*node).iface.name, iface_name, ISCSI_MAX_IFACE_LEN-1);
+
+ /*
+ * Note: because we do not add the iface.iscsi_ifacename to
