shorewall6/Makefile: fix to use reload instead of restart

Signed-off-by: Tuomo Soini <tis@foobar.fi>

Shorewall-core/configure

@@ -158,9 +158,6 @@ else
     if [ ! -f $rcfile ]; then
 	echo "ERROR: $vendor is not a recognized host type" >&2
 	exit 1
-    elif [ $vendor = default ]; then
-	params[HOST]=linux
-	vendor=linux
     fi
 fi
 

Shorewall-core/configure.pl

@@ -82,11 +82,7 @@ unless ( defined $vendor ) {
 
 if ( defined $vendor ) {
     $rcfilename = $vendor eq 'linux' ? 'shorewallrc.default' : 'shorewallrc.' . $vendor;
-    unless ( -f $rcfilename ) {
-	die qq("ERROR: $vendor" is not a recognized host type);
-    } elsif ( $vendor eq 'default' ) {
-	$params{HOST} = $vendor = 'linux';
-    }
+    die qq("ERROR: $vendor" is not a recognized host type) unless -f $rcfilename;
 } else {
     if ( -f '/etc/debian_version' ) {
 	$vendor = 'debian';

Shorewall-core/install.sh

@@ -133,8 +133,6 @@ while [ $finished -eq 0 ]; do
     esac
 done
 
-[ -n $(mywhich install) ] || fatal_error "This installer requires the 'install' utility"
-
 #
 # Read the RC file
 #
@@ -409,9 +407,9 @@ fi
 if [ ${SHAREDIR} != /usr/share ]; then
     for f in lib.*; do
 	if [ $BUILD != apple ]; then
-	    eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}${SHAREDIR}/shorewall/$f
+	    eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}/${SHAREDIR}/shorewall/$f
 	else
-	    eval sed -i \'\' -e \'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}${SHAREDIR}/shorewall/$f
+	    eval sed -i \'\' -e \'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}/${SHAREDIR}/shorewall/$f
 	fi
     done
 fi

Shorewall-core/lib.cli

@@ -149,56 +149,23 @@ syslog_circular_buffer() {
     local pid
     local tty
     local flags
-    local time
+    local cputime
     local path
     local args
     local arg
 
-    ps w 2> /dev/null | while read pid tty stat time path args; do
+    ps ax 2> /dev/null | while read pid tty flags cputime path args; do
 	case $path in
 	    syslogd|*/syslogd)
 		for arg in $args; do
-		    case $arg in
-			-C*)
-			    return 0
-			    ;;
-		    esac
-		done
-		;;
-	    logd|*/logd)
-		for arg in $args; do
-		    case $arg in
-			-S*)
-			    return 0
-			    ;;
-		    esac
+		    if [ x$arg = x-C ]; then
+			echo Yes
+			return
+		    fi
 		done
 		;;
 	esac
     done
-
-    return 1
-}
-
-setup_logread() {
-    [ -z "$LOGFILE" ] && LOGFILE=/var/log/messages
-
-    if syslog_circular_buffer; then
-	LOGFILE=logread
-	if qt mywhich tac; then
-	    g_logread="logread | tac"
-	else
-	    g_logread="logread"
-	fi
-    elif [ -r $LOGFILE ]; then
-	if qt mywhich tac; then
-	    g_logread="tac $LOGFILE"
-	else
-	    g_logread="cat $LOGFILE"
-	fi
-    else
-	fatal_error "LOGFILE ($LOGFILE) does not exist or is not readable!"
-    fi
 }
 
 #
