From 28e49dc9d3470820d0e1d7fa6196dd1fbd81a5144f137515eb55855fb6ab9c77 Mon Sep 17 00:00:00 2001
From: Richard Brown <rbrown@suse.com>
Date: Wed, 24 Jul 2019 09:03:49 +0000
Subject: [PATCH] Accepting request 718146 from
 home:mgerstner:branches:devel:kubic

- 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/718146
OBS-URL: https://build.opensuse.org/package/show/devel:kubic/etcd?expand=0&rev=2
---
 etcd.changes         | 8 ++++++++
 etcd.spec            | 6 ------
 etcd_client_firewall | 5 -----
 etcd_server_firewall | 5 -----
 4 files changed, 8 insertions(+), 16 deletions(-)
 delete mode 100644 etcd_client_firewall
 delete mode 100644 etcd_server_firewall

diff --git a/etcd.changes b/etcd.changes
index 1f400ed..57ddd73 100644
--- a/etcd.changes
+++ b/etcd.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jul 24 08:40:09 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
+
 -------------------------------------------------------------------
 Thu Jun 13 09:48:45 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 
diff --git a/etcd.spec b/etcd.spec
index 1c378d6..a132d01 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -31,8 +31,6 @@ Url:            https://github.com/coreos/etcd
 Source:         %{name}-%{version}.tar.xz
 Source1:        %{name}.conf
 Source2:        %{name}.service
-Source3:        etcd_client_firewall
-Source4:        etcd_server_firewall
 Source5:        README.security
 BuildRequires:  golang-packaging
 BuildRequires:  shadow
@@ -94,8 +92,6 @@ echo -e "\n#Enable arm64\nETCD_UNSUPPORTED_ARCH=arm64\n" >> %{buildroot}%{_fillu
 
 # Additional
 install -d -m 750 %{buildroot}%{_localstatedir}/lib/%{name}
-install -D -m 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/etcd_client
-install -D -m 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/etcd_server
 
 # Move
 mv %{buildroot}%{_bindir}/etcd %{buildroot}%{_sbindir}/%{name}
@@ -130,8 +126,6 @@ getent passwd %{name} >/dev/null || %{_sbindir}/useradd -r -g %{name} -d %{_loca
 
 # Additional
 %dir %attr(0750,%{name},%{name}) %{_localstatedir}/lib/%{name}
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/etcd_server
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/etcd_client
 
 %files -n etcdctl
 %defattr(-,root,root)
diff --git a/etcd_client_firewall b/etcd_client_firewall
deleted file mode 100644
index a5f1c98..0000000
--- a/etcd_client_firewall
+++ /dev/null
@@ -1,5 +0,0 @@
-## Name: etcd
-## Description: etcd communication port
-
-# space separated list of allowed TCP ports
-TCP="2379"
diff --git a/etcd_server_firewall b/etcd_server_firewall
deleted file mode 100644
index ca0f442..0000000
--- a/etcd_server_firewall
+++ /dev/null
@@ -1,5 +0,0 @@
-## Name: etcd server to server
-## Description: etcd server to server communication port
-
-# space separated list of allowed TCP ports
-TCP="2380"