- 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