@@ -206,59 +173,31 @@ setup_logread() {
 #
 packet_log() # $1 = number of messages
 {
-    if qt mywhich tac; then
-	if [ -n "$g_showmacs" -o $VERBOSITY -gt 2 ]; then
-	    if [ $g_family -eq 4 ]; then
-		$g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' | head -n$1 | tac | sed 's/ kernel://; s/\[.*\] //' | sed s/" $host $LOGFORMAT"/" "/
-	    else
-		$g_logread | grep 'IN=.* OUT=.*SRC=.*:.*DST=' | head -n$1 | tac | sed -r 's/ kernel://; s/\[.*\] //; s/0000:/:/g; s/:::+/::/g; s/:0+/:/g' | sed s/" $host $LOGFORMAT"/" "/
-	    fi
-	elif [ $g_family -eq 4 ]; then
-	    $g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' |  head -n$1 | tac | sed 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] '// | sed s/" $host $LOGFORMAT"/" "/
+    if [ -n "$g_showmacs" -o $VERBOSITY -gt 2 ]; then
+	if [ $g_family -eq 4 ]; then
+	    $g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' | head -n$1 | tac | sed 's/ kernel://; s/\[.*\] //' | sed s/" $host $LOGFORMAT"/" "/
 	else
-	    $g_logread | grep 'IN=.* OUT=.*SRC=.*:.*DST=' |  head -n$1 | tac | sed -r 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] //; s/0000:/:/g; s/:::+/::/g; s/:0+/:/g' | sed s/" $host $LOGFORMAT"/" "/
+	    $g_logread | grep 'IN=.* OUT=.*SRC=.*:.*DST=' | head -n$1 | tac | sed -r 's/ kernel://; s/\[.*\] //; s/0000:/:/g; s/:::+/::/g; s/:0+/:/g' | sed s/" $host $LOGFORMAT"/" "/
 	fi
+    elif [ $g_family -eq 4 ]; then
+	$g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' |  head -n$1 | tac | sed 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] '// | sed s/" $host $LOGFORMAT"/" "/
     else
-	if [ -n "$g_showmacs" -o $VERBOSITY -gt 2 ]; then
-	    if [ $g_family -eq 4 ]; then
-		$g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' | tail -n$1 | sed 's/ kernel://; s/\[.*\] //' | sed s/" $host $LOGFORMAT"/" "/
-	    else
-		$g_logread | grep 'IN=.* OUT=.*SRC=.*:.*DST=' | tail -n$1 | sed -r 's/ kernel://; s/\[.*\] //; s/0000:/:/g; s/:::+/::/g; s/:0+/:/g' | sed s/" $host $LOGFORMAT"/" "/
-	    fi
-	elif [ $g_family -eq 4 ]; then
-	    $g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' |  tail -n$1 | sed 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] '// | sed s/" $host $LOGFORMAT"/" "/
-	else
-	    $g_logread | grep 'IN=.* OUT=.*SRC=.*:.*DST=' |  tail -n$1 | sed -r 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] //; s/0000:/:/g; s/:::+/::/g; s/:0+/:/g' | sed s/" $host $LOGFORMAT"/" "/
-	fi
-    fi	
+	$g_logread | grep 'IN=.* OUT=.*SRC=.*:.*DST=' |  head -n$1 | tac | sed -r 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] //; s/0000:/:/g; s/:::+/::/g; s/:0+/:/g' | sed s/" $host $LOGFORMAT"/" "/
+    fi
 }
 
 search_log() # $1 = IP address to search for
 {
-    if qt mywhich tac; then
-	if [ -n "$g_showmacs" -o $VERBOSITY -gt 2 ]; then
-            if [ $g_family -eq 4 ]; then
-		$g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' | grep "$1" | tac | sed 's/ kernel://; s/\[.*\] //' | sed s/" $host $LOGFORMAT"/" "/
-	    else
-		$g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' | grep "$1" | tac | sed -r 's/ kernel://; s/\[.*\] //; s/0000:/:/g; s/:::+/::/g; s/:0+/:/g' | sed s/" $host $LOGFORMAT"/" "/
-	    fi
-	elif [ $g_family -eq 4 ]; then
-	    $g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' |  grep "$1" | tac | sed 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] '// | sed s/" $host $LOGFORMAT"/" "/
+    if [ -n "$g_showmacs" -o $VERBOSITY -gt 2 ]; then
+        if [ $g_family -eq 4 ]; then
+	    $g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' | grep "$1" | tac | sed 's/ kernel://; s/\[.*\] //' | sed s/" $host $LOGFORMAT"/" "/
 	else
-	    $g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' |  grep "$1" | tac | sed -r 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] //; s/0000:/:/g; s/:::+/::/g; s/:0+/:/g' | sed s/" $host $LOGFORMAT"/" "/
+	    $g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' | grep "$1" | tac | sed -r 's/ kernel://; s/\[.*\] //; s/0000:/:/g; s/:::+/::/g; s/:0+/:/g' | sed s/" $host $LOGFORMAT"/" "/
 	fi
+    elif [ $g_family -eq 4 ]; then
+	$g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' |  grep "$1" | tac | sed 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] '// | sed s/" $host $LOGFORMAT"/" "/
     else
-	if [ -n "$g_showmacs" -o $VERBOSITY -gt 2 ]; then
-            if [ $g_family -eq 4 ]; then
-		$g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' | grep "$1" | sed 's/ kernel://; s/\[.*\] //' | sed s/" $host $LOGFORMAT"/" "/
-	    else
-		$g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' | grep "$1" | sed -r 's/ kernel://; s/\[.*\] //; s/0000:/:/g; s/:::+/::/g; s/:0+/:/g' | sed s/" $host $LOGFORMAT"/" "/
-	    fi
-	elif [ $g_family -eq 4 ]; then
-	    $g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' |  grep "$1" | sed 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] '// | sed s/" $host $LOGFORMAT"/" "/
-	else
-	    $g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' |  grep "$1" | sed -r 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] //; s/0000:/:/g; s/:::+/::/g; s/:0+/:/g' | sed s/" $host $LOGFORMAT"/" "/
-	fi
+	$g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' |  grep "$1" | tac | sed -r 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] //; s/0000:/:/g; s/:::+/::/g; s/:0+/:/g' | sed s/" $host $LOGFORMAT"/" "/
     fi
 }
 
