Merge branch '5.2.0' of ssh://git.code.sf.net/p/shorewall/code into 5.2.0

- Escape '{' in REs

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

Shorewall-core/configure

@@ -109,9 +109,6 @@ if [ -z "$vendor" ]; then
 	    opensuse)
 		vendor=suse
 		;;
-	    alt|basealt|altlinux)
-		vendor=alt
-		;;
 	    *)
 		vendor="$ID"
 		;;
@@ -135,8 +132,6 @@ if [ -z "$vendor" ]; then
 	    if [ -f /etc/debian_version ]; then
 		params[HOST]=debian
 		ls -l /sbin/init | fgrep -q systemd &&  rcfile=shorewallrc.debian.systemd || rcfile=shorewallrc.debian.sysvinit
-	    elif [ -f /etc/altlinux-release ] ; then
-		params[HOST]=alt
 	    elif [ -f /etc/redhat-release ]; then
 		params[HOST]=redhat
 		rcfile=shorewallrc.redhat

Shorewall-core/configure.pl

@@ -74,8 +74,6 @@ unless ( defined $vendor ) {
 	} elsif ( $id eq 'ubuntu' || $id eq 'debian' ) {
 	    my $init = `ls -l /sbin/init`;
 	    $vendor = $init =~ /systemd/ ? 'debian.systemd' : 'debian.sysvinit';
-	} elsif ( $id eq 'alt' || $id eq 'basealt' || $id eq 'altlinux' ) {
-	    $vendor = 'alt';
 	} else {
 	    $vendor = $id;
 	}
@@ -119,9 +117,6 @@ if ( defined $vendor ) {
 	} else {
 	    $rcfilename = 'shorewallrc.debian.sysvinit';
 	}
-    } elsif ( -f '/etc/altlinux-release' ){
-	$vendor = 'alt';
-	$rcfilename = 'shorewallrc.alt';
     } elsif ( -f '/etc/redhat-release' ){
 	$vendor = 'redhat';
 	$rcfilename = 'shorewallrc.redhat';

Shorewall-core/install.sh

@@ -172,9 +172,6 @@ if [ -z "$BUILD" ]; then
 		    opensuse)
 			BUILD=suse
 			;;
-		    alt|basealt|altlinux)
-			BUILD=alt
-			;;
 		    *)
 			BUILD="$ID"
 			;;
@@ -183,8 +180,6 @@ if [ -z "$BUILD" ]; then
 		BUILD=debian
 	    elif [ -f /etc/gentoo-release ]; then
 		BUILD=gentoo
-	    elif [ -f /etc/altlinux-release ]; then
-		BUILD=alt
 	    elif [ -f /etc/redhat-release ]; then
 		BUILD=redhat
 	    elif [ -f /etc/slackware-version ] ; then
@@ -243,7 +238,7 @@ case "$HOST" in
     apple)
 	echo "Installing Mac-specific configuration...";
 	;;
-    debian|gentoo|redhat|slackware|archlinux|linux|suse|openwrt|alt)
+    debian|gentoo|redhat|slackware|archlinux|linux|suse|openwrt)
 	;;
     *)
 	fatal_error "Unknown HOST \"$HOST\""

Shorewall-core/lib.cli

@@ -3775,7 +3775,7 @@ ipcalc_command() {
     elif [ $# -eq 3 ]; then
 	address=$2
 	vlsm=$(ip_vlsm $3)
-    elif [ $# -eq 0 ]; then
+    elif [ $# -eq 1 ]; then
 	missing_argument
     else
 	too_many_arguments $4
@@ -3864,7 +3864,7 @@ noiptrace_command() {
 verify_firewall_script() {
     if [ ! -f $g_firewall ]; then
 	echo "   ERROR: $g_product is not properly installed" >&2
-	if [ -L $g_firewall ]; then
+	if [ -h $g_firewall ]; then
 	    echo "          $g_firewall is a symbolic link to a" >&2
 	    echo "          non-existant file" >&2
 	else

Shorewall-core/lib.common

@@ -751,6 +751,8 @@ mutex_on()
     lockf=${LOCKFILE:=${VARDIR}/lock}
     local lockpid
     local lockd
+    local lockbin
+    local openwrt
 
     MUTEX_TIMEOUT=${MUTEX_TIMEOUT:-60}
 
@@ -760,29 +762,33 @@ mutex_on()
 
 	[ -d "$lockd" ] || mkdir -p "$lockd"
 
+	lockbin=$(mywhich lock)
+	[ -n "$lockbin" -a -h "$lockbin" ] && openwrt=Yes
+
 	if [ -f $lockf ]; then
 	    lockpid=`cat ${lockf} 2> /dev/null`
 	    if [ -z "$lockpid" ] || [ $lockpid = 0 ]; then
 		rm -f ${lockf}
 		error_message "WARNING: Stale lockfile ${lockf} removed"
-	    elif [ $lockpid -eq $$ ]; then
-                return 0
-	    elif ! ps | grep -v grep | qt grep ${lockpid}; then
-		rm -f ${lockf}
-		error_message "WARNING: Stale lockfile ${lockf} from pid ${lockpid} removed"
+	    elif [ -z "$openwrt" ]; then
+		if [ $lockpid -eq $$ ]; then
+                    fatal_error "Mutex_on confusion"
+		elif ! qt ps --pid ${lockpid}; then
+		    rm -f ${lockf}
+		    error_message "WARNING: Stale lockfile ${lockf} from pid ${lockpid} removed"
+		fi
 	    fi
 	fi
 
-	if qt mywhich lockfile; then
-	    lockfile -${MUTEX_TIMEOUT} -r1 ${lockf}
+	if [ -n "$openwrt" ]; then
+	    lock ${lockf} || fatal_error "Can't lock ${lockf}"
+	    g_havemutex="lock -u ${lockf}"
+	elif qt mywhich lockfile; then
+	    lockfile -${MUTEX_TIMEOUT} -r1 ${lockf} || fatal_error "Can't lock ${lockf}"
 	    g_havemutex="rm -f ${lockf}"
 	    chmod u+w ${lockf}
 	    echo $$ > ${lockf}
 	    chmod u-w ${lockf}
-	elif qt mywhich lock; then
-	    lock ${lockf}
-	    g_havemutex="lock -u ${lockf} && rm -f ${lockf}"
-	    chmod u=r ${lockf}
 	else
 	    while [ -f ${lockf} -a ${try} -lt ${MUTEX_TIMEOUT} ] ; do
 		sleep 1

Shorewall-core/lib.uninstaller

@@ -60,7 +60,7 @@ mywhich() {
 remove_file() # $1 = file to remove
 {
     if [ -n "$1" ] ; then
-        if [ -f $1 -o -L $1 ] ; then
+        if [ -f $1 -o -h $1 ] ; then
             rm -f $1
             echo "$1 Removed"
         fi
@@ -84,7 +84,7 @@ remove_file_with_wildcard() # $1 = file with wildcard to remove
             if [ -d $f ] ; then
                 rm -rf $f
                 echo "$f Removed"
-            elif [ -f $f -o -L $f ] ; then
+            elif [ -f $f -o -h $f ] ; then
                 rm -f $f
                 echo "$f Removed"
             fi

Shorewall-core/manpages/shorewall.xml

@@ -3216,38 +3216,30 @@
   <refsect1>
     <title>FILES</title>
 
-    <para>/etc/shorewall/*</para>
+    <para>/etc/shorewall/</para>
 
-    <para>/etc/shorewall6/*</para>
+    <para>/etc/shorewall6/</para>
   </refsect1>
 
   <refsect1>
     <title>See ALSO</title>
 
-    <simplelist>
-      <member><ulink
-      url="/starting_and_stopping_shorewall.htm">http://www.shorewall.net/starting_and_stopping_shorewall.htm</ulink>
-      - Describes operational aspects of Shorewall.</member>
+    <para><ulink
+    url="/starting_and_stopping_shorewall.htm">http://www.shorewall.net/starting_and_stopping_shorewall.htm</ulink></para>
 
-      <member><ulink url="shorewall-files.html">shorewall-files(5)</ulink> -
-      Describes the various configuration files along with features and
-      conventions common to those files.</member>
-
-      <member><ulink url="shorewall-names.html">shorewall-names(5)</ulink> -
-      Describes naming of objects within a Shorewall configuration.</member>
-
-      <member><ulink
-      url="shorewall-addresses.html">shorewall-addresses(5)</ulink> -
-      Describes how to specify addresses within a Shorewall
-      configuration.</member>
-
-      <member><ulink
-      url="shorewall-exclusion.html">shorewall-exclusion(5)</ulink> -
-      Describes how to exclude certain hosts and/or networks from matching a
-      rule.</member>
-
-      <member><ulink url="shorewall-nesting.html">shorewall-nesting(5)</ulink>
-      - Describes how to nest one Shorewall zone inside another.</member>
-    </simplelist>
+    <para>shorewall-accounting(5), shorewall-actions(5),
+    shorewall-arprules(5), shorewall-blrules(5), shorewall.conf(5),
+    shorewall-conntrack(5), shorewall-ecn(5), shorewall-exclusion(5),
+    shorewall-hosts(5), shorewall-init(5), shorewall_interfaces(5),
+    shorewall-ipsets(5), shorewall-logging(), shorewall-maclist(5),
+    shorewall-mangle(5), shorewall-masq(5), shorewall-modules(5),
+    shorewall-nat(5), shorewall-nesting(5), shorewall-netmap(5),
+    shorewall-params(5), shorewall-policy(5), shorewall-providers(5),
+    shorewall-proxyarp(5), shorewall6-proxyndp(5), shorewall-routes(5),
+    shorewall-rtrules(5), shorewall-rtrules(5), shorewall-rules(5),
+    shorewall-secmarks(5), shorewall-snat(5), shorewall-tcclasses(5),
+    shorewall-tcdevices(5), shorewall-tcfilters(5), shorewall-tcinterfaces(5),
+    shorewall-tcpri(5), shorewall-tunnels(5), shorewall-vardir(5),
+    shorewall-zones(5)</para>
   </refsect1>
 </refentry>

Shorewall-core/shorewallrc.alt

@@ -1,25 +0,0 @@
-#
-# ALT/BaseALT/ALTLinux Shorewall 5.2 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=alt
-PREFIX=/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/libexec            #Directory for executable scripts.
-PERLLIBDIR=${SHAREDIR}/perl5            #Directory to install Shorewall Perl module directory
-CONFDIR=/etc                            #Directory where subsystem configurations are installed
-SBINDIR=/sbin                           #Directory where system administration programs are installed
-MANDIR=${SHAREDIR}/man                  #Directory where manpages are installed.
-INITDIR=${CONFDIR}/rc.d/init.d          #Directory where SysV init scripts are installed.
-INITFILE=$PRODUCT                       #Name of the product's installed SysV init script
-INITSOURCE=init.alt.sh                  #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SERVICEDIR=/lib/systemd/system          #Directory where .service files are installed (systems running systemd only)
-SYSCONFFILE=sysconfig                   #Name of the distributed file to be installed as $SYSCONFDIR/$PRODUCT
-SERVICEFILE=                            #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
-SYSCONFDIR=/etc/sysconfig/              #Directory where SysV init parameter files are installed
-SERVICEDIR=/lib/systemd/system          #Directory where .service files are installed (systems running systemd only)
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/$PRODUCT               #Directory where product variable data is stored.
-DEFAULT_PAGER=/usr/bin/less             #Pager to use if none specified in shorewall[6].conf

Shorewall-init/init.alt.sh

@@ -1,150 +0,0 @@
-#!/bin/sh
-#
-# Shorewall init script
-#
-# chkconfig: - 09 91
-# description: Initialize the shorewall firewall at boot time
-#
-### BEGIN INIT INFO
-# Provides: shorewall-init
-# Required-Start: $local_fs
-# Required-Stop: $local_fs
-# Default-Start: 3 4 5
-# Default-Stop:  0 1 2 6
-# Short-Description: Initialize the shorewall firewall at boot time
-# Description:       Place the firewall in a safe state at boot time
-#                    prior to bringing up the network.
-### END INIT INFO
-
-# Do not load RH compatibility interface.
-WITHOUT_RC_COMPAT=1
-
-# Source function library.
-. /etc/init.d/functions
-
-#
-# The installer may alter this
-#
-. /usr/share/shorewall/shorewallrc
-NAME="Shorewall-init firewall"
-PROG="shorewall-init"
-SHOREWALL="$SBINDIR/$PROG"
-LOGGER="logger -i -t $PROG"
-
-# Get startup options (override default)
-OPTIONS=
-
-LOCKFILE=/var/lock/subsys/shorewall-init
-
-# check if shorewall-init is configured or not
-if [ -f "/etc/sysconfig/shorewall-init" ]; then
-	. /etc/sysconfig/shorewall-init
-	if [ -z "$PRODUCTS" ]; then
-		echo "No PRODUCTS configured"
-		exit 6
-	fi
-else
-	echo "/etc/sysconfig/shorewall-init not found"
-	exit 6
-fi
-
-RETVAL=0
-
-# set the STATEDIR variable
-setstatedir() {
-	local statedir
-	if [ -f ${CONFDIR}/${PRODUCT}/vardir ]; then
-		statedir=$( . /${CONFDIR}/${PRODUCT}/vardir && echo $VARDIR )
-	fi
-
-	[ -n "$statedir" ] && STATEDIR=${statedir} || STATEDIR=${VARLIB}/${PRODUCT}
-
-	if [ -x ${STATEDIR}/firewall ]; then
-		return 0
-	elif [ $PRODUCT = shorewall ]; then
-		${SBINDIR}/shorewall compile
-	elif [ $PRODUCT = shorewall6 ]; then
-		${SBINDIR}/shorewall -6 compile
-	else
-		return 1
-	fi
-}
-
-start() {
-	local PRODUCT
-	local STATEDIR
-
-	printf "Initializing \"Shorewall-based firewalls\": "
-
-	for PRODUCT in $PRODUCTS; do
-		if setstatedir; then
-			$STATEDIR/$PRODUCT/firewall ${OPTIONS} stop 2>&1 | "$LOGGER"
-			RETVAL=$?
-		else
-			RETVAL=6
-			break
-		fi
-	done
-
-	if [ -n "$SAVE_IPSETS" -a -f "$SAVE_IPSETS" ]; then
-		ipset -R < "$SAVE_IPSETS"
-	fi
-
-	[ $RETVAL -eq 0 ] && touch "$LOCKFILE"
-	return $RETVAL
-}
-
-stop() {
-	local PRODUCT
-	local STATEDIR
-
-	printf "Clearing \"Shorewall-based firewalls\": "
-	for PRODUCT in $PRODUCTS; do
-		if setstatedir; then
-			${STATEDIR}/firewall ${OPTIONS} clear 2>&1 | "$LOGGER"
-			RETVAL=$?
-		else
-			RETVAL=6
-			break
-		fi
-	done
-
-	if [ -n "$SAVE_IPSETS" ]; then
-		mkdir -p $(dirname "$SAVE_IPSETS")
-		if ipset -S > "${SAVE_IPSETS}.tmp"; then
-			grep -qE -- '^(-N|create )' "${SAVE_IPSETS}.tmp" && mv -f "${SAVE_IPSETS}.tmp" "$SAVE_IPSETS" || rm -f "${SAVE_IPSETS}.tmp"
-		else
-			rm -f "${SAVE_IPSETS}.tmp"
-		fi
-	fi
-
-	[ $RETVAL -eq 0 ] && rm -f "$LOCKFILE"
-	return $RETVAL
-}
-
-# See how we were called.
-case "$1" in
-	start)
-	    start
-	    ;;
-	stop)
-	    stop
-	    ;;
-	restart|reload|condrestart|condreload)
-	    # "Not implemented"
-	    ;;
-	condstop)
-	    if [ -e "$LOCKFILE" ]; then
-		stop
-	    fi
-	    ;;
-	status)
-	    status "$PROG"
-	     RETVAL=$?
-	    ;;
-	*)
-	    echo $"Usage: ${0##*/}  {start|stop|restart|reload|condrestart|condstop|status}"
-	    RETVAL=1
-esac
-
-exit $RETVAL

Shorewall-init/install.sh

@@ -181,9 +181,6 @@ if [ -z "$BUILD" ]; then
 		    opensuse)
 			BUILD=suse
 			;;
-		    alt|basealt|altlinux)
-			BUILD=alt
-			;;
 		    *)
 			BUILD="$ID"
 			;;
@@ -194,8 +191,6 @@ if [ -z "$BUILD" ]; then
 		BUILD=debian
 	    elif [ -f /etc/gentoo-release ]; then
 		BUILD=gentoo
-	    elif [ -f /etc/altlinux-release ]; then
-		BUILD=alt
 	    elif [ -f /etc/redhat-release ]; then
 		BUILD=redhat
 	    elif [ -f /etc/SuSE-release ]; then
@@ -258,9 +253,6 @@ case "$HOST" in
     openwrt)
 	echo "Installing Openwrt-specific configuration..."
 	;;
-    alt)
-	echo "Installing ALT-specific configuration...";
-	;;
     linux)
 	fatal_error "Shorewall-init is not supported on this system"
 	;;

Shorewall-lite/init.alt.sh

@@ -1,117 +0,0 @@
-#!/bin/sh
-#
-# Shorewall-Lite init script
-#
-# chkconfig: - 28 90
-# description: Packet filtering firewall
-#
-### BEGIN INIT INFO
-# Provides: shorewall-lite
-# Required-Start: $local_fs $remote_fs $syslog $network
-# Should-Start: $time $named
-# Required-Stop:
-# Default-Start: 3 4 5
-# Default-Stop:  0 1 2 6
-# Short-Description: Packet filtering firewall
-# Description: The Shoreline Firewall, more commonly known as "Shorewall", is a
-#              Netfilter (iptables) based firewall
-### END INIT INFO
-
-# Do not load RH compatibility interface.
-WITHOUT_RC_COMPAT=1
-
-# Source function library.
-. /etc/init.d/functions
-
-#
-# The installer may alter this
-#
-. /usr/share/shorewall/shorewallrc
-
-NAME="Shorewall-Lite firewall"
-PROG="shorewall"
-SHOREWALL="$SBINDIR/$PROG -l"
-LOGGER="logger -i -t $PROG"
-
-# Get startup options (override default)
-OPTIONS=
-
-SourceIfNotEmpty $SYSCONFDIR/${PROG}-lite
-
-LOCKFILE="/var/lock/subsys/${PROG}-lite"
-RETVAL=0
-
-start() {
-	action $"Applying $NAME rules:" "$SHOREWALL" "$OPTIONS" start "$STARTOPTIONS" 2>&1 | "$LOGGER"
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch "$LOCKFILE"
-	return $RETVAL
-}
-
-stop() {
-	action $"Stoping $NAME :" "$SHOREWALL" "$OPTIONS" stop "$STOPOPTIONS" 2>&1 | "$LOGGER"
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f "$LOCKFILE"
-	return $RETVAL
-}
-
-restart() {
-	action $"Restarting $NAME rules: " "$SHOREWALL" "$OPTIONS" restart "$RESTARTOPTIONS" 2>&1 | "$LOGGER"
-	RETVAL=$?
-	return $RETVAL
-}
-
-reload() {
-	action $"Reloadinging $NAME rules: " "$SHOREWALL" "$OPTIONS" reload "$RELOADOPTIONS" 2>&1 | "$LOGGER"
-	RETVAL=$?
-	return $RETVAL
-}
-
-clear() {
-	action $"Clearing $NAME rules: " "$SHOREWALL" "$OPTIONS" clear 2>&1 | "$LOGGER"
-	RETVAL=$?
-	return $RETVAL
-}
-
-# See how we were called.
-case "$1" in
-	start)
-	    start
-	    ;;
-	stop)
-	    stop
-	    ;;
-	restart)
-	    restart
-	    ;;
-	reload)
-	    reload
-	    ;;
-	clear)
-	    clear
-	    ;;
-	condrestart)
-	    if [ -e "$LOCKFILE" ]; then
-		restart
-	    fi
-	    ;;
-	condreload)
-	    if [ -e "$LOCKFILE" ]; then
-		restart
-	    fi
-	    ;;
-	condstop)
-	    if [ -e "$LOCKFILE" ]; then
-		stop
-	    fi
-	    ;;
-	status)
-	    "$SHOREWALL" status
-	     RETVAL=$?
-	    ;;
-	*)
-	    echo $"Usage: ${0##*/}  {start|stop|restart|reload|clear|condrestart|condstop|status}"
-	    RETVAL=1
-esac
-
-exit $RETVAL

