- rediffed

diff --git a/shell-fix.patch b/shell-fix.patch
index c419dba16df42168575447714e1908009b9558de..a1e30ebaa101c4df86c89cc2ab72a82d4beb530e 100644 (file)
--- a/shell-fix.patch
+++ b/shell-fix.patch
@@ -1,7 +1,7 @@
-diff -ur shorewall-5.2.1.orig/shorewall/Perl/Shorewall/Config.pm shorewall-5.2.1/shorewall/Perl/Shorewall/Config.pm
---- shorewall-5.2.1.orig/shorewall/Perl/Shorewall/Config.pm    2018-10-02 15:21:54.000000000 +0000
-+++ shorewall-5.2.1/shorewall/Perl/Shorewall/Config.pm 2018-10-11 21:43:10.782033000 +0000
-@@ -6250,10 +6250,10 @@
+diff -urNp -x '*.orig' shorewall-5.2.8.org/shorewall/Perl/Shorewall/Config.pm shorewall-5.2.8/shorewall/Perl/Shorewall/Config.pm
+--- shorewall-5.2.8.org/shorewall/Perl/Shorewall/Config.pm     2020-09-25 00:02:15.000000000 +0200
++++ shorewall-5.2.8/shorewall/Perl/Shorewall/Config.pm 2024-04-24 21:27:19.537705602 +0200
+@@ -6321,10 +6321,10 @@ sub get_configuration( $$$ ) {
        $have_capabilities = 1;
      }
  
@@ -12,5 +12,5 @@ diff -ur shorewall-5.2.1.orig/shorewall/Perl/Shorewall/Config.pm shorewall-5.2.1
 +    get_params( $export );
 +
      ensure_config_path;
- 
-     @INC = @originalinc;
+     #
+     # To accomodate Cygwin-based compilation, we have separate directories for files whose names

diff --git a/shorewall.spec b/shorewall.spec
index ece36e37561e4ec7679cf66e1dd7c01f7c0e399e..1a678c62704df5955c4aa2f18405500eb3522c94 100644 (file)
--- a/shorewall.spec
+++ b/shorewall.spec
@@ -2,28 +2,28 @@
 # A very helpful document for packaging Shorewall is "Anatomy of Shorewall 4.0"
 # which is found at http://www.shorewall.net/Anatomy.html
 #
-%define                ver     5.2.4
+%define                ver     5.2.8
 %define                rel     %{nil}
 
 Summary:       Shoreline Firewall - an iptables-based firewall for Linux systems
 Summary(pl.UTF-8):     Shoreline Firewall - zapora sieciowa oparta na iptables
 Name:          shorewall
 Version:       %{ver}%{rel}
-Release:       1
+Release:       2
 License:       GPL
 Group:         Networking/Utilities
 Source0:       http://www.shorewall.net/pub/shorewall/5.2/shorewall-%{ver}/%{name}-%{version}.tar.bz2
-# Source0-md5: 2bbd934de00eefb0967b0e9e3c071a12
+# Source0-md5: 0e4041810f066deef40bf9e57fa79e96
 Source1:       http://www.shorewall.net/pub/shorewall/5.2/shorewall-%{ver}/%{name}-lite-%{version}.tar.bz2
-# Source1-md5: cb508d97f119ed017f14360f10a28062
+# Source1-md5: 330562592f437ab44c438988e499d85b
 Source2:       http://www.shorewall.net/pub/shorewall/5.2/shorewall-%{ver}/%{name}6-%{version}.tar.bz2
-# Source2-md5: 7833fa0279dd584a3594f9881ba91560
+# Source2-md5: 4a9a2f55cd40bb2cc17dae0227350c4d
 Source3:       http://www.shorewall.net/pub/shorewall/5.2/shorewall-%{ver}/%{name}6-lite-%{version}.tar.bz2
-# Source3-md5: dca7c9dd346600caae3e48e8c27a264c
+# Source3-md5: be2a9eb5d1aa5de6162e240b24e921e6
 Source4:       http://www.shorewall.net/pub/shorewall/5.2/shorewall-%{ver}/%{name}-init-%{version}.tar.bz2
-# Source4-md5: 53335f0f469ae3b3ecb4494aa36632c3
+# Source4-md5: 364a305ecba4ec40eedc5cf1a48e08e9
 Source5:       http://www.shorewall.net/pub/shorewall/5.2/shorewall-%{ver}/%{name}-core-%{version}.tar.bz2
-# Source5-md5: 6095b2b7422bfef7867579880f3279a3
+# Source5-md5: 07c7371fd2896e87f373b760561e41a8
 Source10:      %{name}.init
 Source11:      %{name}.logrotate
 Patch0:                %{name}-config.patch