From 7f323b724adf80741217229e3b26ea9a92994646b8d3b134175ca49b26c21ee8 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Wed, 10 Jul 2019 10:11:56 +0000
Subject: [PATCH] Accepting request 714405 from
 home:mgerstner:branches:network:cryptocurrencies

- 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/714405
OBS-URL: https://build.opensuse.org/package/show/network:cryptocurrencies/bitcoin?expand=0&rev=20
---
 bitcoin.changes   |  8 ++++++++
 bitcoin.spec      |  5 +----
 bitcoind.firewall | 17 -----------------
 3 files changed, 9 insertions(+), 21 deletions(-)
 delete mode 100644 bitcoind.firewall

diff --git a/bitcoin.changes b/bitcoin.changes
index 4719c87..b998a9e 100644
--- a/bitcoin.changes
+++ b/bitcoin.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jul 10 09:51:31 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 Feb 13 15:46:13 UTC 2019 - Andrei Dziahel <develop7@develop7.info>
 
diff --git a/bitcoin.spec b/bitcoin.spec
index 5cbe9bf..d89eacb 100644
--- a/bitcoin.spec
+++ b/bitcoin.spec
@@ -13,7 +13,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/
 #
 
 
@@ -32,7 +32,6 @@ Group:          Productivity/Networking/Other
 URL:            https://%{name}.org
 Source0:        https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        %{base}d.service
-Source2:        %{base}d.firewall
 Source3:        %{base}d.conf
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -211,7 +210,6 @@ sed -i "s/%{base_pretty}/%{name_pretty}/g" %{SOURCE3}
 %endif
 
 mkdir -p %{buildroot}/%{_localstatedir}/lib/%{name}
-install -Dpm 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}d
 
 mkdir %{buildroot}%{_sbindir}
 ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}d
@@ -290,7 +288,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{name}d.conf >/dev/null 2>&1 || :
 %{_bindir}/%{name}d
 %dir %attr(700,%{name},%{name}) %{_var}/lib/%{name}
 %dir %{_sysconfdir}/%{name}
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}d
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %{_unitdir}/%{name}d.service
 %{_sbindir}/rc%{name}d
diff --git a/bitcoind.firewall b/bitcoind.firewall
deleted file mode 100644
index 4bd91a4..0000000
--- a/bitcoind.firewall
+++ /dev/null
@@ -1,17 +0,0 @@
-## Name: bitcoin daemon
-## Description: Opens ports for bitcoind daemon. 
-
-# space separated list of allowed TCP ports
-TCP="bitcoind 8332:8333"
-
-# 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=""