rpms/shorewall/EL-5 shorewall-4.0.4-init.patch, NONE, 1.1 shorewall-lite-4.0.4-init.patch, NONE, 1.1

[Jonathan G. Underwood (jgu)]

Author: jgu

Update of /cvs/extras/rpms/shorewall/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22180

Added Files:
	shorewall-4.0.4-init.patch shorewall-lite-4.0.4-init.patch 
Log Message:
Added shorewall-4.0.4-init.patch and shorewall-lite-4.0.4-init.patch


shorewall-4.0.4-init.patch:

--- NEW FILE shorewall-4.0.4-init.patch ---
--- shorewall-common-4.0.4-orig/init.sh	2007-09-08 17:07:36.000000000 +0100
+++ shorewall-common-4.0.4/init.sh	2007-10-06 21:41:49.000000000 +0100
@@ -1,5 +1,4 @@
 #!/bin/sh
-RCDLINKS="2,S41 3,S41 6,K41"
 #
 #     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.0
 #
@@ -33,28 +32,32 @@
 #	   shorewall restart			  Restarts the firewall
 #	   shorewall reload			  Reload the firewall
 #						  (same as restart)
+#	   shorewall force-reload		  Reload the firewall
+#						  (same as restart)
 #	   shorewall stop			  Stops the firewall
 #	   shorewall status			  Displays firewall status
 #
 
-# chkconfig: 2345 25 90
+# chkconfig: - 25 90
 # description: Packet filtering firewall
 
 ### BEGIN INIT INFO
-# Provides:	  shorewall
+# Provides: shorewall
 # Required-Start: $network
 # Should-Start: VMware
 # Required-Stop:
-# Default-Start:  2 3 5
-# Default-Stop:	  0 1 6
-# Description:	  starts and stops the shorewall firewall
+# Default-Start:
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: starts and stops the shorewall firewall
+# Description: The Shoreline Firewall, more commonly known as "Shorewall", is a
+#              Netfilter (iptables) based firewall
 ### END INIT INFO
 
 ################################################################################
 # Give Usage Information						       #
 ################################################################################
 usage() {
-    echo "Usage: $0 start|stop|reload|restart|status"
+    echo "Usage: $0 start|stop|reload|force-reload|restart|status"
     exit 1
 }
 
@@ -80,7 +83,7 @@
     stop|restart|status)
 	exec /sbin/shorewall $@
 	;;
-    reload)
+    reload|force-reload)
 	shift
 	exec /sbin/shorewall restart $@
 	;;

shorewall-lite-4.0.4-init.patch:

--- NEW FILE shorewall-lite-4.0.4-init.patch ---
--- shorewall-lite-4.0.4-orig/init.sh	2007-10-07 23:04:14.000000000 +0100
+++ shorewall-lite-4.0.4/init.sh	2007-10-07 23:07:22.000000000 +0100
@@ -1,5 +1,4 @@
 #!/bin/sh
-RCDLINKS="2,S41 3,S41 6,K41"
 #
 #     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.0
 #
@@ -37,23 +36,26 @@
 #	   shorewall status			  Displays firewall status
 #
 
-# chkconfig: 2345 25 90
+# chkconfig: - 25 90
 # description: Packet filtering firewall
 
 ### BEGIN INIT INFO
 # Provides:	  shorewall-lite
 # Required-Start: $network
 # Required-Stop:
-# Default-Start:  2 3 5
-# Default-Stop:	  0 1 6
-# Description:	  starts and stops the shorewall firewall
+# Default-Start:
+# Default-Stop: 0 1 2 3 4 5 6
+# Description: Shorewall Lite is a lightweight iptables based firewall that will
+#              run a firewall script generated on another machine by a
+#              shorewall compiler 
+# Short-Description: starts and stops the shorewall-lite firewall
 ### END INIT INFO
 
 ################################################################################
 # Give Usage Information						       #
 ################################################################################
 usage() {
-    echo "Usage: $0 start|stop|reload|restart|status"
+    echo "Usage: $0 start|stop|reload|force-reload|restart|status"
     exit 1
 }
 
@@ -79,7 +81,7 @@
     stop|restart|status)
 	exec /sbin/shorewall-lite $@
 	;;
-    reload)
+    reload|force-reload)
 	shift
 	exec /sbin/shorewall-lite restart $@
 	;;