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 2022-10-01 17:42:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/open-iscsi (Old)
and /work/SRC/openSUSE:Factory/.open-iscsi.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-iscsi"
Sat Oct 1 17:42:35 2022 rev:121 rq:1006788 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi.changes 2022-07-07
12:56:05.751209969 +0200
+++ /work/SRC/openSUSE:Factory/.open-iscsi.new.2275/open-iscsi.changes
2022-10-01 17:42:38.057613093 +0200
@@ -1,0 +2,12 @@
+Mon Sep 26 21:15:57 UTC 2022 - Lee Duncan <ldun...@suse.com>
+
+- Update to upstream version 2.1.8, which includes some bug fixes,
+ and adds the ability to build using meson. The SPEC file was
+ updated to use meson.
+
+ Also, some files have moved:
+ * the "lock" file has moved from /etc/iscsi to /var/lock/iscsi
+ * the "database files" have moved from /etc/iscsi to
+ /var/lib/iscsi
+
+-------------------------------------------------------------------
Old:
----
open-iscsi-2.1.7-suse.tar.bz2
New:
----
open-iscsi-2.1.8-suse.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ open-iscsi.spec ++++++
--- /var/tmp/diff_new_pack.vzmyDV/_old 2022-10-01 17:42:38.565614020 +0200
+++ /var/tmp/diff_new_pack.vzmyDV/_new 2022-10-01 17:42:38.569614027 +0200
@@ -16,16 +16,27 @@
#
-# ensure usr-merge does not effect existing SLE
+# Ensure usr-merge does not effect existing SLE. Cannot use _sbindir
+# directly since meson macros pass that on, and meson does not like
+# setting it to "/sbin". Also and move DB root to /var/lib/iscsi and
+# lockdir to /run/lock/iscsi for Factory but not SLE (yet)
%if ! 0%{?is_opensuse}
-%define _sbindir /sbin
+# sle
+%define _iscsi_sbindir /sbin
+%define _dbroot %{_sysconfdir}/iscsi
+%define _lockdir %{_sysconfdir}/iscsi
+%else
+# opensuse
+%define _iscsi_sbindir /usr/sbin
+%define _dbroot %{_sharedstatedir}/iscsi
+%define _lockdir %{_rundir}/lock/iscsi
%endif
%define iscsi_minor_release 1
-%define iscsi_patch_release 7
+%define iscsi_patch_release 8
%define iscsi_patch_release_suse %{iscsi_patch_release}-suse
Name: open-iscsi
-Version: 2.1.7
+Version: 2.1.8
Release: 0
Summary: Linux iSCSI Software Initiator
License: GPL-2.0-or-later
@@ -33,8 +44,6 @@
URL: https://www.open-iscsi.com
Source:
%{name}-2.%{iscsi_minor_release}.%{iscsi_patch_release_suse}.tar.bz2
Patch1: %{name}-SUSE-latest.diff.bz2
-BuildRequires: autoconf
-BuildRequires: automake
BuildRequires: bison
BuildRequires: db-devel < 5
BuildRequires: fdupes
@@ -42,9 +51,10 @@
BuildRequires: libkmod-devel
BuildRequires: libmount-devel
BuildRequires: libtool
-BuildRequires: make
+BuildRequires: meson >= 0.54.0
BuildRequires: open-isns-devel
BuildRequires: openssl-devel >= 1.1.1c
+BuildRequires: perl
BuildRequires: pkg-config
BuildRequires: suse-module-tools
BuildRequires: pkgconfig(libsystemd)
@@ -106,6 +116,7 @@
Summary: The iSCSI User-level Library Development Library and Include
files
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
+Requires: libopeniscsiusr0_2_0 = %{version}
Conflicts: libopeniscsiusr0_1_0
%description devel
@@ -119,24 +130,26 @@
%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} SBINDIR=%{_sbindir} user
-cd iscsiuio
-touch AUTHORS NEWS
-autoreconf --install
-%configure --sbindir=%{_sbindir}
-make %{?_smp_mflags} CFLAGS="%{optflags}" LIB_DIR=%{_libdir}
+%meson --libdir=%{_libdir} \
+ -Dc_flags="%{optflags} -fno-strict-aliasing -fno-common
-DOFFLOAD_BOOT_SUPPORTED" \
+ -Discsi_sbindir=%{_iscsi_sbindir} -Ddbroot=%{_dbroot}
-Drulesdir=%{_udevrulesdir} -Dlockdir=%{_lockdir} \
+ --strip
+%meson_build
%install
-make DESTDIR=%{buildroot} LIB_DIR=%{_libdir} SBINDIR=%{_sbindir}
RULESDIR=%{_udevrulesdir} install
+%meson_install
+[ -d %{buildroot}%{_iscsi_sbindir} ] || mkdir -p %{buildroot}%{_iscsi_sbindir}
+# create brcm_iscsiuio symlink if needed
+[ -e %{buildroot}%{_iscsi_sbindir}/brcm_iscsiuio ] || \
+ ln -s %{_iscsi_sbindir}/iscsiuio
%{buildroot}%{_iscsi_sbindir}/brcm_iscsiuio
# create rc symlinks
-[ -d %{buildroot}%{_sbindir} ] || mkdir -p %{buildroot}%{_sbindir}
-ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsi
-ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsid
-ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsiuio
+ln -s %{_iscsi_sbindir}/service %{buildroot}%{_iscsi_sbindir}/rciscsi
+ln -s %{_iscsi_sbindir}/service %{buildroot}%{_iscsi_sbindir}/rciscsid
+ln -s %{_iscsi_sbindir}/service %{buildroot}%{_iscsi_sbindir}/rciscsiuio
+ln -s %{_iscsi_sbindir}/service %{buildroot}%{_iscsi_sbindir}/rciscsi-init
(cd %{buildroot}/etc; ln -sf iscsi/iscsid.conf iscsid.conf)
# create an empty initiatorname file, as a package place holder
echo > %{buildroot}%{_sysconfdir}/iscsi/initiatorname.iscsi
-%make_install -C iscsiuio
# rename iscsiuio logrotate file to proper name
%if 0%{?suse_version} > 1500
mkdir -p %{buildroot}%{_distconfdir}/logrotate.d
@@ -149,22 +162,22 @@
%post
%{?regenerate_initrd_post}
if [ ! -f %{_sysconfdir}/iscsi/initiatorname.iscsi ] ; then
- %{_sbindir}/iscsi-gen-initiatorname
+ %{_iscsi_sbindir}/iscsi-gen-initiatorname
fi
-%service_add_post iscsi.service iscsid.service iscsid.socket
+%service_add_post iscsi.service iscsid.service iscsid.socket iscsi-init.service
%posttrans
%{?regenerate_initrd_posttrans}
%postun
%service_del_postun_without_restart iscsi.service
-%service_del_postun iscsid.service iscsid.socket
+%service_del_postun iscsi.service iscsid.service iscsid.socket
iscsi-init.service
%pre
-%service_add_pre iscsi.service iscsid.service iscsid.socket
+%service_add_pre iscsi.service iscsid.service iscsid.socket iscsi-init.service
%preun
-%service_del_preun iscsi.service iscsid.service iscsid.socket
+%service_del_preun iscsi.service iscsid.service iscsid.socket
iscsi-init.service
%post -n libopeniscsiusr0_2_0 -p %{run_ldconfig}
%postun -n libopeniscsiusr0_2_0 -p %{run_ldconfig}
@@ -183,26 +196,28 @@
%files
%dir %{_sysconfdir}/iscsi
+%{_sysconfdir}/iscsid.conf
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf
%ghost %{_sysconfdir}/iscsi/initiatorname.iscsi
-%dir %{_sysconfdir}/iscsi/ifaces
-%config %{_sysconfdir}/iscsi/ifaces/iface.example
-%{_sysconfdir}/iscsid.conf
+%dir %{_dbroot}
+%dir %{_dbroot}/ifaces
+%{_dbroot}/ifaces/iface.example
%attr(0644,root,root) %{_unitdir}/iscsid.service
%attr(0644,root,root) %{_unitdir}/iscsid.socket
%attr(0644,root,root) %{_unitdir}/iscsi-init.service
%attr(0644,root,root) %{_unitdir}/iscsi.service
%{_systemdgeneratordir}/ibft-rule-generator
-%{_sbindir}/rciscsi
-%{_sbindir}/rciscsid
-%{_sbindir}/iscsid
-%{_sbindir}/iscsiadm
-%{_sbindir}/iscsi-iname
-%{_sbindir}/iscsistart
-%{_sbindir}/iscsi-gen-initiatorname
-%{_sbindir}/iscsi_offload
-%{_sbindir}/iscsi_discovery
-%{_sbindir}/iscsi_fw_login
+%{_iscsi_sbindir}/rciscsi
+%{_iscsi_sbindir}/rciscsid
+%{_iscsi_sbindir}/rciscsi-init
+%{_iscsi_sbindir}/iscsid
+%{_iscsi_sbindir}/iscsiadm
+%{_iscsi_sbindir}/iscsi-iname
+%{_iscsi_sbindir}/iscsistart
+%{_iscsi_sbindir}/iscsi-gen-initiatorname
+%{_iscsi_sbindir}/iscsi_offload
+%{_iscsi_sbindir}/iscsi_discovery
+%{_iscsi_sbindir}/iscsi_fw_login
%doc README
%license COPYING
%{_mandir}/man8/iscsiadm.8%{ext_man}
@@ -216,11 +231,10 @@
%files -n libopeniscsiusr0_2_0
%{_libdir}/libopeniscsiusr.so.*
-%{_libdir}/pkgconfig/*.pc
%files -n iscsiuio
-%{_sbindir}/iscsiuio
-%{_sbindir}/brcm_iscsiuio
+%{_iscsi_sbindir}/iscsiuio
+%{_iscsi_sbindir}/brcm_iscsiuio
%{_mandir}/man8/iscsiuio.8%{ext_man}
%if 0%{?suse_version} > 1500
%dir %{_distconfdir}/logrotate.d
@@ -230,11 +244,12 @@
%endif
%attr(0644,root,root) %{_unitdir}/iscsiuio.service
%attr(0644,root,root) %{_unitdir}/iscsiuio.socket
-%{_sbindir}/rciscsiuio
+%{_iscsi_sbindir}/rciscsiuio
%files devel
%{_includedir}/libopeniscsiusr*.h
%{_mandir}/man3/*.3%{ext_man}
%{_libdir}/libopeniscsiusr.so
+%{_libdir}/pkgconfig/*.pc
%changelog
++++++ open-iscsi-2.1.7-suse.tar.bz2 -> open-iscsi-2.1.8-suse.tar.bz2 ++++++
++++ 4544 lines of diff (skipped)
++++++ open-iscsi-SUSE-latest.diff.bz2 ++++++
--- /var/tmp/diff_new_pack.vzmyDV/_old 2022-10-01 17:42:38.933614691 +0200
+++ /var/tmp/diff_new_pack.vzmyDV/_new 2022-10-01 17:42:38.933614691 +0200
@@ -1,210 +1,3 @@
-diff --git a/Makefile b/Makefile
-index d2f143ba6e0e..826eb499a343 100644
---- a/Makefile
-+++ b/Makefile
-@@ -76,14 +76,14 @@ iscsiuio/configure: iscsiuio/configure.ac
iscsiuio/Makefile.am
-
- force: ;
-
--clean:
-- $(MAKE) $(MFLAGS) -C utils/sysdeps clean
-- $(MAKE) $(MFLAGS) -C utils clean
-- $(MAKE) $(MFLAGS) -C usr clean
-- $(MAKE) $(MFLAGS) -C etc clean
-- $(MAKE) $(MFLAGS) -C libopeniscsiusr clean
-- [ ! -f iscsiuio/Makefile ] || $(MAKE) $(MFLAGS) -C iscsiuio clean
-- [ ! -f iscsiuio/Makefile ] || $(MAKE) $(MFLAGS) -C iscsiuio distclean
-+clean distclean:
-+ $(MAKE) $(MFLAGS) -C utils/sysdeps $@
-+ $(MAKE) $(MFLAGS) -C utils $@
-+ $(MAKE) $(MFLAGS) -C usr $@
-+ $(MAKE) $(MFLAGS) -C etc $@
-+ $(MAKE) $(MFLAGS) -C libopeniscsiusr $@
-+ $(MAKE) $(MFLAGS) -C doc $@
-+ [ ! -f iscsiuio/Makefile ] || $(MAKE) $(MFLAGS) -C iscsiuio $@
-
- # this is for safety
- # now -jXXX will still be safe
-@@ -127,4 +127,6 @@ depend:
-
- .PHONY: all user install force clean install_user install_udev_rules
install_systemd \
- install_programs install_initrd install_initrd_redhat
install_initrd_debian \
-- install_doc install_iname install_libopeniscsiusr install_etc
install_ec_all
-+ install_doc install_iname install_libopeniscsiusr install_etc
install_etc_all \
-+ distclean depend install_initd install_initd_redhat
install_initd_debian \
-+ install_iscsiuio
-diff --git a/doc/Makefile b/doc/Makefile
-index 9ed025d737ba..7267dfc0faa3 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -47,5 +47,9 @@ $(MANPAGES_DEST): $(MAN8DIR)/%: %
- $(MAN8DIR):
- [ -d $@ ] || $(INSTALL) -d $@
-
--clean:
-+clean: ;
-+
-+distclean:
- $(RM) $(MANPAGES_GENERATED)
-+
-+.PHONY: all install install_doc clean distclean
-diff --git a/etc/Makefile b/etc/Makefile
-index d06531972081..6a03c327649f 100644
---- a/etc/Makefile
-+++ b/etc/Makefile
-@@ -104,8 +104,12 @@ $(DESTDIR)$(systemddir)/system
$(DESTDIR)$(systemddir)/system-generators $(DESTD
- $(DESTDIR)$(DBROOT)/ifaces $(DESTDIR)$(initddir)/open-iscsi:
- [ -d $@ ] || $(INSTALL) -d -m 775 $@
-
--clean:
-+clean: ;
-+
-+distclean:
- $(RM) $(SYSTEMD_GENERATED_SERVICE_FILES)
-
- .PHONY: all clean install install_iface install_initd install_initd_redhat \
-- install_initd_debian install_systemd
-+ install_initd_debian install_systemd distclean install_iname \
-+ install_systemd_generator_files install_systemd_service_files \
-+ install_initd_distro install_etc
-diff --git a/iscsiuio/src/unix/Makefile.am b/iscsiuio/src/unix/Makefile.am
-index 8a943714b705..4c10711bf1cb 100644
---- a/iscsiuio/src/unix/Makefile.am
-+++ b/iscsiuio/src/unix/Makefile.am
-@@ -27,16 +27,13 @@ iscsiuio_CFLAGS = $(AM_CFLAGS) \
- $(LIBNL_CFLAGS) \
- -DBYTE_ORDER=@ENDIAN@
-
--iscsiuio_LIBS = $(AM_LIBS) \
-- -ldl \
-- -rdynamic \
-- $(LIBNL_LIBS) \
-- -lpthread
--
--iscsiuio_LDADD = $(AM_LDADD) \
-- ${top_srcdir}/src/uip/lib_iscsi_uip.a \
-- ${top_srcdir}/src/apps/dhcpc/lib_apps_dhcpc.a\
-+iscsiuio_LDADD = ${top_srcdir}/src/uip/lib_iscsi_uip.a
\
-+ ${top_srcdir}/src/apps/dhcpc/lib_apps_dhcpc.a
\
- ${top_srcdir}/src/apps/brcm-iscsi/lib_apps_brcm_iscsi.a
\
-- ${top_srcdir}/src/unix/libs/lib_iscsiuio_hw_cnic.a
-+ ${top_srcdir}/src/unix/libs/lib_iscsiuio_hw_cnic.a
\
-+ $(AM_LDADD)
\
-+ -ldl
\
-+ $(LIBNL_LIBS)
\
-+ -lpthread
-
- iscsiuio_YFLAGS = -d
-diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile
-index 52e453ab109b..757a8535a9b7 100644
---- a/libopeniscsiusr/Makefile
-+++ b/libopeniscsiusr/Makefile
-@@ -73,6 +73,8 @@ clean:
- $(RM) vgcore* core *.a *.o *.gz *.so *.so.* $(TESTS)
- $(RM) -r docs/man
-
-+distclean: ;
-+
- $(TESTS): $(LIBS)
- $(TESTS): CFLAGS += -I$(TOPDIR)/libopeniscsiusr -g
- $(TESTS): LDFLAGS += $(LIBADD) -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr
-@@ -121,3 +123,6 @@ docs/man/$(EXTRA_MAN_FILES).gz: $(HEADERS)
- gzip -f $$file; \
- done
- find docs/man -type f -name \*[0-9].gz
-+
-+.PHONY: all install clean distclean doc install_pkg_files install_docs \
-+ install_libs check
-diff --git a/usr/Makefile b/usr/Makefile
-index 3fc2248894a2..c5571b6140c5 100644
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -120,6 +120,10 @@ clean:
- $(PROGRAMS) .depend
- $(MAKE) $(MFLAGS) -C $(FW_BOOT_DIR) clean
-
-+distclean: ;
-+
-+.PHONY: all install clean distclean depend
-+
- depend:
- $(CC) $(CFLAGS) -M `ls *.c` > .depend
- $(MAKE) $(MFLAGS) -C $(FW_BOOT_DIR) depend
-diff --git a/usr/initiator.c b/usr/initiator.c
-index 718672940514..56bf38bf81ab 100644
---- a/usr/initiator.c
-+++ b/usr/initiator.c
-@@ -1153,8 +1153,9 @@ static void iscsi_stop(void *data)
- rc = iscsi_send_logout(conn);
- if (!rc)
- return;
-- conn_error(conn, "Could not send logout pdu(%s) from
iscsi_stop."
-- "Dropping session", strerror(rc));
-+
-+ conn_error(conn, "Could not send logout pdu(%s) from
iscsi_stop. Dropping session",
-+ strerror(rc));
- }
-
- rc = session_conn_shutdown(conn, conn->logout_qtask, ISCSI_SUCCESS);
-@@ -1239,8 +1240,8 @@ static void iscsi_recv_async_msg(iscsi_conn_t *conn,
struct iscsi_hdr *hdr)
- */
- rc = iscsi_send_logout(conn);
- if (rc)
-- conn_error(conn, "Could not send logout in response to"
-- "logout request aen:%s", strerror(rc));
-+ conn_error(conn, "Could not send logout in response to
logout request aen:%s",
-+ strerror(rc));
- break;
- case ISCSI_ASYNC_MSG_DROPPING_CONNECTION:
- conn_warn(conn, "Target dropping %u, reconnect min %u max %u",
ntohs(async_hdr->param1),
-@@ -2146,12 +2147,12 @@ invalid_state:
- if (!(session->t->caps & CAP_LOGIN_OFFLOAD)) {
- /* unbind is not supported so just do old logout */
- rc = iscsi_send_logout(conn);
-- if (rc)
-+ if (!rc)
- return ISCSI_SUCCESS;
- }
-
-- conn_error(conn, "Could not send logout pdu(%s) from
session_logout_task."
-- "Dropping session", strerror(rc));
-+ conn_error(conn, "Could not send logout pdu(%s) from
session_logout_task. Dropping session",
-+ strerror(rc));
- /* fallthrough */
- default:
- rc = session_conn_shutdown(conn, qtask, ISCSI_SUCCESS);
-diff --git a/utils/Makefile b/utils/Makefile
-index a7eb35232c71..d4b384da06f5 100644
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -68,9 +68,13 @@ $(DESTDIR)$(SBINDIR) $(DESTDIR)$(RULESDIR):
- clean:
- $(RM) $(OBJS)
- $(RM) $(PROGRAMS)
-+ $(RM) .depend
-+
-+distclean:
- $(RM) $(SCRIPTS_GENERATED)
- $(RM) $(RULESFILES_GENERATED)
-- $(RM) .depend
-+
-+.PHONY: all install clean distclean depend install_udev_rules
-
- depend:
- $(CC) $(CFLAGS) -M `ls *.c` > .depend
-diff --git a/utils/sysdeps/Makefile b/utils/sysdeps/Makefile
-index 3387b576c843..d419dba71afd 100644
---- a/utils/sysdeps/Makefile
-+++ b/utils/sysdeps/Makefile
-@@ -10,6 +10,10 @@ all: $(SYSDEPS_OBJS)
- clean:
- $(RM) *.o .depend
-
-+distclean: ;
-+
-+.PHONY: all clean distclean depend
-+
- depend:
- $(CC) $(CFLAGS) -M `ls *.c` > .depend
-
+
+(No newline at EOF)