@@ -341,7 +280,17 @@ show_bl() {
 logwatch() # $1 = timeout -- if negative, prompt each time that
 	   #		     an 'interesting' packet count changes
 {
-    setup_logread
+    if [ -z "$LOGFILE" ]; then
+	LOGFILE=/var/log/messages
+
+	if [ -n "$(syslog_circular_buffer)" ]; then
+	    g_logread="logread | tac"
+	elif [ -r $LOGFILE ]; then
+	    g_logread="tac $LOGFILE"
+	else
+	    fatal_error "LOGFILE ($LOGFILE) does not exist!"
+	fi
+    fi
 
     host=$(echo $g_hostname | sed 's/\..*$//')
     oldrejects=$($g_tool -L -v -n | grep 'LOG')
@@ -1089,7 +1038,17 @@ show_command() {
 	log)
 	    [ $# -gt 2 ] && usage 1
 
-	    setup_logread
+	    if [ -z "$LOGFILE" ]; then
+		LOGFILE=/var/log/messages
+
+		if [ -n "$(syslog_circular_buffer)" ]; then
+		    g_logread="logread | tac"
+		elif [ -r $LOGFILE ]; then
+		    g_logread="tac $LOGFILE"
+		else
+		    fatal_error "LOGFILE ($LOGFILE) does not exist!"
+		fi
+	    fi
 
 	    echo "$g_product $SHOREWALL_VERSION Log ($LOGFILE) at $g_hostname - $(date)"
 	    echo
@@ -1468,7 +1427,17 @@ do_dump_command() {
 	esac
     done
 
-    setup_logread
+    if [ -z "$LOGFILE" ]; then
+	LOGFILE=/var/log/messages
+
+	if [ -n "$(syslog_circular_buffer)" ]; then
+	    g_logread="logread | tac"
+	elif [ -r $LOGFILE ]; then
+	    g_logread="tac $LOGFILE"
+	else
+	    fatal_error "LOGFILE ($LOGFILE) does not exist! - See http://www.shorewall.net/shorewall_logging.html"
+	fi
+    fi
 
     g_ipt_options="$g_ipt_options $g_ipt_options1"
 
@@ -3526,34 +3495,10 @@ noiptrace_command() {
 	fatal_error "$g_product is not started"
     fi
 }
-
 #
-# Verify that we have a compiled firewall script
-#
-verify_firewall_script() {
-    if [ ! -f $g_firewall ]; then
-	echo "   ERROR: $g_product is not properly installed" >&2
-	if [ -L $g_firewall ]; then
-	    echo "          $g_firewall is a symbolic link to a" >&2
-	    echo "          non-existant file" >&2
-	else
-	    echo "          The file $g_firewall does not exist" >&2
-	fi
-
-	exit 2
-    fi
-}
-
-################################################################################
-# The remaining functions are used by the Lite cli - they are overloaded by
-# the Standard CLI by loading lib.cli-std
-################################################################################
-#
-# Set the configuration variables from shorewall[6]-lite.conf.
+# Set the configuration variables from shorewall-lite.conf
 #
 get_config() {
-    local config
-    local lib
 
     ensure_config_path
 
@@ -3575,7 +3520,15 @@ get_config() {
 
     [ -n "$PATH" ] || PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
 
-    setup_logread
+    [ -z "$LOGFILE" ] && LOGFILE=/var/log/messages
+
+    if ( ps ax 2> /dev/null | grep -v grep |  qt grep 'syslogd.*-C' ) ; then
+	g_logread="logread | tac"
+    elif [ -r $LOGFILE ]; then
+	g_logread="tac $LOGFILE"
+    else
+	fatal_error "LOGFILE ($LOGFILE) does not exist!"
+    fi
     #
     # See if we have a real version of "tail" -- use separate redirection so
     # that ash (aka /bin/sh on LRP) doesn't crap
@@ -3637,13 +3590,7 @@ get_config() {
 	VERBOSITY=2
     fi
 
-    if qt mywhich hostname; then
-	g_hostname=$(hostname 2> /dev/null)
-    elif qt mywhich uname; then
-	g_hostname=$(uname -n 2> /dev/null)
-    else
-	g_hostname=localhost
-    fi
+    g_hostname=$(hostname 2> /dev/null)
 
     if [ -n "$IPSET" ]; then
 	case "$IPSET" in
@@ -3683,11 +3630,29 @@ get_config() {
 
     g_loopback=$(find_loopback_interfaces)
 
-    lib=$(find_file lib.cli-user)
-
-    [ -f $lib ] && . $lib
-
 }
+
+#
+# Verify that we have a compiled firewall script
+#
+verify_firewall_script() {
+    if [ ! -f $g_firewall ]; then
+	echo "   ERROR: $g_product is not properly installed" >&2
+	if [ -L $g_firewall ]; then
+	    echo "          $g_firewall is a symbolic link to a" >&2
+	    echo "          non-existant file" >&2
+	else
+	    echo "          The file $g_firewall does not exist" >&2
+	fi
+
+	exit 2
+    fi
+}
+
+################################################################################
+# The remaining functions are used by the Lite cli - they are overloaded by
+# the Standard CLI by loading lib.cli-std
+################################################################################
 #
 # Start Command Executor
 #
@@ -3914,13 +3879,6 @@ usage() # $1 = exit status
     ecko "   refresh [ -d ] [ -n ] [ -T ] [ -D <directory> ] [ <chain>... ]"
     echo "   reject <address> ..."
     ecko "   reload [ -s ] [ -c ] [ -r <root user> ] [ -T ] [ -i ] [ <directory> ] <system>"
-
-    if [ -z "$g_lite" ]; then
-	echo "   remote-reload [ -s ] [ -c ] [ -r <root-name> ] [ -T ] [ -i ] [ <directory> ] <system>"
-	echo "   remote-restart [ -s ] [ -c ] [ -r <root-name> ] [ -T ] [ -i ] [ <directory> ] <system>"
-	echo "   remote-start [ -s ] [ -c ] [ -r <root-name> ] [ -T ] [ -i ] [ <directory> ] <system>"
-    fi
-
     echo "   reset [ <chain> ... ]"
 
     if [ -n "$g_lite" ]; then

Shorewall-core/lib.common

@@ -33,7 +33,7 @@ startup_error() # $* = Error Message
     echo "   ERROR: $@: Firewall state not changed" >&2
 
     if [ $LOG_VERBOSITY -ge 0 ]; then
-        timestamp="$(date +'%b %d %T') "
+        timestamp="$(date +'%_b %d %T') "
         echo "${timestamp}  ERROR: $@" >> $STARTUP_LOG
     fi
 
@@ -50,7 +50,7 @@ startup_error() # $* = Error Message
     esac
 
     if [ $LOG_VERBOSITY -ge 0 ]; then
-        timestamp="$(date +'%b %d %T') "
+        timestamp="$(date +'%_b %d %T') "
 
 	case $COMMAND in
 	    start)

Shorewall-init/shorewall-init.service.214.debian

@@ -2,7 +2,6 @@
 #     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
 #
 #     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
-#     Copyright 2015 Tom Eastep <teastep@shorewall.net>
 #
 [Unit]
 Description=Shorewall firewall (bootup security)

Shorewall-init/shorewall-init.service.debian

@@ -2,7 +2,6 @@
 #     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
 #
 #     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
-#     Copyright 2015 Tom Eastep <teastep@shorewall.net>
 #
 [Unit]
 Description=Shorewall firewall (bootup security)

Shorewall-lite/install.sh

@@ -151,8 +151,6 @@ while [ $finished -eq 0 ] ; do
     esac
 done
 
-[ -n $(mywhich install) ] || fatal_error "This installer requires the 'install' utility"
-
 #
 # Read the RC file
 #
@@ -189,7 +187,7 @@ elif [ -z "${VARDIR}" ]; then
     VARDIR=${VARLIB}/${PRODUCT}
 fi
 
-for var in SHAREDIR LIBEXECDIR CONFDIR SBINDIR VARLIB VARDIR; do
+for var in SHAREDIR LIBEXECDIRDIRDIR CONFDIR SBINDIR VARLIB VARDIR; do
     require $var
 done
 
@@ -318,7 +316,7 @@ if [ -n "$DESTDIR" ]; then
 	OWNERSHIP=""
     fi
 
-    install -d $OWNERSHIP -m 755 ${DESTDIR}${SBINDIR}
+    install -d $OWNERSHIP -m 755 ${DESTDIR}/${SBINDIR}
     install -d $OWNERSHIP -m 755 ${DESTDIR}${INITDIR}
 else
     if [ ! -f ${SHAREDIR}/shorewall/coreversion ]; then
@@ -424,8 +422,8 @@ fi
 # Install the  Makefile
 #
 run_install $OWNERSHIP -m 0600 Makefile ${DESTDIR}${CONFDIR}/$PRODUCT
-[ $SHAREDIR = /usr/share ] || eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}${CONFDIR}/$PRODUCT/Makefile
-[ $SBINDIR = /sbin ]       || eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\'       ${DESTDIR}${CONFDIR}/$PRODUCT/Makefile
+[ $SHAREDIR = /usr/share ] || eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}/${CONFDIR}/$PRODUCT/Makefile
+[ $SBINDIR = /sbin ]       || eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\'       ${DESTDIR}/${CONFDIR}/$PRODUCT/Makefile
 echo "Makefile installed as ${DESTDIR}${CONFDIR}/$PRODUCT/Makefile"
 
 #
@@ -440,7 +438,7 @@ echo "Default config path file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/confi
 for f in lib.* ; do
     if [ -f $f ]; then
 	install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/$f 0644
-	echo "Library ${f#*.} file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/$f"
+	echo "Library ${f#*.} file installed as ${DESTDIR}/${SHAREDIR}/$PRODUCT/$f"
     fi
 done
 
@@ -453,7 +451,7 @@ echo "Common functions linked through ${DESTDIR}${SHAREDIR}/$PRODUCT/functions"
 #
 
 install_file shorecap ${DESTDIR}${LIBEXECDIR}/$PRODUCT/shorecap 0755
-[ $SHAREDIR = /usr/share ] || eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}${LIBEXECDIR}/$PRODUCT/shorecap
+[ $SHAREDIR = /usr/share ] || eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}/${LIBEXECDIR}/$PRODUCT/shorecap
 
 echo
 echo "Capability file builder installed in ${DESTDIR}${LIBEXECDIR}/$PRODUCT/shorecap"
@@ -540,8 +538,8 @@ if [ -n "$SYSCONFFILE" -a -f "$SYSCONFFILE" -a ! -f ${DESTDIR}${SYSCONFDIR}/${PR
 fi
 
 if [ ${SHAREDIR} != /usr/share ]; then
-    eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}${SHAREDIR}/${PRODUCT}/lib.base
-    eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}${SBINDIR}/$PRODUCT
+    eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}/${SHAREDIR}/${PRODUCT}/lib.base
+    eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}/${SBINDIR}/$PRODUCT
 fi
 
 if [ $configure -eq 1 -a -z "$DESTDIR" -a -n "$first_install" -a -z "${cygwin}${mac}" ]; then

