From 835e6d1cbdd4ca2d7d522fbd22ba2160beeeaac2d381d57ac0d0c301c5ce656a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 11 Jul 2019 07:31:21 +0000
Subject: [PATCH] Accepting request 714569 from home:1Antoine1:branches:network

- Remove SuSEfirewall2 service since SuSEfirewall2 has been
  replaced by firewalld (which already provides a rsyncd service).

See also https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html.

OBS-URL: https://build.opensuse.org/request/show/714569
OBS-URL: https://build.opensuse.org/package/show/network/rsync?expand=0&rev=76
---
 rsync-server.firewall | 27 ---------------------------
 rsync.changes         |  6 ++++++
 rsync.spec            |  4 ----
 3 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100644 rsync-server.firewall

diff --git a/rsync-server.firewall b/rsync-server.firewall
deleted file mode 100644
index c586185..0000000
--- a/rsync-server.firewall
+++ /dev/null
@@ -1,27 +0,0 @@
-# Do not edit this file as it's just a template and will be
-# overwritten on package updates! Copy to a new file instead.
-#
-# 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: Rsync server
-## Description: Opens port for rsync server in order to allow remote synchronization
-
-# space separated list of allowed TCP ports
-TCP="rsync"
-
-# space separated list of allowed UDP ports
-UDP=""
-
-# 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/rsync.changes b/rsync.changes
index fe59213..ecff902 100644
--- a/rsync.changes
+++ b/rsync.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul 11 06:04:07 UTC 2019 - Antoine Belvire <antoine.belvire@opensuse.org>
+
+- Remove SuSEfirewall2 service since SuSEfirewall2 has been
+  replaced by firewalld (which already provides a rsyncd service).
+
 -------------------------------------------------------------------
 Mon Apr 15 16:49:02 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
 
diff --git a/rsync.spec b/rsync.spec
index e514ea4..bbb91af 100644
--- a/rsync.spec
+++ b/rsync.spec
@@ -30,7 +30,6 @@ Source3:        rsyncd.socket
 Source4:        rsyncd.rc
 Source5:        rsyncd.conf
 Source6:        rsyncd.secrets
-Source7:        rsync-server.firewall
 Source8:        rsyncd.service
 Source9:        rsyncd@.service
 Source10:       http://rsync.samba.org/ftp/rsync/src/rsync-%{version}.tar.gz.asc
@@ -110,8 +109,6 @@ install -m 755 support/rsyncstats %{buildroot}%{_prefix}/bin
 install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/rsync
 install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/rsyncd.conf
 install -m 600 %{SOURCE6} %{buildroot}%{_sysconfdir}/rsyncd.secrets
-mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
-install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/rsync-server
 install -D -m 0644 %{SOURCE9} %{buildroot}%{_unitdir}/rsyncd@.service
 install -D -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/rsyncd.service
 install -D -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/rsyncd.socket
@@ -140,7 +137,6 @@ ln -sf service %{buildroot}%{_sbindir}/rcrsyncd
 %{_sbindir}/rsyncd
 %{_bindir}/rsyncstats
 %{_bindir}/rsync
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/*
 %{_mandir}/man1/rsync.1%{ext_man}
 %{_mandir}/man5/rsyncd.conf.5%{ext_man}
 %license COPYING