rpms/shorewall/devel patch-perl-4.2.1.1, NONE, 1.1 shorewall.spec, 1.61, 1.62
Jonathan G. Underwood
jgu at fedoraproject.org
Fri Oct 31 23:54:37 UTC 2008
Author: jgu
Update of /cvs/extras/rpms/shorewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14524
Modified Files:
shorewall.spec
Added Files:
patch-perl-4.2.1.1
Log Message:
* Fri Oct 31 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.1-2
- Added upstream patch patch-perl-4.2.1.1
--- NEW FILE patch-perl-4.2.1.1 ---
diff -Naur -X /home/teastep/shorewall/trunk/tools/build/exclude.txt shorewall-perl-4.2.1/install.sh shorewall-perl-4.2.1.1/install.sh
--- shorewall-perl-4.2.1/install.sh 2008-10-08 09:55:31.000000000 -0700
+++ shorewall-perl-4.2.1.1/install.sh 2008-10-30 12:24:05.000000000 -0700
@@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-VERSION=4.2.1
+VERSION=4.2.1.1
usage() # $1 = exit status
{
diff -Naur -X /home/teastep/shorewall/trunk/tools/build/exclude.txt shorewall-perl-4.2.1/Shorewall/Chains.pm shorewall-perl-4.2.1.1/Shorewall/Chains.pm
--- shorewall-perl-4.2.1/Shorewall/Chains.pm 2008-10-21 19:14:45.000000000 -0700
+++ shorewall-perl-4.2.1.1/Shorewall/Chains.pm 2008-10-30 12:24:05.000000000 -0700
@@ -460,7 +460,7 @@
#
my ($first, $ports, $rest) = ( $1, $2, $3 );
- if ( ( $ports =~ tr/:,/:,/ ) > 15 ) {
+ if ( ( $ports =~ tr/:,/:,/ ) > 14 ) {
#
# More than 15 ports specified
#
diff -Naur -X /home/teastep/shorewall/trunk/tools/build/exclude.txt shorewall-perl-4.2.1/Shorewall/Config.pm shorewall-perl-4.2.1.1/Shorewall/Config.pm
--- shorewall-perl-4.2.1/Shorewall/Config.pm 2008-10-21 19:14:45.000000000 -0700
+++ shorewall-perl-4.2.1.1/Shorewall/Config.pm 2008-10-30 12:24:05.000000000 -0700
@@ -270,7 +270,7 @@
ORIGINAL_POLICY_MATCH => '',
LOGPARMS => '',
TC_SCRIPT => '',
- VERSION => "4.2.1",
+ VERSION => "4.2.1.1",
CAPVERSION => 40200 ,
);
#
@@ -1557,7 +1557,7 @@
$capabilities{CONNTRACK_MATCH} = qt1( "$iptables -A $sillyname -m conntrack --ctorigdst 192.168.1.1 -j ACCEPT" );
- if ( $capabilities{CONNTRACL_MATCH} ) {
+ if ( $capabilities{CONNTRACK_MATCH} ) {
$capabilities{NEW_CONNTRACK_MATCH} = qt1( "$iptables -A $sillyname -m conntrack -p tcp --ctorigdstport 22 -j ACCEPT" );
}
diff -Naur -X /home/teastep/shorewall/trunk/tools/build/exclude.txt shorewall-perl-4.2.1/shorewall-perl.spec shorewall-perl-4.2.1.1/shorewall-perl.spec
--- shorewall-perl-4.2.1/shorewall-perl.spec 2008-10-08 10:03:41.000000000 -0700
+++ shorewall-perl-4.2.1.1/shorewall-perl.spec 2008-10-30 12:24:05.000000000 -0700
@@ -1,6 +1,6 @@
%define name shorewall-perl
%define version 4.2.1
-%define release 0base
+%define release 1
Summary: Shoreline Firewall Perl-based compiler.
Name: %{name}
@@ -64,6 +64,8 @@
%doc COPYING releasenotes.txt
%changelog
+* Thu Oct 30 2008 Tom Eastep tom at shorewall.net
+- Updated to 4.2.1-1
* Wed Oct 08 2008 Tom Eastep tom at shorewall.net
- Updated to 4.2.1-0base
* Fri Oct 03 2008 Tom Eastep tom at shorewall.net
Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- shorewall.spec 26 Oct 2008 15:32:24 -0000 1.61
+++ shorewall.spec 31 Oct 2008 23:54:07 -0000 1.62
@@ -11,7 +11,7 @@
Name: shorewall
Version: 4.2.1
-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.1.1
+
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: perl
BuildArch: noarch
@@ -93,6 +95,10 @@
%setup -q -T -D -a 2
%setup -q -T -D -a 3
+pushd shorewall-perl-%{version}
+%patch0 -p1
+popd
+
# Overwrite default init files with Fedora specific ones
cp %{SOURCE10} shorewall-common-%{version}
cp %{SOURCE10} shorewall-lite-%{version}
@@ -262,6 +268,9 @@
%{_mandir}/man8/shorewall-lite.8.gz
%changelog
+* Fri Oct 31 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.1-2
+- Added upstream patch patch-perl-4.2.1.1
+
* Sun Oct 26 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.1-1
- Update to version 4.2.1
- Correct source URLs
More information about the fedora-extras-commits
mailing list