diff --git a/SOURCES/0001-use-LDFLAGS.patch b/SOURCES/0001-use-LDFLAGS.patch new file mode 100644 index 00000000..b46e26ff --- /dev/null +++ b/SOURCES/0001-use-LDFLAGS.patch @@ -0,0 +1,41 @@ +From 38184b2c30837280ccad42b54b1a2da7b4c45c7c Mon Sep 17 00:00:00 2001 +From: Chris Leech +Date: Fri, 13 Sep 2013 17:30:01 -0700 +Subject: [PATCH 1/1] use LDFLAGS + +--- + Makefile.in | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 277a80a..dde76f0 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -100,19 +100,19 @@ $(LIB): $(LIBOBJS) + ar cr $@ $(LIBOBJS) + + isnsd: $(SRVOBJS) $(LIB) +- $(CC) $(CFLAGS) -o $@ $(SRVOBJS) -L. -lisns $(SECLINK) $(SLPLINK) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(SRVOBJS) -L. -lisns $(SECLINK) $(SLPLINK) + + isnsdd: $(ISNSDD) $(LIB) +- $(CC) $(CFLAGS) -o $@ $(ISNSDD) -L. -lisns $(SECLINK) $(SLPLINK) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ISNSDD) -L. -lisns $(SECLINK) $(SLPLINK) + + isnsadm: $(ADMOBJS) $(LIB) +- $(CC) $(CFLAGS) -o $@ $(ADMOBJS) -L. -lisns $(SECLINK) $(SLPLINK) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ADMOBJS) -L. -lisns $(SECLINK) $(SLPLINK) + + tests/%: tests/%.o $(LIB) +- $(CC) $(CFLAGS) -o $@ $@.o -L. -lisns $(SECLINK) $(SLPLINK) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.o -L. -lisns $(SECLINK) $(SLPLINK) + + bitvector: bitvector.c $(LIB) +- $(CC) -DTEST $(CFLAGS) -o $@ bitvector.c -L. -lisns ++ $(CC) -DTEST $(CFLAGS) $(LDFLAGS) -o $@ bitvector.c -L. -lisns + + depend: + gcc $(CFLAGS) -M `ls *.c` > .depend +-- +1.8.1.4 + diff --git a/SOURCES/isnsd.service b/SOURCES/isnsd.service new file mode 100644 index 00000000..f4ee128d --- /dev/null +++ b/SOURCES/isnsd.service @@ -0,0 +1,9 @@ +[Unit] +Description=ISNS Server +After=network.target + +[Service] +ExecStart=/usr/sbin/isnsd -f + +[Install] +WantedBy=multi-user.target diff --git a/SPECS/isns-utils.spec b/SPECS/isns-utils.spec new file mode 100644 index 00000000..72ee9376 --- /dev/null +++ b/SPECS/isns-utils.spec @@ -0,0 +1,147 @@ +Name: isns-utils +Version: 0.93 +Release: 7%{?dist} +Summary: The iSNS daemon and utility programs + +Group: System Environment/Daemons +License: LGPLv2+ +URL: https://github.com/mikechristie/open-isns +Source0: https://github.com/cleech/open-isns/releases/download/v0.93/open-isns-%{version}.tar.bz2 +Source1: isnsd.service + +Patch1: 0001-use-LDFLAGS.patch + +BuildRequires: openssl-devel automake pkgconfig systemd +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units + +%global _hardened_build 1 + +%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. + +%prep +%setup -q -n open-isns-%{version} +%patch1 -p1 + + +%build +autoconf +autoheader +%{configure} +%{__sed} -i -e 's|-Wall -g -O2|%{optflags}|' Makefile +%{__make} %{?_smp_mflags} + + +%install +%{__install} -d %{buildroot}%{_sbindir} +%{__install} -d %{buildroot}%{_mandir}/man8 +%{__install} -d %{buildroot}%{_mandir}/man5 +%{__install} -d %{buildroot}%{_unitdir} +%{__install} -d %{buildroot}%{_sysconfdir}/isns +%{__install} -d %{buildroot}%{_var}/lib +%{__install} -d %{buildroot}%{_var}/lib/isns + +%{__install} -p -m 644 etc/isnsd.conf %{buildroot}%{_sysconfdir}/isns/isnsd.conf +%{__install} -p -m 644 etc/isnsdd.conf %{buildroot}%{_sysconfdir}/isns/isnsdd.conf +%{__install} -p -m 644 etc/isnsadm.conf %{buildroot}%{_sysconfdir}/isns/isnsadm.conf + +%{__install} -p -m 755 isnsd isnsdd isnsadm isnssetup %{buildroot}%{_sbindir} +%{__install} -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/isnsd.service +%{__install} -p -m 644 doc/isns_config.5 %{buildroot}/%{_mandir}/man5/ +%{__install} -p -m 644 doc/isnsd.8 doc/isnsdd.8 doc/isnsadm.8 %{buildroot}/%{_mandir}/man8/ + + +%post +%systemd_post isnsd.service + + +%postun +%systemd_postun isnsd.service + + +%preun +%systemd_preun isnsd.service + + +%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 || : + + +%clean +%{__rm} -rf %{buildroot} + +%files +%doc COPYING README +%{_sbindir}/isnsd +%{_sbindir}/isnsadm +%{_sbindir}/isnsdd +%{_sbindir}/isnssetup +%{_mandir}/man8/* +%{_mandir}/man5/* +%{_unitdir}/isnsd.service +%dir %{_sysconfdir}/isns +%dir %{_var}/lib/isns +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/isns/* + +%changelog +* Fri Jan 24 2014 Daniel Mach - 0.93-7 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 0.93-6 +- Mass rebuild 2013-12-27 + +* Fri Sep 13 2013 Chris Leech - 0.93-5 +- remove unneeded libssl requirement + +* Fri Sep 13 2013 Chris Leech - 0.93-4 +- set hardened build flag, required for long running processes (isnsd) +- patch makefile to actually use LDFLAGS + +* Mon Aug 19 2013 Chris Leech - 0.93-3 +- rpmlint fixes, cleanup spec to keep building after rpm changes + +* 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