Shorewall-lite/install.sh

@@ -190,9 +190,6 @@ if [ -z "$BUILD" ]; then
 		    opensuse)
 			BUILD=suse
 			;;
-		    alt|basealt|altlinux)
-			BUILD=alt
-			;;
 		    *)
 			BUILD="$ID"
 			;;
@@ -201,8 +198,6 @@ if [ -z "$BUILD" ]; then
 		BUILD=debian
 	    elif [ -f /etc/gentoo-release ]; then
 		BUILD=gentoo
-	    elif [ -f /etc/altlinux-release ]; then
-		BUILD=alt
 	    elif [ -f ${CONFDIR}/redhat-release ]; then
 		BUILD=redhat
 	    elif [ -f ${CONFDIR}/SuSE-release ]; then
@@ -271,9 +266,6 @@ case "$HOST" in
     openwrt)
 	echo "Installing OpenWRT-specific configuration..."
 	;;
-    alt)
-	echo "Installing ALT-specific configuration...";
-	;;
     linux)
 	;;
     *)

Shorewall-lite/uninstall.sh

@@ -151,7 +151,7 @@ fi
 
 remove_file ${SBINDIR}/$PRODUCT
 
-if [ -L ${SHAREDIR}/$PRODUCT/init ]; then
+if [ -h ${SHAREDIR}/$PRODUCT/init ]; then
     if [ $HOST = openwrt ]; then
 	if [ $configure -eq 1 ] && /etc/init.d/$PRODUCT enabled; then
 	    /etc/init.d/$PRODUCT disable

Shorewall/Macros/IPFS-swarm

@@ -1,9 +0,0 @@
-#
-# Shorewall -- /usr/share/shorewall/macro.IPFS-swarm
-#
-# This macro handles IPFS data traffic (the connection to IPFS swarm).
-#
-###############################################################################
-#ACTION SOURCE  DEST    PROTO   DPORT   SPORT   ORIGDEST        RATE   USER
-
-PARAM   -       -       tcp     4001

Shorewall/Perl/Shorewall/Chains.pm

