shorewall6/Makefile: fix to use reload instead of restart

Signed-off-by: Tuomo Soini <tis@foobar.fi>
shorewall6.conf: remove #LAST LINE - DO NOT REMOVE - shorewall.conf doesn't have this
2015-10-11 11:08:32 +03:00 · 2015-10-11 11:01:45 +03:00 · 2015-10-11 10:52:52 +03:00 · 2015-10-08 13:16:32 -07:00 · 2015-10-06 09:36:02 -07:00 · 2015-10-05 14:56:01 -07:00
412 changed files with 2848 additions and 4962 deletions
--- a/Shorewall-core/INSTALL
+++ b/Shorewall-core/INSTALL
@@ -1,4 +1,4 @@
-Shoreline Firewall (Shorewall) Version 4
+Shoreline Firewall (Shorewall) Version 5
 -----         ----

 -----------------------------------------------------------------------------
--- a/Shorewall-core/configure
+++ b/Shorewall-core/configure
@@ -28,7 +28,7 @@
 #
 # Build updates this
 #
-VERSION=4.5.2.1
+VERSION=4.6.12

 case "$BASH_VERSION" in
    [4-9].*)
--- a/Shorewall-core/configure.pl
+++ b/Shorewall-core/configure.pl
@@ -31,7 +31,7 @@ use strict;
 # Build updates this
 #
 use constant {
-    VERSION => '4.5.2.1'
+    VERSION => '4.6.12'
 };

 my %params;
--- a/Shorewall-core/lib.base
+++ b/Shorewall-core/lib.base
@@ -1,7 +1,7 @@
 #
-# Shorewall 4.5 -- /usr/share/shorewall/lib.base
+# Shorewall 5.0 -- /usr/share/shorewall/lib.base
 #
-#     (c) 1999-2014 - Tom Eastep (teastep@shorewall.net)
+#     (c) 1999-2015 - Tom Eastep (teastep@shorewall.net)
 #
 #	Complete documentation is available at http://shorewall.net
 #
--- a/Shorewall-core/lib.cli
+++ b/Shorewall-core/lib.cli
@@ -1,7 +1,7 @@
 #
-# Shorewall 4.5 -- /usr/share/shorewall/lib.cli.
+# Shorewall 5.0 -- /usr/share/shorewall/lib.cli.
 #
-#     (c) 1999-2014 - Tom Eastep (teastep@shorewall.net)
+#     (c) 1999-2015 - Tom Eastep (teastep@shorewall.net)
 #
 #	Complete documentation is available at http://shorewall.net
 #
