rpms/shorewall/devel patch-perl-4.0.6-2.diff, NONE, 1.1 patch-perl-4.0.6-3.diff, NONE, 1.1 shorewall.spec, 1.40, 1.41

[Jonathan G. Underwood (jgu)]

Author: jgu

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20392

Modified Files:
	shorewall.spec 
Added Files:
	patch-perl-4.0.6-2.diff patch-perl-4.0.6-3.diff 
Log Message:
* Sat Dec  8 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.6-3
- Added patch-perl-4.0.6-2.diff and patch-perl-4.0.6-3.diff
- Fixed URLs for tarballs to match where upstream has moved them to


patch-perl-4.0.6-2.diff:

--- NEW FILE patch-perl-4.0.6-2.diff ---
Index: Shorewall/Config.pm
===================================================================
--- Shorewall/Config.pm	(revision 7800)
+++ Shorewall/Config.pm	(working copy)
@@ -1145,25 +1145,25 @@
     }
 }
 
-my %validlevels = ( debug   => 7,
-		    info    => 6,
-		    notice  => 5,
-		    warning => 4,
-		    warn    => 4,
-		    err     => 3,
-		    error   => 3,
-		    crit    => 2,
-		    alert   => 1,
-		    emerg   => 0,
-		    panic   => 0,
-		    none    => '',
+my %validlevels = ( DEBUG   => 7,
+		    INFO    => 6,
+		    NOTICE  => 5,
+		    WARNING => 4,
+		    WARN    => 4,
+		    ERR     => 3,
+		    ERROR   => 3,
+		    CRIT    => 2,
+		    ALERT   => 1,
+		    EMERG   => 0,
+		    PANIC   => 0,
+		    NONE    => '',
 		    ULOG    => 'ULOG' );
 
 #
 # Validate a log level -- Drop the trailing '!' and translate to numeric value if appropriate"
 #
 sub validate_level( $ ) {
-    my $level = $_[0];
+    my $level = uc $_[0];
 
     if ( defined $level && $level ne '' ) {
 	$level =~ s/!$//;

patch-perl-4.0.6-3.diff:

--- NEW FILE patch-perl-4.0.6-3.diff ---
--- tags/4.0.6/Shorewall-perl-3/Shorewall/Nat.pm	2007/12/08 17:41:29	7863
+++ tags/4.0.6/Shorewall-perl-3/Shorewall/Nat.pm	2007/12/08 17:50:05	7864
@@ -362,14 +362,11 @@
     fatal_error "Invalid nat file entry" unless defined $interface && defined $internal;
 
     if ( $add_ip_aliases ) {
-	if ( $interface =~ s/:$// ) {
+	if ( defined( $alias ) && $alias eq '' ) {
 	    $add_ip_aliases = '';
 	} else {
-	    my ( $iface , undef ) = split /:/, $interface;
-	    emit "del_ip_addr $external $iface" unless $config{RETAIN_ALIASES};
+	    emit "del_ip_addr $external $interface" unless $config{RETAIN_ALIASES};
 	}
-    } else {
-	$interface =~ s/:$//;
     }
 
     validate_nat_column 'ALL INTERFACES', \$allints;


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- shorewall.spec	28 Nov 2007 00:11:11 -0000	1.40
+++ shorewall.spec	8 Dec 2007 19:19:44 -0000	1.41
@@ -1,27 +1,36 @@
 # A very helpful document for packaging Shorewall is "Anatomy of Shorewall 4.0"
 # which is found at http://www.shorewall.net/Anatomy.html
 
+# Note on upstream sources: the upstream maintainer publishes tarballs for each
+# version in the "base" directory, and subsequent errata are corrected with
+# patches which can be found in the "errata" directory. These patches are to be
+# applied to the tarballs from the "base" directory. Confusingly, upstream also
+# publishes patched tarballs shorewall-foo-X.Y.Z-N.tar.bz2 where N denotes a
+# patchlevel. However, these should not be used for distro packaging.
+
 Name:           shorewall
 Version:	4.0.6
-Release:	2%{?dist}
+Release:	3%{?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
+%define _baseurl http://www.shorewall.net/pub/shorewall/4.0/shorewall-%{version}/base/
+Source0: 	%{_baseurl}%{name}-common-%{version}.tar.bz2
+Source1: 	%{_baseurl}%{name}-perl-%{version}.tar.bz2
+Source2: 	%{_baseurl}%{name}-shell-%{version}.tar.bz2
+Source3: 	%{_baseurl}%{name}-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
+Patch3:		patch-perl-4.0.6-2.diff
+Patch4:		patch-perl-4.0.6-3.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}
@@ -95,6 +104,9 @@
 
 pushd shorewall-perl-%{version}
 %patch2 -p0
+%patch3 -p0
+%patch4 -p3
+popd
 
 # Remove hash-bang from files which are not directly executed as shell
 # scripts. This silences some rpmlint errors.
@@ -259,6 +271,10 @@
 %{_mandir}/man8/shorewall-lite.8.gz
 
 %changelog
+* Sat Dec  8 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.6-3
+- Added patch-perl-4.0.6-2.diff and patch-perl-4.0.6-3.diff
+- Fixed URLs for tarballs to match where upstream has moved them to
+
 * Wed Nov 28 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.6-2
 - Add Requires for shorewall-common to shorewall-shell and shorewall-perl (Orion
   Poplawski)