.gitignore

@@ -1 +1,2 @@
-open-isns-0.103.tar.gz
+SOURCES/open-isns-0.99.tar.gz
+/open-isns-0.99.tar.gz

fix-openssl-argument-order-in-tests.patch

@@ -0,0 +1,25 @@
+From 65aae761c6d1e73b1cd3c05b40b5a70ee0eb67b7 Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech@redhat.com>
+Date: Fri, 22 Mar 2019 16:12:41 -0700
+Subject: [PATCH 1/1] fix openssl argument order in tests
+
+---
+ tests/genkey | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/genkey b/tests/genkey
+index 36c5eeee56a5..2351a65dedf4 100755
+--- a/tests/genkey
++++ b/tests/genkey
+@@ -123,7 +123,7 @@ if [ ! -r $dsa_parms ]; then
+ 	EOF
+ 
+ 	mkdir -p `dirname $dsa_parms`
+-	openssl dsaparam $dsa_bits -out $dsa_parms ||
++	openssl dsaparam -out $dsa_parms $dsa_bits ||
+ 		exit 1
+ 
+ 	# DSA parameters are public
+-- 
+2.17.2
+

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

isns-utils.spec

@@ -1,21 +1,20 @@
 Name:           isns-utils
-Version:        0.103
+Version:        0.99
 Release:        1%{?dist}
 Summary:        The iSNS daemon and utility programs
 
-License:        LGPL-2.1-or-later
+Group:          System Environment/Daemons
+License:        LGPLv2+
 URL:            https://github.com/open-iscsi/open-isns
 Source0:        https://github.com/open-iscsi/open-isns/archive/v%{version}.tar.gz#/open-isns-%{version}.tar.gz
-Source1:        isnsd.service
-Patch1:         test_as_installed.patch
+Patch1:		fix-openssl-argument-order-in-tests.patch
+Patch2:		test_as_installed.patch
 
-BuildRequires:  gcc
-BuildRequires:  pkgconfig systemd-devel systemd
-BuildRequires:  meson ninja-build
+BuildRequires:  openssl-devel automake pkgconfig systemd-devel systemd
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
 
 %description
 The iSNS package contains the daemon and tools to setup a iSNS server,
@@ -24,12 +23,14 @@ allows automated discovery, management and configuration of iSCSI and
 Fibre Channel devices (using iFCP gateways) on a TCP/IP network.
 
 %package libs
+Group: Development/Libraries
 Summary: Shared library files for iSNS
 
 %description libs
 Shared library files for iSNS
 
 %package devel
+Group: Development/Libraries
 Summary: Development files for iSNS
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -38,33 +39,32 @@ Development files for iSNS
 
 
 %prep
-%autosetup -p1 -n open-isns-%{version}
+%autosetup -n open-isns-%{version} -p1
 
 
 %build
-%meson -Dsecurity=disabled -Dslp=disabled
-%meson_build
+%configure --enable-shared --disable-static
+make %{?_smp_mflags}
+
 
 %install
-%meson_install
+make install DESTDIR=%{buildroot}
+make install_hdrs DESTDIR=%{buildroot}
+make install_lib DESTDIR=%{buildroot}
 chmod 755 %{buildroot}%{_sbindir}/isns*
 chmod 755 %{buildroot}%{_libdir}/libisns.so.0
-chmod 700 %{buildroot}/var/lib/isns
-rm %{buildroot}%{_unitdir}/isnsd.service
-rm %{buildroot}%{_unitdir}/isnsd.socket
-install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/isnsd.service
 
 
 %post
-%systemd_post isnsd.service
+%systemd_post isnsd.service isnsd.socket
 
 
 %postun
-%systemd_postun isnsd.service
+%systemd_postun isnsd.service isnsd.socket
 
 
 %preun
-%systemd_preun isnsd.service
+%systemd_preun isnsd.service isnsd.socket
 
 
 %triggerun -- isns-utils < 0.91-7
@@ -78,94 +78,39 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/isnsd.service
 /bin/systemctl try-restart isnsd.service >/dev/null 2>&1 || :
 
 
-%ldconfig_scriptlets -n %{name}-libs
+%post -n %{name}-libs -p /sbin/ldconfig
+
+%postun -n %{name}-libs -p /sbin/ldconfig
 
 
 %files
