From f050fc6e05c7812ba9f949ad48ae6e8271b06044 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 25 Jun 2017 20:57:48 -0700 Subject: [PATCH] Avoid issues with Perl 5.30 Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Config.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 82d4f8263..1ac712941 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -2344,7 +2344,7 @@ sub split_line2( $$;$$$ ) { $inline_matches = $pairs; - if ( $columns =~ /^(\s*|.*[^&@%]){(.*)}\s*$/ ) { + if ( $columns =~ /^(\s*|.*[^&@%])\{(.*)\}\s*$/ ) { # # Pairs are enclosed in curly brackets. # @@ -2360,7 +2360,7 @@ sub split_line2( $$;$$$ ) { if ( $currline =~ /^\s*INLINE(?:\(.*\)(:.*)?|:.*)?\s/ || $currline =~ /^\s*IP6?TABLES(?:\(.*\)|:.*)?\s/ ) { $inline_matches = $pairs; - if ( $columns =~ /^(\s*|.*[^&@%]){(.*)}\s*$/ ) { + if ( $columns =~ /^(\s*|.*[^&@%])\{(.*)\}\s*$/ ) { # # Pairs are enclosed in curly brackets. # @@ -2374,7 +2374,7 @@ sub split_line2( $$;$$$ ) { } elsif ( $checkinline ) { warning_message "This entry needs to be changed before INLINE_MATCHES can be set to Yes"; } - } elsif ( $currline =~ /^(\s*|.*[^&@%]){(.*)}$/ ) { + } elsif ( $currline =~ /^(\s*|.*[^&@%])\{(.*)\}$/ ) { # # Pairs are enclosed in curly brackets. #