Shorewall-lite/shorewall-lite.service.debian

@@ -2,7 +2,6 @@
 #     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
 #
 #     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
-#     Copyright 2015 Tom Eastep <teastep@shorewall.net>
 #
 [Unit]
 Description=Shorewall IPv4 firewall (lite)

Shorewall-lite/uninstall.sh

@@ -168,11 +168,7 @@ if [ $configure -eq 1 ]; then
 fi
 
 if [ -L ${SHAREDIR}/shorewall-lite/init ]; then
-    if [ $HOST = "linux" ] && [ -f /etc/openwrt_release -o -f /etc/openwrt_version ]; then
-	FIREWALL=$(readlink ${SHAREDIR}/shorewall-lite/init)
-    else
-	FIREWALL=$(readlink -m -q ${SHAREDIR}/shorewall-lite/init)
-    fi
+    FIREWALL=$(readlink -m -q ${SHAREDIR}/shorewall-lite/init)
 elif [ -n "$INITFILE" ]; then
     FIREWALL=${INITDIR}/${INITFILE}
 fi
@@ -203,7 +199,6 @@ rm -rf ${VARDIR}/shorewall-lite
 rm -rf ${SHAREDIR}/shorewall-lite
 rm -rf ${LIBEXECDIR}/shorewall-lite
 rm -f  ${CONFDIR}/logrotate.d/shorewall-lite
-rm -f  ${SYSCONFDIR}/shorewall-lite
 
 rm -f ${MANDIR}/man5/shorewall-lite*
 rm -f ${MANDIR}/man8/shorewall-lite*

Shorewall/Macros/macro.AMQP

@@ -1,5 +1,5 @@
 #
-# Shorewall - AMQP Macro
+# Shorewall version 5 - AMQP Macro
 #
 # /usr/share/shorewall/macro.AMQP
 #

Shorewall/Macros/macro.A_AllowICMPs

