From 788ded6a89d209d4e508b21cbe7319391ca644ceaf321e8d38e9c7438b51c7f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Str=C3=B6der?= <michael@stroeder.com>
Date: Fri, 26 Jul 2019 13:24:45 +0000
Subject: [PATCH] Accepting request 718879 from
 home:mgerstner:branches:server:dns

- 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/718879
OBS-URL: https://build.opensuse.org/package/show/server:dns/unbound?expand=0&rev=109
---
 unbound.changes  |  8 ++++++++
 unbound.firewall | 25 -------------------------
 unbound.spec     |  7 -------
 3 files changed, 8 insertions(+), 32 deletions(-)
 delete mode 100644 unbound.firewall

diff --git a/unbound.changes b/unbound.changes
index f76c2b7..df7ec39 100644
--- a/unbound.changes
+++ b/unbound.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jul 26 12:29:06 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
+
 -------------------------------------------------------------------
 Mon Jun 17 17:21:10 UTC 2019 - Michael Ströder <michael@stroeder.com>
 
diff --git a/unbound.firewall b/unbound.firewall
deleted file mode 100644
index 2353d3f..0000000
--- a/unbound.firewall
+++ /dev/null
@@ -1,25 +0,0 @@
-# Only the variables TCP, UDP, RPC, IP and BROADCAST are allowed.
-# More may be supported in the future.
-#
-# For a more detailed description of the individual variables see
-# the comments for FW_SERVICES_*_EXT in /etc/sysconfig/SuSEfirewall2
-#
-
-## Name: bind DNS server
-## Description: Open ports for the bind DNS server                                                                                       
-                                                                                                                                         
-# space separated list of allowed TCP ports                                                                                              
-TCP="domain"                                                                                                                             
-                                                                                                                                         
-# space separated list of allowed UDP ports
-UDP="domain"
-
-# 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=""
-
diff --git a/unbound.spec b/unbound.spec
index 89a811a..f75840b 100644
--- a/unbound.spec
+++ b/unbound.spec
@@ -31,7 +31,6 @@
 #
 %define _sharedstatedir /var/lib/
 %define ldns_version 1.6.16
-%define fwdir /etc/sysconfig/SuSEfirewall2.d/services
 
 #
 %define piddir /run
@@ -91,7 +90,6 @@ Source13:       root.anchor
 Source14:       unbound.sysconfig
 Source15:       unbound-anchor.timer
 Source16:       unbound-munin.README
-Source17:       unbound.firewall
 Source18:       unbound-anchor.service
 
 Summary:        Validating, recursive, and caching DNS(SEC) resolver
@@ -274,9 +272,6 @@ install -p -m 0644 %{SOURCE15}    %{buildroot}%{_unitdir}/unbound-anchor.timer
 install -p -m 0644 %{SOURCE18}    %{buildroot}%{_unitdir}/unbound-anchor.service
 install -p -m 0644 %{SOURCE16}  .
 
-install -d 0755 %{buildroot}%{fwdir}
-install -p -m 0644 %{SOURCE17} %{buildroot}%{fwdir}/%{name}
-
 %if %{with munin}
 # Install munin plugin and its softlinks
 install -d 0755                   %{buildroot}%{_sysconfdir}/munin/plugin-conf.d
@@ -411,8 +406,6 @@ systemd-tmpfiles --create  %{_tmpfilesdir}/unbound.conf  || :
 %endif
 %{_sbindir}/rcunbound
 %{_sbindir}/rcunbound-keygen
-%dir %{fwdir}
-%config %{fwdir}/%{name}
 
 %files -n %{libname}
 %defattr(-,root,root,-)