From d40995658b7f4a3f6eb4315b65df0fb2ec333ef3ff7338dd402a7f8c77434c07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Str=C3=B6der?= <michael@stroeder.com>
Date: Thu, 25 Jul 2019 12:57:50 +0000
Subject: [PATCH] Accepting request 718551 from
 home:stroeder:branches:network:ldap

removal of SuSEfirewall2 service

OBS-URL: https://build.opensuse.org/request/show/718551
OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=248
---
 SuSEfirewall2.openldap | 17 -----------------
 openldap2.changes      |  8 ++++++++
 openldap2.spec         |  4 ----
 3 files changed, 8 insertions(+), 21 deletions(-)
 delete mode 100644 SuSEfirewall2.openldap

diff --git a/SuSEfirewall2.openldap b/SuSEfirewall2.openldap
deleted file mode 100644
index e3fd802..0000000
--- a/SuSEfirewall2.openldap
+++ /dev/null
@@ -1,17 +0,0 @@
-## Name: OpenLDAP Server
-## Description: Opens ports for the OpenLDAP Server (slapd).
-
-# space separated list of allowed TCP ports
-TCP="ldap ldaps"
-
-# space separated list of allowed UDP ports
-UDP="ldap"
-
-# 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/openldap2.changes b/openldap2.changes
index 7c37f82..7acf395 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jul 25 11:08:46 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 Jul 24 21:23:28 UTC 2019 - Michael Ströder <michael@stroeder.com>
 
diff --git a/openldap2.spec b/openldap2.spec
index 6d8fbe8..26a1771 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -53,7 +53,6 @@ Source9:        addonschema.tar.gz
 Source12:       slapd.conf.example
 Source13:       start
 Source14:       slapd.service
-Source15:       SuSEfirewall2.openldap
 Source16:       sysconfig.openldap
 Source17:       openldap_update_modules_path.sh
 Source18:       openldap2.conf
@@ -391,8 +390,6 @@ install -m 644 *.schema %{buildroot}/%{_sysconfdir}/openldap/schema
 install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/openldap
 install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/openldap
 install -m 644 %{SOURCE12} %{buildroot}/%{_sysconfdir}/openldap
-install -d %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/
-install -m 644 %{SOURCE15} %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/openldap
 find doc/guide '(' ! -name *.html -a ! -name *.gif -a ! -name *.png -a ! -type d ')' -delete
 rm -rf doc/guide/release
 
@@ -468,7 +465,6 @@ fi
 
 %files
 %defattr(-,root,root)
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/openldap
 %config %{_sysconfdir}/openldap/schema/*.schema
 %config %{_sysconfdir}/openldap/schema/*.ldif
 %config(noreplace) /etc/sasl2/slapd.conf