@@ -1,5 +1,5 @@
 #
-# Shorewall - Audited AllowICMPs Macro
+# Shorewall version 5 - Audited AllowICMPs Macro
 #
 # /usr/share/shorewall/macro.A_AllowICMPs
 #

Shorewall/Macros/macro.A_DropDNSrep

@@ -1,5 +1,5 @@
 #
-# Shorewall - Audited DropDNSrep Macro
+# Shorewall version 5 - Audited DropDNSrep Macro
 #
 # /usr/share/shorewall/macro.A_DropDNSrep
 #

Shorewall/Macros/macro.A_DropUPnP

@@ -1,5 +1,5 @@
 #
-# Shorewall - ADropUPnP Macro
+# Shorewall version 5 - ADropUPnP Macro
 #
 # /usr/share/shorewall/macro.A_DropUPnP
 #

Shorewall/Macros/macro.ActiveDir

@@ -1,5 +1,5 @@
 #
-# Shorewall - Samba 4 Macro
+# Shorewall version 5 - Samba 4 Macro
 #
 # /usr/share/shorewall/macro.ActiveDir
 #

Shorewall/Macros/macro.AllowICMPs

@@ -1,5 +1,5 @@
 #
-# Shorewall - AllowICMPs Macro
+# Shorewall version 5 - AllowICMPs Macro
 #
 # /usr/share/shorewall/macro.AllowICMPs
 #

Shorewall/Macros/macro.Amanda

@@ -1,5 +1,5 @@
 #
-# Shorewall - Amanda Macro
+# Shorewall version 5 - Amanda Macro
 #
 # /usr/share/shorewall/macro.Amanda
 #

Shorewall/Macros/macro.Auth

@@ -1,5 +1,5 @@
 #
-# Shorewall - Auth Macro
+# Shorewall version 5 - Auth Macro
 #
 # /usr/share/shorewall/macro.Auth
 #

Shorewall/Macros/macro.BGP

@@ -1,5 +1,5 @@
 #
-# Shorewall - BGP Macro
+# Shorewall version 5 - BGP Macro
 #
 # /usr/share/shorewall/macro.BGP
 #

Shorewall/Macros/macro.BLACKLIST

@@ -1,5 +1,5 @@
 #
-# Shorewall - blacklist Macro
+# Shorewall version 5 - blacklist Macro
 #
 # /usr/share/shorewall/macro.blacklist
 #

Shorewall/Macros/macro.BitTorrent

@@ -1,5 +1,5 @@
 #
-# Shorewall - BitTorrent Macro
+# Shorewall version 5 - BitTorrent Macro
 #
 # /usr/share/shorewall/macro.BitTorrent
 #

Shorewall/Macros/macro.BitTorrent32

@@ -1,5 +1,5 @@
 #
-# Shorewall - BitTorrent 3.2 Macro
+# Shorewall version 5 - BitTorrent 3.2 Macro
 #
 # /usr/share/shorewall/macro.BitTorrent32
 #

Shorewall/Macros/macro.CVS

@@ -1,5 +1,5 @@
 #
-# Shorewall - CVS Macro
+# Shorewall version 5 - CVS Macro
 #
 # /usr/share/shorewall/macro.CVS
 #

Shorewall/Macros/macro.Citrix

@@ -1,5 +1,5 @@
 #
-# Shorewall - Citrix/ICA Macro
+# Shorewall version 5 - Citrix/ICA Macro
 #
 # /usr/share/shorewall/macro.Citrix
 #

Shorewall/Macros/macro.DAAP

@@ -1,5 +1,5 @@
 #
-# Shorewall - DAAP Macro
+# Shorewall version 5 - DAAP Macro
 #
 # /usr/share/shorewall/macro.DAAP
 #

Shorewall/Macros/macro.DCC

@@ -1,5 +1,5 @@
 #
-# Shorewall - DCC Macro
+# Shorewall version 5 - DCC Macro
 #
 # /usr/share/shorewall/macro.DCC
 #

Shorewall/Macros/macro.DHCPfwd

@@ -1,5 +1,5 @@
 #
-# Shorewall - DHCPfwd Macro
+# Shorewall version 5 - DHCPfwd Macro
 #
 # /usr/share/shorewall/macro.DHCPfwd
 #

Shorewall/Macros/macro.DNS

@@ -1,5 +1,5 @@
 #
-# Shorewall - DNS Macro
+# Shorewall version 5 - DNS Macro
 #
 # /usr/share/shorewall/macro.DNS
 #

Shorewall/Macros/macro.Distcc

@@ -1,5 +1,5 @@
 #
-# Shorewall - Distcc Macro
+# Shorewall version 5 - Distcc Macro
 #
 # /usr/share/shorewall/macro.Distcc
 #

Shorewall/Macros/macro.Drop

@@ -1,5 +1,5 @@
 #
-# Shorewall - Drop Macro
+# Shorewall version 5 - Drop Macro
 #
 # /usr/share/shorewall/macro.Drop
 #

Shorewall/Macros/macro.DropDNSrep

@@ -1,5 +1,5 @@
 #
-# Shorewall - DropDNSrep Macro
+# Shorewall version 5 - DropDNSrep Macro
 #
 # /usr/share/shorewall/macro.DropDNSrep
 #

Shorewall/Macros/macro.DropUPnP

@@ -1,5 +1,5 @@
 #
-# Shorewall - DropUPnP Macro
+# Shorewall version 5 - DropUPnP Macro
 #
 # /usr/share/shorewall/macro.DropUPnP
 #

Shorewall/Macros/macro.Edonkey

@@ -1,5 +1,5 @@
 #
-# Shorewall - Edonkey Macro
+# Shorewall version 5 - Edonkey Macro
 #
 # /usr/share/shorewall/macro.Edonkey
 #

