Add warning about the sparse population of /etc/shorewall under Debian

Signed-off-by: Tom Eastep <teastep@shorewall.net>

Shorewall-core/configure

@@ -143,6 +143,9 @@ if [ -z "$vendor" ]; then
 	    elif [ -f /etc/arch-release ] ; then
 		params[HOST]=archlinux
 		rcfile=shorewallrc.archlinux
+	    elif [ -f /etc/openwrt_release ]; then
+		params[HOST]=openwrt
+		rcfile=shorewallrc.openwrt
 	    else
 		params[HOST]=linux
 		rcfile=shorewallrc.default

Shorewall-init/install.sh

@@ -397,6 +397,7 @@ if [ $HOST = debian ]; then
 
 	[ $configure -eq 1 ] || mkdir -p ${DESTDIR}${CONFDIR}/default
 	install_file sysconfig ${DESTDIR}${ETC}/default/shorewall-init 0644
+	echo "sysconfig file installed in ${DESTDIR}${SYSCONFDIR}/${PRODUCT}"
     fi
 
     IFUPDOWN=ifupdown.debian.sh
@@ -490,7 +491,12 @@ esac
 if [ -z "$DESTDIR" ]; then
     if [ $configure -eq 1 -a -n "$first_install" ]; then
 	if [ $HOST = debian ]; then
-	    if mywhich insserv; then
+	    if [ -n "$SERVICEDIR" ]; then
+		if systemctl enable ${PRODUCT}.service; then
+                    echo "Shorewall Init will start automatically at 
+boot"
+		fi
+	    elif mywhich insserv; then
 		if insserv ${INITDIR}/shorewall-init; then
 		    echo "Shorewall Init will start automatically at boot"
 		else
@@ -554,7 +560,7 @@ fi
 
 [ -z "${DESTDIR}" ] && [ ! -f ~/.shorewallrc ] && cp ${SHAREDIR}/shorewall/shorewallrc .
 
-if [ -f ${DESTDIR}/etc/ppp ]; then
+if [ -d ${DESTDIR}/etc/ppp ]; then
     case $HOST in
 	debian|suse)
 	    for directory in ip-up.d ip-down.d ipv6-up.d ipv6-down.d; do

Shorewall-init/uninstall.sh

@@ -174,9 +174,13 @@ if [ -f "$INITSCRIPT" ]; then
     remove_file $INITSCRIPT
 fi
 
-if [ -n "$SYSTEMD" ]; then
+if [ -z "${SERVICEDIR}" ]; then
+    SERVICEDIR="$SYSTEMD"
+fi
+
+if [ -n "$SERVICEDIR" ]; then
     [ $configure -eq 1 ] && systemctl disable shorewall-init.service
-    rm -f $SYSTEMD/shorewall-init.service
+    rm -f $SERVICEDIR/shorewall-init.service
 fi
 
 [ "$(readlink -m -q ${SBINDIR}/ifup-local)"   = ${SHAREDIR}/shorewall-init ] && remove_file ${SBINDIR}/ifup-local
@@ -202,8 +206,10 @@ if [ -d ${CONFDIR}/ppp ]; then
     done
 
     for file in if-up.local if-down.local; do
-	if grep -qF Shorewall-based ${CONFDIR}/ppp/$FILE; then
-	    remove_file ${CONFDIR}/ppp/$FILE
+	if [ -f ${CONFDIR}/ppp/$file ]; then
+	    if grep -qF Shorewall-based ${CONFDIR}/ppp/$FILE; then
+		remove_file ${CONFDIR}/ppp/$FILE
+	    fi
 	fi
     done
 fi

Shorewall/configfiles/accounting

@@ -1,5 +1,5 @@
 #
-# Shorewall - Accounting File
+# Shorewall -- /etc/shorewall/accounting
 #
 # For information about entries in this file, type "man shorewall-accounting"
 #

Shorewall/configfiles/actions

@@ -1,7 +1,5 @@
 #
-# Shorewall - Actions File
-#
-# /etc/shorewall/actions
+# Shorewall -- /etc/shorewall/actions
 #
 # For information about entries in this file, type "man shorewall-actions"
 #

Shorewall/configfiles/arprules

@@ -1,5 +1,5 @@
 #
-# Shorewall - Arprules File
+# Shorewall -- /etc/shorewall/arprules
 #
 # For information about entries in this file, type "man shorewall-arprules"
 #

Shorewall/configfiles/blrules

@@ -1,5 +1,5 @@
 #
-# Shorewall - Blrules File
+# Shorewall -- /etc/shorewall/blrules
 #
 # For information about entries in this file, type "man shorewall-blrules"
 #

Shorewall/configfiles/clear

@@ -1,7 +1,5 @@
 #
-# Shorewall - Clear File
-#
-# /etc/shorewall/clear
+# Shorewall -- /etc/shorewall/clear
 #
 # Add commands below that you want to be executed after Shorewall has
 # processed the 'clear' command.

Shorewall/configfiles/conntrack

@@ -1,10 +1,11 @@
 #
-# Shorewall - Conntrack File
+# Shorewall -- /etc/shorewall/conntrack
 #
 # For information about entries in this file, type "man shorewall-conntrack"
 #
 ##############################################################################################################
 ?FORMAT 3
+##############################################################################################################
 #ACTION			SOURCE		DESTINATION	PROTO	DEST		SOURCE	USER/		SWITCH
 #								PORT(S)		PORT(S)	GROUP
 ?if $AUTOHELPERS && __CT_TARGET

Shorewall/configfiles/ecn

@@ -1,5 +1,5 @@
 #
-# Shorewall - Ecn File
+# Shorewall -- /etc/shorewall/ecn
 #
 # For information about entries in this file, type "man shorewall-ecn"
 #

Shorewall/configfiles/findgw

@@ -1,7 +1,5 @@
 #
-# Shorewall - Findgw File
-#
-# /etc/shorewall/findgw
+# Shorewall -- /etc/shorewall/findgw
 #
 # The code in this file is executed when Shorewall is trying to detect the
 # gateway through an interface in /etc/shorewall/providers that has GATEWAY

Shorewall/configfiles/hosts

@@ -1,5 +1,5 @@
 #
-# Shorewall - Hosts file
+# Shorewall -- /etc/shorewall/hosts
 #
 # For information about entries in this file, type "man shorewall-hosts"
 #

Shorewall/configfiles/init

@@ -1,10 +1,8 @@
 #
-# Shorewall - Init File
+# Shorewall -- /etc/shorewall/init
 #
-# /etc/shorewall/init
-#
-#	Add commands below that you want to be executed at the beginning of
-#	a "shorewall start", "shorewall-reload" or "shorewall restart" command.
+# Add commands below that you want to be executed at the beginning of
+# a "shorewall start", "shorewall-reload" or "shorewall restart" command.
 #
 # For additional information, see
 # http://shorewall.net/shorewall_extension_scripts.htm

Shorewall/configfiles/initdone

@@ -1,12 +1,10 @@
 #
-# Shorewall - Initdone File
+# Shorewall -- /etc/shorewall/initdone
 #
-# /etc/shorewall/initdone
-#
-#	Add commands below that you want to be executed during
-#	"shorewall start", "shorewall reload" or "shorewall restart" commands
-#	at the point where Shorewall has not yet added any permanent rules to
-#       the builtin chains.
+# Add commands below that you want to be executed during
+# "shorewall start", "shorewall reload" or "shorewall restart" commands
+# at the point where Shorewall has not yet added any permanent rules to
+# the builtin chains.
 #
 # For additional information, see
 # http://shorewall.net/shorewall_extension_scripts.htm

