rpms/shorewall/EL-5 patch-perl-4.0.8-3.diff, NONE, 1.1 patch-perl-4.0.8-4.diff, NONE, 1.1 shorewall.spec, 1.41, 1.42

[Jonathan G. Underwood (jgu)]

Author: jgu

Update of /cvs/extras/rpms/shorewall/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17033

Modified Files:
	shorewall.spec 
Added Files:
	patch-perl-4.0.8-3.diff patch-perl-4.0.8-4.diff 
Log Message:
* Sat Feb 16 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.8-3
- Added patch-perl-4.0.8-3.diff and patch-perl-4.0.8-4.diff patches from
  upstream


patch-perl-4.0.8-3.diff:

--- NEW FILE patch-perl-4.0.8-3.diff ---
Index: Shorewall/Chains.pm
===================================================================
--- Shorewall/Chains.pm	(revision 8145)
+++ Shorewall/Chains.pm	(working copy)
@@ -1181,6 +1181,7 @@
 	$rule .= "--uid-owner $1 " if defined $1 && $1 ne '';
 	$rule .= "--gid-owner $2 " if defined $2 && $2 ne '';
     } elsif ( $user =~ /^!/ ) {
+	$user =~ s/!//;
 	$rule .= "! --uid-owner $user ";
     } else {
 	$rule .= "--uid-owner $user ";

patch-perl-4.0.8-4.diff:

--- NEW FILE patch-perl-4.0.8-4.diff ---
--- branches/4.0/Shorewall-perl/Shorewall/Tc.pm	2008/02/14 17:40:38	8194
+++ branches/4.0/Shorewall-perl/Shorewall/Tc.pm	2008/02/15 17:45:08	8195
@@ -68,22 +68,9 @@
 		    fw       => 0
 		    } ,
 	    CF => { chain    => 'tcfor' ,
-		    fw       => 0 ,
-		    connmark => 1 ,
-		    } ,
-	    T  => { chain    => 'tcpost' ,
-		    connmark => 0 ,
-		    fw       => 0
-		    } ,
-	    CT => { chain    => 'tcpost' ,
-		    target => 'CONNMARK --set-mark' ,
 		    connmark => 1 ,
-		    fw       => 0
+		    fw       => 0 ,
 		    } ,
-	    C  => { target => 'CONNMARK --set-mark' ,
-		    connmark => 1 ,
-		    fw       => 0
-		    }
 	    );
 
 use constant { NOMARK    => 0 ,


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/EL-5/shorewall.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- shorewall.spec	6 Feb 2008 00:34:20 -0000	1.41
+++ shorewall.spec	16 Feb 2008 20:48:58 -0000	1.42
@@ -11,7 +11,7 @@
 
 Name:           shorewall
 Version:	4.0.8
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	An iptables front end for firewall configuration
 Group:		Applications/System
 License:	GPLv2+
@@ -26,6 +26,8 @@
 Patch1: 	shorewall-lite-4.0.4-init.patch
 Patch2:		patch-perl-4.0.8-1.diff
 Patch3:		patch-perl-4.0.8-2.diff
+Patch4:		patch-perl-4.0.8-3.diff
+Patch5:		patch-perl-4.0.8-4.diff
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	perl
@@ -105,6 +107,11 @@
 %patch2 -p0
 %patch3 -p0
 
+pushd shorewall-perl-%{version}
+%patch4 -p0
+%patch5 -p3
+popd
+
 # Remove hash-bang from files which are not directly executed as shell
 # scripts. This silences some rpmlint errors.
 find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \;
@@ -268,6 +275,10 @@
 %{_mandir}/man8/shorewall-lite.8.gz
 
 %changelog
+* Sat Feb 16 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.8-3
+- Added patch-perl-4.0.8-3.diff and patch-perl-4.0.8-4.diff patches from
+  upstream
+
 * Wed Feb  6 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.8-2
 - Add upstream patches patch-perl-4.0.8-1.diff and patch-perl-4.0.8-2.diff