From 28f175add3810cd86ec362a08b051a962eef6aa6d99161d89990cb54ab646891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 26 Jul 2019 11:36:11 +0000
Subject: [PATCH] Accepting request 718821 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/718821
OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=168
---
 syncthing.changes  | 8 ++++++++
 syncthing.firewall | 8 --------
 syncthing.spec     | 8 +-------
 3 files changed, 9 insertions(+), 15 deletions(-)
 delete mode 100644 syncthing.firewall

diff --git a/syncthing.changes b/syncthing.changes
index 1acc029..c2d22cd 100644
--- a/syncthing.changes
+++ b/syncthing.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jul 26 10:30:25 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 May 13 13:17:01 UTC 2019 - Paolo Stivanin <info@paolostivanin.com>
 
diff --git a/syncthing.firewall b/syncthing.firewall
deleted file mode 100644
index 787a490..0000000
--- a/syncthing.firewall
+++ /dev/null
@@ -1,8 +0,0 @@
-## Name: FOSS Continuous File Synchronization
-## Description: Opens ports for Syncthing.
-
-# space separated list of allowed TCP ports
-TCP="22000"
-
-# space separated list of allowed UDP ports
-UDP="21027"
diff --git a/syncthing.spec b/syncthing.spec
index dbe389e..895eea1 100644
--- a/syncthing.spec
+++ b/syncthing.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/
 #
 
 
@@ -26,7 +26,6 @@ Url:            https://syncthing.net/
 Source:         https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-source-v%{version}.tar.gz
 Source1:        https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-source-v%{version}.tar.gz.asc
 Source2:        %{name}.keyring
-Source3:        %{name}.firewall
 BuildRequires:  go >= 1.8
 BuildRequires:  systemd
 BuildRequires:  systemd-rpm-macros
@@ -51,8 +50,6 @@ joined to the syncthing relay pool or private.
 %prep
 %setup -q -n %{name}
 
-cp -f %{SOURCE3} %{name}.firewall
-
 %build
 export BUILD_USER=abuild
 export BUILD_HOST=openSUSE
@@ -89,8 +86,6 @@ install -Dpm 0644 etc/linux-systemd/system/%{name}-resume.service  \
 install -Dpm 0644 etc/linux-systemd/user/%{name}.service           \
   %{buildroot}%{_userunitdir}/%{name}.service
 %endif
-install -Dpm 0644 %{name}.firewall                                 \
-  %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
 
 %pre
 %service_add_pre %{name}-resume.service
@@ -132,7 +127,6 @@ getent passwd strelaysrv >/dev/null || \
 %files
 %license LICENSE
 %doc AUTHORS CONDUCT.md CONTRIBUTING.md README.md
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
 %{_bindir}/%{name}
 %{_bindir}/stcli
 %{_unitdir}/%{name}@.service