Shorewall/configfiles/interfaces

@@ -1,5 +1,5 @@
 #
-# Shorewall - Interfaces File
+# Shorewall -- /etc/shorewall/interfaces
 #
 # For information about entries in this file, type "man shorewall-interfaces"
 #

Shorewall/configfiles/isusable

@@ -1,15 +1,13 @@
 #
-# Shorewall - Isusable File
+# Shorewall -- /etc/shorewall/isusable
 #
-# /etc/shorewall/isusable
+# This script is called when Shorewall is attempting to determine
+# if an interface named in /etc/shorewall/providers is usable.
 #
-#	This script is called when Shorewall is attempting to determine
-#	if an interface named in /etc/shorewall/providers is usable.
-#
-#	The script is invoked inside a function that accepts an interface
-#	name as a single argument. The file below is designed to work with
-#	both swping and lsm as described at
-#	http://www.shorewall.net/MultiISP.html
+# The script is invoked inside a function that accepts an interface
+# name as a single argument. The file below is designed to work with
+# both swping and lsm as described at
+# http://www.shorewall.net/MultiISP.html
 #
 # See http://shorewall.net/shorewall_extension_scripts.htm for additional
 # information.

Shorewall/configfiles/lib.private

@@ -1,7 +1,5 @@
 #
-# Shorewall - Lib.private File
-#
-# /etc/shorewall/lib.private
+# Shorewall -- /etc/shorewall/lib.private
 #
 # Use this file to declare shell functions to be called in the other
 # run-time extension scripts. The file will be copied into the generated

Shorewall/configfiles/maclist

@@ -1,5 +1,5 @@
 #
-# Shorewall - Maclist file
+# Shorewall -- /etc/shorewall/maclist
 #
 # For information about entries in this file, type "man shorewall-maclist"
 #

Shorewall/configfiles/mangle

@@ -1,5 +1,5 @@
 #
-# Shorewall - Mangle File
+# Shorewall -- /etc/shorewall/mangle
 #
 # For information about entries in this file, type "man shorewall-mangle"
 #
@@ -9,6 +9,7 @@
 #
 # See http://shorewall.net/PacketMarking.html for a detailed description of
 # the Netfilter/Shorewall packet marking mechanism.
+#
 ####################################################################################################################################################
 #ACTION		SOURCE		DEST		PROTO	DEST	SOURCE	USER	TEST	LENGTH	TOS	CONNBYTES	HELPER	PROBABILITY	DSCP
 #							PORT(S)	PORT(S)

Shorewall/configfiles/masq

@@ -1,5 +1,5 @@
 #
-# Shorewall - Masq file
+# Shorewall -- /etc/shorewall/masq
 #
 # For information about entries in this file, type "man shorewall-masq"
 #

Shorewall/configfiles/nat

@@ -1,5 +1,5 @@
 #
-# Shorewall - Nat File
+# Shorewall -- /etc/shorewall/nat
 #
 # For information about entries in this file, type "man shorewall-nat"
 #

Shorewall/configfiles/netmap

@@ -1,5 +1,5 @@
 #
-# Shorewall - Netmap File
+# Shorewall -- /etc/shorewall/netmap
 #
 # For information about entries in this file, type "man shorewall-netmap"
 #

Shorewall/configfiles/params

@@ -1,27 +1,25 @@
 #
-# Shorewall - Params File
+# Shorewall -- /etc/shorewall/params
 #
-# /etc/shorewall/params
+# Assign any variables that you need here.
 #
-#	Assign any variables that you need here.
+# It is suggested that variable names begin with an upper case letter
+# to distinguish them from variables used internally within the
+# Shorewall programs
 #
-#	It is suggested that variable names begin with an upper case letter
-#	to distinguish them from variables used internally within the
-#	Shorewall programs
+# Example:
 #
-#	Example:
+#	NET_IF=eth0
+#	NET_BCAST=130.252.100.255
+#	NET_OPTIONS=routefilter,norfc1918
 #
-#		NET_IF=eth0
-#		NET_BCAST=130.252.100.255
-#		NET_OPTIONS=routefilter,norfc1918
+# Example (/etc/shorewall/interfaces record):
 #
-#	Example (/etc/shorewall/interfaces record):
+#	net	$NET_IF		$NET_BCAST	$NET_OPTIONS
 #
-#		net	$NET_IF		$NET_BCAST	$NET_OPTIONS
+# The result will be the same as if the record had been written
 #
-#	The result will be the same as if the record had been written
-#
-#		net	eth0		130.252.100.255	routefilter,norfc1918
+#	net	eth0		130.252.100.255	routefilter,norfc1918
 #
 ###############################################################################
 

Shorewall/configfiles/policy

@@ -1,5 +1,5 @@
 #
-# Shorewall - Policy File
+# Shorewall -- /etc/shorewall/policy
 #
 # For information about entries in this file, type "man shorewall-policy"
 #

Shorewall/configfiles/providers

@@ -1,5 +1,5 @@
 #
-# Shorewall - Providers File
+# Shorewall -- /etc/shorewall/providers
 #
 # For information about entries in this file, type "man shorewall-providers"
 #

Shorewall/configfiles/proxyarp

@@ -1,5 +1,5 @@
 #
-# Shorewall - Proxyarp File
+# Shorewall -- /etc/shorewall/proxyarp
 #
 # For information about entries in this file, type "man shorewall-proxyarp"
 #

Shorewall/configfiles/refresh

@@ -1,7 +1,5 @@
 #
-# Shorewall - Refresh File
-#
-# /etc/shorewall/refresh
+# Shorewall -- /etc/shorewall/refresh
 #
 # Add commands below that you want to be executed before Shorewall
 # has processed the 'refresh' command.

Shorewall/configfiles/refreshed

@@ -1,7 +1,5 @@
 #
-# Shorewall - Refreshed File
-#
-# /etc/shorewall/refreshed
+# Shorewall -- /etc/shorewall/refreshed
 #
 # Add commands below that you want to be executed after Shorewall has
 # processed the 'refresh' command.

Shorewall/configfiles/restored

@@ -1,10 +1,8 @@
 #
-# Shorewall - Restored File
+# Shorewall -- /etc/shorewall/restored
 #
-# /etc/shorewall/restored
-#
-#	Add commands below that you want to be executed after shorewall has
-#	completed a 'restore' command.
+# Add commands below that you want to be executed after shorewall has
+# completed a 'restore' command.
 #
 # See http://shorewall.net/shorewall_extension_scripts.htm for additional
 # information.

Shorewall/configfiles/routes

@@ -1,8 +1,9 @@
 #
-# Shorewall - Routes File
+# Shorewall -- /etc/shorewall/routes
 #
 # For information about entries in this file, type "man shorewall-routes"
 #
 # For additional information, see http://www.shorewall.net/MultiISP.html
+#
 ###############################################################################
 #PROVIDER		DEST			GATEWAY		DEVICE	OPTIONS

Shorewall/configfiles/routestopped

@@ -1,16 +0,0 @@
-#
-# Shorewall - Routestopped File
-#
-# This file is deprecated in favor of the stoppedrules file
-#
-# For information about entries in this file, type "man shorewall-routestopped"
-#
-# The manpage is also online at
-# http://www.shorewall.net/manpages/shorewall-routestopped.html
-#
-# See http://shorewall.net/starting_and_stopping_shorewall.htm for additional
-# information.
-#
-###############################################################################
-#INTERFACE	HOST(S)			OPTIONS		PROTO	DEST	SOURCE
-#								PORT(S)	PORT(S)

