X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=shell-fix.patch;h=c419dba16df42168575447714e1908009b9558de;hb=HEAD;hp=524e49037df6806d42ec91b9e0f3261c2391c65a;hpb=1cccfd3f59d402425aa096b0debf1c4df10046ad;p=packages%2Fshorewall.git diff --git a/shell-fix.patch b/shell-fix.patch index 524e490..a1e30eb 100644 --- a/shell-fix.patch +++ b/shell-fix.patch @@ -1,7 +1,7 @@ -diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/Perl/Shorewall/Config.pm shorewall-5.2.0.5/shorewall-5.2.0.5/Perl/Shorewall/Config.pm ---- shorewall-5.2.0.5.orig/shorewall-5.2.0.5/Perl/Shorewall/Config.pm 2018-05-18 18:46:49.000000000 +0000 -+++ shorewall-5.2.0.5/shorewall-5.2.0.5/Perl/Shorewall/Config.pm 2018-06-20 12:32:04.348554961 +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.0.5.orig/shorewall-5.2.0.5/Perl/Shorewall/Config.pm shore + get_params( $export ); + ensure_config_path; - - @INC = @originalinc; + # + # To accomodate Cygwin-based compilation, we have separate directories for files whose names