@@ -388,30 +388,16 @@ do_save() {
    status=0

    if [ -f ${VARDIR}/firewall ]; then
-	if [ -n "$WORKAROUNDS" ]; then
-	    if $iptables_save | iptablesbug | grep -v -- '-A dynamic.* -j ACCEPT' > ${VARDIR}/restore-$$; then
-		cp -f ${VARDIR}/firewall $g_restorepath
-		mv -f ${VARDIR}/restore-$$ ${g_restorepath}-iptables
-		chmod +x $g_restorepath
-		echo "   Currently-running Configuration Saved to $g_restorepath"
-		run_user_exit save
-	    else
-		rm -f ${VARDIR}/restore-$$
-		echo "   ERROR: Currently-running Configuration Not Saved" >&2
-		status=1
-	    fi
+	if $iptables_save | grep -v -- '-A dynamic.* -j ACCEPT' > ${VARDIR}/restore-$$; then
+	    cp -f ${VARDIR}/firewall $g_restorepath
+	    mv -f ${VARDIR}/restore-$$ ${g_restorepath}-iptables
+	    chmod +x $g_restorepath
+	    echo "   Currently-running Configuration Saved to $g_restorepath"
+	    run_user_exit save
 	else
-	    if $iptables_save | grep -v -- '-A dynamic.* -j ACCEPT' > ${VARDIR}/restore-$$; then
-		cp -f ${VARDIR}/firewall $g_restorepath
-		mv -f ${VARDIR}/restore-$$ ${g_restorepath}-iptables
-		chmod +x $g_restorepath
-		echo "   Currently-running Configuration Saved to $g_restorepath"
-		run_user_exit save
-	    else
-		rm -f ${VARDIR}/restore-$$
-		echo "   ERROR: Currently-running Configuration Not Saved" >&2
-		status=1
-	    fi
+	    rm -f ${VARDIR}/restore-$$
+	    echo "   ERROR: Currently-running Configuration Not Saved" >&2
+	    status=1
 	fi
    else
 	echo "   ERROR: ${VARDIR}/firewall does not exist" >&2
@@ -423,24 +409,11 @@ do_save() {
 	    resolve_arptables

 	    if [ -n "$arptables" ]; then
-		if [ -n "$WORKAROUNDS" ]; then
-	            #
-	            # 'sed' command is a hack to work around broken arptables_jf
-	            #
-		    if ${arptables}-save | sed 's/-p[[:space:]]\+0\([[:digit:]]\)00\/ffff/-p 000\1\/ffff/' > ${VARDIR}/restore-$$; then
-			if grep -q '^-A' ${VARDIR}/restore-$$; then
-			    mv -f ${VARDIR}/restore-$$ ${g_restorepath}-arptables
-			else
-			    rm -f ${VARDIR}/restore-$$
-			fi
-		    fi
-		else
-		    if ${arptables}-save > ${VARDIR}/restore-$$; then
-			if grep -q '^-A' ${VARDIR}/restore-$$; then
-			    mv -f ${VARDIR}/restore-$$ ${g_restorepath}-arptables
-			else
-			    rm -f ${VARDIR}/restore-$$
-			fi
+		if ${arptables}-save > ${VARDIR}/restore-$$; then
+		    if grep -q '^-A' ${VARDIR}/restore-$$; then
+			mv -f ${VARDIR}/restore-$$ ${g_restorepath}-arptables
+		    else
+			rm -f ${VARDIR}/restore-$$
 		    fi
 		fi
 	    else
@@ -481,28 +454,12 @@ do_save() {
 		esac

 		if [ -n "$IPSET" ]; then
-		    if [ -n "$WORKAROUNDS" ]; then
-			if [ -f /etc/debian_version ] && [ $(cat /etc/debian_version) = 5.0.3 ]; then
-			    #
-			    # The 'grep -v' is a hack for a bug in ipset's nethash implementation when xtables-addons is applied to Lenny
-			    #
-			    hack='| grep -v /31'
-			else
-			    hack=
-			fi
-
-			if eval $IPSET -S $hack > ${VARDIR}/ipsets.tmp; then
-			    #
-			    # Don't save an 'empty' file
-			    #
-			    grep -qE -- '^(-N|create )' ${VARDIR}/ipsets.tmp && mv -f ${VARDIR}/ipsets.tmp ${g_restorepath}-ipsets
-			fi
+		    if eval $IPSET -S > ${VARDIR}/ipsets.tmp; then
+			#
+			# Don't save an 'empty' file
+			#
+			grep -qE -- '^(-N|create )' ${VARDIR}/ipsets.tmp && mv -f ${VARDIR}/ipsets.tmp ${g_restorepath}-ipsets
 		    fi
-		elif eval $IPSET -S > ${VARDIR}/ipsets.tmp; then
-		    #
-		    # Don't save an 'empty' file
-		    #
-		    grep -qE -- '^(-N|create )' ${VARDIR}/ipsets.tmp && mv -f ${VARDIR}/ipsets.tmp ${g_restorepath}-ipsets
 		fi
 		;;
 	    [Nn]o|ipv4|ipv6)
@@ -3787,7 +3744,7 @@ start_command() {
 }

 #
-# Restart Command Executor
+# Reload/Restart Command Executor
 #
 restart_command() {
    local finished
@@ -3846,11 +3803,11 @@ restart_command() {
    [ -n "$g_nolock" ] || mutex_on

    if [ -x ${VARDIR}/firewall ]; then
-	run_it ${VARDIR}/firewall $g_debugging restart
+	run_it ${VARDIR}/firewall $g_debugging $COMMAND
 	rc=$?
    else
 	error_message "${VARDIR}/firewall is missing or is not executable"
-	logger -p kern.err "ERROR:$g_product restart failed"
+	logger -p kern.err "ERROR:$g_product $COMMAND failed"
 	rc=6
    fi

@@ -4012,7 +3969,6 @@ shorewall_cli() {
    g_refreshchains=:none:
    g_confess=
    g_update=
-    g_convert=
    g_annotate=
    g_recovering=
    g_timestamp=
@@ -4021,14 +3977,10 @@ shorewall_cli() {
    g_conditional=
    g_file=
    g_doing="Compiling"
-    g_directives=
    g_inline=
-    g_tcrules=
    g_counters=
    g_loopback=
    g_compiled=
-    g_routestopped=
-    g_notrack=

    VERBOSE=
    VERBOSITY=1
@@ -4207,7 +4159,7 @@ shorewall_cli() {
 	    run_it $g_firewall $g_debugging reset $@
 	    [ -n "$g_nolock" ] || mutex_off
 	    ;;
-	restart)
+	reload|restart)
 	    get_config Yes Yes
 	    shift
 	    restart_command $@
--- a/Shorewall-core/lib.common
+++ b/Shorewall-core/lib.common
@@ -1,7 +1,7 @@
 #
-# Shorewall 4.5 -- /usr/share/shorewall/lib.common.
+# Shorewall 5.0 -- /usr/share/shorewall/lib.common.
 #
-#     (c) 2010-2014 - Tom Eastep (teastep@shorewall.net)
+#     (c) 2010-2015 - Tom Eastep (teastep@shorewall.net)
 #
 #	Complete documentation is available at http://shorewall.net
 #
@@ -71,108 +71,35 @@ startup_error() # $* = Error Message
 }

 #
-# Get the Shorewall version of the passed script
-#
-get_script_version() { # $1 = script
-    local temp
-    local version
-    local ifs
-    local digits
-    local verbosity
-
-    if [ -z "$WORKAROUNDS" -o "$g_compiled" = "$g_file" ]; then
-	#
-	# Unless WORKAROUNDS=No, either this script was just compiled or AUTOMAKE
-	# determined that re-compilation wasn't needed
-	#
-	temp="$SHOREWALL_VERSION"
-    else
-	verbosity="$VERBOSITY"
-	VERBOSITY=0
-
-	temp=$( $SHOREWALL_SHELL $1 version | tail -n 1 )
-    fi
-
-    if [ -z "$temp" ]; then
-	version=0
-    else
-	temp=${temp%-*}
-	ifs=$IFS
-	IFS=.
-	temp=$(echo $temp)
-	IFS=$ifs
-	digits=0
-
-	for temp in $temp; do
-	    version=${version}$(printf '%02d' $temp)
-	    digits=$(($digits + 1))
-	    [ $digits -eq 3 ] && break
-	done
-    fi
-
-    echo $version
-
-    VERBOSITY="$verbosity"
-}
-
-#
-# Do required exports or create the required option string and run the passed script using
+# Create the required option string and run the passed script using
 # $SHOREWALL_SHELL
 #
 run_it() {
    local script
    local options
-    local version

    export VARDIR

    script=$1
    shift

-    version=$(get_script_version $script)
-
-    if [ $version -lt 040408 ]; then
-	#
-	# Old script that doesn't understand 4.4.8 script options
-	#
-	export RESTOREFILE
-	export VERBOSITY
-	export NOROUTES=$g_noroutes
-	export PURGE=$g_purge
-	export TIMESTAMP=$g_timestamp
-	export RECOVERING=$g_recovering
-
-	case "$g_program" in
-	    *-lite)
-		#
-		# Shorewall Lite
-		#
-		export LOGFORMAT
-		export IPTABLES
-		;;
-	esac
+    if [ x$1 = xtrace -o x$1 = xdebug ]; then
+	options="$1 -"
+	shift;
    else
-	#
-	# 4.4.8 or later -- no additional exports required
-	#
-	if [ x$1 = xtrace -o x$1 = xdebug ]; then
-	    options="$1 -"
-	    shift;
-	else
-	    options='-'
-	fi
-
-	[ -n "$g_noroutes" ]   && options=${options}n
-	[ -n "$g_timestamp" ]  && options=${options}t
-	[ -n "$g_purge" ]      && options=${options}p
-	[ -n "$g_recovering" ] && options=${options}r
-	[ -n "$g_counters" ]   && options=${options}c
-
-	options="${options}V $VERBOSITY"
-
-	[ -n "$RESTOREFILE" ] && options="${options} -R $RESTOREFILE"
+	options='-'
    fi

+    [ -n "$g_noroutes" ]   && options=${options}n
+    [ -n "$g_timestamp" ]  && options=${options}t
+    [ -n "$g_purge" ]      && options=${options}p
+    [ -n "$g_recovering" ] && options=${options}r
+    [ -n "$g_counters" ]   && options=${options}c
+
+    options="${options}V $VERBOSITY"
+
+    [ -n "$RESTOREFILE" ] && options="${options} -R $RESTOREFILE"
+
    $SHOREWALL_SHELL $script $options $@
 }

@@ -572,9 +499,9 @@ in_network() # $1 = IP address, $2 = CIDR network
 #
 # Query NetFilter about the existence of a filter chain
 #
-chain_exists() # $1 = chain name
+chain_exists() # $1 = chain name, $2 = table name (optional)
 {
-    qt1 $g_tool -L $1 -n
+    qt1 $g_tool -t ${2:-filter} -L $1 -n
 }

 #
--- a/Shorewall-core/shorewallrc.apple
+++ b/Shorewall-core/shorewallrc.apple
@@ -1,5 +1,5 @@
 #
-# Apple OS X Shorewall 4.5 rc file
+# Apple OS X Shorewall 5.0 rc file
 #
 BUILD=apple
 HOST=apple
--- a/Shorewall-core/shorewallrc.archlinux
+++ b/Shorewall-core/shorewallrc.archlinux
@@ -1,5 +1,5 @@
 #
-# Arch Linux Shorewall 4.5 rc file
+# Arch Linux Shorewall 5.0 rc file
 #
 BUILD=                                 #Default is to detect the build system
 HOST=archlinux
--- a/Shorewall-core/shorewallrc.cygwin
+++ b/Shorewall-core/shorewallrc.cygwin
@@ -1,5 +1,5 @@
 #
-# Cygwin Shorewall 4.5 rc file
+# Cygwin Shorewall 5.0 rc file
 #
 BUILD=cygwin
 HOST=cygwin
--- a/Shorewall-core/shorewallrc.debian.systemd
+++ b/Shorewall-core/shorewallrc.debian.systemd
@@ -15,7 +15,7 @@ INITFILE=				#Name of the product's installed SysV init script
 INITSOURCE=init.debian.sh		#Name of the distributed file to be installed as the SysV init script
 ANNOTATED=				#If non-zero, annotated configuration files are installed
 SYSCONFFILE=default.debian		#Name of the distributed file to be installed in $SYSCONFDIR
-SERVICEFILE=$PRODUCT.service.debian	#Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
+SERVICEFILE=$PRODUCT.service.debian     #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
 SYSCONFDIR=/etc/default			#Directory where SysV init parameter files are installed
 SERVICEDIR=/lib/systemd/system		#Directory where .service files are installed (systems running systemd only)
 SPARSE=Yes				#If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
--- a/Shorewall-core/shorewallrc.default
+++ b/Shorewall-core/shorewallrc.default
@@ -1,5 +1,5 @@
 #
-# Default Shorewall 4.5 rc file
+# Default Shorewall 5.0 rc file
 #
 HOST=linux                              #Generic Linux
 BUILD=                                  #Default is to detect the build system
--- a/Shorewall-core/shorewallrc.redhat
+++ b/Shorewall-core/shorewallrc.redhat
@@ -1,5 +1,5 @@
 #
-# RedHat/FedoraShorewall 4.5 rc file
+# RedHat/FedoraShorewall 5.0 rc file
 #
 BUILD=                                  #Default is to detect the build system
 HOST=redhat
--- a/Shorewall-core/shorewallrc.slackware
+++ b/Shorewall-core/shorewallrc.slackware
@@ -1,5 +1,5 @@
 #
-# Slackware Shorewall 4.5 rc file
+# Slackware Shorewall 5.0 rc file
 #
 BUILD=slackware
 HOST=slackware
--- a/Shorewall-core/shorewallrc.suse
+++ b/Shorewall-core/shorewallrc.suse
@@ -1,5 +1,5 @@
 #
-# SuSE Shorewall 4.5 rc file
+# SuSE Shorewall 5.0 rc file
 #
 BUILD=                                                #Default is to detect the build system
 HOST=suse
--- a/Shorewall-init/init.debian.sh
+++ b/Shorewall-init/init.debian.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5
+#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V5.0
 #
 #     This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
 #
--- a/Shorewall-init/init.sh
+++ b/Shorewall-init/init.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
-#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5
+#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V5.0
 #
 #     (c) 2010,2012-2014 - Tom Eastep (teastep@shorewall.net)
 #
--- a/Shorewall-init/init.suse.sh
+++ b/Shorewall-init/init.suse.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
-#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5
+#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V5.0
 #
 #     This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
 #
@@ -38,7 +38,7 @@
 # 0 - success
 # 1 - generic or unspecified error
 # 2 - invalid or excess argument(s)
-# 3 - unimplemented feature (e.g. "reload")
+# 3 - unimplemented feature
 # 4 - insufficient privilege
 # 5 - program is not installed
 # 6 - program is not configured
--- a/Shorewall-init/shorewall-init
+++ b/Shorewall-init/shorewall-init
@@ -1,5 +1,5 @@
 #!/bin/bash
-#	The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.6
+#	The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V5.0
 #
 #	(c) 2012-2014 - Tom Eastep (teastep@shorewall.net)
 #
--- a/Shorewall-init/shorewall-init.service.214.debian
+++ b/Shorewall-init/shorewall-init.service.214.debian
@@ -2,7 +2,6 @@
 #     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
 #
 #     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
-#     Copyright 2015 Tom Eastep <teastep@shorewall.net>
 #
 [Unit]
 Description=Shorewall firewall (bootup security)
--- a/Shorewall-init/shorewall-init.service.debian
+++ b/Shorewall-init/shorewall-init.service.debian
@@ -2,11 +2,9 @@
 #     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
 #
 #     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
-#     Copyright 2015 Tom Eastep <teastep@shorewall.net>
 #
 [Unit]
 Description=Shorewall firewall (bootup security)
-Wants=network.target
 Before=network.target

 [Service]
--- a/Shorewall-lite/configpath
+++ b/Shorewall-lite/configpath
@@ -1,5 +1,5 @@
 #
-# Shorewall Lite version 4.1 - Default Config Path
+# Shorewall Lite version 5 - Default Config Path
 #
 # /usr/share/shorewall-lite/configpath
 #
--- a/Shorewall-lite/manpages/shorewall-lite.xml
+++ b/Shorewall-lite/manpages/shorewall-lite.xml
@@ -329,6 +329,21 @@
      <arg choice="plain"><replaceable>address</replaceable></arg>
    </cmdsynopsis>

+    <cmdsynopsis>
+      <command>shorewall-lite</command>
+
+      <arg
+      choice="opt"><option>trace</option>|<option>debug</option><arg><option>nolock</option></arg></arg>
+
+      <arg>-<replaceable>options</replaceable></arg>
+
+      <arg choice="plain"><option>reload</option></arg>
+
+      <arg><option>-n</option></arg>
+
+      <arg><option>-p</option><arg><option>-C</option></arg></arg>
+    </cmdsynopsis>
+
    <cmdsynopsis>
      <command>shorewall-lite</command>

@@ -708,6 +723,7 @@
          <para>If <option>-f</option> is given, the command will be processed
          by the compiled script that executed the last successful <emphasis
          role="bold">start</emphasis>, <emphasis
+          role="bold">reload</emphasis>, <emphasis
          role="bold">restart</emphasis> or <emphasis
          role="bold">refresh</emphasis> command if that script exists.</para>
        </listitem>
@@ -1026,6 +1042,32 @@
        </listitem>
      </varlistentry>

+      <varlistentry>
+        <term><emphasis role="bold">reload </emphasis>[-n] [-p]
+        [-<option>C</option>]</term>
+
+        <listitem>
+          <para>Added in Shorewall 5.0.0, <emphasis
+          role="bold">reload</emphasis> is similar to <emphasis
+          role="bold">shorewall-lite start</emphasis> except that it assumes
+          that the firewall is already started. Existing connections are
+          maintained.</para>
+
+          <para>The <option>-n</option> option causes Shorewall-lite to avoid
+          updating the routing table(s).</para>
+
+          <para>The <option>-p</option> option causes the connection tracking
+          table to be flushed; the <command>conntrack</command> utility must
+          be installed to use this option.</para>
+
+          <para>The <option>-C</option> option was added in Shorewall 4.6.5.
+          If the specified (or implicit) firewall script is the one that
+          generated the current running configuration, then the running
+          netfilter configuration will be reloaded as is so as to preserve the
+          iptables packet and byte counters.</para>
+        </listitem>
+      </varlistentry>
+
      <varlistentry>
        <term><emphasis role="bold">reset [<replaceable>chain</replaceable>,
        ...]</emphasis><acronym/></term>
@@ -1043,9 +1085,10 @@
        [-<option>C</option>]</term>

        <listitem>
-          <para>Restart is similar to <emphasis role="bold">shorewall-lite
-          start</emphasis> except that it assumes that the firewall is already
-          started. Existing connections are maintained.</para>
+          <para>Beginning with Shorewall 5.0.0, this command performs a true
+          restart. The firewall is completely stopped as if a
+          <command>stop</command> command had been issued then it is started
+          again.</para>

          <para>The <option>-n</option> option causes Shorewall-lite to avoid
          updating the routing table(s).</para>
--- a/Shorewall-lite/shorewall-lite.conf
+++ b/Shorewall-lite/shorewall-lite.conf
@@ -1,5 +1,5 @@
 ###############################################################################
-#  /etc/shorewall-lite/shorewall-lite.conf Version 4 - Change the following
+#  /etc/shorewall-lite/shorewall-lite.conf Version 5 - Change the following
 #  variables to override the values in the shorewall.conf file used to
 #  compile /var/lib/shorewall-lite/firewall. Those values may be found in
 #  /var/lib/shorewall-lite/firewall.conf.
--- a/Shorewall-lite/shorewall-lite.service.debian
+++ b/Shorewall-lite/shorewall-lite.service.debian
@@ -2,7 +2,6 @@
 #     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
 #
 #     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
-#     Copyright 2015 Tom Eastep <teastep@shorewall.net>
 #
 [Unit]
 Description=Shorewall IPv4 firewall (lite)
@@ -17,6 +16,7 @@ EnvironmentFile=-/etc/default/shorewall-lite
 StandardOutput=syslog
 ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS
 ExecStop=/sbin/shorewall-lite $OPTIONS stop
+ExecReload=/sbin/shorewall-lite $OPTIONS reload $RELOADOPTIONS

 [Install]
 WantedBy=basic.target
--- a/Shorewall/INSTALL
+++ b/Shorewall/INSTALL
@@ -1,4 +1,4 @@
-Shoreline Firewall (Shorewall) Version 4
+Shoreline Firewall (Shorewall) Version 5
 -----         ----

 -----------------------------------------------------------------------------
--- a/Shorewall/Macros/macro.AMQP
+++ b/Shorewall/Macros/macro.AMQP
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - AMQP Macro
+# Shorewall version 5 - AMQP Macro
 #
 # /usr/share/shorewall/macro.AMQP
 #
 #	This macro handles AMQP traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	5672
--- a/Shorewall/Macros/macro.A_AllowICMPs
+++ b/Shorewall/Macros/macro.A_AllowICMPs
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - Audited AllowICMPs Macro
+# Shorewall version 5 - Audited AllowICMPs Macro
 #
 # /usr/share/shorewall/macro.A_AllowICMPs
 #
 #	This macro A_ACCEPTs needed ICMP types
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION		SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #					PORT(S)	PORT(S)	DEST	LIMIT	GROUP

--- a/Shorewall/Macros/macro.A_DropDNSrep
+++ b/Shorewall/Macros/macro.A_DropDNSrep
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - Audited DropDNSrep Macro
+# Shorewall version 5 - Audited DropDNSrep Macro
 #
 # /usr/share/shorewall/macro.A_DropDNSrep
 #
 #	This macro silently audites and drops DNS UDP replies
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP

--- a/Shorewall/Macros/macro.A_DropUPnP
+++ b/Shorewall/Macros/macro.A_DropUPnP
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - ADropUPnP Macro
+# Shorewall version 5 - ADropUPnP Macro
 #
 # /usr/share/shorewall/macro.A_DropUPnP
 #
 #	This macro silently drops UPnP probes on UDP port 1900
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP

--- a/Shorewall/Macros/macro.ActiveDir
+++ b/Shorewall/Macros/macro.ActiveDir
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - Samba 4 Macro
+# Shorewall version 5 - Samba 4 Macro
 #
 # /usr/share/shorewall/macro.ActiveDir
 #
@@ -9,8 +9,6 @@
 #
 #
 ###############################################################################
-?FORMAT 2 
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM   -       -       tcp     389 	#LDAP services
--- a/Shorewall/Macros/macro.AllowICMPs
+++ b/Shorewall/Macros/macro.AllowICMPs
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - AllowICMPs Macro
+# Shorewall version 5 - AllowICMPs Macro
 #
 # /usr/share/shorewall/macro.AllowICMPs
 #
 #	This macro ACCEPTs needed ICMP types
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP

--- a/Shorewall/Macros/macro.Amanda
+++ b/Shorewall/Macros/macro.Amanda
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - Amanda Macro
+# Shorewall version 5 - Amanda Macro
 #
 # /usr/share/shorewall/macro.Amanda
 #
@@ -8,8 +8,6 @@
 #	files from those nodes.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP

--- a/Shorewall/Macros/macro.Auth
+++ b/Shorewall/Macros/macro.Auth
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - Auth Macro
+# Shorewall version 5 - Auth Macro
 #
 # /usr/share/shorewall/macro.Auth
 #
 #	This macro handles Auth (identd) traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	113
--- a/Shorewall/Macros/macro.BGP
+++ b/Shorewall/Macros/macro.BGP
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - BGP Macro
+# Shorewall version 5 - BGP Macro
 #
 # /usr/share/shorewall/macro.BGP
 #
 #	This macro handles BGP4 traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	179	# BGP4
--- a/Shorewall/Macros/macro.BLACKLIST
+++ b/Shorewall/Macros/macro.BLACKLIST
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - blacklist Macro
+# Shorewall version 5 - blacklist Macro
 #
 # /usr/share/shorewall/macro.blacklist
 #
 #	This macro handles blacklisting using BLACKLIST_DISPOSITION and BLACKLIST_LOGLEVEL
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 ?if $BLACKLIST_LOGLEVEL
--- a/Shorewall/Macros/macro.BitTorrent
+++ b/Shorewall/Macros/macro.BitTorrent
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - BitTorrent Macro
+# Shorewall version 5 - BitTorrent Macro
 #
 # /usr/share/shorewall/macro.BitTorrent
 #
@@ -9,8 +9,6 @@
 #	BitTorrent32 macro.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	6881:6889
--- a/Shorewall/Macros/macro.BitTorrent32
+++ b/Shorewall/Macros/macro.BitTorrent32
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - BitTorrent 3.2 Macro
+# Shorewall version 5 - BitTorrent 3.2 Macro
 #
 # /usr/share/shorewall/macro.BitTorrent32
 #
 #	This macro handles BitTorrent traffic for BitTorrent 3.2 and later.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	6881:6999
--- a/Shorewall/Macros/macro.CVS
+++ b/Shorewall/Macros/macro.CVS
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - CVS Macro
+# Shorewall version 5 - CVS Macro
 #
 # /usr/share/shorewall/macro.CVS
 #
 #	This macro handles connections to the CVS pserver.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	2401
--- a/Shorewall/Macros/macro.Citrix
+++ b/Shorewall/Macros/macro.Citrix
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - Citrix/ICA Macro
+# Shorewall version 5 - Citrix/ICA Macro
 #
 # /usr/share/shorewall/macro.Citrix
 #
@@ -7,8 +7,6 @@
 #	ICA Session Reliability)
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	1494	# ICA
--- a/Shorewall/Macros/macro.DAAP
+++ b/Shorewall/Macros/macro.DAAP
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - DAAP Macro
+# Shorewall version 5 - DAAP Macro
 #
 # /usr/share/shorewall/macro.DAAP
 #
@@ -7,8 +7,6 @@
 #	The protocol is used by iTunes, Rythmbox and other similar daemons.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	3689
--- a/Shorewall/Macros/macro.DCC
+++ b/Shorewall/Macros/macro.DCC
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - DCC Macro
+# Shorewall version 5 - DCC Macro
 #
 # /usr/share/shorewall/macro.DCC
 #
@@ -7,8 +7,6 @@
 #	DCC is a distributed spam filtering mechanism.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	6277
--- a/Shorewall/Macros/macro.DHCPfwd
+++ b/Shorewall/Macros/macro.DHCPfwd
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - DHCPfwd Macro
+# Shorewall version 5 - DHCPfwd Macro
 #
 # /usr/share/shorewall/macro.DHCPfwd
 #
 #	This macro (bidirectional) handles forwarded DHCP traffic
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	67:68	67:68	# DHCP
--- a/Shorewall/Macros/macro.DNS
+++ b/Shorewall/Macros/macro.DNS
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - DNS Macro
+# Shorewall version 5 - DNS Macro
 #
 # /usr/share/shorewall/macro.DNS
 #
 #	This macro handles DNS traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	53
--- a/Shorewall/Macros/macro.Distcc
+++ b/Shorewall/Macros/macro.Distcc
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - Distcc Macro
+# Shorewall version 5 - Distcc Macro
 #
 # /usr/share/shorewall/macro.Distcc
 #
 #	This macro handles connections to the Distributed Compiler service.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	3632
--- a/Shorewall/Macros/macro.Drop
+++ b/Shorewall/Macros/macro.Drop
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - Drop Macro
+# Shorewall version 5 - Drop Macro
 #
 # /usr/share/shorewall/macro.Drop
 #
@@ -11,8 +11,6 @@
 #		Drop	net	all
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 #
--- a/Shorewall/Macros/macro.DropDNSrep
+++ b/Shorewall/Macros/macro.DropDNSrep
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - DropDNSrep Macro
+# Shorewall version 5 - DropDNSrep Macro
 #
 # /usr/share/shorewall/macro.DropDNSrep
 #
 #	This macro silently drops DNS UDP replies
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP

--- a/Shorewall/Macros/macro.DropUPnP
+++ b/Shorewall/Macros/macro.DropUPnP
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - DropUPnP Macro
+# Shorewall version 5 - DropUPnP Macro
 #
 # /usr/share/shorewall/macro.DropUPnP
 #
 #	This macro silently drops UPnP probes on UDP port 1900
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP

--- a/Shorewall/Macros/macro.Edonkey
+++ b/Shorewall/Macros/macro.Edonkey
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - Edonkey Macro
+# Shorewall version 5 - Edonkey Macro
 #
 # /usr/share/shorewall/macro.Edonkey
 #
@@ -28,8 +28,6 @@
 #	applications such as aMule WebServer or aMuleCMD.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	4662
--- a/Shorewall/Macros/macro.FTP
+++ b/Shorewall/Macros/macro.FTP
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - FTP Macro
+# Shorewall version 5 - FTP Macro
 #
 # /usr/share/shorewall/macro.FTP
 #
 #	This macro handles FTP traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 ?if ( __CT_TARGET && ! $AUTOHELPERS && __FTP_HELPER  )
--- a/Shorewall/Macros/macro.Finger
+++ b/Shorewall/Macros/macro.Finger
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - Finger Macro
+# Shorewall version 5 - Finger Macro
 #
 # /usr/share/shorewall/macro.Finger
 #
@@ -7,8 +7,6 @@
 #	your finger information to internet.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	79
--- a/Shorewall/Macros/macro.GNUnet
+++ b/Shorewall/Macros/macro.GNUnet
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - GNUnet Macro
+# Shorewall version 5 - GNUnet Macro
 #
 # /usr/share/shorewall/macro.GNUnet
 #
 #	This macro handles GNUnet (secure peer-to-peer networking) traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	2086
--- a/Shorewall/Macros/macro.GRE
+++ b/Shorewall/Macros/macro.GRE
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - GRE Macro
+# Shorewall version 5 - GRE Macro
 #
 # /usr/share/shorewall/macro.GRE
 #
@@ -7,8 +7,6 @@
 #	traffic (RFC 1701)
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	47	# GRE
--- a/Shorewall/Macros/macro.Git
+++ b/Shorewall/Macros/macro.Git
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - Git Macro
+# Shorewall version 5 - Git Macro
 #
 # /usr/share/shorewall/macro.Git
 #
 #	This macro handles Git traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	9418
--- a/Shorewall/Macros/macro.Gnutella
+++ b/Shorewall/Macros/macro.Gnutella
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - Gnutella Macro
+# Shorewall version 5 - Gnutella Macro
 #
 # /usr/share/shorewall/macro.Gnutella
 #
 #	This macro handles Gnutella traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	6346
--- a/Shorewall/Macros/macro.Goto-Meeting
+++ b/Shorewall/Macros/macro.Goto-Meeting
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - Citrix/Goto Meeting macro
+# Shorewall version 5 - Citrix/Goto Meeting macro
 #
 # /usr/share/shorewall/macro.Goto-Meeting
 #          by Eric Teeter
@@ -7,8 +7,6 @@
 #       Assumes that ports 80 and 443 are already open
 #       If needed, use the macros that open Http and Https to reduce redundancy
 ####################################################################################
-?FORMAT 2
-####################################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM      -    -       tcp     8200    # Goto Meeting only needed (TCP outbound)
--- a/Shorewall/Macros/macro.HKP
+++ b/Shorewall/Macros/macro.HKP
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - HKP Macro
+# Shorewall version 5 - HKP Macro
 #
 # /usr/share/shorewall/macro.HKP
 #
 #	This macro handles OpenPGP HTTP keyserver protocol traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	11371
--- a/Shorewall/Macros/macro.HTTP
+++ b/Shorewall/Macros/macro.HTTP
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - HTTP Macro
+# Shorewall version 5 - HTTP Macro
 #
 # /usr/share/shorewall/macro.HTTP
 #
 #	This macro handles plaintext HTTP (WWW) traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	80
--- a/Shorewall/Macros/macro.HTTPS
+++ b/Shorewall/Macros/macro.HTTPS
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - HTTPS Macro
+# Shorewall version 5 - HTTPS Macro
 #
 # /usr/share/shorewall/macro.HTTPS
 #
 #	This macro handles HTTPS (WWW over SSL) traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	443
--- a/Shorewall/Macros/macro.ICPV2
+++ b/Shorewall/Macros/macro.ICPV2
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - ICPV2 Macro
+# Shorewall version 5 - ICPV2 Macro
 #
 # /usr/share/shorewall/macro.ICPV2
 #
 #	This macro handles Internet Cache Protocol V2 (Squid) traffic
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	3130
--- a/Shorewall/Macros/macro.ICQ
+++ b/Shorewall/Macros/macro.ICQ
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - ICQ Macro
+# Shorewall version 5 - ICQ Macro
 #
 # /usr/share/shorewall/macro.ICQ
 #
 #	This macro handles ICQ, now called AOL Instant Messenger (or AIM).
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	5190
--- a/Shorewall/Macros/macro.ILO
+++ b/Shorewall/Macros/macro.ILO
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - ILO Macro
+# Shorewall version 5 - ILO Macro
 #
 # /usr/share/shorewall/macro.ILO
 #
@@ -8,8 +8,6 @@
 #	workstations.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	3002		# Raw serial data
--- a/Shorewall/Macros/macro.IMAP
+++ b/Shorewall/Macros/macro.IMAP
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - IMAP Macro
+# Shorewall version 5 - IMAP Macro
 #
 # /usr/share/shorewall/macro.IMAP
 #
@@ -7,8 +7,6 @@
 #	see macro.IMAPS.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	143
--- a/Shorewall/Macros/macro.IMAPS
+++ b/Shorewall/Macros/macro.IMAPS
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - IMAPS Macro
+# Shorewall version 5 - IMAPS Macro
 #
 # /usr/share/shorewall/macro.IMAPS
 #
@@ -7,8 +7,6 @@
 #	(not recommended), see macro.IMAP.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	993
--- a/Shorewall/Macros/macro.IPIP
+++ b/Shorewall/Macros/macro.IPIP
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - IPIP Macro
+# Shorewall version 5 - IPIP Macro
 #
 # /usr/share/shorewall/macro.IPIP
 #
 #	This macro (bidirectional) handles IPIP capsulation traffic
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	94	# IPIP
--- a/Shorewall/Macros/macro.IPMI
+++ b/Shorewall/Macros/macro.IPMI
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - IPMI Macro
+# Shorewall version 5 - IPMI Macro
 #
 # /usr/share/shorewall/macro.IPMI
 #
@@ -9,8 +9,6 @@
 #	workstations.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	623		# RMCP
--- a/Shorewall/Macros/macro.IPP
+++ b/Shorewall/Macros/macro.IPP
@@ -6,8 +6,6 @@
 #	This macro handles Internet Printing Protocol (IPP).
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	631
--- a/Shorewall/Macros/macro.IPPbrd
+++ b/Shorewall/Macros/macro.IPPbrd
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - IPP Broadcast Macro
+# Shorewall version 5 - IPP Broadcast Macro
 #
 # /usr/share/shorewall/macro.IPPbrd
 #
@@ -8,8 +8,6 @@
 #       direction, use the IPPserver Macro
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	631
--- a/Shorewall/Macros/macro.IPPserver
+++ b/Shorewall/Macros/macro.IPPserver
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - IPPserver Macro
+# Shorewall version 5 - IPPserver Macro
 #
 # /usr/share/shorewall/macro.IPPserver
 #
@@ -23,8 +23,6 @@
 #		IPPserver/ACCEPT $FW loc
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	SOURCE	DEST	tcp	631
--- a/Shorewall/Macros/macro.IPsec
+++ b/Shorewall/Macros/macro.IPsec
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - IPsec Macro
+# Shorewall version 5 - IPsec Macro
 #
 # /usr/share/shorewall/macro.IPsec
 #
 #	This macro (bidirectional) handles IPsec traffic
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	500	500	# IKE
--- a/Shorewall/Macros/macro.IPsecah
+++ b/Shorewall/Macros/macro.IPsecah
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - IPsecah Macro
+# Shorewall version 5 - IPsecah Macro
 #
 # /usr/share/shorewall/macro.IPsecah
 #
@@ -7,8 +7,6 @@
 #       This is insecure. You should use ESP with encryption for security.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	500	500	# IKE
--- a/Shorewall/Macros/macro.IPsecnat
+++ b/Shorewall/Macros/macro.IPsecnat
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - IPsecnat Macro
+# Shorewall version 5 - IPsecnat Macro
 #
 # /usr/share/shorewall/macro.IPsecnat
 #
 #	This macro (bidirectional) handles IPsec traffic and Nat-Traversal
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	500	# IKE
--- a/Shorewall/Macros/macro.IRC
+++ b/Shorewall/Macros/macro.IRC
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 IRC Macro
+# Shorewall version 5 IRC Macro
 #
 # /usr/share/shorewall/macro.IRC
 #
 #	This macro handles IRC traffic (Internet Relay Chat).
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP

--- a/Shorewall/Macros/macro.JAP
+++ b/Shorewall/Macros/macro.JAP
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - JAP Macro
+# Shorewall version 5 - JAP Macro
 #
 # /usr/share/shorewall/macro.JAP
 #
@@ -8,8 +8,6 @@
 #	to browse anonymously!
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	8080 # HTTP port
--- a/Shorewall/Macros/macro.Jabber
+++ b/Shorewall/Macros/macro.Jabber
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - Jabber Macro
+# Shorewall version 5 - Jabber Macro
 #
 # /usr/share/shorewall/macro.Jabber
 #
 #	This macro accepts Jabber traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	5222
--- a/Shorewall/Macros/macro.JabberPlain
+++ b/Shorewall/Macros/macro.JabberPlain
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - JabberPlain Macro
+# Shorewall version 5 - JabberPlain Macro
 #
 # /usr/share/shorewall/macro.JabberPlain
 #
@@ -7,8 +7,6 @@
 #	deprecated - use of macro.Jabber instead is recommended.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 Jabber
--- a/Shorewall/Macros/macro.JabberSecure
+++ b/Shorewall/Macros/macro.JabberSecure
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - JabberSecure (SSL) Macro
+# Shorewall version 5 - JabberSecure (SSL) Macro
 #
 # /usr/share/shorewall/macro.JabberSecure
 #
@@ -8,8 +8,6 @@
 #	Jabber macro instead.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	5223
--- a/Shorewall/Macros/macro.Jabberd
+++ b/Shorewall/Macros/macro.Jabberd
@@ -6,8 +6,6 @@
 #	This macro accepts Jabberd intercommunication traffic
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	5269
--- a/Shorewall/Macros/macro.Jetdirect
+++ b/Shorewall/Macros/macro.Jetdirect
@@ -6,8 +6,6 @@
 #	This macro handles HP Jetdirect printing.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	9100
--- a/Shorewall/Macros/macro.Kerberos
+++ b/Shorewall/Macros/macro.Kerberos
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - Kerberos Macro
+# Shorewall version 5 - Kerberos Macro
 #
 # /usr/share/shorewall/macro.Kerberos
 #
 #	This macro handles Kerberos traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	88
--- a/Shorewall/Macros/macro.L2TP
+++ b/Shorewall/Macros/macro.L2TP
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - L2TP Macro
+# Shorewall version 5 - L2TP Macro
 #
 # /usr/share/shorewall/macro.L2TP
 #
@@ -7,8 +7,6 @@
 #	(RFC 2661)
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	1701	# L2TP
--- a/Shorewall/Macros/macro.LDAP
+++ b/Shorewall/Macros/macro.LDAP
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - LDAP Macro
+# Shorewall version 5 - LDAP Macro
 #
 # /usr/share/shorewall/macro.LDAP
 #
@@ -11,8 +11,6 @@
 #	Consult your LDAP server documentation for details.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	389
--- a/Shorewall/Macros/macro.LDAPS
+++ b/Shorewall/Macros/macro.LDAPS
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - LDAPS Macro
+# Shorewall version 5 - LDAPS Macro
 #
 # /usr/share/shorewall/macro.LDAPS
 #
@@ -11,8 +11,6 @@
 #	Consult your LDAP server documentation for details.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	636
--- a/Shorewall/Macros/macro.MSNP
+++ b/Shorewall/Macros/macro.MSNP
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - MSNP Macro
+# Shorewall version 5 - MSNP Macro
 #
 # /usr/share/shorewall/macro.MSNP
 #
 #	This macro handles MSNP (MicroSoft Notification Protocol)
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	1863
--- a/Shorewall/Macros/macro.MSSQL
+++ b/Shorewall/Macros/macro.MSSQL
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - MSSQL Macro
+# Shorewall version 5 - MSSQL Macro
 #
 # /usr/share/shorewall/macro.MSSQL
 #
 #	This macro handles MSSQL (Microsoft SQL Server)
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	1433
--- a/Shorewall/Macros/macro.Mail
+++ b/Shorewall/Macros/macro.Mail
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - Mail Macro
+# Shorewall version 5 - Mail Macro
 #
 # /usr/share/shorewall/macro.Mail
 #
@@ -12,8 +12,6 @@
 #	the POP3 or IMAP macros.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	25
--- a/Shorewall/Macros/macro.MongoDB
+++ b/Shorewall/Macros/macro.MongoDB
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - MongoDB Macro
+# Shorewall version 5 - MongoDB Macro
 #
 # /usr/share/shorewall/macro.MongoDB
 #
 #	This macro handles MongoDB Daemon/Router traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	27017
--- a/Shorewall/Macros/macro.Munin
+++ b/Shorewall/Macros/macro.Munin
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - Munin Macro
+# Shorewall version 5 - Munin Macro
 #
 # /usr/share/shorewall/macro.Munin
 #
 #	This macro handles Munin networked resource monitoring traffic
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	4949
--- a/Shorewall/Macros/macro.MySQL
+++ b/Shorewall/Macros/macro.MySQL
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - MySQL Macro
+# Shorewall version 5 - MySQL Macro
 #
 # /usr/share/shorewall/macro.MySQL
 #
 #	This macro handles connections to the MySQL server.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	3306
--- a/Shorewall/Macros/macro.NNTP
+++ b/Shorewall/Macros/macro.NNTP
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 NNTP Macro
+# Shorewall version 5 NNTP Macro
 #
 # /usr/share/shorewall/macro.NNTP
 #
@@ -7,8 +7,6 @@
 #	encrypted NNTP, see macro.NNTPS.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	119
--- a/Shorewall/Macros/macro.NNTPS
+++ b/Shorewall/Macros/macro.NNTPS
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 NNTPS Macro
+# Shorewall version 5 NNTPS Macro
 #
 # /usr/share/shorewall/macro.NNTPS
 #
@@ -7,8 +7,6 @@
 #	plaintext NNTP, see macro.NNTP.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	563
--- a/Shorewall/Macros/macro.NTP
+++ b/Shorewall/Macros/macro.NTP
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - NTP Macro
+# Shorewall version 5 - NTP Macro
 #
 # /usr/share/shorewall/macro.NTP
 #
@@ -7,8 +7,6 @@
 #	For broadcast NTP traffic, use NTPbrd Macro.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	123
--- a/Shorewall/Macros/macro.NTPbi
+++ b/Shorewall/Macros/macro.NTPbi
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - NTPbi Macro
+# Shorewall version 5 - NTPbi Macro
 #
 # /usr/share/shorewall/macro.NTPbi
 #
 #        This macro handles  bi-directional NTP (for NTP peers)
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	123
--- a/Shorewall/Macros/macro.NTPbrd
+++ b/Shorewall/Macros/macro.NTPbrd
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - NTPbrd Macro
+# Shorewall version 5 - NTPbrd Macro
 #
 # /usr/share/shorewall/macro.NTPbrd
 #
@@ -11,8 +11,6 @@
 #	Netfilter doesn't track connections for broadcast traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-		-		udp	123
--- a/Shorewall/Macros/macro.OSPF
+++ b/Shorewall/Macros/macro.OSPF
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - OSPF Macro
+# Shorewall version 5 - OSPF Macro
 #
 # /usr/share/shorewall/macro.OSPF
 #
 #	This macro handles OSPF multicast traffic
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	89	# OSPF
--- a/Shorewall/Macros/macro.OpenVPN
+++ b/Shorewall/Macros/macro.OpenVPN
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - OpenVPN Macro
+# Shorewall version 5 - OpenVPN Macro
 #
 # /usr/share/shorewall/macro.OpenVPN Macro
 #
 #	This macro handles OpenVPN traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	1194
--- a/Shorewall/Macros/macro.PCA
+++ b/Shorewall/Macros/macro.PCA
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - PCA Macro
+# Shorewall version 5 - PCA Macro
 #
 # /usr/share/shorewall/macro.PCA
 #
 #	This macro handles PCAnywere (tm)
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	5632
--- a/Shorewall/Macros/macro.POP3
+++ b/Shorewall/Macros/macro.POP3
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - POP3 Macro
+# Shorewall version 5 - POP3 Macro
 #
 # /usr/share/shorewall/macro.POP3
 #
@@ -7,8 +7,6 @@
 #	see macro.POP3S.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	110
--- a/Shorewall/Macros/macro.POP3S
+++ b/Shorewall/Macros/macro.POP3S
@@ -1,5 +1,5 @@
 #
-# Shorewall version 4 - POP3S Macro
+# Shorewall version 5 - POP3S Macro
 #
 # /usr/share/shorewall/macro.POP3S
 #
@@ -7,8 +7,6 @@
 #	see macro.POP3.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	995	# Secure POP3
--- a/Shorewall/Macros/macro.PPtP
+++ b/Shorewall/Macros/macro.PPtP
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - PPTP Macro
+# Shorewall version 5 - PPTP Macro
 #
 # /usr/share/shorewall/macro.PPtP Macro
 #
 #	This macro handles PPTP traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	47
--- a/Shorewall/Macros/macro.Ping
+++ b/Shorewall/Macros/macro.Ping
@@ -1,13 +1,11 @@
 #
-# Shorewall version 4 - Ping Macro
+# Shorewall version 5 - Ping Macro
 #
 # /usr/share/shorewall/macro.Ping
 #
 #	This macro handles 'ping' requests.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	icmp	8
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tuomo Soini	48c654fbed	shorewall6/Makefile: fix to use reload instead of restart Signed-off-by: Tuomo Soini <tis@foobar.fi>	2015-10-11 11:08:32 +03:00
Tuomo Soini	a97b0194c1	shorewall6.conf: remove #LAST LINE - DO NOT REMOVE - shorewall.conf doesn't have this Signed-off-by: Tuomo Soini <tis@foobar.fi>	2015-10-11 11:01:45 +03:00
Tuomo Soini	f84214c8da	shorewall[6].conf.xml: fix LEGACY_RESTART entry Signed-off-by: Tuomo Soini <tis@foobar.fi>	2015-10-11 10:52:52 +03:00
Tom Eastep	97e821d12d	Use %e rather than %_d for busybox compatibility Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-08 13:16:32 -07:00
Tom Eastep	ec2f4362f3	More cleanup of the configuration file basics article Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-06 09:36:02 -07:00
Tom Eastep	dc79a74de5	Mention 'reload' in the Introduction Article Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-05 14:56:01 -07:00
Tom Eastep	af18896851	Remove options from 'update' warning messages Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-05 08:19:09 -07:00
Tom Eastep	35f33b325f	Update blacklisting article Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-05 08:18:52 -07:00
Tom Eastep	89122c0d55	Updates for routestopped -> stoppedrules Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-05 07:51:43 -07:00
Tom Eastep	0385b2cd37	Update URLs to tcrules Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-04 08:20:33 -07:00
Tom Eastep	fed6e7c352	Update Manpages for Shorewall5 Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-03 08:50:49 -07:00
Tom Eastep	141440147c	Merge branch '5.0.0' of ssh://git.code.sf.net/p/shorewall/code into 5.0.0	2015-09-24 14:19:15 -07:00
Tuomo Soini	f1d4ef495e	shorewall-init.service*: fix [Install] section Signed-off-by: Tuomo Soini <tis@foobar.fi>	2015-09-24 18:17:30 +03:00
Tom Eastep	7dd9beeeae	Remove FORMAT specifications from macros and actions Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-22 12:39:22 -07:00
Tom Eastep	dfeeb2d5c3	Add GlusterFS action Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-19 12:31:54 -07:00
Tom Eastep	888444f210	Add the Meta-connection to Tinc - Both the macro and the tunnel type are updated Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-17 09:16:33 -07:00
Tom Eastep	1b2a43e5ea	Merge branch '5.0.0' of ssh://git.code.sf.net/p/shorewall/code into 5.0.0	2015-09-12 12:31:45 -07:00
Tom Eastep	1b571f3d86	Correct the reset command - Also allow chain names to be specified a la the refresh command Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-11 14:16:16 -07:00
Tuomo Soini	53dfe442c1	systemd: add reload to unit files Signed-off-by: Tuomo Soini <tis@foobar.fi>	2015-09-10 14:15:16 +03:00
Tom Eastep	5ce10a633b	Update Articles -Fix typo in Shorewall-5 -Add tag info in the logging article	2015-09-09 15:31:47 -07:00
Tom Eastep	7be4190e4c	Man page updates for the PROBABILITY column in the masq files Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-08 18:00:53 -07:00
Tom Eastep	ddb325a662	Code changes for a PROBABILITY column in the masq file Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-08 17:20:46 -07:00
Tom Eastep	0db233bf7c	Correct shorewall6 mangle man page - Replace 'TTL' by 'HL' Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-08 12:26:29 -07:00
Tom Eastep	e8ebfb5a11	Correct PSH,FIN check Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-07 15:46:14 -07:00
Tom Eastep	242080c59c	Rename SMALL_MASK to SMALL_MAX Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-07 13:10:44 -07:00
Tom Eastep	4b14924b99	Allow non-experts to use the user bits in the fw mark Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-07 11:29:24 -07:00
Tom Eastep	17d1caf8c5	Allow tags in global LOG_LEVELs Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-06 16:08:59 -07:00
Tom Eastep	fcd5b30ca8	Add FIN,RST and PSH,FIN to the tcpflags set Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-06 11:49:29 -07:00
Tom Eastep	e6ec52c711	Move a line of code Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-06 10:33:36 -07:00
Tom Eastep	dbf2c89083	Provide default for SHOREWALL_SHELL Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-06 10:28:44 -07:00
Tom Eastep	bde9558962	Version changes in Shorewall Init - Also remove an obsolete comment in init.suse.sh Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-06 10:02:41 -07:00
Tom Eastep	6554f7fe28	Disable bare SECTION in the rules file Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-04 11:16:07 -07:00
Tom Eastep	07976556ed	More inline match documentation Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-03 09:45:39 -07:00
Tom Eastep	8f86e2df19	Correct typo Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-02 13:07:33 -07:00
Tom Eastep	ba3dba78ff	Correct more Mangle examples Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-02 13:07:20 -07:00
Tom Eastep	59aeafba3a	Delimit inline matches by ';;' Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-02 10:24:31 -07:00
Tom Eastep	c6ec9990e7	Unconditionally get inline matches Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-02 08:02:02 -07:00
Tom Eastep	a30708519d	Correct progress messages Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-01 11:57:28 -07:00
Tom Eastep	447b7cda4e	Describe the discontinued update options in the Shorewall 5 article Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-01 11:18:38 -07:00
Tom Eastep	f5d9e87c59	Remove anacronistic logic from the Rules module Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-31 16:02:22 -07:00
Tom Eastep	ed90360b4c	Remove all of the update-specific options from the update command Leave -i and -A Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-31 14:21:41 -07:00
Tom Eastep	6a374b80e0	Correct INLINE handling Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-31 12:36:05 -07:00
Tom Eastep	9638033e24	Cosmetic changes to first_entry() calls Signed-off-by: Tom Eastep <teastep@shorewall.net> Conflicts: Shorewall/Perl/Shorewall/Tc.pm	2015-08-31 11:33:32 -07:00
Tom Eastep	87ef6f730f	Correct a typo Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-31 11:21:37 -07:00
Tom Eastep	53223e1440	Uniform mechanism for inserting conversion comments Signed-off-by: Tom Eastep <teastep@shorewall.net> Conflicts: Shorewall/Perl/Shorewall/Tc.pm	2015-08-31 11:21:18 -07:00
Tom Eastep	9b886a99af	Fix $convert/$tcrules mess Signed-off-by: Tom Eastep <teastep@shorewall.net> Conflicts: Shorewall/Perl/Shorewall/Tc.pm	2015-08-31 11:19:42 -07:00
Tom Eastep	c77d18965a	Place a header in a created mangle file during update -t Signed-off-by: Tom Eastep <teastep@shorewall.net> Conflicts: Shorewall/Perl/Shorewall/Tc.pm	2015-08-31 11:16:45 -07:00
Tom Eastep	5a6586e06c	Don't enforce FASTACCEPT/BLACKLISTNEWONLY on convert Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-31 11:14:49 -07:00
Tom Eastep	60e08322c5	Update man pages for 'minute' and 'second' in LOGLIMIT specifications Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-31 11:14:37 -07:00
Tom Eastep	df73f4b925	Assume EXPORTMODULES=No if it doesn't exist in old file during update Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-31 11:14:26 -07:00
Tom Eastep	be81ace811	Read capabilities file before the .conf file Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-31 11:11:25 -07:00
Tom Eastep	377e2037ca	Update the Shorewall 5 article for 4.6.13. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-31 11:04:00 -07:00
Tom Eastep	b0bf726c7e	Let 'update' default USE_DEFAULT_RT to 'No' Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-26 12:40:16 -07:00
Tom Eastep	b2b3300ebf	Correct the shorewall6-hosts man page Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-26 12:30:08 -07:00
Tom Eastep	71611233fb	Correct IPV6 range parsing Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-26 11:51:29 -07:00
Tom Eastep	7a98c7b9e5	More 'update' fixes Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-25 15:55:49 -07:00
Tom Eastep	dc73832570	Delete unneeded 'my' Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-25 14:36:53 -07:00
Tom Eastep	f5d1ec0243	Delete EXPORTPARAMS from %config Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-25 14:36:14 -07:00
Tom Eastep	f9ae28aeea	The -t option also converts the 'tos' file. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-24 14:56:24 -07:00
Tom Eastep	463206a3eb	Add Shorewall-5 Article Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-22 13:53:25 -07:00
Tom Eastep	2451c14d8c	Some rules manpage updates Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-22 08:27:52 -07:00
Tom Eastep	a30fdb356d	Update man pages for required '?' in COMMENT, SECTION and FORMAT lines Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-22 08:00:38 -07:00
Tom Eastep	5ead22aa48	Move fatal_error() to lib.base Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-21 14:19:20 -07:00
Tom Eastep	98e5d54b92	Allow 'none' in the log level argument to AutoBL Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-21 13:39:25 -07:00
Tom Eastep	f4776bf388	Eliminate WIDE_TC_MARKS, HIGH_ROUTE_MARKS and BLACKLISTNEWONLY Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-21 12:42:19 -07:00
Tom Eastep	80acdd2836	Disallow bare COMMENT, SECTION and FORMAT lines Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-21 11:18:40 -07:00
Tom Eastep	40d1d86d2c	Drop support for the 'tos' file Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-20 15:35:03 -07:00
Tom Eastep	26fca41e27	Eliminate discontinued files and manpages Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-20 15:17:48 -07:00
Tom Eastep	5af5c67c75	Update a message to refer to the 'mangle' file rather than 'tcrules' Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-20 14:54:54 -07:00
Tom Eastep	5a08f8bf4e	Correct shorewall-mangle(5) examples Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-20 11:09:42 -07:00
Tom Eastep	c59cb1351c	Update manpages for new update options Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-20 11:08:10 -07:00
Tom Eastep	82330395e9	Correct grammer in an error message Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-20 09:25:32 -07:00
Tom Eastep	9a6f16903b	Use NYTProf for profiling. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-20 09:21:47 -07:00
Tom Eastep	37c9db2bd6	Tweak tcrules references Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-20 09:21:42 -07:00
Tom Eastep	9f2958fd27	Correct wording of an error message Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-20 09:21:20 -07:00
Tom Eastep	4a484ced9e	Delete 'conflicts=' from Shorewall-init .service files Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-20 09:19:58 -07:00
Tom Eastep	12ebb491da	Rewrite the trace/debug section of the start/stop article Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-18 16:34:06 -07:00
Tom Eastep	6bdf90631c	Fix a couple of bugs in 5.0.0 Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-16 10:05:21 -07:00
Tom Eastep	c604823053	Default to FORMAT-2 macros and actions. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-14 16:11:41 -07:00
Tom Eastep	12f8cbae29	Correct the test for the existence of the routestopped file Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-14 15:29:52 -07:00
Tom Eastep	8ad63b53ba	Merge branch '5.0.0' of ssh://server.shorewall.net/home/teastep/shorewall/code into 5.0.0	2015-08-14 10:03:51 -07:00
Tom Eastep	4de6638385	Correct handling of termination after .conf file not updated Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-14 09:32:27 -07:00
Tom Eastep	0cef7fad35	Add conversion version and date to the converted files. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-14 09:32:17 -07:00
Tom Eastep	ea2a35415e	Correct convert_blacklist() Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-14 09:32:01 -07:00
Tom Eastep	4cc7a1b87d	Correct tcrules update Signed-off-by: Tom Eastep <teastep@shorewall.net> Conflicts: Shorewall/Perl/Shorewall/Tc.pm	2015-08-14 09:31:36 -07:00
Tom Eastep	0fb5b56126	Merge branch '5.0.0' of ssh://server.shorewall.net/home/teastep/shorewall/code into 5.0.0	2015-08-11 15:30:46 -07:00
Tom Eastep	56aa95ea4f	Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code into 5.0.0 Conflicts: Shorewall-core/shorewallrc.debian.systemd Shorewall-init/shorewall-init.service.debian Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-10 17:49:00 -07:00
Tom Eastep	2ab8bd3040	More update fixes Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-09 14:31:47 -07:00
Tom Eastep	0d635632e3	Add conversion of notrack to conntrack Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-08 16:46:58 -07:00
Tom Eastep	8657682dfd	Merge branch '5.0.0' of ssh://server.shorewall.net/home/teastep/shorewall/code into 5.0.0	2015-08-08 12:43:02 -07:00
Tom Eastep	fb2d261cdb	More Fixes for update Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-08 12:42:32 -07:00
Tom Eastep	88f9a3e255	Allow zero-valued options on multi-zoned interfaces Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-07 14:30:21 -07:00
Tom Eastep	73c8b563a1	Add -s option to update to convert the routestopped file Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-07 13:46:16 -07:00
Tom Eastep	2162d79b5f	Manual Page Uptates Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-03 15:09:16 -07:00
Tom Eastep	0f61bd34e6	Drop support for the 'blacklist' zone option Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-03 14:45:52 -07:00
Tom Eastep	d8d1e96e0d	Delete manpages for files no longer supported Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-03 14:37:15 -07:00
Tom Eastep	f4620606b3	Drop support for the 'blacklist' file. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-03 14:35:51 -07:00
Tom Eastep	65baa7e3b8	Drop support for the tcrules file - The upgrade -t option is still available Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-03 12:34:22 -07:00
Tom Eastep	e5c7ded951	Drop support for the 'notrack' file Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-03 11:36:54 -07:00
Tom Eastep	8bed5c9d65	Drop support for the IPSECFILE option Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-03 10:11:52 -07:00
Tom Eastep	4bf714aca0	Correct debian systemd shorewallrc file Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-01 14:53:05 -07:00
Tom Eastep	2eb1cb5e6e	More debian changes from 4.6.12 Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-01 14:35:03 -07:00
Tom Eastep	037e92a60e	Eliminate some config options Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-01 14:28:12 -07:00
Tom Eastep	2165f746e6	Update .conf documents for 'reload' Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-01 12:58:08 -07:00
Tom Eastep	ef9e75753a	Restore .214 files - Also merge Debian changes from 4.6.12 Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-01 11:23:35 -07:00
Tom Eastep	85648bded1	Deimplement several .conf options - LOGRATE/LOGBURST - EXPORTPARAMS - LEGACY_FASTSTART	2015-08-01 11:11:35 -07:00
Tom Eastep	8cddba1e15	Correct shorewall-init.service to avoid dependency loops on Debian Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-07-28 17:24:33 -07:00
Tom Eastep	67589cab69	More version changes Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-07-28 10:59:11 -07:00
Tom Eastep	f40373d60c	Update config file version and copyrights Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-07-28 10:50:19 -07:00
Tom Eastep	f233031b08	Update shorewallrc files' versions - Correct the SERVICEDIR setting for debian Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-07-28 10:33:22 -07:00
Tom Eastep	fa7248c58c	Add the LEGACY_RESTART option. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-07-27 09:19:52 -07:00
Tom Eastep	b1d75e53a1	Correct syntax error in lib.cli Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-07-27 07:23:39 -07:00
Tom Eastep	2356b814e9	Merge branch 'master' into 5.0.0	2015-07-27 07:05:00 -07:00
Tom Eastep	0a7c65ae0d	Allow connlimit by destination Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-07-26 14:26:58 -07:00
Tom Eastep	6e0fb1ab88	Correct syntax error Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-07-26 14:16:12 -07:00
Tom Eastep	34f58bd6ac	Correct formatting in the rules file man pages Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-07-26 11:36:14 -07:00
Tom Eastep	cecc81ce82	Update .service files - make the .214 versions the default and remove the ones name *.214 - Add 'ExecReload' to all but Shorewall-init - Create Debian-specific versions with /etc/default rather than /etc/sysconfig	2015-07-26 10:58:03 -07:00
Tom Eastep	a00bf196a3	Remove all workarounds Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-07-26 10:27:30 -07:00
Tom Eastep	f9ec0c6930	New 'reload' and 'restart' semantics Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-07-26 09:59:49 -07:00