Shorewall/configfiles/rtrules

@@ -1,8 +1,9 @@
 #
-# Shorewall - Rtrules File
+# Shorewall -- /etc/shorewall/rtrules
 #
 # For information about entries in this file, type "man shorewall-rtrules"
 #
 # For additional information, see http://www.shorewall.net/MultiISP.html
+#
 ####################################################################################
 #SOURCE			DEST			PROVIDER	PRIORITY	MASK

Shorewall/configfiles/rules

@@ -1,5 +1,5 @@
 #
-# Shorewall - Rules File
+# Shorewall -- /etc/shorewall/rules
 #
 # For information on the settings in this file, type "man shorewall-rules"
 #

Shorewall/configfiles/scfilter

@@ -1,7 +1,5 @@
 #
-# Shorewall - Scfilter Filter
-#
-# /etc/shorewall/scfilter
+# Shorewall -- /etc/shorewall/scfilter
 #
 # Replace the 'cat' command below to filter the output of
 # 'show connections'.

Shorewall/configfiles/secmarks

@@ -1,5 +1,5 @@
 #
-# Shorewall - Secmarks File
+# Shorewall -- /etc/shorewall/secmarks
 #
 # For information about entries in this file, type "man shorewall-secmarks"
 #

Shorewall/configfiles/start

@@ -1,10 +1,8 @@
 #
-# Shorewall - Start File
+# Shorewall -- /etc/shorewall/start
 #
-# /etc/shorewall/start
-#
-#	Add commands below that you want to be executed after shorewall has
-#	been started, reloaded or restarted.
+# Add commands below that you want to be executed after shorewall has
+# been started, reloaded or restarted.
 #
 # See http://shorewall.net/shorewall_extension_scripts.htm for additional
 # information.

Shorewall/configfiles/started

@@ -1,17 +1,15 @@
 #
-# Shorewall - Started File
+# Shorewall -- /etc/shorewall/started
 #
-# /etc/shorewall/started
+# Add commands below that you want to be executed after shorewall has
+# been completely started, reloaded or restarted. The difference between
+# this extension script and /etc/shorewall/start is that this one is
+# invoked after the 'shorewall' chain has been created (thus
+# signaling that the firewall is completely up).
 #
-#	Add commands below that you want to be executed after shorewall has
-#	been completely started, reloaded or restarted. The difference between
-#       this extension script and /etc/shorewall/start is that this one is
-#	invoked	after the 'shorewall' chain has been created (thus
-#	signaling that the firewall is completely up).
-#
-#	This script should not change the firewall configuration directly but
-#	may do so indirectly by running /sbin/shorewall with the 'nolock'
-#	option.
+# This script should not change the firewall configuration directly but
+# may do so indirectly by running /sbin/shorewall with the 'nolock'
+# option.
 #
 # See http://shorewall.net/shorewall_extension_scripts.htm for additional
 # information.

Shorewall/configfiles/stop

@@ -1,10 +1,8 @@
 #
-# Shorewall - Stop File
+# Shorewall -- /etc/shorewall/stop
 #
-# /etc/shorewall/stop
-#
-#	Add commands below that you want to be executed at the beginning of a
-#	"shorewall stop" command.
+# Add commands below that you want to be executed at the beginning of a
+# "shorewall stop" command.
 #
 # See http://shorewall.net/shorewall_extension_scripts.htm for additional
 # information.

Shorewall/configfiles/stopped

@@ -1,10 +1,8 @@
 #
-# Shorewall - Stopped File
+# Shorewall -- /etc/shorewall/stopped
 #
-# /etc/shorewall/stopped
-#
-#	Add commands below that you want to be executed at the completion of a
-#	"shorewall stop" command.
+# Add commands below that you want to be executed at the completion of a
+# "shorewall stop" command.
 #
 # See http://shorewall.net/shorewall_extension_scripts.htm for additional
 # information.

Shorewall/configfiles/stoppedrules

@@ -1,5 +1,5 @@
 #
-# Shorewall - Stoppedrules File
+# Shorewall -- /etc/shorewall/stoppedrules
 #
 # For information about entries in this file, type "man shorewall-stoppedrules"
 #

Shorewall/configfiles/tcclasses

@@ -1,5 +1,5 @@
 #
-# Shorewall - Tcclasses File
+# Shorewall -- /etc/shorewall/tcclasses
 #
 # For information about entries in this file, type "man shorewall-tcclasses"
 #

Shorewall/configfiles/tcclear

@@ -1,7 +1,5 @@
 #
-# Shorewall - Tcclear File
-#
-# /etc/shorewall/tcclear
+# Shorewall -- /etc/shorewall/tcclear
 #
 # Add commands below that you want to be executed before Shorewall clears
 # the traffic shaping configuration.

Shorewall/configfiles/tcdevices

@@ -1,5 +1,5 @@
 #
-# Shorewall - Tcdevices File
+# Shorewall -- /etc/shorewall/tcdevices
 #
 # For information about entries in this file, type "man shorewall-tcdevices"
 #

Shorewall/configfiles/tcfilters

@@ -1,5 +1,5 @@
 #
-# Shorewall - Tcfilters File
+# Shorewall -- /etc/shorewall/tcfilters
 #
 # For information about entries in this file, type "man shorewall-tcfilters"
 #

Shorewall/configfiles/tcinterfaces

@@ -1,5 +1,5 @@
 #
-# Shorewall - Tcinterfaces File
+# Shorewall -- /etc/shorewall/tcinterfaces
 #
 # For information about entries in this file, type "man shorewall-tcinterfaces"
 #

Shorewall/configfiles/tcpri

@@ -1,5 +1,5 @@
 #
-# Shorewall - Tcpri File
+# Shorewall -- /etc/shorewall/tcpri
 #
 # For information about entries in this file, type "man shorewall-tcpri"
 #

Shorewall/configfiles/tunnels

@@ -1,5 +1,5 @@
 #
-# Shorewall - Tunnels File
+# Shorewall -- /etc/shorewall/tunnels
 #
 # For information about entries in this file, type "man shorewall-tunnels"
 #

Shorewall/configfiles/zones

@@ -1,5 +1,5 @@
 #
-# Shorewall - Zones File
+# Shorewall -- /etc/shorewall/zones
 #
 # For information about this file, type "man shorewall-zones"
 #

Shorewall/manpages/shorewall-routestopped.xml

