rpms/shorewall/F-8 patch-perl-4.0.8-1.diff, NONE, 1.1 patch-perl-4.0.8-2.diff, NONE, 1.1

[Jonathan G. Underwood (jgu)]

Author: jgu

Update of /cvs/extras/rpms/shorewall/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12384

Added Files:
	patch-perl-4.0.8-1.diff patch-perl-4.0.8-2.diff 
Log Message:
Aadd patch-perl-4.0.8-1.diff patch-perl-4.0.8-2.diff


patch-perl-4.0.8-1.diff:

--- NEW FILE patch-perl-4.0.8-1.diff ---
diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.8/Shorewall/Rules.pm shorewall-perl-4.0.8.1/Shorewall/Rules.pm
--- shorewall-perl-4.0.8/Shorewall/Rules.pm	2008-01-22 15:55:50.000000000 -0800
+++ Shorewall/Rules.pm	2008-02-03 10:43:54.000000000 -0800
@@ -848,11 +848,12 @@
 	fatal_error "Invalid Action ($mtarget) in macro" unless $actiontype & ( ACTION +  STANDARD + NATRULE + MACRO );
 
 	if ( $msource ) {
-	    if ( ( $msource eq '-' ) || ( $msource eq 'SOURCE' ) ) {
+	    if ( $msource eq '-' ) {
 		$msource = $source || '';
-	    } elsif ( $msource eq 'DEST' ) {
-		$msource = $dest || '';
+	    } elsif ( $msource =~ s/^DEST:?// ) {
+		$msource = merge_macro_source_dest $msource, $dest; 
 	    } else {
+		$msource =~ s/^SOURCE:?//;
 		$msource = merge_macro_source_dest $msource, $source;
 	    }
 	} else {
@@ -860,11 +861,12 @@
 	}
 
 	if ( $mdest ) {
-	    if ( ( $mdest eq '-' ) || ( $mdest eq 'DEST' ) ) {
+	    if ( $mdest eq '-' ) {
 		$mdest = $dest || '';
-	    } elsif ( $mdest eq 'SOURCE' ) {
-		$mdest = $source || '';
+	    } elsif ( $mdest =~ s/^SOURCE:?// ) {
+		$mdest = merge_macro_source_dest $mdest , $source;
 	    } else {
+		$mdest =~ s/DEST:?//;
 		$mdest = merge_macro_source_dest $mdest, $dest;
 	    }
 	} else {

patch-perl-4.0.8-2.diff:

--- NEW FILE patch-perl-4.0.8-2.diff ---
diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.8/Shorewall/Rules.pm shorewall-perl-4.0.8.1/Shorewall/Rules.pm
--- shorewall-perl-4.0.8/Shorewall/Rules.pm	2008-01-22 15:55:50.000000000 -0800
+++ Shorewall/Rules.pm	2008-02-03 10:43:54.000000000 -0800
@@ -1512,7 +1514,7 @@
 		my $rule = match_source_dev( $interface ) . match_source_net( $net ) . "-j RETURN";
 		add_rule $frwd_ref , $rule;
 		add_rule $in_ref   , $rule;
-		add_rule $out_ref  , $rule;
+		add_rule $out_ref  , match_dest_dev( $interface ) . match_dest_net( $net ) . "-j RETURN";
 	    }
 	}