From e38ab2a039cd80aac660f86b31c581399a96a48c Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 17:47:14 +0100
Subject: [PATCH] addded shorewall6 (ipv6) [release 4.6.10.1-2mamba;Sat Jun 13
 2015]

---
 shorewall.spec | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/shorewall.spec b/shorewall.spec
index 63c1723..a8c5567 100644
--- a/shorewall.spec
+++ b/shorewall.spec
@@ -2,7 +2,7 @@
 %define maj3ver %(echo %version | cut -d. -f1-3)
 Name:          shorewall
 Version:       4.6.10.1
-Release:       1mamba
+Release:       2mamba
 Summary:       Shoreline Firewall, a high-level tool for configuring Netfilter
 Group:         Network/Security
 Vendor:        openmamba
@@ -18,6 +18,7 @@ Source5:       shorewall-zones
 Source6:        http://slovakia.shorewall.net/pub/shorewall/%{majver}/shorewall-%{maj3ver}/shorewall-docs-html-%{version}.tar.bz2
 #Source8:        http://slovakia.shorewall.net/pub/shorewall/%{majver}/shorewall-%{version}/base/shorewall-perl-%{version}.tar.bz2
 #Source9:        http://slovakia.shorewall.net/pub/shorewall/%{majver}/shorewall-%{version}/base/shorewall-shell-%{version}.tar.bz2
+Source10:      http://slovakia.shorewall.net/pub/shorewall/%{majver}/shorewall-%{maj3ver}/shorewall6-%{version}.tar.bz2
 License:       GPL
 BuildArch:     noarch
 ## AUTOBUILDREQ-BEGIN
@@ -28,15 +29,25 @@ BuildRequires: shorewall-core >= %{version}
 Requires:      shorewall-core >= %{version}
 Requires:      iptables
 Requires:      iptables-ipv6
+Requires:      perl-Socket6
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 The Shoreline Firewall, more commonly known as "Shorewall", is a high-level tool for configuring Netfilter. You describe your firewall/gateway requirements using entries in a set of configuration files. Shorewall reads those configuration files and with the help of the iptables utility, Shorewall configures Netfilter to match your requirements. Shorewall can be used on a dedicated firewall system, a multi-function gateway/router/server or on a standalone GNU/Linux system. Shorewall does not use Netfilter's ipchains compatibility mode; as a consequence, Shorewall can take advantage of Netfilter's connection state tracking capabilities to create a stateful firewall.
 
 %prep
-%setup -q -a6
+%setup -q -a6 -a10
 
 %build
+cd shorewall6-%{version}
+./configure \
+   --prefix=%{_prefix} \
+   --mandir=%{_mandir} \
+   --sysconfdir=%{_sysconfdir} \
+   --systemd=%{_unitdir} \
+   HOST=linux
+
+cd ..
 ./configure \
    --prefix=%{_prefix} \
    --mandir=%{_mandir} \
@@ -46,8 +57,12 @@ The Shoreline Firewall, more commonly known as "Shorewall", is a high-level tool
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
+cd shorewall6-%{version}
 DESTDIR=%{buildroot} ./install.sh
+install -D -m0644 shorewall6.service.214 %{buildroot}%{_unitdir}/shorewall6.service
+cd ..
 
+DESTDIR=%{buildroot} ./install.sh
 install %{SOURCE1} %{buildroot}%{_sysconfdir}/shorewall/shorewall.conf
 install %{SOURCE2} %{buildroot}%{_sysconfdir}/shorewall/interfaces
 install %{SOURCE3} %{buildroot}%{_sysconfdir}/shorewall/policy
@@ -56,6 +71,7 @@ install %{SOURCE5} %{buildroot}%{_sysconfdir}/shorewall/zones
 install -D -m0644 shorewall.service.214 %{buildroot}%{_unitdir}/shorewall.service
 
 rm -f %{buildroot}%{_sysconfdir}/init.d/shorewall
+rm -f %{buildroot}%{_sysconfdir}/init.d/shorewall6
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -64,12 +80,14 @@ rm -f %{buildroot}%{_sysconfdir}/init.d/shorewall
 if [ $1 -ge 1 ]; then
    systemctl -q daemon-reload
    systemctl -q reload-or-try-restart shorewall
+   systemctl -q reload-or-try-restart shorewall6
 fi
 :
 
 %preun
 if [ $1 -eq 0 ]; then
    systemctl -q stop shorewall
+   systemctl -q stop shorewall6
 fi
 :
 
@@ -77,18 +95,29 @@ fi
 %defattr(-,root,root)
 %dir %{_sysconfdir}/shorewall
 %config(noreplace) %{_sysconfdir}/shorewall/*
+%dir %{_sysconfdir}/shorewall6
+%config(noreplace) %{_sysconfdir}/shorewall6/*
 %{_sysconfdir}/logrotate.d/shorewall
+%{_sysconfdir}/logrotate.d/shorewall6
 /sbin/shorewall
+/sbin/shorewall6
 %{_unitdir}/shorewall.service
+%{_unitdir}/shorewall6.service
 %dir %{_datadir}/shorewall
 %{_datadir}/shorewall/*
+%dir %{_datadir}/shorewall6
+%{_datadir}/shorewall6/*
 %{_mandir}/man5/shorewall*.5*
 %{_mandir}/man8/shorewall*.8*
 %dir /var/lib/shorewall
+%dir /var/lib/shorewall6
 #%doc COPYING
 #README.txt
 
 %changelog
+* Sat Jun 13 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 4.6.10.1-2mamba
+- addded shorewall6 (ipv6)
+
 * Thu Jun 11 2015 Automatic Build System <autodist@mambasoft.it> 4.6.10.1-1mamba
 - automatic version update by autodist