Accepting request 853181 from Base:System

OBS-URL: https://build.opensuse.org/request/show/853181
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/open-isns?expand=0&rev=14

open-isns-fix-586-time.patch

@@ -1,25 +0,0 @@
-diff -aurp a/configure.ac b/configure.ac
---- a/configure.ac	2020-01-23 13:02:36.000000000 -0800
-+++ b/configure.ac	2020-02-01 10:14:08.853538750 -0800
-@@ -17,7 +17,7 @@ AC_PATH_PROG(SH, sh)
- dnl C Compiler features
- AC_C_INLINE
- if test "$GCC" = "yes"; then
--        CFLAGS="-Wall -Werror -Wextra $CFLAGS"
-+        CFLAGS="-Wall -Wextra $CFLAGS"
- 	CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- fi
- 
-Only in ./open-isns-0.100: .configure.ac.swp
-diff -aurp a/isnsdd.c b/isnsdd.c
---- a/isnsdd.c	2020-01-23 13:02:36.000000000 -0800
-+++ b/isnsdd.c	2020-02-01 10:14:04.277547782 -0800
-@@ -401,7 +401,7 @@ check_portal_registration(__attribute__(
- 			continue;
- 
- 		last_modified = isns_object_last_modified(obj);
--		if (last_modified + 2 * interval > now) {
-+		if ((time_t)(last_modified + 2 * interval) > now) {
- 			good_portals++;
- 			continue;
- 		}

open-isns-updates.diff.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3801804763eda4826dca32be83e4ad904ff9c97bb48fcf6e9369c0ee3d5f5e07
+oid sha256:7d0c5d789f3384b5e4099ab41f5509fc7ff2c1a82b5e3a8d76164210d8dcb374
-size 2274
+size 4320

open-isns.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Fri Dec  4 20:08:53 UTC 2020 - Lee Duncan <lduncan@suse.com>
+
+- Updated SPEC file to Recommend open-iscsi
+
+-------------------------------------------------------------------
+Fri Dec  4 19:51:59 UTC 2020 - Lee Duncan <lduncan@suse.com>
+
+- Updated to latest upstream, including:
+  * Add man page for isnssetup.
+  * Fix broken server authentication initialization.
+  * Update version string to "0.100".
+  * Added a TODO: 'make depend' not worrking
+  * libisns: remove sighold and sigrelse
+  * fix compilation without deprecated OpenSSL APIs
+  * socket.c: include poll.h instead of sys/poll.h for POSIX compatibility
+  * Fix 586 compile issue and remove -Werror
+  * Do not ignore write() return value.
+  * Fix compiler issue when n
+  Which updates open-isns-updates.diff.bz2, and removes the
+  no-longer-needed patch open-isns-fix-586-time.patch.
+  Also, security will be enabled/configured with this update.
+
 -------------------------------------------------------------------
 Fri Jan 31 22:05:13 UTC 2020 - lduncan@suse.com
 

open-isns.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package open-isns
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,8 +24,7 @@ Version:        0.100
 Release:        0
 Source:         %{name}-%{version}.tar.xz
 Patch1:         %{name}-updates.diff.bz2
-Patch2:         %{name}-fix-586-time.patch
+URL:            https://github.com/open-iscsi/%{name}
-Url:            https://github.com/open-iscsi/%{name}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -35,6 +34,7 @@ BuildRequires:  openssl-devel
 BuildRequires:  systemd-rpm-macros
 %{?systemd_requires}
 Requires:       coreutils
+Recommends:     open-iscsi
 
 %description
 This is a partial implementation of the iSNS protocol (see below),
@@ -58,13 +58,12 @@ Files to develop an application using the open-isns library.
 %prep
 %setup -n %{name}-%{version}
 %patch1 -p1
-%patch2 -p1
 
 %build
 %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects
 autoconf
 autoheader
-%configure
+%configure --prefix=/usr --with-security
 make OPTFLAGS="%{optflags}"
 
 %install
@@ -74,6 +73,7 @@ if [ ! -d "%{buildroot}/usr/sbin" ] ; then
 fi
 ln -sf /usr/sbin/service %{buildroot}/usr/sbin/rcisnsd
 make DESTDIR="%{buildroot}" install_hdrs install_lib
+install -m 755 isnssetup %{buildroot}%{_sbindir}
 
 %post
 %{service_add_post isnsd.socket isnsd.service}
@@ -92,15 +92,18 @@ make DESTDIR="%{buildroot}" install_hdrs install_lib
 %{_sbindir}/isnsd
 %{_sbindir}/isnsadm
 %{_sbindir}/isnsdd
+%{_sbindir}/isnssetup
 %dir %{_sysconfdir}/isns
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/isns/isnsd.conf
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/isns/isnsadm.conf
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/isns/isnsdd.conf
 %{_sbindir}/rcisnsd
-%doc COPYING HACKING README TODO
+%license COPYING
+%doc HACKING README TODO
 %doc %{_mandir}/man8/isnsd.8%{?ext_man}
 %doc %{_mandir}/man8/isnsadm.8%{?ext_man}
 %doc %{_mandir}/man8/isnsdd.8%{?ext_man}
+%doc %{_mandir}/man8/isnssetup.8%{?ext_man}
 %doc %{_mandir}/man5/isns_config.5%{?ext_man}
 %{_unitdir}/isnsd.service
 %{_unitdir}/isnsd.socket