diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c8e8922 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/open-isns-0.99.tar.gz diff --git a/.isns-utils.metadata b/.isns-utils.metadata new file mode 100644 index 0000000..aa115ec --- /dev/null +++ b/.isns-utils.metadata @@ -0,0 +1 @@ +4302dfdc450d9a55266986033481f0fa5bc4492e SOURCES/open-isns-0.99.tar.gz diff --git a/SOURCES/fix-openssl-argument-order-in-tests.patch b/SOURCES/fix-openssl-argument-order-in-tests.patch new file mode 100644 index 0000000..b01032e --- /dev/null +++ b/SOURCES/fix-openssl-argument-order-in-tests.patch @@ -0,0 +1,25 @@ +From 65aae761c6d1e73b1cd3c05b40b5a70ee0eb67b7 Mon Sep 17 00:00:00 2001 +From: Chris Leech +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 + diff --git a/SOURCES/test_as_installed.patch b/SOURCES/test_as_installed.patch new file mode 100644 index 0000000..63d8452 --- /dev/null +++ b/SOURCES/test_as_installed.patch @@ -0,0 +1,27 @@ +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); + diff --git a/SPECS/isns-utils.spec b/SPECS/isns-utils.spec new file mode 100644 index 0000000..253995d --- /dev/null +++ b/SPECS/isns-utils.spec @@ -0,0 +1,194 @@ +Name: isns-utils +Version: 0.99 +Release: 1%{?dist} +Summary: The iSNS daemon and utility programs + +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 +Patch1: fix-openssl-argument-order-in-tests.patch +Patch2: test_as_installed.patch + +BuildRequires: openssl-devel automake pkgconfig systemd-devel systemd +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 +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} + +%description devel +Development files for iSNS + + +%prep +%autosetup -n open-isns-%{version} -p1 + + +%build +%configure --enable-shared --disable-static +make %{?_smp_mflags} + + +%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 + + +%post +%systemd_post isnsd.service isnsd.socket + + +%postun +%systemd_postun isnsd.service isnsd.socket + + +%preun +%systemd_preun isnsd.service isnsd.socket + + +%triggerun -- isns-utils < 0.91-7 +# Save the current service runlevel info +# User must manually run systemd-sysv-convert --apply httpd +# to migrate them to systemd targets +/usr/bin/systemd-sysv-convert --save isnsd >/dev/null 2>&1 ||: + +# Run these because the SysV package being removed won't do them +/sbin/chkconfig --del isnsd >/dev/null 2>&1 || : +/bin/systemctl try-restart isnsd.service >/dev/null 2>&1 || : + + +%post -n %{name}-libs -p /sbin/ldconfig + +%postun -n %{name}-libs -p /sbin/ldconfig + + +%files +%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 + + +%changelog +* Fri Mar 22 2019 Chris Leech - 0.99-1 +- rebase to 0.99 + +* Wed Feb 07 2018 Fedora Release Engineering - 0.97-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 0.97-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.97-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Apr 12 2017 Chris Leech - 0.97-3 +- switch to building as a shared library instead of static + +* Fri Feb 10 2017 Fedora Release Engineering - 0.97-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Dec 13 2016 Miro Hrončok - 0.97-1 +- Update to 0.97 +- Upstream moved on GitHub + +* Thu Feb 04 2016 Fedora Release Engineering - 0.94-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sat Dec 12 2015 Michael Schwendt - 0.94-2 +- add -static Provides to the -devel package (#1284298) + +* Mon Oct 05 2015 Chris Leech - 0.94-1 +- new upstream location, update to 0.94 +- new devel package, upstream open-iscsi is dropping it's internal copy + +* Wed Jun 17 2015 Chris Leech - 0.93-8 +- use of systemd rpm macros now require systemd as a BuildRequires + +* Wed Jun 17 2015 Fedora Release Engineering - 0.93-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Aug 16 2014 Fedora Release Engineering - 0.93-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.93-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 4 2013 Peter Robinson 0.93-4 +- Fix FTBFS, modernise spec + +* Sat Aug 03 2013 Fedora Release Engineering - 0.93-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 0.93-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Sep 10 2012 Chris Leech - 0.93-1 +- Rebase to 0.93 +- Make use of systemd rpm macros for scriptlets, BZ 850174 + +* Thu Jul 19 2012 Fedora Release Engineering - 0.91-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Feb 15 2012 Jon Ciesla - 0.91-7 +- Migrate to systemd, BZ 789707. + +* Fri Jan 13 2012 Fedora Release Engineering - 0.91-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Feb 09 2011 Fedora Release Engineering - 0.91-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Aug 21 2009 Tomas Mraz - 0.91-4 +- rebuilt with new openssl + +* Fri Jul 24 2009 Fedora Release Engineering - 0.91-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0.91-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Jan 17 2009 Tomas Mraz - 0.91-1 +- rebuild with new openssl + +* Wed Jan 16 2008 Mike Christie - 0.91-0.0 +- first build