rpms/shorewall/devel init.sh, NONE, 1.1 .cvsignore, 1.40, 1.41 shorewall.spec, 1.58, 1.59 sources, 1.40, 1.41 shorewall-4.0.4-init.patch, 1.1, NONE shorewall-lite-4.0.4-init.patch, 1.1, NONE
Jonathan G. Underwood
jgu at fedoraproject.org
Sat Oct 18 19:40:31 UTC 2008
Author: jgu
Update of /cvs/extras/rpms/shorewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15066
Modified Files:
.cvsignore shorewall.spec sources
Added Files:
init.sh
Removed Files:
shorewall-4.0.4-init.patch shorewall-lite-4.0.4-init.patch
Log Message:
* Sun Oct 12 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.0-1
- Update to version 4.2.0
- New sysv init files which are no longer maintained as patches, but as a
Fedora specific file
--- NEW FILE init.sh ---
#!/bin/sh
#
# Shorewall init script
#
# chkconfig: - 25 90
# description: Packet filtering firewall
### BEGIN INIT INFO
# Provides: shorewall
# Required-Start: $local_fs $remote_fs $syslog $network
# Should-Start: VMware $time $named
# Required-Stop:
# Default-Start:
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: Packet filtering firewall
# Description: The Shoreline Firewall, more commonly known as "Shorewall", is a
# Netfilter (iptables) based firewall
### END INIT INFO
# Source function library.
. /etc/rc.d/init.d/functions
prog="shorewall"
shorewall="/sbin/$prog"
logger="logger -i -t $prog"
lockfile="/var/lock/subsys/$prog"
# Get startup options (override default)
OPTIONS=
if [ -f /etc/sysconfig/$prog ]; then
. /etc/sysconfig/$prog
fi
start() {
echo -n $"Starting Shorewall: "
$shorewall $OPTIONS start 2>&1 | $logger
retval=${PIPESTATUS[0]}
if [[ $retval == 0 ]]; then
touch $lockfile
success
else
failure
fi
echo
return $retval
}
stop() {
echo -n $"Stopping Shorewall: "
$shorewall $OPTIONS stop 2>&1 | $logger
retval=${PIPESTATUS[0]}
if [[ $retval == 0 ]]; then
rm -f $lockfile
success
else
failure
fi
echo
return $retval
}
restart() {
# Note that we don't simply stop and start since shorewall has a built in
# restart which stops the firewall if running and then starts it.
echo -n $"Restarting Shorewall: "
$shorewall $OPTIONS restart 2>&1 | $logger
retval=${PIPESTATUS[0]}
if [[ $retval == 0 ]]; then
touch $lockfile
success
else # Failed to start, clean up lock file if present
rm -f $lockfile
failure
fi
echo
return $retval
}
status(){
$shorewall status
return $?
}
status_q() {
status > /dev/null 2>&1
}
case "$1" in
start)
status_q && exit 0
$1
;;
stop)
status_q || exit 0
$1
;;
restart|reload|force-reload)
restart
;;
condrestart|try-restart)
status_q || exit 0
restart
;;
status)
$1
;;
*)
echo "Usage: $0 start|stop|reload|restart|force-reload|status"
exit 1
;;
esac
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore 28 Sep 2008 23:34:10 -0000 1.40
+++ .cvsignore 18 Oct 2008 19:40:00 -0000 1.41
@@ -1,4 +1,4 @@
-shorewall-common-4.0.14.tar.bz2
-shorewall-shell-4.0.14.tar.bz2
-shorewall-perl-4.0.14.tar.bz2
-shorewall-lite-4.0.14.tar.bz2
+shorewall-common-4.2.0.tar.bz2
+shorewall-shell-4.2.0.tar.bz2
+shorewall-perl-4.2.0.tar.bz2
+shorewall-lite-4.2.0.tar.bz2
Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- shorewall.spec 28 Sep 2008 23:34:10 -0000 1.58
+++ shorewall.spec 18 Oct 2008 19:40:01 -0000 1.59
@@ -10,7 +10,7 @@
# patchlevel. However, these should not be used for distro packaging.
Name: shorewall
-Version: 4.0.14
+Version: 4.2.0
Release: 1%{?dist}
Summary: An iptables front end for firewall configuration
Group: Applications/System
@@ -22,8 +22,9 @@
Source1: %{_baseurl}%{name}-perl-%{version}.tar.bz2
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
+
+# Init files for Fedora
+Source10: init.sh
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: perl
@@ -92,13 +93,10 @@
%setup -q -T -D -a 2
%setup -q -T -D -a 3
-pushd shorewall-common-%{version}
-%patch0 -p1
-popd
-
-pushd shorewall-lite-%{version}
-%patch1 -p1
-popd
+# Overwrite default init files with Fedora specific ones
+cp %{SOURCE10} shorewall-common-%{version}
+cp %{SOURCE10} shorewall-lite-%{version}
+sed -i -e 's|prog="shorewall"|prog="shorewall-lite"|' shorewall-lite-%{version}/init.sh
# Remove hash-bang from files which are not directly executed as shell
# scripts. This silences some rpmlint errors.
@@ -217,6 +215,7 @@
%{_mandir}/man5/shorewall-masq.5.gz
%{_mandir}/man5/shorewall-hosts.5.gz
%{_mandir}/man5/shorewall-tcdevices.5.gz
+%{_mandir}/man5/shorewall-tcfilters.5.gz
%{_mandir}/man5/shorewall-netmap.5.gz
%{_mandir}/man5/shorewall-interfaces.5.gz
%{_mandir}/man5/shorewall-maclist.5.gz
@@ -263,6 +262,11 @@
%{_mandir}/man8/shorewall-lite.8.gz
%changelog
+* Sun Oct 12 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.0-1
+- Update to version 4.2.0
+- New sysv init files which are no longer maintained as patches, but as a
+ Fedora specific file
+
* Sun Sep 28 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.14-1
- Update to version 4.0.14
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources 28 Sep 2008 23:34:10 -0000 1.40
+++ sources 18 Oct 2008 19:40:01 -0000 1.41
@@ -1,4 +1,4 @@
-f8d545a52da01b340405f39464d4d64a shorewall-common-4.0.14.tar.bz2
-878b016480b967fd861722ffa27a18ee shorewall-shell-4.0.14.tar.bz2
-42baaf5bbcdf073a0e030e3c541c4e67 shorewall-perl-4.0.14.tar.bz2
-6c6aa18831ffc8f0e87f2ce8fac2d1d0 shorewall-lite-4.0.14.tar.bz2
+4e071589a35072f4bb78270645391617 shorewall-common-4.2.0.tar.bz2
+9274cda4ff5e6faf1c77ffc7ddd825d8 shorewall-shell-4.2.0.tar.bz2
+9fec19de17844be659f3f69b9f80fb5c shorewall-perl-4.2.0.tar.bz2
+cba88eeb55e7b386ec236e593361555a shorewall-lite-4.2.0.tar.bz2
--- shorewall-4.0.4-init.patch DELETED ---
--- shorewall-lite-4.0.4-init.patch DELETED ---
More information about the scm-commits
mailing list