rpms/shorewall/F-8 patch-perl-4.0.7.2-cherrypick, NONE, 1.1 shorewall.spec, 1.41, 1.42 sources, 1.32, 1.33 patch-perl-4.0.6-1.diff, 1.1, NONE patch-perl-4.0.6-2.diff, 1.1, NONE patch-perl-4.0.6-3.diff, 1.1, NONE
Jonathan G. Underwood (jgu)
fedora-extras-commits at redhat.com
Sun Jan 6 19:11:04 UTC 2008
Author: jgu
Update of /cvs/extras/rpms/shorewall/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11871
Modified Files:
shorewall.spec sources
Added Files:
patch-perl-4.0.7.2-cherrypick
Removed Files:
patch-perl-4.0.6-1.diff patch-perl-4.0.6-2.diff
patch-perl-4.0.6-3.diff
Log Message:
* Sun Jan 6 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 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 <jonathan.underwood at gmail.com> - 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 <jonathan.underwood at gmail.com> - 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
--- NEW FILE patch-perl-4.0.7.2-cherrypick ---
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 at shorewall.net
+- Updated to 4.0.7-2
* Fri Dec 28 2007 Tom Eastep tom at shorewall.net
- Updated to 4.0.7-1
* Wed Dec 26 2007 Tom Eastep tom at shorewall.net
Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-8/shorewall.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- shorewall.spec 8 Dec 2007 19:21:31 -0000 1.41
+++ shorewall.spec 6 Jan 2008 19:10:07 -0000 1.42
@@ -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 @@
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 @@
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 @@
%{_mandir}/man8/shorewall-lite.8.gz
%changelog
+* Sun Jan 6 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 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 <jonathan.underwood at gmail.com> - 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 <jonathan.underwood at gmail.com> - 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 <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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-8/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources 24 Nov 2007 16:03:31 -0000 1.32
+++ sources 6 Jan 2008 19:10:07 -0000 1.33
@@ -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
--- patch-perl-4.0.6-1.diff DELETED ---
--- patch-perl-4.0.6-2.diff DELETED ---
--- patch-perl-4.0.6-3.diff DELETED ---
More information about the fedora-extras-commits
mailing list