Shorewall/Macros/macro.FTP

@@ -1,5 +1,5 @@
 #
-# Shorewall - FTP Macro
+# Shorewall version 5 - FTP Macro
 #
 # /usr/share/shorewall/macro.FTP
 #

Shorewall/Macros/macro.Finger

@@ -1,5 +1,5 @@
 #
-# Shorewall - Finger Macro
+# Shorewall version 5 - Finger Macro
 #
 # /usr/share/shorewall/macro.Finger
 #

Shorewall/Macros/macro.GNUnet

@@ -1,5 +1,5 @@
 #
-# Shorewall - GNUnet Macro
+# Shorewall version 5 - GNUnet Macro
 #
 # /usr/share/shorewall/macro.GNUnet
 #

Shorewall/Macros/macro.GRE

@@ -1,5 +1,5 @@
 #
-# Shorewall - GRE Macro
+# Shorewall version 5 - GRE Macro
 #
 # /usr/share/shorewall/macro.GRE
 #

Shorewall/Macros/macro.Git

@@ -1,5 +1,5 @@
 #
-# Shorewall - Git Macro
+# Shorewall version 5 - Git Macro
 #
 # /usr/share/shorewall/macro.Git
 #

Shorewall/Macros/macro.Gnutella

@@ -1,5 +1,5 @@
 #
-# Shorewall - Gnutella Macro
+# Shorewall version 5 - Gnutella Macro
 #
 # /usr/share/shorewall/macro.Gnutella
 #

Shorewall/Macros/macro.Goto-Meeting

@@ -1,5 +1,5 @@
 #
-# Shorewall - Citrix/Goto Meeting macro
+# Shorewall version 5 - Citrix/Goto Meeting macro
 #
 # /usr/share/shorewall/macro.Goto-Meeting
 #          by Eric Teeter

Shorewall/Macros/macro.HKP

@@ -1,5 +1,5 @@
 #
-# Shorewall - HKP Macro
+# Shorewall version 5 - HKP Macro
 #
 # /usr/share/shorewall/macro.HKP
 #

Shorewall/Macros/macro.HTTP

@@ -1,5 +1,5 @@
 #
-# Shorewall - HTTP Macro
+# Shorewall version 5 - HTTP Macro
 #
 # /usr/share/shorewall/macro.HTTP
 #

Shorewall/Macros/macro.HTTPS

@@ -1,5 +1,5 @@
 #
-# Shorewall - HTTPS Macro
+# Shorewall version 5 - HTTPS Macro
 #
 # /usr/share/shorewall/macro.HTTPS
 #

Shorewall/Macros/macro.ICPV2

@@ -1,5 +1,5 @@
 #
-# Shorewall - ICPV2 Macro
+# Shorewall version 5 - ICPV2 Macro
 #
 # /usr/share/shorewall/macro.ICPV2
 #

Shorewall/Macros/macro.ICQ

@@ -1,5 +1,5 @@
 #
-# Shorewall - ICQ Macro
+# Shorewall version 5 - ICQ Macro
 #
 # /usr/share/shorewall/macro.ICQ
 #

Shorewall/Macros/macro.ILO

@@ -1,5 +1,5 @@
 #
-# Shorewall - ILO Macro
+# Shorewall version 5 - ILO Macro
 #
 # /usr/share/shorewall/macro.ILO
 #

Shorewall/Macros/macro.IMAP

@@ -1,5 +1,5 @@
 #
-# Shorewall - IMAP Macro
+# Shorewall version 5 - IMAP Macro
 #
 # /usr/share/shorewall/macro.IMAP
 #

Shorewall/Macros/macro.IMAPS

@@ -1,5 +1,5 @@
 #
-# Shorewall - IMAPS Macro
+# Shorewall version 5 - IMAPS Macro
 #
 # /usr/share/shorewall/macro.IMAPS
 #

Shorewall/Macros/macro.IPIP

@@ -1,5 +1,5 @@
 #
-# Shorewall - IPIP Macro
+# Shorewall version 5 - IPIP Macro
 #
 # /usr/share/shorewall/macro.IPIP
 #

Shorewall/Macros/macro.IPMI

@@ -1,5 +1,5 @@
 #
-# Shorewall - IPMI Macro
+# Shorewall version 5 - IPMI Macro
 #
 # /usr/share/shorewall/macro.IPMI
 #

Shorewall/Macros/macro.IPP

@@ -1,5 +1,5 @@
 #
-# Shorewall - IPP Macro
+# Shorewall version 3.2 - IPP Macro
 #
 # /usr/share/shorewall/macro.IPP
 #

Shorewall/Macros/macro.IPPbrd

@@ -1,5 +1,5 @@
 #
-# Shorewall - IPP Broadcast Macro
+# Shorewall version 5 - IPP Broadcast Macro
 #
 # /usr/share/shorewall/macro.IPPbrd
 #

Shorewall/Macros/macro.IPPserver

@@ -1,5 +1,5 @@
 #
-# Shorewall - IPPserver Macro
+# Shorewall version 5 - IPPserver Macro
 #
 # /usr/share/shorewall/macro.IPPserver
 #

Shorewall/Macros/macro.IPsec

@@ -1,5 +1,5 @@
 #
-# Shorewall - IPsec Macro
+# Shorewall version 5 - IPsec Macro
 #
 # /usr/share/shorewall/macro.IPsec
 #

Shorewall/Macros/macro.IPsecah

@@ -1,5 +1,5 @@
 #
-# Shorewall - IPsecah Macro
+# Shorewall version 5 - IPsecah Macro
 #
 # /usr/share/shorewall/macro.IPsecah
 #

Shorewall/Macros/macro.IPsecnat

