rpms/shorewall/FC-4 shorewall-2.4.4-init.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 shorewall.spec, 1.8, 1.9 sources, 1.2, 1.3 shorewall.init, 1.1, NONE
Robert Marcano (robmv)
fedora-extras-commits at redhat.com
Tue Oct 11 12:33:35 UTC 2005
Author: robmv
Update of /cvs/extras/rpms/shorewall/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18670
Modified Files:
.cvsignore shorewall.spec sources
Added Files:
shorewall-2.4.4-init.patch
Removed Files:
shorewall.init
Log Message:
backport from devel branch to FC4
shorewall-2.4.4-init.patch:
--- NEW FILE shorewall-2.4.4-init.patch ---
diff -Naur shorewall-2.4.4.original/init.sh shorewall-2.4.4/init.sh
--- shorewall-2.4.4.original/init.sh 2005-07-13 16:59:06.000000000 -0400
+++ shorewall-2.4.4/init.sh 2005-09-28 14:04:12.000000000 -0400
@@ -33,17 +33,18 @@
# shorewall restart Restarts the firewall
# shorewall stop Stops the firewall
# shorewall status Displays firewall status
+# shorewall reload Restarts the firewall
#
-# 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
@@ -77,6 +78,11 @@
exec /sbin/shorewall $OPTIONS start
;;
+ reload)
+
+ exec /sbin/shorewall restart
+ ;;
+
stop|restart|status)
exec /sbin/shorewall $@
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 05:20:56 -0000 1.2
+++ .cvsignore 11 Oct 2005 12:33:32 -0000 1.3
@@ -1 +1 @@
-shorewall-1.4.8.tgz
+shorewall-2.4.5.tar.bz2
Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-4/shorewall.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- shorewall.spec 27 Sep 2005 10:16:25 -0000 1.8
+++ shorewall.spec 11 Oct 2005 12:33:32 -0000 1.9
@@ -1,18 +1,21 @@
Name: shorewall
-Version: 1.4.8
-Release: 3
+Version: 2.4.5
+Release: 1
Summary: Iptables-based firewall for Linux systems
Group: Applications/System
License: GPL
URL: http://www.shorewall.net/
-Source: http://www.shorewall.net/pub/shorewall/shorewall-1.4.8/shorewall-1.4.8.tgz
-Source1: shorewall.init
+Source: http://www.shorewall.net/pub/shorewall/2.4/shorewall-2.4.5/shorewall-2.4.5.tar.bz2
+Patch0: shorewall-2.4.4-init.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: iptables iproute
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
%description
@@ -20,84 +23,72 @@
(iptables) based firewall that can be used on a dedicated firewall system,
a multi-function gateway/router/server or on a standalone GNU/Linux system.
-%package doc
-Summary: Documentation for the Shoreline Firewall (Shorewall)
-Group: Documentation
-
-%description doc
-
-This package contains the extensive and excellent documentation for the
-Shoreline Firewall (aka Shorewall). This documentation can also be found at
-http://www.shorewall.net/
-
%prep
-echo "
---------------------------------------------------------------
-Build disabled. Binary packages removed from the repository.
-Package is without maintainer and has been declared orphaned.
---------------------------------------------------------------" > /dev/null
-exit 1
-
%setup -q
-
-# Clean backup doc files
-rm -rf documentation/*~
-
-%build
+%patch0 -p1
%install
rm -rf $RPM_BUILD_ROOT
-export PREFIX=$RPM_BUILD_ROOT ; \
-export OWNER=`id -n -u` ; \
-export GROUP=`id -n -g` ;\
-./install.sh %{_initrddir}
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/shorewall
+export PREFIX=$RPM_BUILD_ROOT ;\
+export DEST=%{_initrddir} ;\
+
+./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}
+touch $RPM_BUILD_ROOT/%{_localstatedir}/lib/shorewall/{chains,nat,proxyarp,restarted,zones,restore-base,restore-tail}
%clean
rm -rf $RPM_BUILD_ROOT
%post
-if [ $1 -eq 1 ]; then
- echo \
-"########################################################################
-# REMOVE THIS FILE AFTER YOU HAVE CONFIGURED SHOREWALL #
-########################################################################" \
- > %{_sysconfdir}/shorewall/startup_disabled
+if [ $1 = 1 ]; then
/sbin/chkconfig --add shorewall;
fi
%preun
-if [ $1 -eq 0 ]; then
+if [ $1 = 0 ]; then
+ /sbin/service shorewall stop >/dev/null 2>&1
/sbin/chkconfig --del shorewall
- rm -f %{_sysconfdir}/shorewall/startup_disabled
fi
%files
%defattr(0644,root,root,0755)
+
%attr(0755,root,root) %{_initrddir}/shorewall
%attr(0700,root,root) %dir %{_sysconfdir}/shorewall
-%attr(0700,root,root) %dir %{_prefix}/share/shorewall
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/shorewall/*
+%attr(0755,root,root) %dir %{_datadir}/shorewall
+
+%{_datadir}/shorewall/action.*
+%{_datadir}/shorewall/actions.std
+%{_datadir}/shorewall/bogons
+%{_datadir}/shorewall/configpath
+%{_datadir}/shorewall/rfc1918
+%{_datadir}/shorewall/version
+
+%attr(0754,root,root) %{_datadir}/shorewall/firewall
+%attr(0754,root,root) %{_datadir}/shorewall/functions
+%attr(0754,root,root) %{_datadir}/shorewall/help
+
%attr(0700,root,root) %dir %{_localstatedir}/lib/shorewall
-%attr(-,root,root) %ghost %{_localstatedir}/lib/shorewall/*
-%attr(0600,root,root) %config %{_sysconfdir}/shorewall/*
-%attr(0554,root,root) /sbin/shorewall
-%attr(0600,root,root) %{_datadir}/shorewall/version
-%attr(0444,root,root) %{_datadir}/shorewall/functions
-%attr(0544,root,root) %{_datadir}/shorewall/firewall
-%attr(0544,root,root) %{_datadir}/shorewall/help
+%attr(0600,root,root) %ghost %{_localstatedir}/lib/shorewall/*
+%attr(0750,root,root) /sbin/shorewall
%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel
-%files doc
-%defattr(0644,root,root,0755)
-%doc documentation/*
-
%changelog
+* Sat Oct 08 2005 Robert Marcano <robert at marcanoonline.com> - 2.4.5-1
+- Update to upstream version 2.4.5
+
+* Wed Sep 28 2005 Robert Marcano <robert at marcanoonline.com> - 2.4.4-4
+- Spec cleanup following review recomendations
+
+* Tue Sep 27 2005 Robert Marcano <robert at marcanoonline.com>
+- Update to 2.4.4, removing doc subpackage because it is not distributed
+ with the source package anymore, it is on a different tarball
+
* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
- rebuilt
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 05:20:56 -0000 1.2
+++ sources 11 Oct 2005 12:33:32 -0000 1.3
@@ -1 +1 @@
-d8034cea29239d0188e8574b660afb35 shorewall-1.4.8.tgz
+1bbbecd7d94719a03f42b07f4f566dda shorewall-2.4.5.tar.bz2
--- shorewall.init DELETED ---
More information about the fedora-extras-commits
mailing list