Following Tom's advice, moving this (entire thread (1)) to the devel list.
Any thoughts on the below (the patch in question (2) is reattached here)?
1)
https://sourceforge.net/p/shorewall/mailman/shorewall-users/thread/d83aa9a2626c6459f58f671af768b570.squirrel%40webmail.bi.corp.invoca.ch/#msg37121743
2) Release repository, master branch, patch file:
release-master-1-20.10.07.17.04.57-rfc.patch
-------- Forwarded Message --------
Subject: Re: [Shorewall-users] Shorewall reload doesn't reload?
Date: Wed, 7 Oct 2020 08:49:47 -0700
From: Tom Eastep <teas...@shorewall.net>
Reply-To: Shorewall Users <shorewall-us...@lists.sourceforge.net>
To: shorewall-us...@lists.sourceforge.net
--
Matt Darfeuille <m...@shorewall.org>
Community: https://sourceforge.net/p/shorewall/mailman/message/37107049/
SPC: https://sourceforge.net/p/shorewall/mailman/message/36596609/
Homepage: https://shorewall.org
>From eb2ca7995543dd7734e342ef64a3153ba7bb3a9a Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <m...@shorewall.org>
Date: Wed, 7 Oct 2020 17:04:31 +0200
Subject: [RFC PATCH] Ensure compilation when updating RPMs
Signed-off-by: Matt Darfeuille <m...@shorewall.org>
---
shorewall.spec | 4 ++++
shorewall6.spec | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/shorewall.spec b/shorewall.spec
index ad69165..990033e 100644
--- a/shorewall.spec
+++ b/shorewall.spec
@@ -44,6 +44,10 @@ rm -rf %{buildroot}
%post
+if [ -f %{_var}/lib/%{name}/firewall ]; then
+ %{__mv} -f %{_var}/lib/%{name}/firewall
%{_var}/lib/%{name}/firewall.rpmold > /dev/null 2>&1 || :
+fi
+
if [ $1 -eq 1 ]; then
if [ -x %{_sbindir}/systemctl ]; then
%{_sbindir}/systemctl enable shorewall
diff --git a/shorewall6.spec b/shorewall6.spec
index 37c1025..77a229a 100644
--- a/shorewall6.spec
+++ b/shorewall6.spec
@@ -47,6 +47,10 @@ rm -rf $RPM_BUILD_ROOT
%post
+if [ -f %{_var}/lib/%{name}6/firewall ]; then
+ %{__mv} -f %{_var}/lib/%{name}6/firewall
%{_var}/lib/%{name}6firewall.rpmold > /dev/null 2>&1 || :
+fi
+
if [ $1 -eq 1 ]; then
if [ -x %{_sbindir}/systemctl ]; then
%{_sbindir}/systemctl enable shorewall6
--
2.11.0
_______________________________________________
Shorewall-devel mailing list
Shorewall-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/shorewall-devel