@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<refentry>
-  <refmeta>
-    <refentrytitle>shorewall-routestopped</refentrytitle>
-
-    <manvolnum>5</manvolnum>
-
-    <refmiscinfo>Configuration Files</refmiscinfo>
-  </refmeta>
-
-  <refnamediv>
-    <refname>routestopped</refname>
-
-    <refpurpose>The Shorewall file that governs what traffic flows through the
-    firewall while it is in the 'stopped' state.</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>/etc/shorewall/routestopped</command>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>This file is deprecated in favor of the <ulink
-    url="/manpages/shorewall-stoppedrules.html">shorewall-stoppedrules</ulink>(5)
-    file.</para>
-
-    <para>This file is used to define the hosts that are accessible when the
-    firewall is stopped or is being stopped.</para>
-
-    <warning>
-      <para>Changes to this file do not take effect until after the next
-      <command>shorewall start</command> or <command>shorewall
-      restart</command> command.</para>
-    </warning>
-
-    <para>The columns in the file are as follows (where the column name is
-    followed by a different name in parentheses, the different name is used in
-    the alternate specification syntax).</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><emphasis role="bold">INTERFACE</emphasis> -
-        <emphasis>interface</emphasis></term>
-
-        <listitem>
-          <para>Interface through which host(s) communicate with the
-          firewall</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><emphasis role="bold">HOST(S)</emphasis> (hosts) - [<emphasis
-        role="bold">-</emphasis>|<emphasis>address</emphasis>[,<emphasis>address</emphasis>]...]</term>
-
-        <listitem>
-          <para>Optional. Comma-separated list of IP/subnet addresses. If your
-          kernel and iptables include iprange match support, IP address ranges
-          are also allowed.</para>
-
-          <para>If left empty or supplied as "-", 0.0.0.0/0 is assumed.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><emphasis role="bold">OPTIONS</emphasis> - [<emphasis
-        role="bold">-</emphasis>|<emphasis>option</emphasis>[<emphasis
-        role="bold">,</emphasis><emphasis>option</emphasis>]...]</term>
-
-        <listitem>
-          <para>Optional. A comma-separated list of options. The order of the
-          options is not important but the list can contain no embedded
-          white-space. The currently-supported options are:</para>
-
-          <variablelist>
-            <varlistentry>
-              <term><emphasis role="bold">routeback</emphasis></term>
-
-              <listitem>
-                <para>Set up a rule to ACCEPT traffic from these hosts back to
-                themselves. Beginning with Shorewall 4.4.9, this option is
-                automatically set if <emphasis
-                role="bold">routeback</emphasis> is specified in <ulink
-                url="/manpages/shorewall-interfaces.html">shorewall-interfaces</ulink>
-                (5) or if the rules compiler detects that the interface is a
-                bridge.</para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term><emphasis role="bold">source</emphasis></term>
-
-              <listitem>
-                <para>Allow traffic from these hosts to ANY destination.
-                Without this option or the <emphasis
-                role="bold">dest</emphasis> option, only traffic from this
-                host to other listed hosts (and the firewall) is allowed. If
-                <emphasis role="bold">source</emphasis> is specified then
-                <emphasis role="bold">routeback</emphasis> is
-                redundant.</para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term><emphasis role="bold">dest</emphasis></term>
-
-              <listitem>
-                <para>Allow traffic to these hosts from ANY source. Without
-                this option or the <emphasis role="bold">source</emphasis>
-                option, only traffic from this host to other listed hosts (and
-                the firewall) is allowed. If <emphasis
-                role="bold">dest</emphasis> is specified then <emphasis
-                role="bold">routeback</emphasis> is redundant.</para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term><emphasis role="bold">notrack</emphasis></term>
-
-              <listitem>
-                <para>The traffic will be exempted from connection
-                tracking.</para>
-              </listitem>
-            </varlistentry>
-          </variablelist>
-
-          <note>
-            <para>The <emphasis role="bold">source</emphasis> and <emphasis
-            role="bold">dest</emphasis> options work best when used in
-            conjunction with ADMINISABSENTMINDED=Yes in <ulink
-            url="shorewall6.conf.html">shorewall6.conf</ulink>(5).</para>
-          </note>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>PROTO (Optional) ‒
-        <replaceable>protocol-name-or-number</replaceable></term>
-
-        <listitem>
-          <para>Protocol.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>DEST PORT(S) (dport) ‒
-        <replaceable>service-name/port-number-list</replaceable></term>
-
-        <listitem>
-          <para>Optional. A comma-separated list of port numbers and/or
-          service names from <filename>/etc/services</filename>. May also
-          include port ranges of the form
-          <replaceable>low-port</replaceable>:<replaceable>high-port</replaceable>
-          if your kernel and iptables include port range support.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>SOURCE PORT(S) (sport) ‒
-        <replaceable>service-name/port-number-list</replaceable></term>
-
-        <listitem>
-          <para>Optional. A comma-separated list of port numbers and/or
-          service names from <filename>/etc/services</filename>. May also
-          include port ranges of the form
-          <replaceable>low-port</replaceable>:<replaceable>high-port</replaceable>
-          if your kernel and iptables include port range support.</para>
-
-          <para>Beginning with Shorewall 4.5.15, you may place '=' in this
-          column, provided that the DEST PORT(S) column is non-empty. This
-          causes the rule to match when either the source port or the
-          destination port in a packet matches one of the ports specified in
-          DEST PORTS(S). Use of '=' requires multi-port match in your iptables
-          and kernel.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <note>
-      <para>The <emphasis role="bold">source</emphasis> and <emphasis
-      role="bold">dest</emphasis> options work best when used in conjunction
-      with ADMINISABSENTMINDED=Yes in <ulink
-      url="/manpages/shorewall.conf.html">shorewall.conf</ulink>(5).</para>
-    </note>
-  </refsect1>
-
-  <refsect1>
-    <title>Example</title>
-
-    <variablelist>
-      <varlistentry>
-        <term>Example 1:</term>
-
-        <listitem>
-          <programlisting>        #INTERFACE      HOST(S)                 OPTIONS         PROTO          DEST       SOURCE
-        #                                                                      PORT(S)    PORT(S)
-        eth2            192.168.1.0/24
-        eth0            192.0.2.44
-        br0             -                       routeback
-        eth3            -                       source
-        eth4            -                       notrack        41</programlisting>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>FILES</title>
-
-    <para>/etc/shorewall/routestopped</para>
-  </refsect1>
-
-  <refsect1>
-    <title>See ALSO</title>
-
-    <para><ulink
-    url="/starting_and_stopping_shorewall.htm">http://www.shorewall.net/starting_and_stopping_shorewall.htm</ulink></para>
-
-    <para><ulink
-    url="/configuration_file_basics.htm#Pairs">http://www.shorewall.net/configuration_file_basics.htm#Pairs</ulink></para>
-
-    <para>shorewall(8), shorewall-accounting(5), shorewall-actions(5),
-    shorewall-blacklist(5), shorewall-hosts(5), shorewall_interfaces(5),
-    shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5),
-    shorewall-nat(5), shorewall-netmap(5), shorewall-params(5),
-    shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
-    shorewall-rtrules(5), shorewall-rules(5), shorewall.conf(5),
-    shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
-    shorewall-mangle(5), shorewall-tos(5), shorewall-tunnels(5),
-    shorewall-zones(5)</para>
-  </refsect1>
-</refentry>

Shorewall/uninstall.sh

@@ -168,8 +168,8 @@ fi
 
 rm -f ${SBINDIR}/shorewall
 
-if [ -L ${SHAREDIR}/shorewall6/init ]; then
-    FIREWALL=$(readlink -m -q ${SHAREDIR}/shorewall6/init)
+if [ -L ${SHAREDIR}/shorewall/init ]; then
+    FIREWALL=$(readlink -m -q ${SHAREDIR}/shorewall/init)
 elif [ -n "$INITFILE" ]; then
     FIREWALL=${INITDIR}/${INITFILE}
 fi
@@ -188,17 +188,19 @@ if [ -f "$FIREWALL" ]; then
     remove_file $FIREWALL
 fi
 
-if [ -n "$SYSTEMD" ]; then
+if [ -z "${SERVICEDIR}" ]; then
+    SERVICEDIR="$SYSTEMD"
+fi
+if [ -n "$SERVICEDIR" ]; then
     [ $configure -eq 1 ] && systemctl disable ${PRODUCT}
-    rm -f $SYSTEMD/shorewall.service
+    rm -f $SERVICEDIR/shorewall.service
 fi
 
 rm -rf ${SHAREDIR}/shorewall/version
 rm -rf ${CONFDIR}/shorewall
 
 if [ -n "$SYSCONFDIR" ]; then