@@ -1,5 +1,5 @@
 #
-# Shorewall - IPsecnat Macro
+# Shorewall version 5 - IPsecnat Macro
 #
 # /usr/share/shorewall/macro.IPsecnat
 #

Shorewall/Macros/macro.IRC

@@ -1,5 +1,5 @@
 #
-# Shorewall IRC Macro
+# Shorewall version 5 IRC Macro
 #
 # /usr/share/shorewall/macro.IRC
 #

Shorewall/Macros/macro.JAP

@@ -1,5 +1,5 @@
 #
-# Shorewall - JAP Macro
+# Shorewall version 5 - JAP Macro
 #
 # /usr/share/shorewall/macro.JAP
 #

Shorewall/Macros/macro.Jabber

@@ -1,5 +1,5 @@
 #
-# Shorewall - Jabber Macro
+# Shorewall version 5 - Jabber Macro
 #
 # /usr/share/shorewall/macro.Jabber
 #

Shorewall/Macros/macro.JabberPlain

@@ -1,5 +1,5 @@
 #
-# Shorewall - JabberPlain Macro
+# Shorewall version 5 - JabberPlain Macro
 #
 # /usr/share/shorewall/macro.JabberPlain
 #

Shorewall/Macros/macro.JabberSecure

@@ -1,5 +1,5 @@
 #
-# Shorewall - JabberSecure (SSL) Macro
+# Shorewall version 5 - JabberSecure (SSL) Macro
 #
 # /usr/share/shorewall/macro.JabberSecure
 #

Shorewall/Macros/macro.Jabberd

@@ -1,5 +1,5 @@
 #
-# Shorewall - Jabberd (server intercommunication)
+# Shorewall version 3.4 - Jabberd (server intercommunication)
 #
 # /usr/share/shorewall/macro.Jabberd
 #

Shorewall/Macros/macro.Jetdirect

@@ -1,5 +1,5 @@
 #
-# Shorewall - Jetdirect Macro
+# Shorewall version 3.2 - Jetdirect Macro
 #
 # /usr/share/shorewall/macro.Jetdirect
 #

Shorewall/Macros/macro.Kerberos

@@ -1,5 +1,5 @@
 #
-# Shorewall - Kerberos Macro
+# Shorewall version 5 - Kerberos Macro
 #
 # /usr/share/shorewall/macro.Kerberos
 #

Shorewall/Macros/macro.L2TP

@@ -1,5 +1,5 @@
 #
-# Shorewall - L2TP Macro
+# Shorewall version 5 - L2TP Macro
 #
 # /usr/share/shorewall/macro.L2TP
 #

Shorewall/Macros/macro.LDAP

@@ -1,5 +1,5 @@
 #
-# Shorewall - LDAP Macro
+# Shorewall version 5 - LDAP Macro
 #
 # /usr/share/shorewall/macro.LDAP
 #

Shorewall/Macros/macro.LDAPS

@@ -1,5 +1,5 @@
 #
-# Shorewall - LDAPS Macro
+# Shorewall version 5 - LDAPS Macro
 #
 # /usr/share/shorewall/macro.LDAPS
 #

Shorewall/Macros/macro.MSNP

@@ -1,5 +1,5 @@
 #
-# Shorewall - MSNP Macro
+# Shorewall version 5 - MSNP Macro
 #
 # /usr/share/shorewall/macro.MSNP
 #

Shorewall/Macros/macro.MSSQL

@@ -1,5 +1,5 @@
 #
-# Shorewall - MSSQL Macro
+# Shorewall version 5 - MSSQL Macro
 #
 # /usr/share/shorewall/macro.MSSQL
 #
@@ -9,4 +9,3 @@
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	1433
-PARAM	-	-	udp	1434

Shorewall/Macros/macro.Mail

@@ -1,5 +1,5 @@
 #
-# Shorewall - Mail Macro
+# Shorewall version 5 - Mail Macro
 #
 # /usr/share/shorewall/macro.Mail
 #

Shorewall/Macros/macro.MongoDB

@@ -1,5 +1,5 @@
 #
-# Shorewall - MongoDB Macro
+# Shorewall version 5 - MongoDB Macro
 #
 # /usr/share/shorewall/macro.MongoDB
 #

Shorewall/Macros/macro.Munin

@@ -1,5 +1,5 @@
 #
-# Shorewall - Munin Macro
+# Shorewall version 5 - Munin Macro
 #
 # /usr/share/shorewall/macro.Munin
 #

Shorewall/Macros/macro.MySQL

@@ -1,5 +1,5 @@
 #
-# Shorewall - MySQL Macro
+# Shorewall version 5 - MySQL Macro
 #
 # /usr/share/shorewall/macro.MySQL
 #

Shorewall/Macros/macro.NNTP

@@ -1,5 +1,5 @@
 #
-# Shorewall NNTP Macro
+# Shorewall version 5 NNTP Macro
 #
 # /usr/share/shorewall/macro.NNTP
 #

Shorewall/Macros/macro.NNTPS

@@ -1,5 +1,5 @@
 #
-# Shorewall NNTPS Macro
+# Shorewall version 5 NNTPS Macro
 #
 # /usr/share/shorewall/macro.NNTPS
 #

Shorewall/Macros/macro.NTP

@@ -1,5 +1,5 @@
 #
-# Shorewall - NTP Macro
+# Shorewall version 5 - NTP Macro
 #
 # /usr/share/shorewall/macro.NTP
 #

Shorewall/Macros/macro.NTPbi

@@ -1,5 +1,5 @@
 #
-# Shorewall - NTPbi Macro
+# Shorewall version 5 - NTPbi Macro
 #
 # /usr/share/shorewall/macro.NTPbi
 #

Shorewall/Macros/macro.NTPbrd

