From 3edd2e1ad9d136c02082b0b8b9e35b09ffab8719cfe370cddb9f722c208d2fc3 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 25 Jul 2019 17:07:06 +0000
Subject: [PATCH] Accepting request 717919 from home:mgerstner:branches:network

- 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/717919
OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=112
---
 SuSEFirewall.dnsmasq-dhcp | 24 ------------------------
 SuSEFirewall.dnsmasq-dns  | 24 ------------------------
 dnsmasq.changes           |  8 ++++++++
 dnsmasq.spec              |  9 +--------
 4 files changed, 9 insertions(+), 56 deletions(-)
 delete mode 100644 SuSEFirewall.dnsmasq-dhcp
 delete mode 100644 SuSEFirewall.dnsmasq-dns

diff --git a/SuSEFirewall.dnsmasq-dhcp b/SuSEFirewall.dnsmasq-dhcp
deleted file mode 100644
index e2f243d..0000000
--- a/SuSEFirewall.dnsmasq-dhcp
+++ /dev/null
@@ -1,24 +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: dnsmasq
-## Description: Open ports for the dnsmasq DNS/DHCP server
-
-# space separated list of allowed TCP ports
-TCP=""
-
-# space separated list of allowed UDP ports
-UDP="bootps"
-
-# 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="bootps"
diff --git a/SuSEFirewall.dnsmasq-dns b/SuSEFirewall.dnsmasq-dns
deleted file mode 100644
index 561da84..0000000
--- a/SuSEFirewall.dnsmasq-dns
+++ /dev/null
@@ -1,24 +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: dnsmasq
-## Description: Open ports for the dnsmasq DNS/DHCP server
-
-# space separated list of allowed TCP ports
-TCP=""
-
-# 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/dnsmasq.changes b/dnsmasq.changes
index 3ded235..ee3c51e 100644
--- a/dnsmasq.changes
+++ b/dnsmasq.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jul 23 13:52:05 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
+
 -------------------------------------------------------------------
 Wed Jul 10 06:28:36 UTC 2019 - Jiri Slaby <jslaby@suse.com>
 
diff --git a/dnsmasq.spec b/dnsmasq.spec
index c1905d4..de40dd0 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
@@ -31,8 +31,6 @@ Source2:        %{name}.keyring
 Source3:        dnsmasq.reg
 Source4:        dnsmasq.service
 Source5:        rc.dnsmasq-suse
-Source6:        SuSEFirewall.dnsmasq-dhcp
-Source7:        SuSEFirewall.dnsmasq-dns
 Source8:        %{name}-rpmlintrc
 Patch0:         dnsmasq-groups.patch
 Patch1:         0001-fix-build-after-y2038-changes-in-glibc.patch
@@ -146,11 +144,8 @@ fi
 %install
 make install-i18n DESTDIR=%{buildroot} PREFIX=/usr AWK=gawk COPTS=%{_copts}
 install -d -m 755 %{buildroot}/%{_sysconfdir}/slp.reg.d
-install -d -m 755 %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 install -m 644 dnsmasq.conf.example %{buildroot}/%{_sysconfdir}/dnsmasq.conf
 install -m 644 %SOURCE3 %{buildroot}/%{_sysconfdir}/slp.reg.d/
-install -m 644 %SOURCE7 %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns
-install -m 644 %SOURCE6 %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
 install -d 755 %{buildroot}/etc/dbus-1/system.d/
 install -m 644 dbus/dnsmasq.conf %{buildroot}/etc/dbus-1/system.d/dnsmasq.conf
 install -D -m 0644 %SOURCE4 %{buildroot}%{_unitdir}/dnsmasq.service
@@ -181,8 +176,6 @@ rm -rf contrib/MacOSX-launchd
 %config(noreplace) %{_sysconfdir}/dnsmasq.conf
 %{_sbindir}/dnsmasq
 %{_sbindir}/rcdnsmasq
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
 %dir %{_sysconfdir}/slp.reg.d/
 %config %attr(0644,root,root) /%{_sysconfdir}/slp.reg.d/dnsmasq.reg
 %{_mandir}/man8/dnsmasq.8.gz