-    [ -n "$SYSCONFFILE" ] || SYSCONFFILE=${PRODUCT};
-    rm -f ${SYSCONFDIR}/${SYSCONFFILE}
+    [ -n "$SYSCONFFILE" ] && rm -f ${SYSCONFDIR}/${PRODUCT}
 fi
 
 rm -rf ${VARDIR}/shorewall

Shorewall6-lite/uninstall.sh

@@ -144,16 +144,16 @@ fi
 if [ -f ${SHAREDIR}/shorewall6-lite/version ]; then
     INSTALLED_VERSION="$(cat ${SHAREDIR}/shorewall6-lite/version)"
     if [ "$INSTALLED_VERSION" != "$VERSION" ]; then
-	echo "WARNING: Shorewall Lite Version $INSTALLED_VERSION is installed"
+	echo "WARNING: Shorewall6 Lite Version $INSTALLED_VERSION is installed"
 	echo "         and this is the $VERSION uninstaller."
 	VERSION="$INSTALLED_VERSION"
     fi
 else
-    echo "WARNING: Shorewall Lite Version $VERSION is not installed"
+    echo "WARNING: Shorewall6 Lite Version $VERSION is not installed"
     VERSION=""
 fi
 
-echo "Uninstalling Shorewall Lite $VERSION"
+echo "Uninstalling Shorewall6 Lite $VERSION"
 
 [ -n "$SANDBOX" ] && configure=0
 
@@ -169,7 +169,7 @@ if [ -f ${SHAREDIR}/shorewall6-lite/init ]; then
 	    /etc/init.d/shorewall6-lite disable
 	fi
 	
-	FIREWALL$(readlink ${SHAREDIR}/shorewall6-lite/init)
+	FIREWALL=$(readlink ${SHAREDIR}/shorewall6-lite/init)
     else
 	FIREWALL=$(readlink -m -q ${SHAREDIR}/shorewall6-lite/init)
     fi

Shorewall6/configfiles/accounting

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Accounting File
+# Shorewall6 -- /etc/shorewall6/accounting
 #
 # For information about entries in this file, type "man shorewall6-accounting"
 #

Shorewall6/configfiles/actions

@@ -1,7 +1,5 @@
 #
-# Shorewall6 - Actions File
-#
-# /etc/shorewall6/actions
+# Shorewall6 -- /etc/shorewall6/actions
 #
 # For information about entries in this file, type "man shorewall6-actions"
 #

Shorewall6/configfiles/blrules

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Blrules File
+# Shorewall6 -- /etc/shorewall6/blrules
 #
 # For information about entries in this file, type "man shorewall6-blrules"
 #

Shorewall6/configfiles/clear

@@ -1,7 +1,5 @@
 #
-# Shorewall6 - Clear File
-#
-# /etc/shorewall6/clear
+# Shorewall6 -- /etc/shorewall6/clear
 #
 # Add commands below that you want to be executed after Shorewall6 has
 # processed the 'clear' command.

Shorewall6/configfiles/conntrack

@@ -1,53 +1,54 @@
 #
-# Shorewall6 - Conntrack File
+# Shorewall6 -- /etc/shorewall6/conntrack
 #
 # For information about entries in this file, type "man shorewall6-conntrack"
 #
 ##############################################################################################################
-?FORMAT 2
+?FORMAT 3
+##############################################################################################################
 #ACTION			SOURCE		DESTINATION	PROTO	DEST		SOURCE	USER/		SWITCH
 #								PORT(S)		PORT(S)	GROUP
-?if __CT_TARGET
+?if $AUTOHELPERS && __CT_TARGET
 
 ?if __AMANDA_HELPER
-CT:helper:amanda	all		-		udp	10080
+CT:helper:amanda:PO	-		-		udp	10080
 ?endif
 
 ?if __FTP_HELPER
-CT:helper:ftp		all		-		tcp	21
+CT:helper:ftp:PO	-		-		tcp	21
 ?endif
 
 ?if __H323_HELPER
-CT:helper:RAS		all		-		udp	1719
-CT:helper:Q.931		all		-		tcp	1720
+CT:helper:RAS:PO	-		-		udp	1719
+CT:helper:Q.931:PO	-		-		tcp	1720
 ?endif
 
 ?if __IRC_HELPER
-CT:helper:irc		all		-		tcp	6667
+CT:helper:irc:PO	-		-		tcp	6667
 ?endif
 
 ?if __NETBIOS_NS_HELPER
-CT:helper:netbios-ns	all		-		udp	137
+CT:helper:netbios-ns:PO	-		-		udp	137
 ?endif
 
 ?if __PPTP_HELPER
-CT:helper:pptp		all		-		tcp	1723
+CT:helper:pptp:PO	-		-		tcp	1723
 ?endif
 
 ?if __SANE_HELPER
-CT:helper:sane		all		-		tcp	6566
+CT:helper:sane:PO	-		-		tcp	6566
 ?endif
 
 ?if __SIP_HELPER
-CT:helper:sip		all		-		udp	5060
+CT:helper:sip:PO	-		-		udp	5060
 ?endif
 
 ?if __SNMP_HELPER
-CT:helper:snmp		all		-		udp	161
+CT:helper:snmp:PO	-		-		udp	161
 ?endif
 
 ?if __TFTP_HELPER
-CT:helper:tftp		all		-		udp	69
+CT:helper:tftp:PO	-		-		udp	69
 ?endif
 
 ?endif

Shorewall6/configfiles/findgw

@@ -1,7 +1,5 @@
 #
-# Shorewall - Findgw File
-#
-# /etc/shorewall6/findgw
+# Shorewall6 -- /etc/shorewall6/findgw
 #
 # The code in this file is executed when Shorewall is trying to detect the
 # gateway through an interface in /etc/shorewall6/providers that has GATEWAY

Shorewall6/configfiles/hosts

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Hosts file
+# Shorewall6 -- /etc/shorewall6/hosts
 #
 # For information about entries in this file, type "man shorewall6-hosts"
 #

Shorewall6/configfiles/init

@@ -1,10 +1,8 @@
 #
-# Shorewall6 - Init File
+# Shorewall6 -- /etc/shorewall6/init
 #
-# /etc/shorewall6/init
-#
-#	Add commands below that you want to be executed at the beginning of
-#	a "shorewall6 start" or "shorewall6 restart" command.
+# Add commands below that you want to be executed at the beginning of
+# a "shorewall6 start" or "shorewall6 restart" command.
 #
 # For additional information, see
 # http://shorewall.net/shorewall_extension_scripts.htm

Shorewall6/configfiles/interfaces

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Interfaces File
+# Shorewall6 -- /etc/shorewall6/interfaces
 #
 # For information about entries in this file, type "man shorewall6-interfaces"
 #

Shorewall6/configfiles/isusable

@@ -1,15 +1,13 @@
 #
-# Shorewall6 - Isusable File
+# Shorewall6 -- /etc/shorewall6/isusable
 #
-# /etc/shorewall6/isusable
+# This script is called when Shorewall6 is attempting to determine
+# if an interface named in /etc/shorewall6/providers is usable.
 #
-#	This script is called when Shorewall6 is attempting to determine
-#	if an interface named in /etc/shorewall6/providers is usable.
-#
-#	The script is invoked inside a function that accepts an interface
-#	name as a single argument. The file below is designed to work with
-#	both swping and lsm as described at
-#	http://www.shorewall.net/MultiISP.html
+# The script is invoked inside a function that accepts an interface
+# name as a single argument. The file below is designed to work with
+# both swping and lsm as described at
+# http://www.shorewall.net/MultiISP.html
 #
 # See http://shorewall.net/shorewall_extension_scripts.htm for additional
 # information.