-%doc COPYING README.md
+%defattr(-,root,root,-)
+%doc COPYING README
 %{_sbindir}/isnsd
 %{_sbindir}/isnsadm
 %{_sbindir}/isnsdd
 %{_mandir}/man5/*
 %{_mandir}/man8/*
 %{_unitdir}/isnsd.service
+%{_unitdir}/isnsd.socket
 %dir %{_sysconfdir}/isns
 %dir %{_var}/lib/isns
 %config(noreplace) %{_sysconfdir}/isns/*
 
 %files libs
+%defattr(-,root,root,-)
 %{_libdir}/libisns.so.0
 
 %files devel
+%defattr(-,root,root,-)
 %dir %{_includedir}/libisns
 %{_includedir}/libisns/*.h
 %{_libdir}/libisns.so
-%{_libdir}/pkgconfig/libisns.pc
 
 
 %changelog
-* Fri Dec 13 2024 Chris Leech <cleech@redhat.com> - 0.101-12
-- Add explicit requires with version on subpackage isns-utils-lib
-  Resolves: RHEL-70744
-
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.101-11
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.101-10
-- Bump release for June 2024 mass rebuild
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.101-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.101-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.101-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.101-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.101-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.101-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 0.101-3
-- Rebuilt with OpenSSL 3.0.0
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.101-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue May 18 2021 Chris Leech <cleech@redhat.com> - 0.101-0
-- update to 0.101
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.100-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Sep 17 2020 Chris Leech <cleech@redhat.com> - 0.100-0
-- rebase to upstream v0.100 + patches from git
-
-* Fri Aug 21 2020 Tom Stellard <tstellar@redhat.com> - 0.97-12
-- Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.97-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.97-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.97-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.97-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.97-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Fri Mar 22 2019 Chris Leech <cleech@redhat.com> - 0.99-1
+- rebase to 0.99
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.97-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

isnsd.service

@@ -1,9 +0,0 @@
-[Unit]
-Description=ISNS Server
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/isnsd -f
-
-[Install]
-WantedBy=multi-user.target

sources

@@ -1 +1 @@
-SHA512 (open-isns-0.103.tar.gz) = 219dd4f7e0a8459f5acaf2036fc737b90604cdcfe78b5492d50e4826744923afe35c9c331b3e39aa7c9bb5ebb2c378c464dced204d51da46e2b7474c6ca94057
+SHA512 (open-isns-0.99.tar.gz) = 90a2297535c5e939f83c761173ce5f5f88e68adc31e41e833b23d07b6dc6959572ae7184db0084b861918199a877b251ebae4b4a7456fdd8c93400dc8457adc9

test_as_installed.patch

@@ -1,57 +1,27 @@
-From f04f3c56ac1598a787cee58489e3de5589d7f879 Mon Sep 17 00:00:00 2001
-From: Chris Leech <cleech@redhat.com>
-Date: Fri, 13 Dec 2024 20:48:21 -0800
-Subject: [PATCH 1/1] Test from installed for CI
-
-Signed-off-by: Chris Leech <cleech@redhat.com>
----
- tests/Makefile   | 5 +++++
- tests/harness.py | 6 ++++++
- 2 files changed, 11 insertions(+)
- create mode 100644 tests/Makefile
-
 diff --git a/tests/Makefile b/tests/Makefile
-new file mode 100644
-index 0000000..cd856c2
---- /dev/null
+index 5b7884f319e0..f4ec3428d29b 100644
+--- a/tests/Makefile
 +++ b/tests/Makefile
-@@ -0,0 +1,5 @@
-+# Run tests on installed executables for CI
-+# Excludes tests that use external test binaries (8-11)
+@@ -43,3 +43,8 @@ tests-no-security:
+ 	@for test in test*.pl; do \
+ 		perl $$test -i -q; \
+ 	done
++
 +tests-as-installed:
-+	@echo running tests from installed executables
-+	./test-isns.py --bin-dir=/usr/sbin Test0{1..7}
-diff --git a/tests/harness.py b/tests/harness.py
-index f232132..d5a03b1 100644
---- a/tests/harness.py
-+++ b/tests/harness.py
-@@ -60,6 +60,8 @@ def get_bindir():
-     """
-     return the directory where binaries live
-     """
-+    if os.path.isabs(Global.isns_bin_dir):
-+        return Global.isns_bin_dir
-     return '%s/%s' % (Global.test_dir, Global.isns_bin_dir)
++	@for test in test*.pl; do \
++		perl $$test -q --path="/usr/sbin/"; \
++	done
+diff --git a/tests/harness.pl b/tests/harness.pl
+index 7ed4fa09f5b6..fc7f937a3ca0 100755
+--- a/tests/harness.pl
++++ b/tests/harness.pl
+@@ -858,7 +858,8 @@ sub __isns_prep_test {
+ 	GetOptions('verbose+' => \$__isns_verbose,
+ 		   "quiet"    => \$__isns_quiet,
+ 		   "fast"     => \$__isns_quick,
+-		   "insecure" => \$__isns_insecure);
++		   "insecure" => \$__isns_insecure,
++		   "path=s" => \$__isns_bin);
+ 	$__isns_verbose = 0 if ($__isns_quiet);
+ 	$__isns_security = 0 if ($__isns_insecure);
  
- def isns_stage(name, msg):
-@@ -148,6 +150,9 @@ def new_initArgParsers(self):
-     self._main_parser.add_argument('-D', '--test-dir', dest='test_dir',
-             default='.',
-             help='Sets the test dir (default ".")')
-+    self._main_parser.add_argument('--bin-dir', dest='bin_dir',
-+            default='../builddir',
-+            help='Sets the isns bin dir (default "../builddir")')
- 
- def new_parseArgs(self, argv):
-     """
-@@ -160,6 +165,7 @@ def new_parseArgs(self, argv):
-     Global.security = self.security
-     Global.debug = self.debug
-     Global.test_dir = self.test_dir
-+    Global.isns_bin_dir = self.bin_dir
-     dprint("found: debug=%s, verbosity=%d, security=%s, list=%s, test_dir='%s'" % \
-            (Global.debug, Global.verbosity,
-             Global.security, self.list, self.test_dir))
--- 
-2.47.0
-