From 55455dd3eae82aebb8dce55ece7314b9cf1f998474d2ecdbd1f36005b39ffba1 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Fri, 16 Aug 2019 11:57:34 +0000
Subject: [PATCH] Accepting request 718789 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/718789
OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=309
---
 rsyslog.changes  |  8 ++++++++
 rsyslog.firewall | 29 -----------------------------
 rsyslog.spec     |  7 +------
 3 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 rsyslog.firewall

diff --git a/rsyslog.changes b/rsyslog.changes
index ebbc57b..a9dafc4 100644
--- a/rsyslog.changes
+++ b/rsyslog.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jul 25 13:20:58 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 Mar  5 09:45:52 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/rsyslog.firewall b/rsyslog.firewall
deleted file mode 100644
index bdcea32..0000000
--- a/rsyslog.firewall
+++ /dev/null
@@ -1,29 +0,0 @@
-## Name: Syslog Server
-## Description: Opens ports to accept remote syslog entries.
-
-# space separated list of allowed TCP ports
-TCP=""
-
-# space separated list of allowed UDP ports
-UDP="syslog"
-
-# space separated list of allowed RPC services
-RPC=""
-
-# space separated list of allowed IP protocols
-IP=""
-
-# space separated list of allowed UDP ports that accept broadcasts
-BROADCAST=""
-
-### variables below are only needed in very special cases
-
-# space separated list of net,protocol[,sport[,dport]]
-# see FW_SERVICES_ACCEPT_RELATED_EXT
-# net 0/0 means IPv4 and IPv6. If this sevice should only work for
-# IPv4 use 0.0.0.0/0
-RELATED=""
-
-# additional kernel modules needed for this service
-# see FW_LOAD_MODULES
-MODULES=""
diff --git a/rsyslog.spec b/rsyslog.spec
index 2a0b9cc..249c344 100644
--- a/rsyslog.spec
+++ b/rsyslog.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 http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -230,7 +230,6 @@ Source7:        module-mysql
 Source8:        module-snmp
 Source9:        module-udpspoof
 Source14:       http://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-%{version}.tar.gz
-Source15:       rsyslog.firewall
 Source16:       journald-rsyslog.conf
 Source17:       acpid.frule
 Source18:       firewall.frule
@@ -842,9 +841,6 @@ install -m0600 %{SOURCE19} %{buildroot}%{_sysconfdir}/rsyslog.d/
   install -m0640 %{SOURCE9} %{buildroot}%{APPARMOR_PROFILE_PATH}/rsyslog.d/
 %endif
 
-# firewall config
-install -m 644 -D %{SOURCE15} %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
-
 %clean
 if [ -n "%{buildroot}" ] && [ "%{buildroot}" != "/" ] ; then
 	rm -rf "%{buildroot}"
@@ -1055,7 +1051,6 @@ fi
 %endif
 %{APPARMOR_PROFILE_PATH_DIR_COMMANDS}
 %config %{APPARMOR_PROFILE_PATH}/usr.sbin.rsyslogd
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
 
 %files doc
 %defattr(-,root,root)