Shorewall6/configfiles/lib.private

@@ -1,7 +1,5 @@
 #
-# Shorewall6 - Lib.private File
-#
-# /etc/shorewall6/lib.private
+# Shorewall6 -- /etc/shorewall6/lib.private
 #
 # Use this file to declare shell functions to be called in the other
 # run-time extension scripts. The file will be copied into the generated

Shorewall6/configfiles/maclist

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Maclist file
+# Shorewall6 -- /etc/shorewall6/maclist
 #
 # For information about entries in this file, type "man shorewall6-maclist"
 #

Shorewall6/configfiles/mangle

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Mangle File
+# Shorewall6 -- /etc/shorewall6/mangle
 #
 # For information about entries in this file, type "man shorewall6-mangle"
 #
@@ -9,6 +9,7 @@
 #
 # See http://shorewall.net/PacketMarking.html for a detailed description of
 # the Netfilter/Shorewall packet marking mechanism.
+#
 ############################################################################################################################################################
 #ACTION		SOURCE		DEST		PROTO	DEST	SOURCE	USER	TEST	LENGTH	TOS	CONNBYTES	HELPER	HEADERS	PROBABILITY	DSCP
 #							PORT(S)	PORT(S)

Shorewall6/configfiles/masq

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Masq file
+# Shorewall6 -- /etc/shorewall6/masq
 #
 # For information about entries in this file, type "man shorewall6-masq"
 #

Shorewall6/configfiles/nat

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Nat File
+# Shorewall6 -- /etc/shorewall6/nat
 #
 # For information about entries in this file, type "man shorewall6-nat"
 #

Shorewall6/configfiles/netmap

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Netmap File
+# Shorewall6 -- /etc/shorewall6/netmap
 #
 # For information about entries in this file, type "man shorewall-netmap"
 #

Shorewall6/configfiles/params

@@ -1,26 +1,24 @@
 #
-# Shorewall6 - Params File
+# Shorewall6 -- /etc/shorewall6/params
 #
-# /etc/shorewall6/params
+# Assign any variables that you need here.
 #
-#	Assign any variables that you need here.
+# It is suggested that variable names begin with an upper case letter
+# to distinguish them from variables used internally within the
+# Shorewall6 programs
 #
-#	It is suggested that variable names begin with an upper case letter
-#	to distinguish them from variables used internally within the
-#	Shorewall6 programs
+# Example:
 #
-#	Example:
+#	NET_IF=eth0
+#	NET_OPTIONS=dhcp,nosmurfs
 #
-#		NET_IF=eth0
-#		NET_OPTIONS=dhcp,nosmurfs
+# Example (/etc/shorewall6/interfaces record):
 #
-#	Example (/etc/shorewall6/interfaces record):
+#	net	$NET_IF		-	$NET_OPTIONS
 #
-#		net	$NET_IF		-	$NET_OPTIONS
+# The result will be the same as if the record had been written
 #
-#	The result will be the same as if the record had been written
-#
-#		net	eth0		-	dhcp,nosmurfs
+#	net	eth0		-	dhcp,nosmurfs
 #
 ###############################################################################
 

Shorewall6/configfiles/policy

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Policy File
+# Shorewall6 -- /etc/shorewall6/policy
 #
 # For information about entries in this file, type "man shorewall6-policy"
 #

Shorewall6/configfiles/providers

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Providers File
+# Shorewall6 -- /etc/shorewall6/providers
 #
 # For information about entries in this file, type "man shorewall6-providers"
 #

Shorewall6/configfiles/proxyndp

@@ -1,5 +1,5 @@
 #
-# Shorewall - Proxyndp File
+# Shorewall6 -- /etc/shorewall6/proxyndp
 #
 # For information about entries in this file, type "man shorewall6-proxyndp"
 #

Shorewall6/configfiles/refresh

@@ -1,7 +1,5 @@
 #
-# Shorewall6 - Refresh File
-#
-# /etc/shorewall6/refresh
+# Shorewall6 -- /etc/shorewall6/refresh
 #
 # Add commands below that you want to be executed before Shorewall6 has
 # processed the 'refresh' command.

Shorewall6/configfiles/refreshed

@@ -1,7 +1,5 @@
 #
-# Shorewall6 - Refreshed File
-#
-# /etc/shorewall6/refreshed
+# Shorewall6 -- /etc/shorewall6/refreshed
 #
 # Add commands below that you want to be executed after Shorewall6 has
 # processed the 'refresh' command.

Shorewall6/configfiles/restored

@@ -1,10 +1,8 @@
 #
-# Shorewall6 - Restored File
+# Shorewall6 -- /etc/shorewall6/restored
 #
-# /etc/shorewall6/restored
-#
-#	Add commands below that you want to be executed after shorewall6 has
-#	completed a 'restore' command.
+# Add commands below that you want to be executed after shorewall6 has
+# completed a 'restore' command.
 #
 # See http://shorewall.net/shorewall_extension_scripts.htm for additional
 # information.

Shorewall6/configfiles/routes

@@ -1,8 +1,9 @@
 #
-# Shorewall6 - Routes File
+# Shorewall6 -- /etc/shorewall6/routes
 #
 # For information about entries in this file, type "man shorewall6-routes"
 #
 # For additional information, see http://www.shorewall.net/MultiISP.html
+#
 ###############################################################################
 #PROVIDER		DEST			GATEWAY		DEVICE	OPTIONS

Shorewall6/configfiles/routestopped

@@ -1,15 +0,0 @@
-#
-# Shorewall6 - Routestopped File
-#
-# This file is deprecated in favor of the stoppedrules file.
-#
-# For information about entries in this file, type "man shorewall6-routestopped"
-#
-# The manpage is also online at
-# http://www.shorewall.net/manpages/shorewall6-routestopped.html
-#
-# See http://shorewall.net/starting_and_stopping_shorewall.htm for additional
-# information.
-#
-###############################################################################
-#INTERFACE	HOST(S)			OPTIONS

Shorewall6/configfiles/rtrules

@@ -1,8 +1,9 @@
 #
-# Shorewall6 - Rtrules File
+# Shorewall6 -- /etc/shorewall6/rtrules
 #
 # For information about entries in this file, type "man shorewall6-rtrules"
 #
 # For additional information, see http://www.shorewall.net/MultiISP.html
+#
 ####################################################################################
 #SOURCE			DEST			PROVIDER	PRIORITY	MASK

Shorewall6/configfiles/rules

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Rules File
+# Shorewall6 -- /etc/shorewall6/rules
 #
 # For information on the settings in this file, type "man shorewall6-rules"
 #

Shorewall6/configfiles/scfilter

@@ -1,7 +1,5 @@
 #
-# Shorewall - Scfilter File
-#
-# /etc/shorewall/scfilter
+# Shorewall6 -- /etc/shorewall6/scfilter
 #
 # Replace the 'cat' command below to filter the output of
 # 'show connections'.

Shorewall6/configfiles/secmarks

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Secmarks File
+# Shorewall6 -- /etc/shorewall6/secmarks
 #
 # For information about entries in this file, type "man shorewall-secmarks"
 #

Shorewall6/configfiles/start

@@ -1,10 +1,8 @@
 #
-# Shorewall6 - Start File
+# Shorewall6 -- /etc/shorewall6/start
 #
-# /etc/shorewall6/start
-#
-#	Add commands below that you want to be executed after shorewall6 has
-#	been started or restarted.
+# Add commands below that you want to be executed after shorewall6 has
+# been started or restarted.
 #
 # See http://shorewall.net/shorewall_extension_scripts.htm for additional
 # information.

