diff --git a/patch-perl-4.0.6-1.diff b/patch-perl-4.0.6-1.diff deleted file mode 100644 index 0e1e1e3..0000000 --- a/patch-perl-4.0.6-1.diff +++ /dev/null @@ -1,106 +0,0 @@ -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 ) { - diff --git a/patch-perl-4.0.6-2.diff b/patch-perl-4.0.6-2.diff deleted file mode 100644 index cba823b..0000000 --- a/patch-perl-4.0.6-2.diff +++ /dev/null @@ -1,43 +0,0 @@ -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/!$//; diff --git a/patch-perl-4.0.6-3.diff b/patch-perl-4.0.6-3.diff deleted file mode 100644 index c298122..0000000 --- a/patch-perl-4.0.6-3.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- 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; diff --git a/patch-perl-4.0.7.2-cherrypick b/patch-perl-4.0.7.2-cherrypick new file mode 100644 index 0000000..cc348a0 --- /dev/null +++ b/patch-perl-4.0.7.2-cherrypick @@ -0,0 +1,79 @@ +diff -Naur -X /home/teastep/shorewall/trunk/tools/build/exclude.txt shorewall-perl-4.0.7.1/install.sh shorewall-perl-4.0.7.2/install.sh +--- shorewall-perl-4.0.7.1/install.sh 2007-12-28 21:38:42.000000000 -0800 ++++ shorewall-perl-4.0.7.2/install.sh 2008-01-02 08:18:54.000000000 -0800 +@@ -22,7 +22,7 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + # + +-VERSION=4.0.7.1 ++VERSION=4.0.7.2 + + usage() # $1 = exit status + { +diff -Naur -X /home/teastep/shorewall/trunk/tools/build/exclude.txt shorewall-perl-4.0.7.1/Shorewall/Chains.pm shorewall-perl-4.0.7.2/Shorewall/Chains.pm +--- shorewall-perl-4.0.7.1/Shorewall/Chains.pm 2007-12-28 21:38:42.000000000 -0800 ++++ shorewall-perl-4.0.7.2/Shorewall/Chains.pm 2008-01-02 08:07:57.000000000 -0800 +@@ -1131,7 +1131,7 @@ + + validate_mark $testval; + +- $testval .= '/0xFF' unless ( $testval =~ '/' ); ++ $testval = join( '/', $testval, in_hex( $mask ) ) unless ( $testval =~ '/' ); + + "$match $testval "; + } +diff -Naur -X /home/teastep/shorewall/trunk/tools/build/exclude.txt shorewall-perl-4.0.7.1/Shorewall/Config.pm shorewall-perl-4.0.7.2/Shorewall/Config.pm +--- shorewall-perl-4.0.7.1/Shorewall/Config.pm 2007-12-28 21:38:42.000000000 -0800 ++++ shorewall-perl-4.0.7.2/Shorewall/Config.pm 2008-01-02 08:18:54.000000000 -0800 +@@ -54,6 +54,7 @@ + + our %EXPORT_TAGS = ( internal => [ qw( create_temp_object + finalize_object ++ in_hex + emit + emit_unindented + save_progress_message +@@ -243,7 +244,7 @@ + ORIGINAL_POLICY_MATCH => '', + LOGPARMS => '', + TC_SCRIPT => '', +- VERSION => "4.0.7.1", ++ VERSION => "4.0.7.2", + CAPVERSION => 40006 , + ); + # +@@ -448,6 +449,13 @@ + } + + # ++# Return the argument expressed in Hex ++# ++sub in_hex( $ ) { ++ sprintf '0x%x', $_[0]; ++} ++ ++# + # Write the arguments to the object file (if any) with the current indentation. + # + # Replaces leading spaces with tabs as appropriate and suppresses consecutive blank lines. + +diff -Naur -X /home/teastep/shorewall/trunk/tools/build/exclude.txt shorewall-perl-4.0.7.1/shorewall-perl.spec shorewall-perl-4.0.7.2/shorewall-perl.spec +--- shorewall-perl-4.0.7.1/shorewall-perl.spec 2007-12-28 21:38:42.000000000 -0800 ++++ shorewall-perl-4.0.7.2/shorewall-perl.spec 2008-01-02 08:18:54.000000000 -0800 +@@ -1,6 +1,6 @@ + %define name shorewall-perl + %define version 4.0.7 +-%define release 1 ++%define release 2 + + Summary: Shoreline Firewall Perl-based compiler. + Name: %{name} +@@ -64,6 +64,8 @@ + %doc COPYING releasenotes.txt + + %changelog ++* Wed Jan 02 2008 Tom Eastep tom@shorewall.net ++- Updated to 4.0.7-2 + * Fri Dec 28 2007 Tom Eastep tom@shorewall.net + - Updated to 4.0.7-1 + * Wed Dec 26 2007 Tom Eastep tom@shorewall.net diff --git a/shorewall.spec b/shorewall.spec index 7d232ea..de77855 100644 --- a/shorewall.spec +++ b/shorewall.spec @@ -2,14 +2,15 @@ # 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 +# version in the "base" subdirectory, and subsequent errata are corrected with +# patches found in the top directory (NOT in the errata directory - these are +# patches against installed packages). 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 +Version: 4.0.7 Release: 3%{?dist} Summary: An iptables front end for firewall configuration Group: Applications/System @@ -23,9 +24,7 @@ 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 +Patch2: patch-perl-4.0.7.2-cherrypick BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl @@ -103,9 +102,7 @@ pushd shorewall-lite-%{version} popd pushd shorewall-perl-%{version} -%patch2 -p0 -%patch3 -p0 -%patch4 -p3 +%patch2 -p1 popd # Remove hash-bang from files which are not directly executed as shell @@ -271,6 +268,20 @@ fi %{_mandir}/man8/shorewall-lite.8.gz %changelog +* Sun Jan 6 2008 Jonathan G. Underwood - 4.0.7-2 +- Remove 4.0.7.1 patch as it seems that's already been applied to the tarball + contents + +* Sun Jan 6 2008 Jonathan G. Underwood - 4.0.7-2 +- Fix error in patching commands in spec file (change -p0 to -p1 for new patches) + +* Sun Jan 6 2008 Jonathan G. Underwood - 4.0.7-1 +- Update to version 4.0.7 +- Added 4.0.7.1 patch and all parts of the 4.0.7.2 patch that are relevant + (i.e. not the parts working around the iproute2-2.23 bug, as we don't ship the + broken iproute2) +- Clarified notes about tarball and patch locations + * Sat Dec 8 2007 Jonathan G. Underwood - 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 diff --git a/sources b/sources index 962ff86..524f361 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -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 +2df43356b1fdbc91920d48c5595aa101 shorewall-common-4.0.7.tar.bz2 +36a9af67d008b217852e465b7d6c428e shorewall-lite-4.0.7.tar.bz2 +e145fb655492e3c96ac51b2c71226c96 shorewall-perl-4.0.7.tar.bz2 +9f5601226dce958869b329f1a00387b6 shorewall-shell-4.0.7.tar.bz2