From 5eb3179c3bd179590f9a081bd445afec09995327 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 24 Apr 2024 21:28:28 +0200 Subject: [PATCH] - rediffed --- shell-fix.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shell-fix.patch b/shell-fix.patch index c419dba..a1e30eb 100644 --- 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 -- 2.44.0