Shorewall6/configfiles/started

@@ -1,17 +1,15 @@
 #
-# Shorewall6 - Started File
+# Shorewall6 -- /etc/shorewall6/started
 #
-# /etc/shorewall6/started
+# Add commands below that you want to be executed after shorewall6 has
+# been completely started or restarted. The difference between this
+# extension script and /etc/shorewall6/start is that this one is invoked
+# after the 'shorewall' chain has been created (thus signaling that the
+# firewall is completely up).
 #
-#	Add commands below that you want to be executed after shorewall6 has
-#	been completely started or restarted. The difference between this
-#	extension script and /etc/shorewall6/start is that this one is invoked
-#	after the 'shorewall' chain has been created (thus signaling that the
-#	firewall is completely up).
-#
-#	This script should not change the firewall configuration directly but
-#	may do so indirectly by running /sbin/shorewall6 with the 'nolock'
-#	option.
+# This script should not change the firewall configuration directly but
+# may do so indirectly by running /sbin/shorewall6 with the 'nolock'
+# option.
 #
 # See http://shorewall.net/shorewall_extension_scripts.htm for additional
 # information.

Shorewall6/configfiles/stop

@@ -1,10 +1,8 @@
 #
-# Shorewall6 - Stop File
+# Shorewall6 -- /etc/shorewall6/stop
 #
-# /etc/shorewall6/stop
-#
-#	Add commands below that you want to be executed at the beginning of a
-#	"shorewall6 stop" command.
+# Add commands below that you want to be executed at the beginning of a
+# "shorewall6 stop" command.
 #
 # See http://shorewall.net/shorewall_extension_scripts.htm for additional
 # information.

Shorewall6/configfiles/stopped

@@ -1,10 +1,8 @@
 #
-# Shorewall6 - Stopped File
+# Shorewall6 -- /etc/shorewall6/stopped
 #
-# /etc/shorewall6/stopped
-#
-#	Add commands below that you want to be executed at the completion of a
-#	"shorewal6l stop" command.
+# Add commands below that you want to be executed at the completion of a
+# "shorewall6 stop" command.
 #
 # See http://shorewall.net/shorewall_extension_scripts.htm for additional
 # information.

Shorewall6/configfiles/stoppedrules

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Stoppedrules File
+# Shorewall6 -- /etc/shorewall6/stoppedrules
 #
 # For information about entries in this file,
 # type "man shorewall6-stoppedrules"

Shorewall6/configfiles/tcclasses

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Tcclasses File
+# Shorewall6 -- /etc/shorewall6/tcclasses
 #
 # For information about entries in this file, type "man shorewall6-tcclasses"
 #

Shorewall6/configfiles/tcclear

@@ -1,7 +1,5 @@
 #
-# Shorewall6 - tcclear File
-#
-# /etc/shorewall6/tcclear
+# Shorewall6 -- /etc/shorewall6/tcclear
 #
 # Add commands below that you want to be executed before Shorewall6 clears
 # the traffic shaping configuration.

Shorewall6/configfiles/tcdevices

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Tcdevices File
+# Shorewall6 -- /etc/shorewall6/tcdevices
 #
 # For information about entries in this file, type "man shorewall6-tcdevices"
 #

Shorewall6/configfiles/tcfilters

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Tcfilters File
+# Shorewall6 -- /etc/shorewall6/tcfilters
 #
 # For information about entries in this file, type "man shorewall6-tcfilters"
 #

Shorewall6/configfiles/tcinterfaces

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Tcinterfaces File
+# Shorewall6 -- /etc/shorewall6/tcinterfaces
 #
 # For information about entries in this file,
 # type "man shorewall6-tcinterfaces"

Shorewall6/configfiles/tcpri

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Tcpri File
+# Shorewall6 -- /etc/shorewall6/tcpri
 #
 # For information about entries in this file, type "man shorewall6-tcpri"
 #

Shorewall6/configfiles/tunnels

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Tunnels File
+# Shorewall6 -- /etc/shorewall6/tunnels
 #
 # For information about entries in this file, type "man shorewall6-tunnels"
 #

Shorewall6/configfiles/zones

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Zones File
+# Shorewall6 -- /etc/shorewall6/zones
 #
 # For information about this file, type "man shorewall6-zones"
 #

Shorewall6/manpages/shorewall6-routestopped.xml

@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<refentry>
-  <refmeta>
-    <refentrytitle>shorewall6-routestopped</refentrytitle>
-
-    <manvolnum>5</manvolnum>
-
-    <refmiscinfo>Configuration Files</refmiscinfo>
-  </refmeta>
-
-  <refnamediv>
-    <refname>routestopped</refname>
-
-    <refpurpose>The Shorewall6 file that governs what traffic flows through
-    the firewall while it is in 'stopped' state.</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>/etc/shorewall6/routestopped</command>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>This file is deprecated in favor of the <ulink
-    url="/manpages6/shorewall6-stoppedrules.html">shorewall6-stoppedrules</ulink>(5)
-    file.</para>
-
-    <para>This file is used to define the hosts that are accessible when the
-    firewall is stopped or is being stopped. When shorewall6-shell is being
-    used, the file also determines those hosts that are accessible when the
-    firewall is in the process of being [re]started.</para>
-
-    <para>The columns in the file are as follows (where the column name is
-    followed by a different name in parentheses, the different name is used in
-    the alternate specification syntax).</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><emphasis role="bold">INTERFACE</emphasis> -
-        <emphasis>interface</emphasis></term>
-
-        <listitem>
-          <para>Interface through which host(s) communicate with the
-          firewall</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><emphasis role="bold">HOST(S)</emphasis> - [<emphasis
-        role="bold">-</emphasis>|<emphasis>address</emphasis>[,<emphasis>address</emphasis>]...]</term>
-
-        <listitem>
-          <para>Optional comma-separated list of IP/subnet addresses. If your
-          kernel and ip6tables include iprange match support, IP address
-          ranges are also allowed.</para>
-
-          <para>If left empty or supplied as "-", 0.0.0.0/0 is assumed.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><emphasis role="bold">OPTIONS</emphasis> - [<emphasis
-        role="bold">-</emphasis>|<emphasis>option</emphasis>[<emphasis
-        role="bold">,</emphasis><emphasis>option</emphasis>]...]</term>
-
-        <listitem>
-          <para>An optional comma-separated list of options. The order of the
-          options is not important but the list can contain no embedded
-          white-space. The currently-supported options are:</para>
-
-          <variablelist>
-            <varlistentry>
-              <term><emphasis role="bold">routeback</emphasis></term>
-
-              <listitem>
-                <para>Set up a rule to ACCEPT traffic from these hosts back to
-                themselves. Beginning with Shorewall 4.4.9, this option is
-                automatically set if <emphasis
-                role="bold">routeback</emphasis> is specified in <ulink
-                url="/manpages6/shorewall6-interfaces.html">shorewall6-interfaces</ulink>
-                (5) or if the rules compiler detects that the interface is a
-                bridge.</para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term><emphasis role="bold">source</emphasis></term>
-
-              <listitem>
-                <para>Allow traffic from these hosts to ANY destination.
-                Without this option or the <emphasis
-                role="bold">dest</emphasis> option, only traffic from this
-                host to other listed hosts (and the firewall) is allowed. If
-                <emphasis role="bold">source</emphasis> is specified then
-                <emphasis role="bold">routeback</emphasis> is
-                redundant.</para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term><emphasis role="bold">dest</emphasis></term>
-
-              <listitem>
-                <para>Allow traffic to these hosts from ANY source. Without
-                this option or the <emphasis role="bold">source</emphasis>
-                option, only traffic from this host to other listed hosts (and
-                the firewall) is allowed. If <emphasis
-                role="bold">dest</emphasis> is specified then <emphasis
-                role="bold">routeback</emphasis> is redundant.</para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term><emphasis role="bold">notrack</emphasis></term>
-
-              <listitem>
-                <para>The traffic will be exempted from connection
-                tracking.</para>
-              </listitem>
-            </varlistentry>
-          </variablelist>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <note>
-      <para>The <emphasis role="bold">source</emphasis> and <emphasis
-      role="bold">dest</emphasis> options work best when used in conjunction
-      with ADMINISABSENTMINDED=Yes in <ulink
-      url="/manpages6/shorewall6.conf.html">shorewall6.conf</ulink>(5).</para>
-    </note>
-  </refsect1>
-
-  <refsect1>
-    <title>Example</title>
-
-    <variablelist>
-      <varlistentry>
-        <term>Example 1:</term>
-
-        <listitem>
-          <programlisting>        #INTERFACE      HOST(S)                 OPTIONS
-        eth2            2002:ce7c:92b4::/64
-        eth0            2002:ce7c:92b4:1::/64
-        br0             -                       routeback
-        eth3            -                       source</programlisting>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>FILES</title>
-
-    <para>/etc/shorewall6/routestopped</para>
-  </refsect1>
-
-  <refsect1>
-    <title>See ALSO</title>
-
-    <para><ulink
-    url="/starting_and_stopping_shorewall.htm">http://www.shorewall.net/starting_and_stopping_shorewall.htm</ulink></para>
-
-    <para><ulink
-    url="/configuration_file_basics.htm#Pairs">http://www.shorewall.net/configuration_file_basics.htm#Pairs</ulink></para>
-
-    <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
-    shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-interfaces(5),
-    shorewall6-maclist(5), shorewall6-netmap(5),shorewall6-params(5),
-    shorewall6-policy(5), shorewall6-providers(5), shorewall6-rtrules(5),
-    shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5),
-    shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-mangle(5),
-    shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5)</para>
-  </refsect1>
-</refentry>

