1 diff -ur shorewall-5.2.0.5.orig/shorewall-5.2.0.5/Perl/Shorewall/Chains.pm shorewall-5.2.0.5/shorewall-5.2.0.5/Perl/Shorewall/Chains.pm
2 --- shorewall-5.2.0.5.orig/shorewall-5.2.0.5/Perl/Shorewall/Chains.pm 2018-08-05 17:31:09.000000000 +0000
3 +++ shorewall-5.2.0.5/shorewall-5.2.0.5/Perl/Shorewall/Chains.pm 2018-09-06 15:14:31.187972699 +0000
8 - while ( $condition =~ m( ^(.*?) @({)?(?:0|chain)(?(2)}) (.*)$ )x ) {
9 + while ( $condition =~ m( ^(.*?) @(\{)?(?:0|chain)(?(2)}) (.*)$ )x ) {
10 $condition = join( '', $1, $chain, $3 );
13 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
14 --- shorewall-5.2.0.5.orig/shorewall-5.2.0.5/Perl/Shorewall/Config.pm 2018-08-05 17:31:09.000000000 +0000
15 +++ shorewall-5.2.0.5/shorewall-5.2.0.5/Perl/Shorewall/Config.pm 2018-09-06 15:14:25.806972759 +0000
20 - while ( $expression =~ m( ^(.*?) \$({)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) {
21 + while ( $expression =~ m( ^(.*?) \$(\{)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) {
22 my ( $first, $var, $rest ) = ( $1, $3, $4);
24 if ( $var =~ /^\d+$/ ) {
29 - while ( $expression =~ m( ^(.*?) \@({)? (\d+|[a-zA-Z]\w*) (?(2)}) (.*)$ )x ) {
30 + while ( $expression =~ m( ^(.*?) \@(\{)? (\d+|[a-zA-Z]\w*) (?(2)}) (.*)$ )x ) {
31 my ( $first, $var, $rest ) = ( $1, $3, $4);
32 $var = numeric_value( $var ) if $var =~ /^\d/;
33 $val = $var ? $actparams{$var} : $chain;
38 - while ( $expression =~ m( ^(.*?) __({)? (\w+) (?(2)}) (.*)$ )x ) {
39 + while ( $expression =~ m( ^(.*?) __(\{)? (\w+) (?(2)}) (.*)$ )x ) {
40 my ( $first, $cap, $rest ) = ( $1, $3, $4);
42 if ( exists $capdesc{$cap} ) {
44 my ( $lineref, $count ) = ( $_[0], 0 );
45 my $chain = $actparams{chain};
47 - while ( $$lineref =~ m( ^(.*?) \$({)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) {
48 + while ( $$lineref =~ m( ^(.*?) \$(\{)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) {
50 my ( $first, $var, $rest ) = ( $1, $3, $4);
54 $$lineref =~ s/\\@/??/g;
56 - while ( $$lineref =~ m( ^(.*?) \@({)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) {
57 + while ( $$lineref =~ m( ^(.*?) \@(\{)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) {
58 my ( $first, $var, $rest ) = ( $1, $3, $4);
59 my $val = $var ? $actparams{$var} : $actparams{chain};
60 $usedcaller = USEDCALLER if $var eq 'caller';
62 sub expand_shorewallrc_variables( \$ ) {
63 my ( $lineref, $count ) = ( $_[0], 0 );
65 - while ( $$lineref =~ m( ^(.*?) \$({)? (\d+|[a-zA-Z]\w*) (?(2)}) (.*)$ )x ) {
66 + while ( $$lineref =~ m( ^(.*?) \$(\{)? (\d+|[a-zA-Z]\w*) (?(2)}) (.*)$ )x ) {
68 my ( $first, $var, $rest ) = ( $1, $3, $4);