diff --git a/isns.xml b/isns.xml new file mode 100644 index 0000000..3186a10 --- /dev/null +++ b/isns.xml @@ -0,0 +1,7 @@ + + + iSNS + The Internet Storage Name Service makes it easier to discover, manage, and configure iSCSI devices. Enable this service if you run the isnsd daemon (server). + + + diff --git a/open-isns.changes b/open-isns.changes index 0fea009..7961a3b 100644 --- a/open-isns.changes +++ b/open-isns.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 7 23:49:05 UTC 2020 - Lee Duncan + +- Added file isns.xml for firewalld, updated SPEC file for it, + since SuSEfirewall2 is deprecated. + ------------------------------------------------------------------- Fri Dec 4 20:08:53 UTC 2020 - Lee Duncan diff --git a/open-isns.spec b/open-isns.spec index c13055e..af9c50b 100644 --- a/open-isns.spec +++ b/open-isns.spec @@ -25,9 +25,11 @@ Release: 0 Source: %{name}-%{version}.tar.xz Patch1: %{name}-updates.diff.bz2 URL: https://github.com/open-iscsi/%{name} +Source1: isns.xml BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake +BuildRequires: firewall-macros BuildRequires: glibc-devel BuildRequires: make BuildRequires: openssl-devel @@ -63,7 +65,7 @@ Files to develop an application using the open-isns library. %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects autoconf autoheader -%configure --prefix=/usr --with-security +%configure --prefix=%{_prefix} --with-security make OPTFLAGS="%{optflags}" %install @@ -73,6 +75,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 -D -m 644 %{S:1} %{buildroot}%{_prefix}/lib/firewalld/services/isns.xml install -m 755 isnssetup %{buildroot}%{_sbindir} %post @@ -80,6 +83,7 @@ install -m 755 isnssetup %{buildroot}%{_sbindir} %postun %{service_del_postun isnsd.socket isnsd.service} +%firewalld_reload %pre %{service_add_pre isnsd.socket isnsd.service} @@ -97,6 +101,9 @@ install -m 755 isnssetup %{buildroot}%{_sbindir} %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 +%dir %{_prefix}/lib/firewalld +%dir %{_prefix}/lib/firewalld/services +%{_prefix}/lib/firewalld/services/isns.xml %{_sbindir}/rcisnsd %license COPYING %doc HACKING README TODO