diff --git a/patch-perl-4.0,9-1.diff b/patch-perl-4.0,9-1.diff deleted file mode 100644 index 01df617..0000000 --- a/patch-perl-4.0,9-1.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: Shorewall/Zones.pm -=================================================================== ---- Shorewall/Zones.pm (revision 8219) -+++ Shorewall/Zones.pm (working copy) -@@ -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 --git a/patch-perl-4.0.9.1 b/patch-perl-4.0.9.1 new file mode 100644 index 0000000..c4d5d96 --- /dev/null +++ b/patch-perl-4.0.9.1 @@ -0,0 +1,56 @@ +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@shorewall.net ++- Updated to 4.0.9-1 + * Fri Feb 15 2008 Tom Eastep tom@shorewall.net + - Updated to 4.0.9-0base + * Sun Jan 06 2008 Tom Eastep tom@shorewall.net diff --git a/patch-shell-4.0.9.1 b/patch-shell-4.0.9.1 new file mode 100644 index 0000000..6109000 --- /dev/null +++ b/patch-shell-4.0.9.1 @@ -0,0 +1,44 @@ +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@shorewall.net ++- Updated to 4.0.9-1 + * Fri Feb 15 2008 Tom Eastep tom@shorewall.net + - Updated to 4.0.9-0base + * Sun Jan 06 2008 Tom Eastep tom@shorewall.net diff --git a/shorewall.spec b/shorewall.spec index 55ab623..fc00b5f 100644 --- a/shorewall.spec +++ b/shorewall.spec @@ -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 @@ 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,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 @@ pushd shorewall-lite-%{version} %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 @@ fi %{_mandir}/man8/shorewall-lite.8.gz %changelog +* Tue Mar 25 2008 Jonathan G. Underwood - 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 - 4.0.9-1 - Update to version 4.0.9 - Remove 4.0.8 series patches