From bdbdd8e5bb973d31f43ef3551ff22f3602a89abe694f9b5d9517bb1ffda2e444 Mon Sep 17 00:00:00 2001
From: Lee Duncan <lduncan@suse.com>
Date: Fri, 26 Jul 2019 15:14:38 +0000
Subject: [PATCH] Accepting request 718518 from
 home:mgerstner:branches:Base:System

- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by
  firewalld, see [1].
  [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html

OBS-URL: https://build.opensuse.org/request/show/718518
OBS-URL: https://build.opensuse.org/package/show/Base:System/open-isns?expand=0&rev=19
---
 open-isns-firewall.service | 17 -----------------
 open-isns.changes          |  8 ++++++++
 open-isns.spec             |  3 ---
 3 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 open-isns-firewall.service

diff --git a/open-isns-firewall.service b/open-isns-firewall.service
deleted file mode 100644
index fddc902..0000000
--- a/open-isns-firewall.service
+++ /dev/null
@@ -1,17 +0,0 @@
-## Name: iSNS iSCSI Name Server Daemon
-## Description: Opens ports for iSNS Name Server Daemon with broadcast allowed.
-
-# space separated list of allowed TCP ports
-TCP="isns"
-
-# space separated list of allowed UDP ports
-UDP="isns"
-
-# space separated list of allowed RPC services
-RPC=""
-
-# space separated list of allowed IP protocols
-IP=""
-
-# space separated list of allowed UDP broadcast ports
-BROADCAST="isns"
diff --git a/open-isns.changes b/open-isns.changes
index b1d972c..62a1711 100644
--- a/open-isns.changes
+++ b/open-isns.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jul 24 13:52:45 UTC 2019 - matthias.gerstner@suse.com
+
+- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by
+  firewalld, see [1].
+
+  [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html
+
 -------------------------------------------------------------------
 Fri Apr 26 11:28:12 UTC 2019 - Martin Liška <mliska@suse.cz>
 
diff --git a/open-isns.spec b/open-isns.spec
index 9cd7701..6de7638 100644
--- a/open-isns.spec
+++ b/open-isns.spec
@@ -24,7 +24,6 @@ Version:        0.99
 Release:        0
 Source:         %{name}-%{version}.tar.xz
 Url:            https://github.com/open-iscsi/%{name}
-Source1:        %{name}-firewall.service
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -70,7 +69,6 @@ if [ ! -d "%{buildroot}/usr/sbin" ] ; then
 	mkdir -p %{buildroot}/usr/sbin
 fi
 ln -sf /usr/sbin/service %{buildroot}/usr/sbin/rcisnsd
-install -vD %{S:1} %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/isns
 make DESTDIR="%{buildroot}" install_hdrs install_lib
 
 %post
@@ -94,7 +92,6 @@ make DESTDIR="%{buildroot}" install_hdrs install_lib
 %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
-%attr(0644,root,root) %config /etc/sysconfig/SuSEfirewall2.d/services/isns
 %{_sbindir}/rcisnsd
 %doc COPYING HACKING README TODO
 %doc %{_mandir}/man8/isnsd.8%{?ext_man}