rpms/shorewall/FC-4 shorewall-3.0.3-init.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 shorewall.spec, 1.11, 1.12 sources, 1.4, 1.5 shorewall-2.4.4-init.patch, 1.1, NONE

Wed Feb 8 18:28:14 UTC 2006

Author: robmv

Update of /cvs/extras/rpms/shorewall/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14514

Modified Files:
	.cvsignore shorewall.spec sources 
Added Files:
	shorewall-3.0.3-init.patch 
Removed Files:
	shorewall-2.4.4-init.patch 
Log Message:
Update to 3.0.x using devel branch


shorewall-3.0.3-init.patch:

--- NEW FILE shorewall-3.0.3-init.patch ---
diff -Naur shorewall-3.0.3.original/init.sh shorewall-3.0.3/init.sh
--- shorewall-3.0.3.original/init.sh	2005-12-07 18:03:44.000000000 -0400
+++ shorewall-3.0.3/init.sh	2006-01-03 15:18:33.000000000 -0400
@@ -36,15 +36,15 @@
 #	   shorewall status			  Displays firewall status
 #
 
-# chkconfig: 2345 25 90
+# chkconfig: - 25 90
 # description: Packet filtering firewall
 
 ### BEGIN INIT INFO
 # Provides:	  shorewall
 # Required-Start: $network
 # Required-Stop:
-# Default-Start:  2 3 5
-# Default-Stop:	  0 1 6
+# Default-Start:
+# Default-Stop:	  0 1 2 3 4 5 6
 # Description:	  starts and stops the shorewall firewall
 ### END INIT INFO
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Oct 2005 17:17:34 -0000	1.4
+++ .cvsignore	8 Feb 2006 18:28:13 -0000	1.5
@@ -1 +1 @@
-shorewall-2.4.6.tar.bz2
+shorewall-3.0.4.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-4/shorewall.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- shorewall.spec	31 Oct 2005 17:17:34 -0000	1.11
+++ shorewall.spec	8 Feb 2006 18:28:13 -0000	1.12
@@ -1,5 +1,5 @@
 Name: shorewall
-Version: 2.4.6
+Version: 3.0.4
 Release: 1%{?dist}
 
 Summary: Iptables-based firewall for Linux systems
@@ -7,8 +7,8 @@
 Group: Applications/System
 License: GPL
 URL: http://www.shorewall.net/
-Source: http://www.shorewall.net/pub/shorewall/2.4/shorewall-%{version}/shorewall-%{version}.tar.bz2
-Patch0: shorewall-2.4.4-init.patch
+Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-%{version}/shorewall-%{version}.tar.bz2
+Patch0: shorewall-3.0.3-init.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -36,7 +36,7 @@
 ./install.sh
 # Create %ghost files
 install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/shorewall
-touch $RPM_BUILD_ROOT/%{_localstatedir}/lib/shorewall/{chains,nat,proxyarp,restarted,zones,restore-base,restore-tail}
+touch $RPM_BUILD_ROOT/%{_localstatedir}/lib/shorewall/{chains,nat,proxyarp,restarted,zones,restore-base,restore-tail,state}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,10 +64,11 @@
 
 %{_datadir}/shorewall/action.*
 %{_datadir}/shorewall/actions.std
-%{_datadir}/shorewall/bogons
 %{_datadir}/shorewall/configpath
+%{_datadir}/shorewall/macro.*
 %{_datadir}/shorewall/rfc1918
 %{_datadir}/shorewall/version
+%{_datadir}/shorewall/Limit
 
 %attr(0754,root,root) %{_datadir}/shorewall/firewall
 %attr(0754,root,root) %{_datadir}/shorewall/functions
@@ -76,11 +77,32 @@
 %attr(0700,root,root) %dir %{_localstatedir}/lib/shorewall
 %attr(0600,root,root) %ghost %{_localstatedir}/lib/shorewall/*
 %attr(0750,root,root) /sbin/shorewall
-%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel README.txt
+%doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples
 
 %changelog
-* Mon Oct 31 2005 Robert Marcano <robert at marcanoonline.com> - 2.4.6-1
-- Update to upstream version 2.4.6, package README.txt as a doc file
+* Thu Jan 12 2006 Robert Marcano <robert at marcanoonline.com> - 3.0.4-1
+- Update to upstream 3.0.4
+
+* Tue Jan 03 2006 Robert Marcano <robert at marcanoonline.com> - 3.0.3-1
+- Update to upstream 3.0.3
+
+* Sun Nov 27 2005 Robert Marcano <robert at marcanoonline.com> - 3.0.2-1
+- Update to upstream 3.0.2
+
+* Fri Nov 11 2005 Robert Marcano <robert at marcanoonline.com> - 3.0.0-1
+- Update to final 3.0.0 release
+
+* Thu Nov 03 2005 Robert Marcano <robert at marcanoonline.com> - 3.0.0-0.3.RC3
+- Update to upstream 3.0.0-RC3. Samples added to the doc directory
+
+* Sun Oct 23 2005 Robert Marcano <robert at marcanoonline.com> - 3.0.0-0.3.RC2
+- Update to upstream 3.0.0-RC2
+
+* Thu Oct 17 2005 Robert Marcano <robert at marcanoonline.com> - 3.0.0-0.2.RC1
+- Update to upstream 3.0.0-RC1
+
+* Thu Oct 14 2005 Robert Marcano <robert at marcanoonline.com> - 3.0.0-0.1.Beta1
+- Update to upstream 3.0.0-Beta1, package README.txt as a documentation file
 
 * Sat Oct 08 2005 Robert Marcano <robert at marcanoonline.com> - 2.4.5-1
 - Update to upstream version 2.4.5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Oct 2005 17:17:34 -0000	1.4
+++ sources	8 Feb 2006 18:28:13 -0000	1.5
@@ -1 +1 @@
-c90eabfb128563766e0899429538947c  shorewall-2.4.6.tar.bz2
+2745e8e5c2143c3d9f5836b964c67721  shorewall-3.0.4.tar.bz2


--- shorewall-2.4.4-init.patch DELETED ---


