rpms/shorewall/devel patch-perl-4.2.3.1, NONE, 1.1 shorewall.spec, 1.64, 1.65

[Jonathan G. Underwood]

Author: jgu

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2300

Modified Files:
	shorewall.spec 
Added Files:
	patch-perl-4.2.3.1 
Log Message:
* Tue Dec 30 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.3-2
- Add upstream patch patch-perl-4.2.3.1



--- NEW FILE patch-perl-4.2.3.1 ---
diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.2.3/install.sh shorewall-perl-4.2.3.1/install.sh
--- shorewall-perl-4.2.3/install.sh	2008-12-05 08:47:43.000000000 -0800
+++ shorewall-perl-4.2.3.1/install.sh	2008-12-21 08:30:18.000000000 -0800
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.2.3
+VERSION=4.2.3.1
 
 usage() # $1 = exit status
 {
diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.2.3/Shorewall/Chains.pm shorewall-perl-4.2.3.1/Shorewall/Chains.pm
--- shorewall-perl-4.2.3/Shorewall/Chains.pm	2008-12-15 09:02:27.000000000 -0800
+++ shorewall-perl-4.2.3.1/Shorewall/Chains.pm	2008-12-21 08:37:09.000000000 -0800
@@ -619,6 +619,8 @@
     return 1 if $interfaceref->{nets} > 1;
 
     my $zone = $interfaceref->{zone4};
+
+    return 1 unless $zone;
     #
     # Interface associated with a single zone -- Must use the interface chain if
     #                                            the zone has  multiple interfaces
@@ -658,6 +660,8 @@
     return 0 unless $nets;
 
     my $zone = $interfaceref->{zone4};
+
+    return 1 unless $zone;
     #
     # Interface associated with a single zone -- Must use the interface chain if
     #                                            the zone has  multiple interfaces
diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.2.3/Shorewall/Config.pm shorewall-perl-4.2.3.1/Shorewall/Config.pm
--- shorewall-perl-4.2.3/Shorewall/Config.pm	2008-12-06 08:59:04.000000000 -0800
+++ shorewall-perl-4.2.3.1/Shorewall/Config.pm	2008-12-21 08:30:18.000000000 -0800
@@ -274,7 +274,7 @@
 		    LOGPARMS => '',
 		    TC_SCRIPT => '',
 		    EXPORT => 0,
-		    VERSION => "4.2.3",
+		    VERSION => "4.2.3.1",
 		    CAPVERSION => 40203 ,
 		  );
     #
diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.2.3/shorewall-perl.spec shorewall-perl-4.2.3.1/shorewall-perl.spec
--- shorewall-perl-4.2.3/shorewall-perl.spec	2008-12-05 08:47:43.000000000 -0800
+++ shorewall-perl-4.2.3.1/shorewall-perl.spec	2008-12-21 08:30:18.000000000 -0800
@@ -1,6 +1,6 @@
 %define name shorewall-perl
 %define version 4.2.3
-%define release 0base
+%define release 1
 
 Summary: Shoreline Firewall Perl-based compiler.
 Name: %{name}
@@ -64,6 +64,8 @@
 %doc COPYING releasenotes.txt
 
 %changelog
+* Sun Dec 21 2008 Tom Eastep tom at shorewall.net
+- Updated to 4.2.3-1
 * Fri Dec 05 2008 Tom Eastep tom at shorewall.net
 - Updated to 4.2.3-0base
 * Wed Nov 05 2008 Tom Eastep tom at shorewall.net


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- shorewall.spec	18 Dec 2008 00:27:49 -0000	1.64
+++ shorewall.spec	30 Dec 2008 00:27:14 -0000	1.65
@@ -11,7 +11,7 @@
 
 Name:           shorewall
 Version:	4.2.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An iptables front end for firewall configuration
 Group:		Applications/System
 License:	GPLv2+
@@ -26,6 +26,8 @@
 # Init files for Fedora
 Source10:	init.sh
 
+Patch0:		patch-perl-4.2.3.1
+
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	perl
 BuildArch:	noarch
@@ -102,6 +104,10 @@
 # scripts. This silences some rpmlint errors.
 find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \;
 
+pushd shorewall-perl-%{version}
+%patch0 -p1
+popd
+
 %build
 
 %install
@@ -262,6 +268,9 @@
 %{_mandir}/man8/shorewall-lite.8.gz
 
 %changelog
+* Tue Dec 30 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.3-2
+- Add upstream patch patch-perl-4.2.3.1
+
 * Thu Dec 18 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.3-1
 - Update to version 4.2.3