From 6c5a600340e4bf930079270380234c394039b55c100191f4499a02ec5ad5a186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Rostecki?= <mrostecki@suse.com>
Date: Fri, 8 Oct 2021 13:20:47 +0000
Subject: [PATCH] Accepting request 921449 from home:gmbr3:Active

- Update to 1.0.1:
  * keep linux capability CAP_SYS_MODULE
  * UPnP Client: actually allow SSDP traffic
  * Fix RPM macros to test if firewall-cmd is executable

OBS-URL: https://build.opensuse.org/request/show/921449
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/firewalld?expand=0&rev=116
---
 firewalld-1.0.0.tar.gz |  3 ---
 firewalld-1.0.1.tar.gz |  3 +++
 firewalld.changes      |  8 ++++++++
 firewalld.spec         | 15 +++++++++++----
 4 files changed, 22 insertions(+), 7 deletions(-)
 delete mode 100644 firewalld-1.0.0.tar.gz
 create mode 100644 firewalld-1.0.1.tar.gz

diff --git a/firewalld-1.0.0.tar.gz b/firewalld-1.0.0.tar.gz
deleted file mode 100644
index 7c743c8..0000000
--- a/firewalld-1.0.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4c2ced8d2007d4a4aaf8a3f1ccc2e3a8c4089e60061f767a2992e867cfbe9ca0
-size 2037168
diff --git a/firewalld-1.0.1.tar.gz b/firewalld-1.0.1.tar.gz
new file mode 100644
index 0000000..9943262
--- /dev/null
+++ b/firewalld-1.0.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:35a89949e527cd7fc863574b2eceb80f99092cca838c79c4c1fce2228a01eb09
+size 2041381
diff --git a/firewalld.changes b/firewalld.changes
index 4288ea4..061ca4f 100644
--- a/firewalld.changes
+++ b/firewalld.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Sep 25 20:24:33 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
+
+- Update to 1.0.1:
+  * keep linux capability CAP_SYS_MODULE
+  * UPnP Client: actually allow SSDP traffic
+  * Fix RPM macros to test if firewall-cmd is executable
+
 -------------------------------------------------------------------
 Sat Aug  7 14:27:01 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
 
diff --git a/firewalld.spec b/firewalld.spec
index c3acf8a..ca59d80 100644
--- a/firewalld.spec
+++ b/firewalld.spec
@@ -20,8 +20,12 @@
 %if ! %{defined _fillupdir}
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
+%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150300
+# systemd-rpm-macros(or kmod) is wrong in 15.2
+%define _modprobedir /lib/modprobe.d
+%endif
 Name:           firewalld
-Version:        1.0.0
+Version:        1.0.1
 Release:        0
 Summary:        A firewall daemon with D-Bus interface providing a dynamic firewall
 License:        GPL-2.0-or-later
@@ -183,8 +187,8 @@ install -dp %{buildroot}%{_prefix}/lib/firewalld/zones
 install -p -m 644 %{SOURCE1} %{buildroot}%{_prefix}/lib/firewalld/zones/docker.xml
 
 # No more /etc
-mkdir -p %{buildroot}%{_prefix}/lib/modprobe.d
-mv %{buildroot}%{_sysconfdir}/modprobe.d/* %{buildroot}%{_prefix}/lib/modprobe.d
+mkdir -p %{buildroot}%{_modprobedir}
+mv %{buildroot}%{_sysconfdir}/modprobe.d/* %{buildroot}%{_modprobedir}
 %if %{defined _distconfdir}
 mkdir -p %{buildroot}%{_distconfdir}/xdg/autostart
 mv %{buildroot}%{_sysconfdir}/xdg/autostart/* %{buildroot}%{_distconfdir}/xdg/autostart
@@ -262,7 +266,10 @@ fi
 %{_datadir}/polkit-1
 %dir %{_datadir}/dbus-1
 %dir %{_datadir}/dbus-1/system.d
-%{_prefix}/lib/modprobe.d/firewalld-sysctls.conf
+%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150300
+%dir %{_modprobedir}
+%endif
+%{_modprobedir}/firewalld-sysctls.conf
 %config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf
 %config(noreplace) %{_sysconfdir}/firewalld/lockdown-whitelist.xml
 %config(noreplace) %{_sysconfdir}/logrotate.d/firewalld