rpms/shorewall/devel patch-perl-4.0.9.1, NONE, 1.1 patch-shell-4.0.9.1, NONE, 1.1 shorewall.spec, 1.50, 1.51 patch-perl-4.0, 9-1.diff, 1.1, NONE

Jonathan G. Underwood (jgu) fedora-extras-commits at redhat.com
Tue Mar 25 15:37:59 UTC 2008


Author: jgu

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

Modified Files:
	shorewall.spec 
Added Files:
	patch-perl-4.0.9.1 patch-shell-4.0.9.1 
Removed Files:
	patch-perl-4.0,9-1.diff 
Log Message:
* Tue Mar 25 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.9-2
- Replace patch-perl-4.0,9-1 with patch-perl-4.0.9.1
- Add patch-shell-4.0.9.1



--- NEW FILE patch-perl-4.0.9.1 ---
diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.9/install.sh shorewall-perl-4.0.9.1/install.sh
--- shorewall-perl-4.0.9/install.sh	2008-02-15 10:47:42.000000000 -0800
+++ shorewall-perl-4.0.9.1/install.sh	2008-02-25 12:37:14.000000000 -0800
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.0.9
+VERSION=4.0.9.1
 
 usage() # $1 = exit status
 {
diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.9/Shorewall/Config.pm shorewall-perl-4.0.9.1/Shorewall/Config.pm
--- shorewall-perl-4.0.9/Shorewall/Config.pm	2008-02-22 12:28:06.000000000 -0800
+++ shorewall-perl-4.0.9.1/Shorewall/Config.pm	2008-02-25 12:37:14.000000000 -0800
@@ -244,7 +244,7 @@
 		    ORIGINAL_POLICY_MATCH => '',
 		    LOGPARMS => '',
 		    TC_SCRIPT => '',
-		    VERSION => "4.0.9",
+		    VERSION => "4.0.9.1",
 		    CAPVERSION => 40006 ,
 		  );
     #
diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.9/Shorewall/Zones.pm shorewall-perl-4.0.9.1/Shorewall/Zones.pm
--- shorewall-perl-4.0.9/Shorewall/Zones.pm	2008-02-22 09:00:28.000000000 -0800
+++ shorewall-perl-4.0.9.1/Shorewall/Zones.pm	2008-02-25 12:36:16.000000000 -0800
@@ -623,7 +623,7 @@
 	if ( defined $port ) {
 	    fatal_error qq("Virtual" interfaces are not supported -- see http://www.shorewall.net/Shorewall_and_Aliased_Interfaces.html) if $port =~ /^\d+$/;
 	    require_capability( 'PHYSDEV_MATCH', 'Bridge Ports', '');
-	    fatal_error "Your iptables is not recent enough to support bridge ports" unless $config{KLUDGEFREE};
+	    fatal_error "Your iptables is not recent enough to support bridge ports" unless $capabilities{KLUDGEFREE};
 	    fatal_error "Duplicate Interface ($port)" if $interfaces{$port};
 	    fatal_error "$interface is not a defined bridge" unless $interfaces{$interface} && $interfaces{$interface}{options}{bridge};
 	    fatal_error "Bridge Ports may only be associated with 'bport' zones" if $zone && $zoneref->{type} ne 'bport4';
diff -Naur -X /usr/local/bin/exclude.txt shorewall-perl-4.0.9/shorewall-perl.spec shorewall-perl-4.0.9.1/shorewall-perl.spec
--- shorewall-perl-4.0.9/shorewall-perl.spec	2008-02-15 10:47:42.000000000 -0800
+++ shorewall-perl-4.0.9.1/shorewall-perl.spec	2008-02-25 12:37:14.000000000 -0800
@@ -1,6 +1,6 @@
 %define name shorewall-perl
 %define version 4.0.9
-%define release 0base
+%define release 1
 
 Summary: Shoreline Firewall Perl-based compiler.
 Name: %{name}
@@ -64,6 +64,8 @@
 %doc COPYING releasenotes.txt
 
 %changelog
+* Mon Feb 25 2008 Tom Eastep tom at shorewall.net
+- Updated to 4.0.9-1
 * Fri Feb 15 2008 Tom Eastep tom at shorewall.net
 - Updated to 4.0.9-0base
 * Sun Jan 06 2008 Tom Eastep tom at shorewall.net


--- NEW FILE patch-shell-4.0.9.1 ---
diff -Naur -X /usr/local/bin/exclude.txt shorewall-shell-4.0.9/install.sh shorewall-shell-4.0.9.1/install.sh
--- shorewall-shell-4.0.9/install.sh	2008-02-15 10:47:42.000000000 -0800
+++ shorewall-shell-4.0.9.1/install.sh	2008-03-02 09:35:31.000000000 -0800
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.0.9
+VERSION=4.0.9.1
 
 usage() # $1 = exit status
 {
diff -Naur -X /usr/local/bin/exclude.txt shorewall-shell-4.0.9/lib.actions shorewall-shell-4.0.9.1/lib.actions
--- shorewall-shell-4.0.9/lib.actions	2007-09-08 09:07:36.000000000 -0700
+++ shorewall-shell-4.0.9.1/lib.actions	2008-03-02 09:35:31.000000000 -0800
@@ -672,7 +672,7 @@
 	done < $TMP_DIR/$inputfile
     done
 
-    for action in $DROP_DEFAULT $REJECT_DEFAULT; do
+    for action in $DROP_DEFAULT $REJECT_DEFAULT $ACCEPT_DEFAULT $QUEUE_DEFAULT; do
 	case $action in
 	    none)
 		;;
diff -Naur -X /usr/local/bin/exclude.txt shorewall-shell-4.0.9/shorewall-shell.spec shorewall-shell-4.0.9.1/shorewall-shell.spec
--- shorewall-shell-4.0.9/shorewall-shell.spec	2008-02-15 10:47:42.000000000 -0800
+++ shorewall-shell-4.0.9.1/shorewall-shell.spec	2008-03-02 09:37:30.000000000 -0800
@@ -1,6 +1,6 @@
 %define name shorewall-shell
 %define version 4.0.9
-%define release 0base
+%define release 1
 
 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
 Name: %{name}
@@ -81,6 +81,8 @@
 %doc COPYING INSTALL 
 
 %changelog
+* Sun Mar 02 2008 Tom Eastep tom at shorewall.net
+- Updated to 4.0.9-1
 * Fri Feb 15 2008 Tom Eastep tom at shorewall.net
 - Updated to 4.0.9-0base
 * Sun Jan 06 2008 Tom Eastep tom at shorewall.net


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- shorewall.spec	28 Feb 2008 01:41:00 -0000	1.50
+++ shorewall.spec	25 Mar 2008 15:37:16 -0000	1.51
@@ -11,7 +11,7 @@
 
 Name:           shorewall
 Version:	4.0.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An iptables front end for firewall configuration
 Group:		Applications/System
 License:	GPLv2+
@@ -24,7 +24,8 @@
 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,9-1.diff
+Patch2:		patch-perl-4.0.9.1
+Patch3:		patch-shell-4.0.9.1
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	perl
@@ -101,9 +102,8 @@
 %patch1 -p1
 popd
 
-pushd shorewall-perl-%{version}
 %patch2 -p0
-popd
+%patch3 -p0
 
 # Remove hash-bang from files which are not directly executed as shell
 # scripts. This silences some rpmlint errors.
@@ -268,6 +268,10 @@
 %{_mandir}/man8/shorewall-lite.8.gz
 
 %changelog
+* Tue Mar 25 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.9-2
+- Replace patch-perl-4.0,9-1 with patch-perl-4.0.9.1
+- Add patch-shell-4.0.9.1
+
 * Thu Feb 28 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.9-1
 - Update to version 4.0.9
 - Remove 4.0.8 series patches

***** Not enough context to create diffstat for file: patch-perl-4.0,9-1.diff,1.1,NONE
***** Not enough context to create diff for file: patch-perl-4.0,9-1.diff,1.1,NONE




More information about the fedora-extras-commits mailing list