@@ -153,9 +153,6 @@ our %EXPORT_TAGS = (
 				       STICKY
 				       STICKO
 				       REALPREROUTING
-				       REALINPUT
-				       REALOUTPUT
-				       REALPOSTROUTING
 				       ACTIONCHAIN
 
 				       unreachable_warning
@@ -428,7 +425,7 @@ our $VERSION = 'MODULEVERSION';
 #      Established     - ^<z1-z2>
 #      Related         - +<z1-z2>
 #      Invalid         - _<z1-z2>
-#      Untracked       - &<z1-z2>
+#      Untracked       - =<z1-z2>
 #
 our %chain_table;
 our $raw_table;
@@ -493,19 +490,16 @@ use constant { NO_RESTRICT         => 0,   # FORWARD chain rule     - Both -i an
 # Mangle Table allowed chains enumeration
 #
 use constant {
-    PREROUTING      => 1,        #Actually tcpre
-    INPUT           => 2,        #Actually tcin
-    FORWARD         => 4,        #Actually tcfor
-    OUTPUT          => 8,        #Actually tcout
-    POSTROUTING     => 16,       #Actually tcpost
-    STICKY          => 32,
-    STICKO          => 64,
-    REALPREROUTING  => 128,
-    REALINPUT       => 256,
-    REALOUTPUT      => 512,
-    REALPOSTROUTING => 1024,
-    ALLCHAINS       => 2047,
-    ACTIONCHAIN     => 2048,
+    PREROUTING     => 1,        #Actually tcpre
+    INPUT          => 2,        #Actually tcin
+    FORWARD        => 4,        #Actually tcfor
+    OUTPUT         => 8,        #Actually tcout
+    POSTROUTING    => 16,       #Actually tcpost
+    ALLCHAINS      => 31,
+    STICKY         => 32,
+    STICKO         => 64,
+    REALPREROUTING => 128,
+    ACTIONCHAIN    => 256,
 };
 
 #
@@ -2275,7 +2269,7 @@ sub invalid_chain($$) {
 # Name of the untracked chain between an ordered pair of zones
 #
 sub untracked_chain($$) {
-    '&' . &rules_chain(@_);
+    '=' . &rules_chain(@_);
 }
 
 #
@@ -5293,8 +5287,8 @@ sub do_imac( $ ) {
 #
 sub verify_mark( $ ) {
     my $mark  = $_[0];
-    my $limit = $config{TC_EXPERT} ? $globals{TPROXY_MARK} + 1 : $globals{EXCLUSION_MASK};
-    my $mask  = $config{TC_EXPERT} ? $globals{TPROXY_MARK}     : $globals{TC_MASK};
+    my $limit = $globals{EXCLUSION_MASK};
+    my $mask  = $globals{TC_MASK};
     my $value = numeric_value( $mark );
 
     fatal_error "Invalid Mark or Mask value ($mark)"
@@ -5825,7 +5819,7 @@ sub do_condition( $$ ) {
 
     $chain =~ s/[^\w-]//g;
     #                          $1    $2      -     $3
-    while ( $condition =~ m( ^(.*?) @({)?(?:0|chain)(?(2)}) (.*)$ )x ) {
+    while ( $condition =~ m( ^(.*?) @(\{)?(?:0|chain)(?(2)}) (.*)$ )x ) {
 	$condition = join( '', $1, $chain, $3 );
     }
 
@@ -5874,48 +5868,36 @@ sub do_nfacct( $ ) {
 # Match Source Interface
 #
 sub match_source_dev( $;$ ) {
-    my ( $interface, $nodev ) = @_;
-    my $invert       =  ( $interface =~ s/^!// ) ? '!' : '';
+    my ( $interface, $nodev ) = @_;;
     my $interfaceref =  known_interface( $interface );
     $interface = $interfaceref->{physical} if $interfaceref;
-
-    if ( $interface eq '+' ) {
-	fatal_error "Invalid interface (!+)" if $invert;
-	return '';
-    }
-
+    return '' if $interface eq '+';
     if ( $interfaceref && $interfaceref->{options}{port} ) {
 	if ( $nodev ) {
-	    "${invert}-m physdev --physdev-in $interface ";
+	    "-m physdev --physdev-in $interface ";
 	} else {
 	    my $bridgeref = find_interface $interfaceref->{bridge};
-	    "-i $bridgeref->{physical} ${invert}-m physdev --physdev-in $interface ";
+	    "-i $bridgeref->{physical} -m physdev --physdev-in $interface ";
 	}
     } else {
-	"${invert}-i $interface ";
+	"-i $interface ";
     }
 }
 
 sub imatch_source_dev( $;$ ) {
-    my ( $interface, $nodev ) = @_;
-    my $invert       =  ( $interface =~ s/^!// ) ? '! ' : '';
+    my ( $interface, $nodev ) = @_;;
     my $interfaceref =  known_interface( $interface );
     $interface = $interfaceref->{physical} if $interfaceref;
-
-    if ( $interface eq '+' ) {
-	fatal_error "Invalid interface (!+)" if $invert;
-	return ();
-    }
-
+    return () if $interface eq '+';
     if ( $interfaceref && $interfaceref->{options}{port} ) {
 	if ( $nodev ) {
-	    ( physdev => "${invert}--physdev-in $interface" );
+	    ( physdev => "--physdev-in $interface" );
 	} else {
 	    my $bridgeref = find_interface $interfaceref->{bridge};
-	    ( i => $bridgeref->{physical}, physdev => "${invert}--physdev-in $interface" );
+	    ( i => $bridgeref->{physical}, physdev => "--physdev-in $interface" );
 	}
     } else {
-	( i => $invert . $interface );
+	( i => $interface );
     }
 }
 
@@ -5923,66 +5905,54 @@ sub imatch_source_dev( $;$ ) {
 # Match Dest device
 #
 sub match_dest_dev( $;$ ) {
-    my ( $interface, $nodev ) = @_;
+    my ( $interface, $nodev ) = @_;;
     my $interfaceref =  known_interface( $interface );
-    my $invert       =  ( $interface =~ s/^!// ) ? '! ' : '';
     $interface = $interfaceref->{physical} if $interfaceref;
-
-    if ( $interface eq '+' ) {
-	fatal_error "Invalid interface (!+)" if $invert;
-	return '';
-    }
-
+    return '' if $interface eq '+';
     if ( $interfaceref && $interfaceref->{options}{port} ) {
 	if ( $nodev ) {
 	    if ( have_capability( 'PHYSDEV_BRIDGE' ) ) {
-		"${invert}-m physdev --physdev-is-bridged --physdev-out $interface ";
+		"-m physdev --physdev-is-bridged --physdev-out $interface ";
 	    } else {
-		"${invert}-m physdev --physdev-out $interface ";
+		"-m physdev --physdev-out $interface ";
 	    }
 	} else {
 	    my $bridgeref = find_interface $interfaceref->{bridge};
 
 	    if ( have_capability( 'PHYSDEV_BRIDGE' ) ) {
-		"-o $bridgeref->{physical} ${invert}-m physdev --physdev-is-bridged --physdev-out $interface ";
+		"-o $bridgeref->{physical} -m physdev --physdev-is-bridged --physdev-out $interface ";
 	    } else {
-		"-o $bridgeref->{physical} ${invert}-m physdev --physdev-out $interface ";
+		"-o $bridgeref->{physical} -m physdev --physdev-out $interface ";
 	    }
 	}
     } else {
-	"${invert}-o $interface ";
+	"-o $interface ";
     }
 }
 
 sub imatch_dest_dev( $;$ ) {
-    my ( $interface, $nodev ) = @_;
-    my $invert       =  ( $interface =~ s/^!// ) ? '!' : '';
+    my ( $interface, $nodev ) = @_;;
     my $interfaceref =  known_interface( $interface );
     $interface = $interfaceref->{physical} if $interfaceref;
-
-    if ( $interface eq '+' ) {
-	fatal_error "Invalid interface (!+)" if $invert;
-	return ();
-    }
-
+    return () if $interface eq '+';
     if ( $interfaceref && $interfaceref->{options}{port} ) {
 	if ( $nodev ) {
 	    if ( have_capability( 'PHYSDEV_BRIDGE' ) ) {
-		( physdev => "${invert}--physdev-is-bridged --physdev-out $interface" );
+		( physdev => "--physdev-is-bridged --physdev-out $interface" );
 	    } else {
-		( physdev => "${invert}--physdev-out $interface" );
+		( physdev => "--physdev-out $interface" );
 	    }
 	} else {
 	    my $bridgeref = find_interface $interfaceref->{bridge};
 
 	    if ( have_capability( 'PHYSDEV_BRIDGE' ) ) {
-		( o => $bridgeref->{physical}, physdev => "${invert}--physdev-is-bridged --physdev-out $interface" );
+		( o => $bridgeref->{physical}, physdev => "--physdev-is-bridged --physdev-out $interface" );
 	    } else {
-		( o => $bridgeref->{physical}, physdev => "${invert}--physdev-out $interface" );
+		( o => $bridgeref->{physical}, physdev => "--physdev-out $interface" );
 	    }
 	}
     } else {
-	( o => $invert . $interface );
+	( o => $interface );
     }
 }
 
@@ -7598,11 +7568,6 @@ sub verify_source_interface( $$$$ ) {
     my ( $iiface, $restriction, $table, $chainref ) = @_;
 
     my $rule = '';
-    my $oiiface = $iiface;
-    #
-    # Ignore exclusion for now
-    #
-    $iiface =~ s/^!//;
 
     fatal_error "Unknown Interface ($iiface)" unless known_interface $iiface;
 
@@ -7632,7 +7597,7 @@ sub verify_source_interface( $$$$ ) {
 	}
 
 	$chainref->{restricted} |= $restriction;
-	$rule .= match_source_dev( $oiiface );
+	$rule .= match_source_dev( $iiface );
     }
 
     $rule;
@@ -7727,11 +7692,6 @@ sub verify_dest_interface( $$$$ ) {
     my ( $diface, $restriction, $chainref, $iiface ) = @_;
 
     my $rule = '';
-    my $odiface = $diface;
-    #
-    # Ignore exclusion for now
-    #
-    $diface =~ s/^!//;
 
     fatal_error "Unknown Interface ($diface)" unless known_interface $diface;
 
@@ -7761,7 +7721,7 @@ sub verify_dest_interface( $$$$ ) {
 	}
 
 	$chainref->{restricted} |= $restriction;
-	$rule .= match_dest_dev( $odiface );
+	$rule .= match_dest_dev( $diface );
     }
 
     $rule;

Shorewall/Perl/Shorewall/Config.pm

@@ -465,7 +465,7 @@ our %capdesc = ( NAT_ENABLED     => 'NAT',
 		 TPROXY_TARGET   => 'TPROXY Target',
 		 FLOW_FILTER     => 'Flow Classifier',
 		 FWMARK_RT_MASK  => 'fwmark route mask',
-		 MARK_ANYWHERE   => 'Mark in the filter and nat tables',
+		 MARK_ANYWHERE   => 'Mark in the filter table',
 		 HEADER_MATCH    => 'Header Match',
 		 ACCOUNT_TARGET  => 'ACCOUNT Target',
 		 AUDIT_TARGET    => 'AUDIT Target',
@@ -2833,7 +2833,7 @@ sub evaluate_expression( $$$$ ) {
     }
 
     #                         $1      $2   $3                     -     $4
-    while ( $expression =~ m( ^(.*?) \$({)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) {
+    while ( $expression =~ m( ^(.*?) \$(\{)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) {
 	my ( $first, $var, $rest ) = ( $1, $3, $4);
 
 	if ( $var =~ /^\d+$/ ) {
@@ -2850,7 +2850,7 @@ sub evaluate_expression( $$$$ ) {
 
     if ( $chain ) {
 	#                         $1      $2   $3                     -     $4
-	while ( $expression =~ m( ^(.*?) \@({)? (\d+|[a-zA-Z]\w*) (?(2)}) (.*)$ )x ) {
+	while ( $expression =~ m( ^(.*?) \@(\{)? (\d+|[a-zA-Z]\w*) (?(2)}) (.*)$ )x ) {
 	    my ( $first, $var, $rest ) = ( $1, $3, $4);
 	    $var = numeric_value( $var ) if $var =~ /^\d/;
 	    $val = $var ? $actparams{$var} : $chain;
@@ -2861,7 +2861,7 @@ sub evaluate_expression( $$$$ ) {
     }
 
     #                         $1      $2   $3      -     $4
-    while ( $expression =~ m( ^(.*?) __({)? (\w+) (?(2)}) (.*)$ )x ) {
+    while ( $expression =~ m( ^(.*?) __(\{)? (\w+) (?(2)}) (.*)$ )x ) {
 	my ( $first, $cap, $rest ) = ( $1, $3, $4);
 
 	if ( exists $capdesc{$cap} ) {
@@ -3791,7 +3791,7 @@ sub expand_variables( \$ ) {
     my ( $lineref, $count ) = ( $_[0], 0 );
     my $chain = $actparams{chain};
     #                         $1      $2   $3                   -     $4
-    while ( $$lineref =~ m( ^(.*?) \$({)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) {
+    while ( $$lineref =~ m( ^(.*?) \$(\{)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) {
 
 	my ( $first, $var, $rest ) = ( $1, $3, $4);
 
@@ -3830,7 +3830,7 @@ sub expand_variables( \$ ) {
 	#
 	$$lineref =~ s/\\@/??/g;
 	#                         $1      $2   $3                     -     $4
-	while ( $$lineref =~ m( ^(.*?) \@({)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) {
+	while ( $$lineref =~ m( ^(.*?) \@(\{)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) {
 	    my ( $first, $var, $rest ) = ( $1, $3, $4);
 	    my $val = $var ? $actparams{$var} : $actparams{chain};
 	    $usedcaller = USEDCALLER if $var eq 'caller';
@@ -3846,7 +3846,7 @@ sub expand_variables( \$ ) {
 sub expand_shorewallrc_variables( \$ ) {
     my ( $lineref, $count ) = ( $_[0], 0 );
     #                         $1      $2   $3                  -     $4
-    while ( $$lineref =~ m( ^(.*?) \$({)? (\d+|[a-zA-Z]\w*) (?(2)}) (.*)$ )x ) {
+    while ( $$lineref =~ m( ^(.*?) \$(\{)? (\d+|[a-zA-Z]\w*) (?(2)}) (.*)$ )x ) {
 
 	my ( $first, $var, $rest ) = ( $1, $3, $4);
 

Shorewall/Perl/Shorewall/Rules.pm

@@ -4077,10 +4077,6 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$$ ) {
 	O => OUTPUT,
 	T => POSTROUTING,
 	R => REALPREROUTING,
-	NP => REALPREROUTING,
-	NI => REALINPUT,
-	NO => REALOUTPUT,
-	NT => REALPOSTROUTING
 	);
 
     my %chainlabels = ( 1  => 'PREROUTING',
@@ -4089,17 +4085,14 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$$ ) {
 			8  => 'OUTPUT',
 			16 => 'POSTROUTING' );
 
-    my %chainnames = ( 1    => 'tcpre',
-		       2    => 'tcin',
-		       4    => 'tcfor',
-		       8    => 'tcout',
-		       16   => 'tcpost',
-		       32   => 'sticky',
-		       64   => 'sticko',
-		       128  => 'PREROUTING',
-		       256  => 'INPUT',
-		       512  => 'OUTPUT',
-		       1024 => 'POSTROUTING',
+    my %chainnames = ( 1   => 'tcpre',
+		       2   => 'tcin',
+		       4   => 'tcfor',
+		       8   => 'tcout',
+		       16  => 'tcpost',
+		       32  => 'sticky',
+		       64  => 'sticko',
+		       128 => 'PREROUTING',
 	);
 
     my $inchain        = defined $chainref;
@@ -4123,8 +4116,6 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$$ ) {
     my $actiontype;
     my $commandref;
     my $prerule        = '';
-    my $table          = 'mangle';
-    my $tabletype      = MANGLE_TABLE;
     #
     # Subroutine for handling MARK and CONNMARK. We use an enclosure so as to keep visibility of the
     # function's local variables without making them static. process_mangle_rule1() is called
@@ -4166,7 +4157,7 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$$ ) {
 
 	    $option ||= ( $and_or eq '|' ? '--or-mark' : $and_or ? '--and-mark' : '--set-mark' );
 
-	    my $chainref = ensure_chain( $table, $chain = $chainnames{$chain} );
+	    my $chainref = ensure_chain( 'mangle', $chain = $chainnames{$chain} );
 
 	    $restriction |= $chainref->{restriction};
 
@@ -4485,7 +4476,7 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$$ ) {
 		my ( $tgt,  $options ) = split( ' ', $params, 2 );
 		my $target_type = $builtin_target{$tgt};
 		fatal_error "Unknown target ($tgt)" unless $target_type;
-		fatal_error "The $tgt TARGET is not allowed in the mangle table" unless $target_type & $tabletype;
+		fatal_error "The $tgt TARGET is not allowed in the mangle table" unless $target_type & MANGLE_TABLE;
 		$target        = $params;
 		$usergenerated = 1;
 	    },
@@ -4501,7 +4492,7 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$$ ) {
 		my ( $tgt,  $options ) = split( ' ', $params, 2 );
 		my $target_type = $builtin_target{$tgt};
 		fatal_error "Unknown target ($tgt)" unless $target_type;
-		fatal_error "The $tgt TARGET is not allowed in the mangle table" unless $target_type & $tabletype;
+		fatal_error "The $tgt TARGET is not allowed in the mangle table" unless $target_type & MANGLE_TABLE;
 		$target        = $params;
 		$usergenerated = 1;
 	    },
@@ -4573,7 +4564,7 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$$ ) {
 
 	RESTORE    => {
 	    defaultchain   => 0,
-	    allowedchains  => PREROUTING | INPUT | FORWARD | OUTPUT | POSTROUTING | REALPREROUTING | REALINPUT | REALOUTPUT | REALPOSTROUTING,
+	    allowedchains  => PREROUTING | INPUT | FORWARD | OUTPUT | POSTROUTING,
 	    minparams      => 0,
 	    maxparams      => 1,
 	    function       => sub () {
@@ -4609,7 +4600,7 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$$ ) {
 
 	SAVE       => {
 	    defaultchain   => 0,
-	    allowedchains  => PREROUTING | INPUT | FORWARD | OUTPUT | POSTROUTING | REALPREROUTING | REALINPUT | REALOUTPUT | REALPOSTROUTING,
+	    allowedchains  => PREROUTING | INPUT | FORWARD | OUTPUT | POSTROUTING,
 	    minparams      => 0,
 	    maxparams      => 1,
 	    function       => sub () {
@@ -4855,14 +4846,6 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$$ ) {
 	fatal_error "A chain designator may not be specified in an action body" if $inaction;
 	my $temp = $designators{$designator};
 	fatal_error "Invalid chain designator ( $designator )" unless $temp;
-
-	if ( $designator =~ /^N/ ) {
-	    fatal_error "Only MARK, CONNMARK, SAVE and RESTORE may be used in the nat table" unless $cmd =~ /^(?:(?:(?:CONN)MARK)|SAVE|RESTORE)[(]?/;
-	    require_capability('MARK_ANYWHERE', "The $designator designator", 's');
-	    $table = 'nat';
-	    $tabletype = NAT_TABLE;
-	}
-
 	$designator = $temp;
     }
 
@@ -4895,21 +4878,12 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$$ ) {
 
     if ( $source ne '-' ) {
 	if ( $source eq $fw ) {
-	    if ( $designator ) {
-		fatal_error 'Rules with SOURCE $FW must use the OUTPUT chain' unless $designator & ( OUTPUT | REALOUTPUT );
-		$chain = $designator;
-	    } else {
-		$chain = OUTPUT;
-	    }
-
+	    fatal_error 'Rules with SOURCE $FW must use the OUTPUT chain' if $designator && $designator != OUTPUT;
+	    $chain = OUTPUT;
 	    $source = '-';
 	} elsif ( $source =~ s/^($fw):// ) {
-	    if ( $designator ) {
-		fatal_error 'Rules with SOURCE $FW must use the OUTPUT chain' unless $designator & ( OUTPUT | REALOUTPUT );
-		$chain = $designator;
-	    } else {
-		$chain = OUTPUT;
-	    }
+	    fatal_error 'Rules with SOURCE $FW must use the OUTPUT chain' if $designator && $designator != OUTPUT;
+	    $chain = OUTPUT;
 	}
     }
 
@@ -4979,11 +4953,11 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$$ ) {
 	} else {
 	    $resolve_chain->();
 	    fatal_error "$cmd rules are not allowed in the $chainlabels{$chain} chain" unless $commandref->{allowedchains} & $chain;
-	    unless ( $chain & ( OUTPUT | POSTROUTING | REALOUTPUT | REALPOSTROUTING ) ) {
+	    unless ( $chain == OUTPUT || $chain == POSTROUTING  ) {
 		fatal_error 'A USER/GROUP may only be specified when the SOURCE is $FW' unless $user eq '-';
 	    }
 
-	    $chainref = ensure_chain( $table, $chainnames{$chain} );
+	    $chainref = ensure_chain( 'mangle', $chainnames{$chain} );
 	}
 
 	$restriction |= $chainref->{restriction};

Shorewall/init.alt.sh

@@ -1,117 +0,0 @@
-#!/bin/sh
-#
-# Shorewall init script
-#
-# chkconfig: - 28 90
-# description: Packet filtering firewall
-#
-### BEGIN INIT INFO
-# Provides: shorewall
-# Required-Start: $local_fs $remote_fs $syslog $network
-# Should-Start: $time $named
-# Required-Stop:
-# Default-Start: 3 4 5
-# Default-Stop:  0 1 2 6
-# Short-Description: Packet filtering firewall
-# Description: The Shoreline Firewall, more commonly known as "Shorewall", is a
-#              Netfilter (iptables) based firewall
-### END INIT INFO
-
-# Do not load RH compatibility interface.
-WITHOUT_RC_COMPAT=1
-
-# Source function library.
-. /etc/init.d/functions
-
-#
-# The installer may alter this
-#
-. /usr/share/shorewall/shorewallrc
-
-NAME="Shorewall firewall"
-PROG="shorewall"
-SHOREWALL="$SBINDIR/$PROG"
-LOGGER="logger -i -t $PROG"
-
-# Get startup options (override default)
-OPTIONS=
-
-SourceIfNotEmpty $SYSCONFDIR/$PROG
-
-LOCKFILE=/var/lock/subsys/shorewall
-RETVAL=0
-
-start() {
-	action $"Applying $NAME rules:" "$SHOREWALL" "$OPTIONS" start "$STARTOPTIONS" 2>&1 | "$LOGGER"
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch "$LOCKFILE"
-	return $RETVAL
-}
-
-stop() {
-	action $"Stoping $NAME :" "$SHOREWALL" "$OPTIONS" stop "$STOPOPTIONS" 2>&1 | "$LOGGER"
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f "$LOCKFILE"
-	return $RETVAL
-}
-
-restart() {
-	action $"Restarting $NAME rules: " "$SHOREWALL" "$OPTIONS" restart "$RESTARTOPTIONS" 2>&1 | "$LOGGER"
-	RETVAL=$?
-	return $RETVAL
-}
-
-reload() {
-	action $"Reloading $NAME rules: " "$SHOREWALL" "$OPTIONS" reload "$RELOADOPTIONS" 2>&1 | "$LOGGER"
-	RETVAL=$?
-	return $RETVAL
-}
-
-clear() {
-	action $"Clearing $NAME rules: " "$SHOREWALL" "$OPTIONS" clear 2>&1 | "$LOGGER"
-	RETVAL=$?
-	return $RETVAL
-}
-
-# See how we were called.
-case "$1" in
-	start)
-	    start
-	    ;;
-	stop)
-	    stop
-	    ;;
-	restart)
-	    restart
-	    ;;
-	reload)
-	    reload
-	    ;;
-	clear)
-	    clear
-	    ;;
-	condrestart)
-	    if [ -e "$LOCKFILE" ]; then
-		restart
-	    fi
-	    ;;
-	condreload)
-	    if [ -e "$LOCKFILE" ]; then
-		restart
-	    fi
-	    ;;
-	condstop)
-	    if [ -e "$LOCKFILE" ]; then
-		stop
-	    fi
-	    ;;
-	status)
-	    "$SHOREWALL" status
-	     RETVAL=$?
-	    ;;
-	*)
-	    echo $"Usage: ${0##*/}  {start|stop|restart|reload|clear|condrestart|condstop|status}"
-	    RETVAL=1
-esac
-
-exit $RETVAL

Shorewall/install.sh

@@ -197,9 +197,6 @@ if [ -z "$BUILD" ]; then
 		    opensuse)
 			BUILD=suse
 			;;
-		    alt|basealt|altlinux)
-			BUILD=alt
-			;;
 		    *)
 			BUILD="$ID"
 			;;
@@ -208,8 +205,6 @@ if [ -z "$BUILD" ]; then
 		BUILD=debian
 	    elif [ -f /etc/gentoo-release ]; then
 		BUILD=gentoo
-	    elif [ -f /etc/altlinux-release ]; then
-		BUILD=alt
 	    elif [ -f /etc/redhat-release ]; then
 		BUILD=redhat
 	    elif [ -f /etc/slackware-version ] ; then
@@ -274,9 +269,6 @@ case "$HOST" in
     openwrt)
 	echo "Installing OpenWRT-specific configuration..."
 	;;
-    alt)
-	echo "Installing ALT-specific configuration...";
-	;;
     linux)
 	;;
     *)

Shorewall/manpages/shorewall-addresses.xml

@@ -1,199 +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-addresses</refentrytitle>
-
-    <manvolnum>5</manvolnum>
-
-    <refmiscinfo>Configuration Files</refmiscinfo>
-  </refmeta>
-
-  <refnamediv>
-    <refname>addresses</refname>
-
-    <refpurpose>Specifying addresses within a Shorewall
-    configuration</refpurpose>
-  </refnamediv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>In both Shorewall and Shorewall6, there are two basic types of
-    addresses:</para>
-
-    <variablelist>
-      <varlistentry>
-        <term>Host Address</term>
-
-        <listitem>
-          <para>This address type refers to a single host.</para>
-
-          <para>In IPv4, the format is <emphasis>i.j.k.l</emphasis> where
-          <emphasis>i</emphasis> through <emphasis>l</emphasis> are decimal
-          numbers between 1 and 255.</para>
-
-          <para>In IPv6, the format is <emphasis>a:b:c:d:e:f:g:h</emphasis>
-          where <emphasis>a</emphasis> through <emphasis>h</emphasis> consist
-          of 1 to 4 hexidecimal digits (leading zeros may be omitted). a
-          single series of 0 addresses may be omitted. For example
-          2001:227:e857:1:0:0:0:0:1 may be written 2001:227:e857:1::1.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Network Address</term>
-
-        <listitem>
-          <para>A network address refers to 1 or more hosts and consists of a
-          host address followed by a slash ("/") and a <firstterm>Variable
-          Length Subnet Mask</firstterm> (VLSM). This is known as
-          <firstterm>Classless Internet Domain Routing</firstterm> (CIDR)
-          notation.</para>
-
-          <para>The VLSM is a decimal number. For IPv4, it is in the range 0
-          through 32. For IPv6, the range is 0 through 128. The number
-          represents the number of leading bits in the address that represent
-          the network address; the remainder of the bits are a host address
-          and are generally given as zero.</para>
-
-          <para>Examples:</para>
-
-          <para>IPv4: 192.168.1.0/24</para>
-
-          <para>IPv6: 2001:227:e857:1:0:0:0:0:1/64</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para>In the Shorewall documentation and manpages, we have tried to make
-    it clear which type of address is accepted in each specific case.</para>
-
-    <para>Because Shorewall uses a colon (":") as a separator in many
-    contexts, IPv6 addresses are best written using the standard convention in
-    which the address itself is enclosed in square brackets:</para>
-
-    <simplelist>
-      <member>[2001:227:e857:1::1]</member>
-
-      <member>[2001:227:e857:1::]/64</member>
-    </simplelist>
-  </refsect1>
-
-  <refsect1>
-    <title>Specifying SOURCE and DEST</title>
-
-    <para>Entries in Shorewall configuration files often deal with the source
-    (SOURCE) and destination (DEST) of connections and Shorewall implements a
-    uniform way for specifying them.</para>
-
-    <para>A SOURCE or DEST consists of one to three parts separated by colons
-    (":"):</para>
-
-    <orderedlist>
-      <listitem>
-        <para>ZONE — The name of a zone declared in
-        <filename>/etc/shorewall/zones</filename> or
-        <filename>/etc/shorewall6/zones</filename>. This part is only
-        available in the rules file
-        (<filename>/etc/shorewall/rules</filename>,
-        <filename>/etc/shorewall/blrules</filename>,<filename>
-        /etc/shorewall6/rules</filename> and
-        <filename>/etc/shorewall6/blrules</filename>).</para>
-      </listitem>
-
-      <listitem>
-        <para>INTERFACE — The name of an interface that matches an entry in
-        <filename>/etc/shorewall/interfaces</filename>
-        (<filename>/etc/shorewall6/interfaces</filename>).</para>
-
-        <para>Beginning with Shorweall 5.2.1, the
-        <replaceable>interface</replaceable> may be preceded with '!' which
-        matches all interfaces except the one specified.</para>
-      </listitem>
-
-      <listitem>
-        <para>ADDRESS LIST — A list of one or more addresses (host or network)
-        or address ranges, separated by commas. In an IPv6 configuration, this
-        list must be included in square or angled brackets ("[...]" or
-        "&lt;...&gt;"). The list may have exclusion.</para>
-      </listitem>
-    </orderedlist>
-
-    <para>Examples.</para>
-
-    <orderedlist>
-      <listitem>
-        <para>All hosts in the <emphasis role="bold">net</emphasis> zone —
-        <emphasis role="bold">net</emphasis></para>
-      </listitem>
-
-      <listitem>
-        <para>Subnet 192.168.1.0/29 in the <emphasis
-        role="bold">loc</emphasis> zone — <emphasis
-        role="bold">loc:192.168.1.0/29</emphasis></para>
-      </listitem>
-
-      <listitem>
-        <para>All hosts in the net zone connecting through <filename
-        class="devicefile">ppp0</filename> — <emphasis
-        role="bold">net:ppp0</emphasis></para>
-      </listitem>
-
-      <listitem>
-        <para>All hosts interfaced by <filename
-        class="devicefile">eth3</filename> — <emphasis
-        role="bold">eth3</emphasis></para>
-      </listitem>
-
-      <listitem>
-        <para>Subnet 10.0.1.0/24 interfacing through <filename><filename
-        class="devicefile">eth2</filename></filename> — <emphasis
-        role="bold">eth2:10.0.1.0/24</emphasis></para>
-      </listitem>
-
-      <listitem>
-        <para>Host 2002:ce7c:92b4:1:a00:27ff:feb1:46a9 in the <emphasis
-        role="bold">loc</emphasis> zone — <emphasis
-        role="bold">loc:[2002:ce7c:92b4:1:a00:27ff:feb1:46a9]</emphasis></para>
-      </listitem>
-
-      <listitem>
-        <para>The primary IP address of eth0 in the $FW zone - <emphasis
-        role="bold">$FW:&amp;eth0</emphasis></para>
-      </listitem>
-
-      <listitem>
-        <para>All hosts in Vatican City - <emphasis
-        role="bold">net:^VA</emphasis> (Requires the <emphasis>GeoIP
-        Match</emphasis> capability).</para>
-      </listitem>
-    </orderedlist>
-  </refsect1>
-
-  <refsect1>
-    <title>IP Address Ranges</title>
-
-    <para>If you kernel and iptables have <emphasis>IP Range match
-    support</emphasis>, you may use IP address ranges in Shorewall
-    configuration file entries; IP address ranges have the syntax
-    &lt;<emphasis>low IP address</emphasis>&gt;-&lt;<emphasis>high IP
-    address</emphasis>&gt;.</para>
-
-    <para>Example: 192.168.1.5-192.168.1.12.</para>
-  </refsect1>
-
-  <refsect1>
-    <title/>
-
-    <para/>
-  </refsect1>
-
-  <refsect1>
-    <title>See ALSO</title>
-
-    <para>For more information about addressing, see the<ulink
-    url="shorewall_setup_guide.htm#Addressing"> Setup Guide</ulink>.</para>
-  </refsect1>
-</refentry>

Shorewall/manpages/shorewall-files.xml

@@ -1,967 +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-files</refentrytitle>
-
-    <manvolnum>5</manvolnum>
-
-    <refmiscinfo>Configuration Files</refmiscinfo>
-  </refmeta>
-
-  <refnamediv>
-    <refname>files</refname>
-
-    <refpurpose>Shorewall Configuration Files</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>/etc/shorewall[6]/*</command>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>The following are the Shorewall[6] configuration files:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para><ulink
-        url="shorewall.conf.html"><filename>/etc/shorewall/shorewall.conf</filename>
-        and <filename>/etc/shorewall6/shorewall6.conf</filename></ulink> -
-        used to set global firewall parameters.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-params.html">/etc/shorewall[6]/params</ulink></filename>
-        - use this file to set shell variables that you will expand in other
-        files. It is always processed by /bin/sh or by the shell specified
-        through SHOREWALL_SHELL in
-        <filename>/etc/shorewall/shorewall.conf.</filename></para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-zones.html">/etc/shorewall[6]/zones</ulink></filename>
-        - partition the firewall's view of the world into zones.</para>
-      </listitem>
-
-      <listitem>
-        <para><ulink
-        url="shorewall-policy.html"><filename>/etc/shorewall[6]/policy</filename></ulink>
-        - establishes firewall high-level policy.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename>/etc/shorewall[6]/initdone</filename> - An optional
-        Perl script that will be invoked by the Shorewall rules compiler when
-        the compiler has finished it's initialization.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-interfaces.html">/etc/shorewall[6]/interfaces</ulink></filename>
-        - describes the interfaces on the firewall system.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-hosts.html">/etc/shorewall[6]/hosts</ulink></filename>
-        - allows defining zones in terms of individual hosts and
-        subnetworks.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-masq.html">/etc/shorewall[6]/masq</ulink></filename> -
-        directs the firewall where to use many-to-one (dynamic) Network
-        Address Translation (a.k.a. Masquerading) and Source Network Address
-        Translation (SNAT). Superseded by /etc/shorewall[6]/snat in Shorewall
-        5.0.14 and not supported in Shorewall 5.1.0 and later versions.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-mangle.html">/etc/shorewall[6]/mangle</ulink></filename>
-        - supersedes <filename>/etc/shorewall/tcrules</filename> in Shorewall
-        4.6.0. Contains rules for packet marking, TTL, TPROXY, etc.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-rules.html">/etc/shorewall[6]/rules</ulink></filename>
-        - defines rules that are exceptions to the overall policies
-        established in /etc/shorewall/policy.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-nat.html">/etc/shorewall[6]/nat</ulink></filename> -
-        defines one-to-one NAT rules.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-proxyarp.html">/etc/shorewall6/proxyarp</ulink></filename>
-        - defines use of Proxy ARP.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-proxyndp.html">/etc/shorewall6/proxyndp</ulink></filename>
-        - defines use of Proxy NDP.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename>/etc/shorewall[6]/routestopped</filename> - defines
-        hosts accessible when Shorewall is stopped. Superseded in Shorewall
-        4.6.8 by <filename>/etc/shorewall/stoppedrules</filename>. Not
-        supported in Shorewall 5.0.0 and later versions.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-tcrules.html">/etc/shorewall[6]/tcrules</ulink>
-        </filename>- The file has a rather unfortunate name because it is used
-        to define marking of packets for later use by both traffic
-        control/shaping and policy routing. This file is superseded by
-        <filename>/etc/shorewall/mangle</filename> in Shorewall 4.6.0. Not
-        supported in Shorewall 5.0.0 and later releases.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-tos.html">/etc/shorewall[6]/tos</ulink></filename> -
-        defines rules for setting the TOS field in packet headers. Superseded
-        in Shorewall 4.5.1 by the TOS target in
-        <filename>/etc/shorewall/tcrules</filename> (which file has since been
-        superseded by <filename>/etc/shorewall/mangle</filename>). Not
-        supported in Shorewall 5.0.0 and later versions.</para>
-      </listitem>
-
-      <listitem>
-        <para><ulink
-        url="shorewall-tunnels.html"><filename>/etc/shorewall[6]/tunnels</filename></ulink>
-        - defines tunnels (VPN) with end-points on the firewall system.</para>
-      </listitem>
-
-      <listitem>
-        <para><ulink
-        url="shorewall-blacklist.html"><filename>/etc/shorewall[6]/blacklist</filename></ulink>
-        - Deprecated in favor of <filename>/etc/shorewall/blrules</filename>.
-        Lists blacklisted IP/subnet/MAC addresses. Not supported in Shorewall
-        5.0.0 and later releases.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename>/etc/shorewall[6]/blrules</filename> — Added in
-        Shorewall 4.5.0. Define blacklisting and whitelisting. Supersedes
-        <filename>/etc/shorewall/blacklist</filename>.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename>/etc/shorewall[6]/init</filename> - shell commands
-        that you wish to execute at the beginning of a <quote>shorewall
-        start</quote>, "shorewall reload" or <quote>shorewall
-        restart</quote>.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename>/etc/shorewall[6]/start</filename> - shell commands
-        that you wish to execute near the completion of a <quote>shorewall
-        start</quote>, "shorewall reload" or <quote>shorewall
-        restart</quote></para>
-      </listitem>
-
-      <listitem>
-        <para><filename>/etc/shorewall[6]/started</filename> - shell commands
-        that you wish to execute after the completion of a <quote>shorewall
-        start</quote>, "shorewall reload" or <quote>shorewall
-        restart</quote></para>
-      </listitem>
-
-      <listitem>
-        <para><filename>/etc/shorewall[6]/stop </filename>- commands that you
-        wish to execute at the beginning of a <quote>shorewall
-        stop</quote>.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename>/etc/shorewall[6]/stopped</filename> - shell commands
-        that you wish to execute at the completion of a <quote>shorewall
-        stop</quote>.</para>
-      </listitem>
-
-      <listitem>
-        <para><ulink url="shorewall-ecn.html">/etc/shorewall/ecn</ulink> -
-        disable Explicit Congestion Notification (ECN - RFC 3168) to remote
-        hosts or networks. Superceded by ECN entries in
-        <filename>/etc/shorewall/mangle</filename> in Shorewall 5.0.6.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-accounting.html">/etc/shorewall/accounting</ulink></filename>
-        - define IP traffic accounting rules</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-actions.html">/etc/shorewall[6]/actions</ulink></filename>
-        and <filename>/usr/share/shorewall[6]/action.template</filename> allow
-        user-defined actions.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="???">/etc/shorewall[6]/providers</ulink></filename> - defines
-        alternate routing tables.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-rtrules.html">/etc/shorewall[6]/rtrules</ulink></filename>
-        - Defines routing rules to be used in conjunction with the routing
-        tables defined in
-        <filename>/etc/shorewall/providers</filename>.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-tcdevices.html">/etc/shorewall[6]/tcdevices</ulink></filename>,
-        <filename><ulink
-        url="shorewall-tcclasses.html">/etc/shorewall[6]/tcclasses</ulink></filename>,
-        <filename><ulink
-        url="shorewall-tcfilters.html">/etc/shorewall[6]/tcfilters</ulink></filename>
-        - Define complex traffic shaping.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-tcrules.html">/etc/shorewall[6]/tcrules</ulink></filename>
-        - Mark or classify traffic for traffic shaping or multiple providers.
-        Deprecated in Shorewall 4.6.0 in favor of
-        <filename>/etc/shorewall/mangle</filename>. Not supported in Shorewall
-        5.0.0 and later releases.</para>
-      </listitem>
-
-      <listitem>
-        <para><ulink
-        url="shorewall-tcinterfaces.html"><filename>/etc/shorewall[6]/tcinterfaces</filename></ulink>
-        and <filename><ulink
-        url="shorewall-tcpri.html">/etc/shorewall[6]/tcpri</ulink></filename>
-        - Define simple traffic shaping.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-secmarks.html">/etc/shorewall[6]/secmarks</ulink></filename>
-        - Added in Shorewall 4.4.13. Attach an SELinux context to selected
-        packets.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-vardir.html">/etc/shorewall[6]/vardir</ulink></filename>
-        - Determines the directory where Shorewall maintains its state.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-arprules.html">/etc/shorewall/arprules</ulink></filename>
-        — Added in Shorewall 4.5.12. Allows specification of arptables
-        rules.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-mangle.html">/etc/shorewall/mangle</ulink></filename>
-        -- Added in Shorewall 4.6.0. Supersedes<filename>
-        /etc/shorewall/tcrules</filename>.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename><ulink
-        url="shorewall-snat.html">/etc/shorewall[6]/snat</ulink></filename> -
-        directs the firewall where to use many-to-one (dynamic) Network
-        Address Translation (a.k.a. Masquerading) and Source Network Address
-        Translation (SNAT). Superseded /etc/shorewall[6]/masq in Shorewall
-        5.0.14</para>
-      </listitem>
-
-      <listitem>
-        <para><filename>/usr/share/shorewall[6]/actions.std</filename> -
-        Actions defined by Shorewall.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename>/usr/share/shorewall[6]/action.*</filename> - Details
-        of actions defined by Shorewall.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename>/usr/share/shorewall[6]/macro.*</filename> - Details
-        of macros defined by Shorewall.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename>/usr/share/shorewall[6]/modules</filename> — Specifies
-        the kernel modules to be loaded during shorewall start/restart.</para>
-      </listitem>
-
-      <listitem>
-        <para><filename>/usr/share/shorewall[6]/helpers</filename> — Added in
-        Shorewall 4.4.7. Specifies the kernel modules to be loaded during
-        shorewall start/restart when LOAD_HELPERS_ONLY=Yes in
-        <filename>shorewall.conf</filename>.</para>
-      </listitem>
-    </itemizedlist>
-  </refsect1>
-
-  <refsect1>
-    <title>CONFIG_PATH</title>
-
-    <para>The CONFIG_PATH option in <ulink
-    url="???">shorewall[6].conf(5)</ulink> determines where the compiler
-    searches for configuration files. The default setting is
-    CONFIG_PATH=/etc/shorewall:/usr/share/shorewall which means that the
-    compiler first looks in /etc/shorewall and if it doesn't find the file, it
-    then looks in /usr/share/shorewall.</para>
-
-    <para>You can change this setting to have the compiler look in different
-    places. For example, if you want to put your own versions of standard
-    macros in /etc/shorewall/Macros, then you could set
-    CONFIG_PATH=/etc/shorewall:/etc/shorewall/Macros:/usr/share/shorewall and
-    the compiler will use your versions rather than the standard ones.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Comments</title>
-
-    <para>You may place comments in configuration files by making the first
-    non-whitespace character a pound sign (<quote>#</quote>). You may also
-    place comments at the end of any line, again by delimiting the comment
-    from the rest of the line with a pound sign.</para>
-
-    <example id="comment">
-      <title>Comments in a Configuration File</title>
-
-      <programlisting># This is a comment
-ACCEPT  net     $FW      tcp     www     #This is an end-of-line comment</programlisting>
-    </example>
-
-    <important>
-      <para>Except in <ulink
-      url="shorewall.conf.html">shorewall.conf(5)</ulink> and <ulink
-      url="shorewall-params.html">params(5)</ulink>, if a comment ends with a
-      backslash ("\"), the next line will also be treated as a comment. See
-      <link linkend="Continuation">Line Continuation</link> below.</para>
-    </important>
-  </refsect1>
-
-  <refsect1>
-    <title>Blank Lines</title>
-
-    <para>Most of the configuration files are organized into space-separated
-    columns. If you don't want to supply a value in a column but want to
-    supply a value in a following column, simply enter '-' to make the column
-    appear empty.</para>
-
-    <para>Example:<programlisting>#INTERFACE         BROADCAST            OPTIONS
-br0                -                    routeback</programlisting></para>
-  </refsect1>
-
-  <refsect1>
-    <title>Line Continuation</title>
-
-    <para>Lines may be continued using the usual backslash (<quote>\</quote>)
-    followed immediately by a new line character (Enter key).</para>
-
-    <programlisting>ACCEPT  net     $FW      tcp \↵
-smtp,www,pop3,imap  #Services running on the firewall</programlisting>
-
-    <important>
-      <para>What follows does NOT apply to <ulink
-      url="manpages/shorewall-params.html">shorewall-params(5)</ulink> and
-      <ulink url="shorewall.conf.html">shorewall.conf(5)</ulink>.</para>
-    </important>
-
-    <para>In certain cases, leading white space is ignored in continuation
-    lines:</para>
-
-    <orderedlist>
-      <listitem>
-        <para>The continued line ends with a colon (":")</para>
-      </listitem>
-
-      <listitem>
-        <para>The continued line ends with a comma (",")</para>
-      </listitem>
-    </orderedlist>
-
-    <para>Example (<filename>/etc/shorewall/rules</filename>):</para>
-
-    <programlisting>#ACTION     SOURCE          DEST            PROTO           DPORT
-ACCEPT      net:\
-            206.124.146.177,\
-            206.124.146.178,\
-            206.124.146.180\
-                            dmz             tcp             873</programlisting>
-
-    <para>The leading white space on the first through third continuation
-    lines is ignored so the SOURCE column effectively contains
-    "net:206.124.146.177,206.124.147.178,206.124.146.180". Because the third
-    continuation line does not end with a comma or colon, the leading white
-    space in the last line is not ignored.</para>
-
-    <important>
-      <para>A trailing backslash is not ignored in a comment. So the continued
-      rule above can be commented out with a single '#' as follows:</para>
-
-      <programlisting>#ACTION     SOURCE          DEST            PROTO           DPORT
-<emphasis role="bold">#</emphasis>ACCEPT     net:\
-            206.124.146.177,\
-            206.124.146.178,\
-            206.124.146.180\
-                            dmz             tcp             873</programlisting>
-    </important>
-  </refsect1>
-
-  <refsect1>
-    <title>Alternative Specification of Column Values</title>
-
-    <para>Some of the configuration files now have a large number of columns.
-    That makes it awkward to specify a value for one of the right-most columns
-    as you must have the correct number of intervening '-' columns.</para>
-
-    <para>This problem is addressed by allowing column values to be specified
-    as <replaceable>column-name</replaceable>/<replaceable>value</replaceable>
-    pairs.</para>
-
-    <para>There is considerable flexibility in how you specify the
-    pairs:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>At any point, you can enter a left curly bracket ('{') followed
-        by one or more specifications of the following forms:</para>
-
-        <simplelist>
-          <member><replaceable>column-name</replaceable>=<replaceable>value</replaceable></member>
-
-          <member><replaceable>column-name</replaceable>=<replaceable>&gt;value</replaceable></member>
-
-          <member><replaceable>column-name</replaceable>:<replaceable>value</replaceable></member>
-        </simplelist>
-
-        <para>The pairs must be followed by a right curly bracket
-        ("}").</para>
-
-        <para>The value may optionally be enclosed in double quotes.</para>
-
-        <para>The pairs must be separated by white space, but you can add a
-        comma adjacent to the <replaceable>values</replaceable> for
-        readability as in:</para>
-
-        <simplelist>
-          <member><emphasis role="bold">{ proto=&gt;udp, port=1024
-          }</emphasis></member>
-        </simplelist>
-      </listitem>
-
-      <listitem>
-        <para>You can also separate the pairs from columns by using a
-        semicolon:</para>
-
-        <simplelist>
-          <member><emphasis role="bold">; proto:udp,
-          port:1024</emphasis></member>
-        </simplelist>
-      </listitem>
-    </itemizedlist>
-
-    <para>In Shorewall 5.0.3, the sample configuration files and the man pages
-    were updated to use the same column names in both the column headings and
-    in the alternate specification format. The following table shows the
-    column names for each of the table-oriented configuration files.</para>
-
-    <note>
-      <para>Column names are <emphasis
-      role="bold">case-insensitive</emphasis>.</para>
-    </note>
-
-    <informaltable>
-      <tgroup cols="2">
-        <tbody>
-          <row>
-            <entry><emphasis role="bold">File</emphasis></entry>
-
-            <entry><emphasis role="bold">Column names</emphasis></entry>
-          </row>
-
-          <row>
-            <entry>accounting</entry>
-
-            <entry>action,chain, source, dest, proto, dport, sport, user,
-            mark, ipsec, headers</entry>
-          </row>
-
-          <row>
-            <entry>conntrack</entry>
-
-            <entry>action,source,dest,proto,dport,sport,user,switch</entry>
-          </row>
-
-          <row>
-            <entry>blacklist</entry>
-
-            <entry>networks,proto,port,options</entry>
-          </row>
-
-          <row>
-            <entry>blrules</entry>
-
-            <entry>action,source,dest,proto,dport,sport,origdest,rate,user,mark,connlimit,time,headers,switch,helper</entry>
-          </row>
-
-          <row>
-            <entry>ecn</entry>
-
-            <entry>interface,hosts. Beginning with Shorewall 4.5.4, 'host' is
-            a synonym for 'hosts'.</entry>
-          </row>
-
-          <row>
-            <entry>hosts</entry>
-
-            <entry>zone,hosts,options. Beginning with Shorewall 4.5.4, 'host'
-            is a synonym for 'hosts'.</entry>
-          </row>
-
-          <row>
-            <entry>interfaces</entry>
-
-            <entry>zone,interface,broadcast,options</entry>
-          </row>
-
-          <row>
-            <entry>maclist</entry>
-
-            <entry>disposition,interface,mac,addresses</entry>
-          </row>
-
-          <row>
-            <entry>mangle</entry>
-
-            <entry>action,source,dest,proto,dport,sport,user,test,length,tos,connbytes,helper,headers</entry>
-          </row>
-
-          <row>
-            <entry>masq</entry>
-
-            <entry>interface,source,address,proto,port,ipsec,mark,user,switch</entry>
-          </row>
-
-          <row>
-            <entry>nat</entry>
-
-            <entry>external,interface,internal,allints,local</entry>
-          </row>
-
-          <row>
-            <entry>netmap</entry>
-
-            <entry>type,net1,interface,net2,net3,proto,dport,sport</entry>
-          </row>
-
-          <row>
-            <entry>notrack</entry>
-
-            <entry>source,dest,proto,dport,sport,user</entry>
-          </row>
-
-          <row>
-            <entry>policy</entry>
-
-            <entry>source,dest,policy,loglevel,limit,connlimit</entry>
-          </row>
-
-          <row>
-            <entry>providers</entry>
-
-            <entry>table,number,mark,duplicate,interface,gateway,options,copy</entry>
-          </row>
-
-          <row>
-            <entry>proxyarp and proxyndp</entry>
-
-            <entry>address,interface,external,haveroute,persistent</entry>
-          </row>
-
-          <row>
-            <entry>rtrules</entry>
-
-            <entry>source,dest,provider,priority</entry>
-          </row>
-
-          <row>
-            <entry>routes</entry>
-
-            <entry>provider,dest,gateway,device</entry>
-          </row>
-
-          <row>
-            <entry>routestopped</entry>
-
-            <entry>interface,hosts,options,proto,dport,sport</entry>
-          </row>
-
-          <row>
-            <entry>rules</entry>
-
-            <entry>action,source,dest,proto,dport,sport,origdest,rate,user,mark,connlimit,time,headers,switch,helper</entry>
-          </row>
-
-          <row>
-            <entry>secmarks</entry>
-
-            <entry>secmark,chain,source,dest,proto,dport,sport,user,mark</entry>
-          </row>
-
-          <row>
-            <entry>tcclasses</entry>
-
-            <entry>interface,mark,rate,ceil,prio,options</entry>
-          </row>
-
-          <row>
-            <entry>tcdevices</entry>
-
-            <entry>interface,in_bandwidth,out_bandwidth,options,redirect</entry>
-          </row>
-
-          <row>
-            <entry>tcfilters</entry>
-
-            <entry>class,source,dest,proto,dport,sport,tos,length</entry>
-          </row>
-
-          <row>
-            <entry>tcinterfaces</entry>
-
-            <entry>interface,type,in_bandwidth,out_bandwidth</entry>
-          </row>
-
-          <row>
-            <entry>tcpri</entry>
-
-            <entry>band,proto,port,address,interface,helper</entry>
-          </row>
-
-          <row>
-            <entry>tcrules</entry>
-
-            <entry>mark,source,dest,proto,dport,sport,user,test,length,tos,connbytes,helper,headers.
-            Beginning with Shorewall 4.5.3, 'action' is a synonym for
-            'mark'.</entry>
-          </row>
-
-          <row>
-            <entry>tos</entry>
-
-            <entry>source,dest,proto,dport,sport,tos,mark</entry>
-          </row>
-
-          <row>
-            <entry>tunnels</entry>
-
-            <entry>type,zone,gateway,gateway_zone. Beginning with Shorewall
-            4.5.3, 'gateways' is a synonym for 'gateway'. Beginning with
-            Shorewall 4.5.4, 'gateway_zones' is a synonym for
-            'gateway_zone'.</entry>
-          </row>
-
-          <row>
-            <entry>zones</entry>
-
-            <entry>zone,type,options,in_options,out_options</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-
-    <para>Example (rules file):</para>
-
-    <programlisting>#ACTION         SOURCE            DEST            PROTO   DPORT
-DNAT            net               loc:10.0.0.1    tcp     80    ; mark="88"</programlisting>
-
-    <para>Here's the same line in several equivalent formats:</para>
-
-    <programlisting>{ action=&gt;DNAT, source=&gt;net, dest=&gt;loc:10.0.0.1, proto=&gt;tcp, dport=&gt;80, mark=&gt;88 }
-; action:"DNAT" source:"net"  dest:"loc:10.0.0.1" proto:"tcp" dport:"80" mark:"88"
-DNAT { source=net dest=loc:10.0.0.1 proto=tcp dport=80 mark=88 }</programlisting>
-
-    <para>Beginning with Shorewall 5.0.11, ip[6]table comments can be attached
-    to individual rules using the <option>comment</option> keyword.</para>
-
-    <para>Example from the rules file:</para>
-
-    <programlisting>        ACCEPT net $FW { proto=tcp, dport=22, comment="Accept \"SSH\"" }</programlisting>
-
-    <para>As shown in that example, when the comment contains whitespace, it
-    must be enclosed in double quotes and any embedded double quotes must be
-    escaped using a backslash ("\").</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Time Columns</title>
-
-    <para>Several of the files include a TIME colum that allows you to specify
-    times when the rule is to be applied. Contents of this column is a list of
-    <replaceable>timeelement</replaceable>s separated by apersands
-    (&amp;).</para>
-
-    <para>Each <replaceable>timeelement</replaceable> is one of the
-    following:</para>
-
-    <variablelist>
-      <varlistentry>
-        <term>timestart=<replaceable>hh</replaceable>:<replaceable>mm</replaceable>[:<replaceable>ss</replaceable>]</term>
-
-        <listitem>
-          <para>Defines the starting time of day.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>timestop=<replaceable>hh</replaceable>:<replaceable>mm</replaceable>[:<replaceable>ss</replaceable>]</term>
-
-        <listitem>
-          <para>Defines the ending time of day.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>contiguous</term>
-
-        <listitem>
-          <para>Added in Shoreawll 5.0.12. When <emphasis
-          role="bold">timestop</emphasis> is smaller than <emphasis
-          role="bold">timestart</emphasis> value, match this as a single time
-          period instead of distinct intervals. See the Examples below.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>utc</term>
-
-        <listitem>
-          <para>Times are expressed in Greenwich Mean Time.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>localtz</term>
-
-        <listitem>
-          <para>Deprecated by the Netfilter team in favor of <emphasis
-          role="bold">kerneltz</emphasis>. Times are expressed in Local Civil
-          Time (default).</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>kerneltz</term>
-
-        <listitem>
-          <para>Added in Shorewall 4.5.2. Times are expressed in Local Kernel
-          Time (requires iptables 1.4.12 or later).</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>weekdays=ddd[,ddd]...</term>
-
-        <listitem>
-          <para>where <replaceable>ddd</replaceable> is one of
-          <option>Mon</option>, <option>Tue</option>, <option>Wed</option>,
-          <option>Thu</option>, <option>Fri</option>, <option>Sat</option> or
-          <option>Sun</option></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>monthdays=dd[,dd],...</term>
-
-        <listitem>
-          <para>where <replaceable>dd</replaceable> is an ordinal day of the
-          month</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>datestart=<replaceable>yyyy</replaceable>[-<replaceable>mm</replaceable>[-<replaceable>dd</replaceable>[<option>T</option><replaceable>hh</replaceable>[:<replaceable>mm</replaceable>[:<replaceable>ss</replaceable>]]]]]</term>
-
-        <listitem>
-          <para>Defines the starting date and time.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>datestop=<replaceable>yyyy</replaceable>[-<replaceable>mm</replaceable>[-<replaceable>dd</replaceable>[<option>T</option><replaceable>hh</replaceable>[:<replaceable>mm</replaceable>[:<replaceable>ss</replaceable>]]]]]</term>
-
-        <listitem>
-          <para>Defines the ending date and time.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para>Examples:</para>
-
-    <variablelist>
-      <varlistentry>
-        <term>To match on weekends, use:</term>
-
-        <listitem>
-          <para/>
-
-          <para>weekdays=Sat,Sun</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Or, to match (once) on a national holiday block:</term>
-
-        <listitem>
-          <para/>
-
-          <para>datestart=2016-12-24&amp;datestop=2016-12-27</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Since the stop time is actually inclusive, you would need the
-        following stop time to not match the first second of the new
-        day:</term>
-
-        <listitem>
-          <para/>
-
-          <para>datestart=2016-12-24T17:00&amp;datestop=2016-12-27T23:59:59</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>During Lunch Hour</term>
-
-        <listitem>
-          <para/>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>The fourth Friday in the month:</term>
-
-        <listitem>
-          <para/>
-
-          <para>weekdays=Fri&amp;monthdays=22,23,24,25,26,27,28</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Matching across days might not do what is expected. For
-        instance,</term>
-
-        <listitem>
-          <para/>
-
-          <para>weekdays=Mon&amp;timestart=23:00&amp;timestop=01:00</para>
-
-          <para>Will match Monday, for one hour from midnight to 1 a.m., and
-          then again for another hour from 23:00 onwards. If this is unwanted,
-          e.g. if you would like 'match for two hours from Montay 23:00
-          onwards' you need to also specify the <emphasis
-          role="bold">contiguous</emphasis> option in the example
-          above.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>Switches</title>
-
-    <para>here are times when you would like to enable or disable one or more
-    rules in the configuration without having to do a <command>shorewall
-    reload</command> or <command>shorewall restart</command>. This may be
-    accomplished using the SWITCH column in <ulink
-    url="manpages/shorewall-rules.html">shorewall-rules</ulink> (5) or <ulink
-    url="manpages6/shorewall6-rules.html">shorewall6-rules</ulink> (5). Using
-    this column requires that your kernel and iptables include
-    <firstterm>Condition Match Support</firstterm> and you must be running
-    Shorewall 4.4.24 or later. See the output of <command>shorewall show
-    capabilities</command> and <command>shorewall version</command> to
-    determine if you can use this feature.</para>
-
-    <para>The SWITCH column contains the name of a
-    <firstterm>switch.</firstterm> Each switch is initially in the <emphasis
-    role="bold">off</emphasis> position. You can turn on the switch named
-    <emphasis>switch1</emphasis> by:</para>
-
-    <simplelist>
-      <member><command>echo 1 &gt;
-      /proc/net/nf_condition/switch1</command></member>
-    </simplelist>
-
-    <para>You can turn it off again by:</para>
-
-    <simplelist>
-      <member><command>echo 0 &gt;
-      /proc/net/nf_condition/switch1</command></member>
-    </simplelist>
-
-    <para>If you simply include the switch name in the SWITCH column, then the
-    rule is enabled only when the switch is <emphasis
-    role="bold">on</emphasis>. If you precede the switch name with ! (e.g.,
-    !switch1), then the rule is enabled only when the switch is <emphasis
-    role="bold">off</emphasis>. Switch settings are retained over
-    <command>shorewall restart</command>.</para>
-
-    <para>Shorewall requires that switch names:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>begin with a letter and be composed of letters, digits,
-        underscore ('_') or hyphen ('-'); and</para>
-      </listitem>
-
-      <listitem>
-        <para>be 30 characters or less in length.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>Multiple rules can be controlled by the same switch.</para>
-
-    <para>Example:</para>
-
-    <blockquote>
-      <para>Forward port 80 to dmz host $BACKUP if switch 'primary_down' is
-      on.</para>
-
-      <programlisting>#ACTION     SOURCE          DEST        PROTO       DPORT        SPORT     ORIGDEST   RATE      USER      MARK    CONNLIMIT     TIME     HEADERS    SWITCH
-DNAT        net             dmz:$BACKUP tcp         80           -         -          -         -         -       -             -        -          <emphasis
-          role="bold">primary_down</emphasis>  </programlisting>
-    </blockquote>
-  </refsect1>
-
-  <refsect1>
-    <title>FILES</title>
-
-    <para>/etc/shorewall[6]/*</para>
-  </refsect1>
-</refentry>

Shorewall/manpages/shorewall-mangle.xml

@@ -90,44 +90,8 @@
                 <para>INPUT chain.</para>
               </listitem>
             </varlistentry>
-
-            <varlistentry>
-              <term>NP</term>
-
-              <listitem>
-                <para>PREROUTING chain in the nat table.</para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term>NI</term>
-
-              <listitem>
-                <para>INPUT chain in the nat table.</para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term>NO</term>
-
-              <listitem>
-                <para>OUTPUT chain in the nat table.</para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term>NT</term>
-
-              <listitem>
-                <para>POSTROUTING chain in the nat table.</para>
-              </listitem>
-            </varlistentry>
           </variablelist>
 
-          <para>The nat table designators were added in Shorewall 5.2.1. When
-          a nat table designator is given, only the CONNMARK, MARK, SAVE and
-          RESTORE commands may be used.</para>
-
           <para>Unless otherwise specified for the particular
           <replaceable>command</replaceable>, the default chain is PREROUTING
           when MARK_IN_FORWARD_CHAIN=No in <ulink
@@ -857,20 +821,15 @@ Normal-Service       =&gt; 0x00</programlisting>
 
           <variablelist>
             <varlistentry>
-              <term>[!]<replaceable>interface</replaceable></term>
+              <term><replaceable>interface</replaceable></term>
 
               <listitem>
                 <para>where <replaceable>interface</replaceable> is the
-                logical name of an <replaceable>interface</replaceable>
-                defined in <ulink
+                logical name of an interface defined in <ulink
                 url="/manpages/shorewall-interfaces.html">shorewall-interfaces</ulink>(5).
                 Matches packets entering the firewall from the named
                 interface. May not be used in CLASSIFY rules or in rules using
                 the :T chain qualifier.</para>
-
-                <para>Beginning with Shorweall 5.2.1, the
-                <replaceable>interface</replaceable> may be preceded with '!'
-                which matches all interfaces except the one specified.</para>
               </listitem>
             </varlistentry>
 
@@ -904,31 +863,23 @@ Normal-Service       =&gt; 0x00</programlisting>
             </varlistentry>
 
             <varlistentry>
-              <term>[!]<replaceable>interface</replaceable>:<replaceable>address</replaceable>,[...][<replaceable>exclusion</replaceable>]</term>
+              <term><replaceable>interface</replaceable>:<replaceable>address</replaceable>,[...][<replaceable>exclusion</replaceable>]</term>
 
               <listitem>
                 <para>This form combines the preceding two forms and matches
                 when both the incoming interface and source IP address
                 match.</para>
-
-                <para>Beginning with Shorweall 5.2.1, the
-                <replaceable>interface</replaceable> may be preceded with '!'
-                which matches all interfaces except the one specified.</para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term>[!]<replaceable>interface</replaceable>:<replaceable>exclusion</replaceable></term>
+              <term><replaceable>interface</replaceable>:<replaceable>exclusion</replaceable></term>
 
               <listitem>
                 <para>This form matches packets arriving through the named
                 <replaceable>interface</replaceable> and whose source IP
                 address does not match any of the addresses in the
                 <replaceable>exclusion</replaceable>.</para>
-
-                <para>Beginning with Shorweall 5.2.1, the
-                <replaceable>interface</replaceable> may be preceded with '!'
-                which matches all interfaces except the one specified.</para>
               </listitem>
             </varlistentry>
 

Shorewall/manpages/shorewall-names.xml

@@ -1,310 +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-names</refentrytitle>
-
-    <manvolnum>5</manvolnum>
-
-    <refmiscinfo>Configuration Files</refmiscinfo>
-  </refmeta>
-
-  <refnamediv>
-    <refname>names</refname>
-
-    <refpurpose>Shorewall object names</refpurpose>
-  </refnamediv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>When you define an object in Shorewall (<ulink
-    url="manpages/shorewall-zones.html">Zone</ulink>, <link
-    linkend="Logical">Logical Interface</link>, <ulink
-    url="ipsets.html">ipsets</ulink>, <ulink
-    url="Actions.html">Actions</ulink>, etc., you give it a name. Shorewall
-    names start with a letter and consist of letters, digits or underscores
-    ("_"). Except for Zone names, Shorewall does not impose a limit on name
-    length.</para>
-
-    <para>When an ipset is referenced, the name must be preceded by a plus
-    sign ("+").</para>
-
-    <para>The last character of an interface may also be a plus sign to
-    indicate a wildcard name.</para>
-
-    <para>Physical interface names match names shown by 'ip link ls'; if the
-    name includes an at sign ("@"), do not include that character or any
-    character that follows. For example, "sit1@NONE" is referred to as simply
-    'sit1".</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Zone and Chain Names</title>
-
-    <para>For a pair of zones, Shorewall creates two Netfilter chains; one for
-    connections in each direction. The names of these chains are formed by
-    separating the names of the two zones by either "2" or "-".</para>
-
-    <para>Example: Traffic from zone A to zone B would go through chain A2B
-    (think "A to B") or "A-B".</para>
-
-    <para>In Shorewall 4.6, the default separator is "-" but you can override
-    that by setting ZONE_SEPARATOR="2" in <ulink
-    url="manpages/shorewall.conf.html">shorewall.conf</ulink> (5).</para>
-
-    <note>
-      <para>Prior to Shorewall 4.6, the default separator was "2".</para>
-    </note>
-
-    <para>Zones themselves have names that begin with a letter and are
-    composed of letters, numerals, and "_". The maximum length of a name is
-    dependent on the setting of LOGFORMAT in <ulink
-    url="manpages/shorewall.conf.html">shorewall.conf</ulink> (5). See <ulink
-    url="manpages/shorewall-zones.html">shorewall-zones</ulink> (5) for
-    details.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Using DNS Names</title>
-
-    <caution>
-      <para>I personally recommend strongly against using DNS names in
-      Shorewall configuration files. If you use DNS names and you are called
-      out of bed at 2:00AM because Shorewall won't start as a result of DNS
-      problems then don't say that you were not forewarned.</para>
-    </caution>
-
-    <para>Host addresses in Shorewall configuration files may be specified as
-    either IP addresses or DNS Names.</para>
-
-    <para>DNS names in iptables rules aren't nearly as useful as they first
-    appear. When a DNS name appears in a rule, the iptables utility resolves
-    the name to one or more IP addresses and inserts those addresses into the
-    rule. So changes in the DNS-&gt;IP address relationship that occur after
-    the firewall has started have absolutely no effect on the firewall's rule
-    set.</para>
-
-    <para>For some sites, using DNS names is very risky. Here's an
-    example:</para>
-
-    <programlisting>teastep@ursa:~$ dig pop.gmail.com
-
-; &lt;&lt;&gt;&gt; DiG 9.4.2-P1 &lt;&lt;&gt;&gt; pop.gmail.com
-;; global options:  printcmd
-;; Got answer:
-;; -&gt;&gt;HEADER&lt;&lt;- opcode: QUERY, status: NOERROR, id: 1774
-;; flags: qr rd ra; QUERY: 1, ANSWER: 3, AUTHORITY: 7, ADDITIONAL: 0
-
-;; QUESTION SECTION:
-;pop.gmail.com.               IN A
-
-;; ANSWER SECTION:
-pop.gmail.com.          <emphasis role="bold">300</emphasis>   IN CNAME gmail-pop.l.google.com.
-gmail-pop.l.google.com. <emphasis role="bold">300</emphasis>   IN A     209.85.201.109
-gmail-pop.l.google.com. <emphasis role="bold">300</emphasis>   IN A     209.85.201.111</programlisting>
-
-    <para>Note that the TTL is 300 -- 300 seconds is only 5 minutes. So five
-    minutes later, the answer may change!</para>
-
-    <para>So this rule may work for five minutes then suddently stop
-    working:</para>
-
-    <programlisting>#ACTION        SOURCE               DEST              PROTO             DPORT
-POP(ACCEPT)    loc                  net:pop.gmail.com</programlisting>
-
-    <para>There are two options in <ulink
-    url="manpages/shorewall.conf.html">shorewall[6].conf(5)</ulink> that
-    affect the use of DNS names in Shorewall[6] config files:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>DEFER_DNS_RESOLUTION - When set to No, DNS names are resolved at
-        compile time; when set to Yes, DNS Names are resolved at
-        runtime.</para>
-      </listitem>
-
-      <listitem>
-        <para>AUTOMAKE - When set to Yes, <command>start</command>,
-        <command>restart</command> and <command>reload</command> only result
-        in compilation if one of the files on the CONFIG_PATH has changed
-        since the the last compilation.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>So by setting AUTOMAKE=Yes, and DEFER_DNS_RESOLUTION=No, compilation
-    will only take place at boot time if a change had been make to the config
-    but no <command>restart</command> or <command>reload</command> had taken
-    place. This is clearly spelled out in the shorewall.conf manpage. So with
-    these settings, so long as a 'reload' or 'restart' takes place after the
-    Shorewall configuration is changes, there should be no DNS-related
-    problems at boot time.</para>
-
-    <important>
-      <para>When DEFER_DNS_RESOLUTION=No and AUTOMAKE=Yes and a DNS change
-      makes it necessary to recompile an existing firewall script, the
-      <option>-c</option> option must be used with the
-      <command>reload</command> or <command>restart</command> command to force
-      recompilation.</para>
-    </important>
-
-    <para>If your firewall rules include DNS names then, even if
-    DEFER_DNS_RESOLUTION=No and AUTOMAKE=Yes:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>If your <filename>/etc/resolv.conf </filename>is wrong then your
-        firewall may not start.</para>
-      </listitem>
-
-      <listitem>
-        <para>If your <filename>/etc/nsswitch.conf</filename> is wrong then
-        your firewall may not start.</para>
-      </listitem>
-
-      <listitem>
-        <para>If your Name Server(s) is(are) down then your firewall may not
-        start.</para>
-      </listitem>
-
-      <listitem>
-        <para>If your startup scripts try to start your firewall before
-        starting your DNS server then your firewall may not start.</para>
-      </listitem>
-
-      <listitem>
-        <para>Factors totally outside your control (your ISP's router is down
-        for example), can prevent your firewall from starting.</para>
-      </listitem>
-
-      <listitem>
-        <para>You must bring up your network interfaces prior to starting your
-        firewall, or the firewall may not start.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>Each DNS name must be fully qualified and include a minimum of two
-    periods (although one may be trailing). This restriction is imposed by
-    Shorewall to insure backward compatibility with existing configuration
-    files.</para>
-
-    <example id="validdns">
-      <title>Valid DNS Names</title>
-
-      <itemizedlist>
-        <listitem>
-          <para>mail.shorewall.net</para>
-        </listitem>
-
-        <listitem>
-          <para>shorewall.net. (note the trailing period).</para>
-        </listitem>
-      </itemizedlist>
-    </example>
-
-    <example id="invaliddns">
-      <title>Invalid DNS Names</title>
-
-      <itemizedlist>
-        <listitem>
-          <para>mail (not fully qualified)</para>
-        </listitem>
-
-        <listitem>
-          <para>shorewall.net (only one period)</para>
-        </listitem>
-      </itemizedlist>
-    </example>
-
-    <para>DNS names may not be used as:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>The server address in a DNAT rule (/etc/shorewall/rules
-        file)</para>
-      </listitem>
-
-      <listitem>
-        <para>In the ADDRESS column of an entry in /etc/shorewall/masq.</para>
-      </listitem>
-
-      <listitem>
-        <para/>
-      </listitem>
-
-      <listitem>
-        <para>In the <filename>/etc/shorewall/nat</filename> file.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>These restrictions are imposed by Netfilter and not by
-    Shorewall.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Logical Interface Names</title>
-
-    <para>When dealing with a complex configuration, it is often awkward to
-    use physical interface names in the Shorewall configuration.</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>You need to remember which interface is which.</para>
-      </listitem>
-
-      <listitem>
-        <para>If you move the configuration to another firewall, the interface
-        names might not be the same.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>Beginning with Shorewall 4.4.4, you can use logical interface names
-    which are mapped to the actual interface using the
-    <option>physical</option> option in <ulink
-    url="manpages/shorewall-interfaces.html">shorewall-interfaces</ulink>
-    (5).</para>
-
-    <para>Here is an example:</para>
-
-    <programlisting>#ZONE  INTERFACE  OPTIONS
-net    <emphasis role="bold">COM_IF </emphasis>    dhcp,blacklist,tcpflags,optional,upnp,routefilter=0,nosmurfs,logmartians=0,<emphasis
-        role="bold">physical=eth0</emphasis>
-net    <emphasis role="bold">EXT_IF</emphasis>     dhcp,blacklist,tcpflags,optional,routefilter=0,nosmurfs,logmartians=0,proxyarp=1,<emphasis
-        role="bold">physical=eth2</emphasis>
-loc    <emphasis role="bold">INT_IF </emphasis>    dhcp,logmartians=1,routefilter=1,tcpflags,nets=172.20.1.0/24,<emphasis
-        role="bold">physical=eth1</emphasis>
-dmz    <emphasis role="bold">VPS_IF </emphasis>    logmartians=1,routefilter=0,routeback,<emphasis
-        role="bold">physical=venet0</emphasis>
-loc    <emphasis role="bold">TUN_IF</emphasis>     <emphasis role="bold">physical=tun+</emphasis></programlisting>
-
-    <para>In this example, COM_IF is a logical interface name that refers to
-    Ethernet interface <filename class="devicefile">eth0</filename>, EXT_IF is
-    a logical interface name that refers to Ethernet interface <filename
-    class="devicefile">eth2</filename>, and so on.</para>
-
-    <para>Here are a couple of more files from the same configuration:</para>
-
-    <para><ulink url="manpages/shorewall-masq.html">shorewall-masq</ulink>
-    (5):</para>
-
-    <programlisting>#INTERFACE SOURCE                    ADDRESS
-
-COMMENT Masquerade Local Network
-<emphasis role="bold">COM_IF</emphasis>     0.0.0.0/0
-<emphasis role="bold">EXT_IF </emphasis>    !206.124.146.0/24         206.124.146.179:persistent</programlisting>
-
-    <para><ulink
-    url="manpages/shorewall-providers.html">shorewall-providers</ulink>
-    (5)</para>
-
-    <programlisting>#NAME   NUMBER   MARK    DUPLICATE  INTERFACE  GATEWAY         OPTIONS               COPY
-Avvanta 1        0x10000 main       <emphasis role="bold">EXT_IF </emphasis>    206.124.146.254 loose,fallback        <emphasis
-        role="bold">INT_IF,VPS_IF,TUN_IF</emphasis>
-Comcast 2        0x20000 main       <emphasis role="bold">COM_IF</emphasis>     detect          balance               <emphasis
-        role="bold">INT_IF,VPS_IF,TUN_IF</emphasis></programlisting>
-
-    <para>Note in particular that Shorewall translates TUN_IF to <filename
-    class="devicefile">tun*</filename> in the COPY column.</para>
-  </refsect1>
-</refentry>

Shorewall/manpages/shorewall-rules.xml

@@ -461,7 +461,8 @@
               <listitem>
                 <para>Added in Shorewall 4.5.16. This action allows you to
                 construct most of the rule yourself using iptables syntax. The
-                part that you specify must follow two semicolons (';;') and is
+                part that you specify must follow two semicolons (';;')
+		and is
                 completely free-form. If the target of the rule (the part
                 following 'j') is something that Shorewall supports in the
                 ACTION column, then you may enclose it in parentheses (e.g.,
@@ -1045,7 +1046,7 @@
             </varlistentry>
 
             <varlistentry>
-              <term><replaceable>zone</replaceable>:[!]<replaceable>interface</replaceable></term>
+              <term><replaceable>zone</replaceable>:<replaceable>interface</replaceable></term>
 
               <listitem>
                 <para>When this form is used,
@@ -1058,11 +1059,6 @@
                 Only packets from hosts in the <replaceable>zone</replaceable>
                 that arrive through the named interface will match the
                 rule.</para>
-
-                <para>Beginning with Shorweall 5.2.1, the
-                <replaceable>interface</replaceable> may be preceded with '!'
-                which matches all interfaces associated with the zone except
-                the one specified.</para>
               </listitem>
             </varlistentry>
 
@@ -1401,7 +1397,7 @@
             </varlistentry>
 
             <varlistentry>
-              <term><replaceable>zone</replaceable>:[!]<replaceable>interface</replaceable></term>
+              <term><replaceable>zone</replaceable>:<replaceable>interface</replaceable></term>
 
               <listitem>
                 <para>When this form is used,
@@ -1414,11 +1410,6 @@
                 Only packets to hosts in the <replaceable>zone</replaceable>
                 that are sent through the named interface will match the
                 rule.</para>
-
-                <para>Beginning with Shorweall 5.2.1, the
-                <replaceable>interface</replaceable> may be preceded with '!'
-                which matches all interfaces associated with the zone except
-                the one specified.</para>
               </listitem>
             </varlistentry>
 
@@ -1472,17 +1463,12 @@
             </varlistentry>
 
             <varlistentry>
-              <term><replaceable>zone</replaceable>:[!]<replaceable>interface</replaceable>:<replaceable>address</replaceable>[,...]</term>
+              <term><replaceable>zone</replaceable>:<replaceable>interface</replaceable>:<replaceable>address</replaceable>[,...]</term>
 
               <listitem>
                 <para>This form combines the preceding two and requires that
                 both the outgoing interface and destinationaddress
                 match.</para>
-
-                <para>Beginning with Shorweall 5.2.1, the
-                <replaceable>interface</replaceable> may be preceded with '!'
-                which matches all interfaces associated with the zone except
-                the one specified.</para>
               </listitem>
             </varlistentry>
 
@@ -1497,7 +1483,7 @@
             </varlistentry>
 
             <varlistentry>
-              <term><replaceable>zone</replaceable>:[!]<replaceable>interface</replaceable>:<replaceable>exclusion</replaceable></term>
+              <term><replaceable>zone</replaceable>:<replaceable>interface</replaceable>:<replaceable>exclusion</replaceable></term>
 
               <listitem>
                 <para>This form matches packets to the named
@@ -1505,11 +1491,6 @@
                 <replaceable>interface</replaceable> where the destination
                 address does not match any entry in the
                 <replaceable>exclusion</replaceable>.</para>
-
-                <para>Beginning with Shorweall 5.2.1, the
-                <replaceable>interface</replaceable> may be preceded with '!'
-                which matches all interfaces associated with the zone except
-                the one specified.</para>
               </listitem>
             </varlistentry>
 

Shorewall/uninstall.sh

@@ -151,7 +151,7 @@ fi
 
 remove_file ${SBINDIR}/$PRODUCT
 
-if [ -L ${SHAREDIR}/$PRODUCT/init ]; then
+if [ -h ${SHAREDIR}/$PRODUCT/init ]; then
     FIREWALL=$(readlink -m -q ${SHAREDIR}/$PRODUCT/init)
 elif [ -n "$INITFILE" ]; then
     FIREWALL=${INITDIR}/${INITFILE}

Shorewall6-lite/init.alt.sh

@@ -1,117 +0,0 @@
-#!/bin/sh
-#
-# Shorewall6-Lite init script
-#
-# chkconfig: - 28 90
-# description: Packet filtering firewall
-#
-### BEGIN INIT INFO
-# Provides: shorewall6
-# Required-Start: $local_fs $remote_fs $syslog $network
-# Should-Start: $time $named
-# Required-Stop:
-# Default-Start: 3 4 5
-# Default-Stop:  0 1 2 6
-# Short-Description: Packet filtering firewall
-# Description: The Shoreline Firewall, more commonly known as "Shorewall", is a
-#              Netfilter (iptables) based firewall
-### END INIT INFO
-
-# Do not load RH compatibility interface.
-WITHOUT_RC_COMPAT=1
-
-# Source function library.
-. /etc/init.d/functions
-
-#
-# The installer may alter this
-#
-. /usr/share/shorewall/shorewallrc
-
-NAME="Shorewall6-Lite firewall"
-PROG="shorewall"
-SHOREWALL="$SBINDIR/$PROG -6l"
-LOGGER="logger -i -t $PROG"
-
-# Get startup options (override default)
-OPTIONS=
-
-SourceIfNotEmpty $SYSCONFDIR/${PROG}6-lite
-
-LOCKFILE="/var/lock/subsys/${PROG}6-lite"
-RETVAL=0
-
-start() {
-	action $"Applying $NAME rules:" "$SHOREWALL" "$OPTIONS" start "$STARTOPTIONS" 2>&1 | "$LOGGER"
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch "$LOCKFILE"
-	return $RETVAL
-}
-
-stop() {
-	action $"Stoping $NAME :" "$SHOREWALL" "$OPTIONS" stop "$STOPOPTIONS" 2>&1 | "$LOGGER"
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f "$LOCKFILE"
-	return $RETVAL
-}
-
-restart() {
-	action $"Restarting $NAME rules: " "$SHOREWALL" "$OPTIONS" restart "$RESTARTOPTIONS" 2>&1 | "$LOGGER"
-	RETVAL=$?
-	return $RETVAL
-}
-
-reload() {
-	action $"Reloadinging $NAME rules: " "$SHOREWALL" "$OPTIONS" reload "$RELOADOPTIONS" 2>&1 | "$LOGGER"
-	RETVAL=$?
-	return $RETVAL
-}
-
-clear() {
-	action $"Clearing $NAME rules: " "$SHOREWALL" "$OPTIONS" clear 2>&1 | "$LOGGER"
-	RETVAL=$?
-	return $RETVAL
-}
-
-# See how we were called.
-case "$1" in
-	start)
-	    start
-	    ;;
-	stop)
-	    stop
-	    ;;
-	restart)
-	    restart
-	    ;;
-	reload)
-	    reload
-	    ;;
-	clear)
-	    clear
-	    ;;
-	condrestart)
-	    if [ -e "$LOCKFILE" ]; then
-		restart
-	    fi
-	    ;;
-	condreload)
-	    if [ -e "$LOCKFILE" ]; then
-		restart
-	    fi
-	    ;;
-	condstop)
-	    if [ -e "$LOCKFILE" ]; then
-		stop
-	    fi
-	    ;;
-	status)
-	    "$SHOREWALL" status
-	     RETVAL=$?
-	    ;;
-	*)
-	    echo $"Usage: ${0##*/}  {start|stop|restart|reload|clear|condrestart|condstop|status}"
-	    RETVAL=1
-esac
-
-exit $RETVAL

Shorewall6/init.alt.sh

@@ -1,117 +0,0 @@
-#!/bin/sh
-#
-# Shorewall6 init script
-#
-# chkconfig: - 28 90
-# description: Packet filtering firewall
-#
-### BEGIN INIT INFO
-# Provides: shorewall6
-# Required-Start: $local_fs $remote_fs $syslog $network
-# Should-Start: $time $named
-# Required-Stop:
-# Default-Start: 3 4 5
-# Default-Stop:  0 1 2 6
-# Short-Description: Packet filtering firewall
-# Description: The Shoreline Firewall, more commonly known as "Shorewall", is a
-#              Netfilter (iptables) based firewall
-### END INIT INFO
-
-# Do not load RH compatibility interface.
-WITHOUT_RC_COMPAT=1
-
-# Source function library.
-. /etc/init.d/functions
-
-#
-# The installer may alter this
-#
-. /usr/share/shorewall/shorewallrc
-
-NAME="Shorewall6 firewall"
-PROG="shorewall"
-SHOREWALL="$SBINDIR/$PROG -6"
-LOGGER="logger -i -t $PROG"
-
-# Get startup options (override default)
-OPTIONS=
-
-SourceIfNotEmpty $SYSCONFDIR/${PROG}6
-
-LOCKFILE="/var/lock/subsys/${PROG}6"
-RETVAL=0
-
-start() {
-	action $"Applying $NAME rules:" "$SHOREWALL" "$OPTIONS" start "$STARTOPTIONS" 2>&1 | "$LOGGER"
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch "$LOCKFILE"
-	return $RETVAL
-}
-
-stop() {
-	action $"Stoping $NAME :" "$SHOREWALL" "$OPTIONS" stop "$STOPOPTIONS" 2>&1 | "$LOGGER"
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f "$LOCKFILE"
-	return $RETVAL
-}
-
-restart() {
-	action $"Restarting $NAME rules: " "$SHOREWALL" "$OPTIONS" restart "$RESTARTOPTIONS" 2>&1 | "$LOGGER"
-	RETVAL=$?
-	return $RETVAL
-}
-
-reload() {
-	action $"Reloadinging $NAME rules: " "$SHOREWALL" "$OPTIONS" reload "$RELOADOPTIONS" 2>&1 | "$LOGGER"
-	RETVAL=$?
-	return $RETVAL
-}
-
-clear() {
-	action $"Clearing $NAME rules: " "$SHOREWALL" "$OPTIONS" clear 2>&1 | "$LOGGER"
-	RETVAL=$?
-	return $RETVAL
-}
-
-# See how we were called.
-case "$1" in
-	start)
-	    start
-	    ;;
-	stop)
-	    stop
-	    ;;
-	restart)
-	    restart
-	    ;;
-	reload)
-	    reload
-	    ;;
-	clear)
-	    clear
-	    ;;
-	condrestart)
-	    if [ -e "$LOCKFILE" ]; then
-		restart
-	    fi
-	    ;;
-	condreload)
-	    if [ -e "$LOCKFILE" ]; then
-		restart
-	    fi
-	    ;;
-	condstop)
-	    if [ -e "$LOCKFILE" ]; then
-		stop
-	    fi
-	    ;;
-	status)
-	    "$SHOREWALL" status
-	     RETVAL=$?
-	    ;;
-	*)
-	    echo $"Usage: ${0##*/}  {start|stop|restart|reload|clear|condrestart|condstop|status}"
-	    RETVAL=1
-esac
-
-exit $RETVAL

docs/configuration_file_basics.xml

@@ -3300,7 +3300,7 @@ Comcast 2        0x20000 main       <emphasis role="bold">COM_IF</emphasis>
         <para>If <emphasis role="bold">detect</emphasis> is specified in the
         ADDRESS column of an entry in <ulink
         url="manpages/shorewall-masq.html">shorewall-masq</ulink> (5) then the
-        firewall still starts if the optional interface in the INTERFACE
+        firewall still startS if the optional interface in the INTERFACE
         column does not have an IP address.</para>
       </listitem>
     </itemizedlist>