From 253eaba53085a78d55f80a5a56ae11e796f2dce7a85f44f27b46fba2d77e746d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 24 Jul 2019 07:19:18 +0000
Subject: [PATCH] Accepting request 717906 from
 home:mgerstner:branches:devel:tools:building

- 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/717906
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/distcc?expand=0&rev=21
---
 distcc.changes   |  8 ++++++++
 distcc.spec      |  8 ++------
 distccd.firewall | 17 -----------------
 3 files changed, 10 insertions(+), 23 deletions(-)
 delete mode 100644 distccd.firewall

diff --git a/distcc.changes b/distcc.changes
index af3977f..6362f23 100644
--- a/distcc.changes
+++ b/distcc.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jul 23 13:09:00 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
+
 -------------------------------------------------------------------
 Tue Jun 11 12:32:07 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/distcc.spec b/distcc.spec
index 7b07d54..999d880 100644
--- a/distcc.spec
+++ b/distcc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package distcc
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,7 +30,6 @@ Url:            https://github.com/distcc/distcc
 Source0:        https://github.com/distcc/distcc/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        distccd.sysconfig
 Source2:        distccd.service
-Source3:        distccd.firewall
 Patch1:         distcc-3.2_rc1-freedesktop.patch
 Patch2:         distcc-3.2_rc1-gssapi.patch
 Patch3:         distcc-3.2_rc1-python.patch
@@ -43,13 +42,13 @@ BuildRequires:  libtool
 BuildRequires:  make
 BuildRequires:  pkgconfig
 BuildRequires:  python
-BuildRequires:  pkgconfig(systemd)
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(avahi-client)
 BuildRequires:  pkgconfig(gtk+-2.0)
 BuildRequires:  pkgconfig(libgssglue)
 BuildRequires:  pkgconfig(pango)
 BuildRequires:  pkgconfig(python3)
+BuildRequires:  pkgconfig(systemd)
 Recommends:     %{name}-server = %{version}
 Suggests:       %{name}-gui = %{version}
 
@@ -114,8 +113,6 @@ ln -sf service %{buildroot}/%{_sbindir}/rc%{name}d
 install -D -m 0644 %{SOURCE2} %{buildroot}/%{_unitdir}/%{name}d.service
 # sysconfig
 install -Dm 644 %{SOURCE1} %{buildroot}%{_fillupdir}/sysconfig.%{name}d
-# firewall
-install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}d
 # compat links for env override
 install -d %{buildroot}%{_libexecdir}/%{name}/bin
 ln -sf %{_bindir}/%{name} %{buildroot}%{_libexecdir}/%{name}/bin/cc
@@ -186,7 +183,6 @@ rm -rf %{buildroot}%{_docdir}/%{name}/{INSTALL,COPYING}
 %{_sysconfdir}/distcc/*allow*
 %{_mandir}/man1/distccd*
 %{_mandir}/man1/include_server*
-%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/distccd
 %{_fillupdir}/*
 %{python3_sitearch}/include_server*
 
diff --git a/distccd.firewall b/distccd.firewall
deleted file mode 100644
index 1183696..0000000
--- a/distccd.firewall
+++ /dev/null
@@ -1,17 +0,0 @@
-## Name: distccd Server
-## Description: Opens ports for distccd Server.
-
-# space separated list of allowed TCP ports
-TCP="distcc"
-
-# space separated list of allowed UDP ports
-UDP="distcc"
-
-# 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=""