Compare commits

...

No commits in common. "c8s" and "c10s" have entirely different histories.
c8s ... c10s

8 changed files with 177 additions and 85 deletions

7
.gitignore vendored
View File

@ -1,2 +1,5 @@
SOURCES/open-isns-0.99.tar.gz
/open-isns-0.99.tar.gz
open-isns-0.93.tar.bz2
/open-isns-0.94.tar.gz
/open-isns-0.97.tar.gz
/open-isns-0.100.tar.gz
/open-isns-0.101.tar.gz

View File

@ -1,25 +0,0 @@
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

View File

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

View File

@ -1,21 +1,20 @@
Name: isns-utils
Version: 0.99
Release: 1%{?dist}
Version: 0.101
Release: 11%{?dist}
Summary: The iSNS daemon and utility programs
Group: System Environment/Daemons
License: LGPLv2+
License: LGPL-2.1-or-later
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
Patch1: fix-openssl-argument-order-in-tests.patch
Patch2: test_as_installed.patch
Source1: isnsd.service
BuildRequires: gcc
BuildRequires: openssl-devel automake pkgconfig systemd-devel systemd
BuildRequires: make
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
%description
The iSNS package contains the daemon and tools to setup a iSNS server,
and iSNS client tools. The Internet Storage Name Service (iSNS) protocol
@ -23,14 +22,12 @@ 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}
@ -39,32 +36,35 @@ Development files for iSNS
%prep
%autosetup -n open-isns-%{version} -p1
%autosetup -p1 -n open-isns-%{version}
%build
%configure --enable-shared --disable-static
make %{?_smp_mflags}
%make_build
%install
make install DESTDIR=%{buildroot}
%make_install
make install_hdrs DESTDIR=%{buildroot}
make install_lib DESTDIR=%{buildroot}
chmod 755 %{buildroot}%{_sbindir}/isns*
chmod 755 %{buildroot}%{_libdir}/libisns.so.0
rm %{buildroot}%{_unitdir}/isnsd.service
rm %{buildroot}%{_unitdir}/isnsd.socket
install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/isnsd.service
%post
%systemd_post isnsd.service isnsd.socket
%systemd_post isnsd.service
%postun
%systemd_postun isnsd.service isnsd.socket
%systemd_postun isnsd.service
%preun
%systemd_preun isnsd.service isnsd.socket
%systemd_preun isnsd.service
%triggerun -- isns-utils < 0.91-7
@ -78,13 +78,10 @@ chmod 755 %{buildroot}%{_libdir}/libisns.so.0
/bin/systemctl try-restart isnsd.service >/dev/null 2>&1 || :
%post -n %{name}-libs -p /sbin/ldconfig
%postun -n %{name}-libs -p /sbin/ldconfig
%ldconfig_scriptlets -n %{name}-libs
%files
%defattr(-,root,root,-)
%doc COPYING README
%{_sbindir}/isnsd
%{_sbindir}/isnsadm
@ -92,25 +89,78 @@ chmod 755 %{buildroot}%{_libdir}/libisns.so.0
%{_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
%changelog
* Fri Mar 22 2019 Chris Leech <cleech@redhat.com> - 0.99-1
- rebase to 0.99
* 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
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.97-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

88
isnsd.init Normal file
View File

@ -0,0 +1,88 @@
#!/bin/sh
#
# open-isns isnsd init script
# # Copyright (C) 2007 Albert Pauw
#
# chkconfig: - 39 35
#
### BEGIN INIT INFO
# Provides: isnsd
# Required-Start: $network
# Short-Description: Starts and stops the generic iSNS daemon
# Description: isnsd provides a iSNS daemon and iSNS management tools.
### END INIT INFO
#
#
# pidfile: /var/run/isns.pid
# Source function library.
. /etc/init.d/functions
PATH=/sbin:/bin:/usr/sbin:/usr/bin
RETVAL=0
start()
{
[ `id -u` = 0 ] || exit 4
echo -n "Starting iSNS Server:"
daemon isnsd
echo
RETVAL=$?
if [ $RETVAL -eq "0" ]; then
touch /var/lock/subsys/isnsd
fi
}
stop()
{
[ `id -u` = 0 ] || exit 4
echo -n "Stopping iSNS Server: "
if [ ! -f /var/lock/subsys/isnsd ]; then
echo
success
return
fi
killproc isnsd
echo
RETVAL=$?
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/isnsd
}
restart()
{
stop
start
}
case "$1" in
start)
start
;;
stop)
stop
;;
reload)
exit 3
;;
force-reload)
restart
;;
restart)
restart
;;
status)
status isnsd
RETVAL=$?
;;
condrestart|try-restart)
[ -f /var/lock/subsys/isnsd ] && restart
;;
*)
echo $"Usage: $0 {start|stop|restart|status|force-reload|condrestart|try-restart}"
exit 2
esac
exit $RETVAL

9
isnsd.service Normal file
View File

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

View File

@ -1 +1 @@
SHA512 (open-isns-0.99.tar.gz) = 90a2297535c5e939f83c761173ce5f5f88e68adc31e41e833b23d07b6dc6959572ae7184db0084b861918199a877b251ebae4b4a7456fdd8c93400dc8457adc9
SHA512 (open-isns-0.101.tar.gz) = e5a392127b0d85f36e9e4aa963c0c502af8c5aea0aba6d12abb4425649969dcc20ba6e87a99083626d981438439b17b71a86320f816042d82ed5dbe7e7a63e77

View File

@ -1,27 +0,0 @@
diff --git a/tests/Makefile b/tests/Makefile
index 5b7884f319e0..f4ec3428d29b 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -43,3 +43,8 @@ tests-no-security:
@for test in test*.pl; do \
perl $$test -i -q; \
done
+
+tests-as-installed:
+ @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);