Shorewall6/uninstall.sh

@@ -184,9 +184,18 @@ if [ -f "$FIREWALL" ]; then
     remove_file $FIREWALL
 fi
 
-if [ -n "$SYSTEMD" ]; then
+[ -n "$SERVICEDIR" ] || SERVICEDIR=${SYSTEMD}
+
+if [ -n "$SERVICEDIR" ]; then
     [ $configure -eq 1 ] && systemctl disable ${PRODUCT}
-    rm -f $SYSTEMD/shorewall6.service
+    rm -f $SERVICEDIR/shorewall6.service
+fi
+
+rm -rf ${SHAREDIR}/shorewall6/version
+rm -rf ${CONFDIR}/shorewall6
+
+if [ -n "$SYSCONFDIR" ]; then
+    [ -n "$SYSCONFFILE" ] && rm -f ${SYSCONFDIR}/${PRODUCT}
 fi
 
 rm -f ${SBINDIR}/shorewall6

docs/Build.xml

@@ -164,10 +164,10 @@
     </section>
 
     <section>
-      <title>build45 and build46</title>
+      <title>build45, build46 and build50</title>
 
-      <para>These are the scripts that respectively build Shorewall 4.5 and
-      Shorewall 4.6 packages from Git.</para>
+      <para>These are the scripts that respectively build Shorewall 4.5,
+      Shorewall 4.6 and Shorewall 5.0 packages from Git.</para>
 
       <para>The scripts copy content from Git using the <command>git
       archive</command> command. They then use that content to build the
@@ -281,7 +281,7 @@
       <para>The general form of the build command is:</para>
 
       <blockquote>
-        <para><command>build</command>4x [ -<replaceable>options</replaceable>
+        <para><command>build</command>xx [ -<replaceable>options</replaceable>
         ] <replaceable>release</replaceable> [ <replaceable>prior
         release</replaceable> ]</para>
       </blockquote>
@@ -549,15 +549,23 @@
         </listitem>
 
         <listitem>
-          <para>MAC - Apple MacIntosh (Shorewall and Shorewall6 packages
-          only)</para>
+          <para>MAC - Apple MacIntosh (Shorewall-core, Shorewall and
+          Shorewall6 packages only)</para>
         </listitem>
 
         <listitem>
-          <para>CYGWIN - Cygwin under Windows (Shorewall and Shorewall6
-          packages only)</para>
+          <para>CYGWIN - Cygwin under Windows (Shorewall-core, Shorewall and
+          Shorewall6 packages only)</para>
+        </listitem>
+
+        <listitem>
+          <para>OPENWRT - OpenWRT (Shorewall-core, Shorewall6-lite ad
+          Shorewall6-lite only)</para>
         </listitem>
       </itemizedlist>
+
+      <para>See the <ulink url="Insall.htm">installation article</ulink> for
+      additional information</para>
     </section>
   </section>
 </article>

docs/Install.xml

@@ -187,6 +187,10 @@
         <listitem>
           <para>shorewallrc.suse (SLES and OpenSuSE)</para>
         </listitem>
+
+        <listitem>
+          <para>shorewallrc.openwrt (OpenWRT)</para>
+        </listitem>
       </itemizedlist>
 
       <para>When installing 4.5.2 or later for the first time, a special
@@ -232,9 +236,9 @@
             <member>./install.sh
             <replaceable>shorewallrcfile-that-meets-your-needs</replaceable></member>
 
-            <member></member>
+            <member/>
 
-            <member>Example: <command>./install
+            <member>Example: <command>./install.sh
             shorewallrc.debian</command></member>
           </simplelist>
         </listitem>
@@ -334,6 +338,14 @@
                     <para>SLES and OpenSuSe</para>
                   </listitem>
                 </varlistentry>
+
+                <varlistentry>
+                  <term>openwrt</term>
+
+                  <listitem>
+                    <para>OpenWRT (Shorewall 5.0.2 and later)</para>
+                  </listitem>
+                </varlistentry>
               </variablelist>
             </listitem>
           </varlistentry>
@@ -698,7 +710,7 @@
         root of the filesystem tree. In other words, the created installation
         is only runnable if one chroots to $DESTDIR. Please note that the
         uninstall.sh scripts cannot uninstall a configuration installed with
-        non-empty DESTDIR. </para>
+        non-empty DESTDIR.</para>
       </section>
 
       <section>

docs/configuration_file_basics.xml

@@ -306,6 +306,24 @@
     <para><emphasis role="bold">If you need to change a file in
     /usr/share/shorewall/, copy it to <filename>/etc/shorewall</filename> and
     modify the copy</emphasis></para>
+
+    <warning>
+      <para><emphasis role="bold">Note to Debian and Ubuntu
+      Users</emphasis></para>
+
+      <para>If you install using the .deb or using the tarball installers with
+      the default <filename>shorewallrc.debian</filename> file, you will find
+      that your <filename class="directory">/etc/shorewall</filename>
+      directory is practially empty. This is intentional. When you install the
+      .deb, the released configuration file skeletons may be found on your
+      system in the directory <filename
+      class="directory">/usr/share/doc/shorewall/default-config</filename>. If
+      you install using the tarball installers, the files are in the
+      <filename>/usr/share/shorewall/configfiles</filename> sub-directory.
+      Simply copy the files you need from the appropriate directory to
+      <filename class="directory">/etc/shorewall</filename> and modify the
+      copies.</para>
+    </warning>
   </section>
 
   <section id="Manpages">