rpms/shorewall/F-8 patch-perl-4.0.6-1.diff, NONE, 1.1 shorewall.spec, 1.38, 1.39 sources, 1.31, 1.32

[Jonathan G. Underwood (jgu)]

Author: jgu

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

Modified Files:
	shorewall.spec sources 
Added Files:
	patch-perl-4.0.6-1.diff 
Log Message:
* Sat Nov 24 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.6-1
- Update to 4.0.6 plus patch-perl-4.0.6-1.diff upstream errata


patch-perl-4.0.6-1.diff:

--- NEW FILE patch-perl-4.0.6-1.diff ---
Index: Shorewall/Tunnels.pm
===================================================================
--- Shorewall/Tunnels.pm	(revision 0)
+++ Shorewall/Tunnels.pm	(working copy)
@@ -270,7 +270,7 @@
     #
     my $fn = open_file 'tunnels';
 
-    first_entry "$doing $fn...";
+    first_entry "$doing $fn..." if $fn;
 
     while ( read_a_line ) {
 
Index: Shorewall/Accounting.pm
===================================================================
--- Shorewall/Accounting.pm	(revision 0)
+++ Shorewall/Accounting.pm	(working copy)
@@ -176,7 +176,7 @@
 
     my $fn = open_file 'accounting';
 
-    first_entry "$doing $fn...";
+    first_entry "$doing $fn..." if $fn;
 
     while ( read_a_line ) {
 
Index: Shorewall/Rules.pm
===================================================================
--- Shorewall/Rules.pm	(revision 0)
+++ Shorewall/Rules.pm	(working copy)
@@ -221,7 +221,7 @@
 
     my $fn = open_file 'rfc1918';
 
-    first_entry "$doing $fn...";
+    first_entry "$doing $fn..." if $fn;
 
     while ( read_a_line ) {
 
@@ -341,7 +341,7 @@
 
     my $fn = open_file 'routestopped';
 
-    first_entry "$doing $fn for critical hosts...";
+    first_entry "$doing $fn for critical hosts..." if $fn;
 
     while ( read_a_line ) {
 
@@ -382,7 +382,7 @@
 
     my $fn = open_file 'routestopped';
 
-    first_entry "$doing $fn...";
+    first_entry "$doing $fn..." if $fn;
 
     while ( read_a_line ) {
 
@@ -702,7 +702,7 @@
 
 	my $fn = open_file 'maclist';
 
-	first_entry "$doing $fn...";
+	first_entry "$doing $fn..." if $fn;
 
 	while ( read_a_line ) {
 
@@ -1345,7 +1345,7 @@
 
     my $fn = open_file 'rules';
 
-    first_entry "$doing $fn...";
+    first_entry "$doing $fn..." if $fn;
 
     while ( read_a_line ) {
 
Index: Shorewall/Nat.pm
===================================================================
--- Shorewall/Nat.pm	(revision 0)
+++ Shorewall/Nat.pm	(working copy)
@@ -297,7 +297,7 @@
 {
     my $fn = open_file 'masq';
 
-    first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty masq file' , 's'; } );
+    first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty masq file' , 's'; } ) if $fn;
     
     while ( read_a_line ) {
 
@@ -402,7 +402,7 @@
 
     my $fn = open_file 'nat';
 
-    first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty nat file' , 's'; } );
+    first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty nat file' , 's'; } ) if $fn;
     
     while ( read_a_line ) {
 
@@ -426,7 +426,7 @@
 
     my $fn = open_file 'netmap';
 
-    first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty netmap file' , 's'; } );
+    first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty netmap file' , 's'; } ) if $fn;
 
     while ( read_a_line ) {
 


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-8/shorewall.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- shorewall.spec	13 Nov 2007 00:00:14 -0000	1.38
+++ shorewall.spec	24 Nov 2007 16:03:31 -0000	1.39
@@ -2,22 +2,26 @@
 # which is found at http://www.shorewall.net/Anatomy.html
 
 Name:           shorewall
-Version:	4.0.5
+Version:	4.0.6
 Release:	1%{?dist}
 Summary:	An iptables front end for firewall configuration
-
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://www.shorewall.net/
+
 Source0: 	http://www.shorewall.net/pub/shorewall/4.0/shorewall-%{version}/shorewall-common-%{version}.tar.bz2
 Source1: 	http://www.shorewall.net/pub/shorewall/4.0/shorewall-%{version}/shorewall-perl-%{version}.tar.bz2
 Source2: 	http://www.shorewall.net/pub/shorewall/4.0/shorewall-%{version}/shorewall-shell-%{version}.tar.bz2
 Source3: 	http://www.shorewall.net/pub/shorewall/4.0/shorewall-%{version}/shorewall-lite-%{version}.tar.bz2
 Patch0: 	shorewall-4.0.4-init.patch
 Patch1: 	shorewall-lite-4.0.4-init.patch
+Patch2:		patch-perl-4.0.6-1.diff
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	perl
 BuildArch:	noarch
+
+
 Requires:	shorewall-common = %{version}-%{release}
 Requires:	shorewall-perl = %{version}-%{release}
 Requires:	shorewall-shell = %{version}-%{release}
@@ -87,6 +91,9 @@
 %patch1 -p1
 popd
 
+pushd shorewall-perl-%{version}
+%patch2 -p0
+
 # 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' {} \;
@@ -250,6 +257,9 @@
 %{_mandir}/man8/shorewall-lite.8.gz
 
 %changelog
+* Sat Nov 24 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.6-1
+- Update to 4.0.6 plus patch-perl-4.0.6-1.diff upstream errata
+
 * Sat Oct 27 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.5-1
 - Update to 4.0.5 which removes the need for the buildports.pl functionality
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-8/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	13 Nov 2007 00:00:14 -0000	1.31
+++ sources	24 Nov 2007 16:03:31 -0000	1.32
@@ -1,4 +1,4 @@
-0113ff6a91ca0ec0f3bba0aa8ba7b81c  shorewall-common-4.0.5.tar.bz2
-8bbd26a068e76792d4f19dd06e73afe5  shorewall-lite-4.0.5.tar.bz2
-b0e3bb425bb7898a52d743f0e920df10  shorewall-perl-4.0.5.tar.bz2
-ed38e7bbe742414ad655167695220f4d  shorewall-shell-4.0.5.tar.bz2
+671414a774b75ed49736a0a4be4162bc  shorewall-common-4.0.6.tar.bz2
+cba24c5cd99c8f4ccb8262cdb07de330  shorewall-lite-4.0.6.tar.bz2
+b6409d73ed5f800cc511efbb55bb8418  shorewall-perl-4.0.6.tar.bz2
+e1db7daf1bb0123fe14bb3f381c06b0e  shorewall-shell-4.0.6.tar.bz2