@@ -1,5 +1,5 @@
 #
-# Shorewall - NTPbrd Macro
+# Shorewall version 5 - NTPbrd Macro
 #
 # /usr/share/shorewall/macro.NTPbrd
 #

Shorewall/Macros/macro.OSPF

@@ -1,5 +1,5 @@
 #
-# Shorewall - OSPF Macro
+# Shorewall version 5 - OSPF Macro
 #
 # /usr/share/shorewall/macro.OSPF
 #

Shorewall/Macros/macro.OpenVPN

@@ -1,5 +1,5 @@
 #
-# Shorewall - OpenVPN Macro
+# Shorewall version 5 - OpenVPN Macro
 #
 # /usr/share/shorewall/macro.OpenVPN Macro
 #

Shorewall/Macros/macro.PCA

@@ -1,5 +1,5 @@
 #
-# Shorewall - PCA Macro
+# Shorewall version 5 - PCA Macro
 #
 # /usr/share/shorewall/macro.PCA
 #

Shorewall/Macros/macro.POP3

@@ -1,5 +1,5 @@
 #
-# Shorewall - POP3 Macro
+# Shorewall version 5 - POP3 Macro
 #
 # /usr/share/shorewall/macro.POP3
 #

Shorewall/Macros/macro.POP3S

@@ -1,5 +1,5 @@
 #
-# Shorewall - POP3S Macro
+# Shorewall version 5 - POP3S Macro
 #
 # /usr/share/shorewall/macro.POP3S
 #

Shorewall/Macros/macro.PPtP

@@ -1,5 +1,5 @@
 #
-# Shorewall - PPTP Macro
+# Shorewall version 5 - PPTP Macro
 #
 # /usr/share/shorewall/macro.PPtP Macro
 #

Shorewall/Macros/macro.Ping

@@ -1,5 +1,5 @@
 #
-# Shorewall - Ping Macro
+# Shorewall version 5 - Ping Macro
 #
 # /usr/share/shorewall/macro.Ping
 #

Shorewall/Macros/macro.PostgreSQL

@@ -1,5 +1,5 @@
 #
-# Shorewall - PostgreSQL Macro
+# Shorewall version 5 - PostgreSQL Macro
 #
 # /usr/share/shorewall/macro.PostgreSQL
 #

Shorewall/Macros/macro.Printer

@@ -1,5 +1,5 @@
 #
-# Shorewall - Printer Macro
+# Shorewall version 3.2 - Printer Macro
 #
 # /usr/share/shorewall/macro.Printer
 #

Shorewall/Macros/macro.Puppet

@@ -1,5 +1,5 @@
 #
-# Shorewall - Puppet Macro
+# Shorewall version 5 - Puppet Macro
 #
 # /usr/share/shorewall/macro.Puppet
 #

Shorewall/Macros/macro.QUIC

@@ -1,5 +1,5 @@
 #
-# Shorewall - QUIC Macro
+# Shorewall version 5 - QUIC Macro
 #
 # /usr/share/shorewall/macro.QUIC
 #

Shorewall/Macros/macro.RDP

@@ -1,5 +1,5 @@
 #
-# Shorewall - RDP Macro
+# Shorewall version 3.2 - RDP Macro
 #
 # /usr/share/shorewall/macro.RDP
 #

Shorewall/Macros/macro.RIPbi

@@ -1,5 +1,5 @@
 #
-# Shorewall - RIPbi Macro
+# Shorewall version 5 - RIPbi Macro
 #
 # /usr/share/shorewall/macro.RIPbi
 #

Shorewall/Macros/macro.RNDC

@@ -1,5 +1,5 @@
 #
-# Shorewall - RNDC Macro
+# Shorewall version 5 - RNDC Macro
 #
 # /usr/share/shorewall/macro.RNDC
 #

Shorewall/Macros/macro.Razor

@@ -1,5 +1,5 @@
 #
-# Shorewall - Razor Macro
+# Shorewall version 5 - Razor Macro
 #
 # /usr/share/shorewall/macro.Razor
 #

Shorewall/Macros/macro.Rdate

@@ -1,5 +1,5 @@
 #
-# Shorewall - Rdate Macro
+# Shorewall version 5 - Rdate Macro
 #
 # /usr/share/shorewall/macro.Rdate
 #

Shorewall/Macros/macro.Redis

@@ -1,5 +1,5 @@
 #
-# Shorewall - Redis Macro
+# Shorewall version 5 - Redis Macro
 #
 # /usr/share/shorewall/macro.Redis
 #

Shorewall/Macros/macro.Reject

@@ -1,5 +1,5 @@
 #
-# Shorewall - Reject Macro
+# Shorewall version 5 - Reject Macro
 #
 # /usr/share/shorewall/macro.Reject
 #

Shorewall/Macros/macro.Rfc1918

@@ -1,5 +1,5 @@
 #
-# Shorewall - Macro Template
+# Shorewall version 5 - Macro Template
 #
 # /usr/share/shorewall/macro.Rfc1918
 #

Shorewall/Macros/macro.Rsync

@@ -1,5 +1,5 @@
 #
-# Shorewall - Rsync Macro
+# Shorewall version 5 - Rsync Macro
 #
 # /usr/share/shorewall/macro.Rsync
 #

Shorewall/Macros/macro.SANE

@@ -1,5 +1,5 @@
 #
-# Shorewall - SANE Macro
+# Shorewall version 5 - SANE Macro
 #
 # /usr/share/shorewall/macro.SANE
 #

Shorewall/Macros/macro.SIP

@@ -1,5 +1,5 @@
 #
-# Shorewall - SIP Macro
+# Shorewall version 5 - SIP Macro
 #
 # /usr/share/shorewall/macro.SIP
 #