shorewall6/Makefile: fix to use reload instead of restart

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

Shorewall-core/configure

@@ -91,8 +91,6 @@ for p in $@; do
     fi
 done
 
-cd $(dirname $0)
-
 vendor=${params[HOST]}
 
 if [ -z "$vendor" ]; then
@@ -104,7 +102,7 @@ if [ -z "$vendor" ]; then
 		vendor=redhat
 		;;
 	    debian|ubuntu)
-		vendor=debian
+		ls -l /sbin/init |fgrep -q systemd | vendor=debian.systemd | vendor=debian.sysvinit
 		;;
 	    opensuse)
 		vendor=suse
@@ -124,6 +122,7 @@ if [ -z "$vendor" ]; then
 	    params[HOST]=apple
 	    rcfile=shorewallrc.apple
 	    ;;
+
 	cygwin*|CYGWIN*)
 	    params[HOST]=cygwin
 	    rcfile=shorewallrc.cygwin
@@ -131,7 +130,7 @@ 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
+		rcfile=shorewallrc.debian.sysvinit
 	    elif [ -f /etc/redhat-release ]; then
 		params[HOST]=redhat
 		rcfile=shorewallrc.redhat
@@ -144,41 +143,28 @@ if [ -z "$vendor" ]; then
 	    elif [ -f /etc/arch-release ] ; then
 		params[HOST]=archlinux
 		rcfile=shorewallrc.archlinux
-	    elif [ -f /etc/openwrt_release ]; then
-		params[HOST]=openwrt
-		rcfile=shorewallrc.openwrt
 	    else
 		params[HOST]=linux
 		rcfile=shorewallrc.default
 	    fi
 	    ;;
     esac
-    vendor=${params[HOST]}
-else
-    if [ $vendor = linux ]; then
-	rcfile=shorewallrc.default;
-    elif [ $vendor = debian -a -f /etc/debian_version ]; then
-	ls -l /sbin/init | fgrep -q systemd && rcfile=shorewallrc.debian.systemd || rcfile=shorewallrc.debian.sysvinit
-    else
-	rcfile=shorewallrc.$vendor
-    fi
 
+    vendor=${params[HOST]}
+elif [ $vendor = linux ]; then
+    rcfile=shorewallrc.default;
+else
+    rcfile=shorewallrc.$vendor
     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
-    elif [[ $vendor == debian.* ]]; then
-	params[HOST]=debian
-	vendor=debian
     fi
 fi
 
 if [ $vendor = linux ]; then
     echo "INFO: Creating a generic Linux installation - " `date`;
 else
-    echo "INFO: Creating a ${params[HOST]}-specific installation - " `date`;
+    echo "INFO: Creating a ${vendor}-specific installation - " `date`;
 fi
 
 echo
@@ -191,7 +177,6 @@ done
 
 echo '#'                                                                 > shorewallrc
 echo "# Created by Shorewall Core version $VERSION configure - " `date` >> shorewallrc
-echo "# rc file: $rcfile"                                               >> shorewallrc
 echo '#'                                                                >> shorewallrc
 
 if [ $# -gt 0 ]; then

Shorewall-core/configure.pl

@@ -52,9 +52,6 @@ for ( @ARGV ) {
     $params{$pn} = $pv;
 }
 
-use File::Basename;
-chdir dirname($0);
-
 my $vendor = $params{HOST};
 my $rcfile;
 my $rcfilename;
@@ -84,39 +81,12 @@ unless ( defined $vendor ) {
 }
 
 if ( defined $vendor ) {
-    if ( $vendor eq 'debian' && -f '/etc/debian_version' ) {
-	if ( -l '/sbin/init' ) {
-	    if ( readlink('/sbin/init') =~ /systemd/ ) {
-		$rcfilename = 'shorewallrc.debian.systemd';
-	    } else {
-		$rcfilename = 'shorewallrc.debian.sysvinit';
-	    }
-	} else {
-	    $rcfilename = 'shorewallrc.debian.sysvinit';
-	}
-    } else {
-	$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';
-    } elsif ( $vendor =~ /^debian\./ ) {
-	$params{HOST} = $vendor = 'debian';
-    }
+    $rcfilename = $vendor eq 'linux' ? 'shorewallrc.default' : 'shorewallrc.' . $vendor;
+    die qq("ERROR: $vendor" is not a recognized host type) unless -f $rcfilename;
 } else {
     if ( -f '/etc/debian_version' ) {
 	$vendor = 'debian';
-	if ( -l '/sbin/init' ) {
-	    if ( readlink( '/sbin/init' ) =~ /systemd/ ) {
-		$rcfilename = 'shorewallrc.debian.systemd';
-	    } else {
-		$rcfilename = 'shorewallrc.debian.sysvinit';
-	    }
-	} else {
-	    $rcfilename = 'shorewallrc.debian.sysvinit';
-	}
+	$rcfilename = 'shorewallrc.debian.sysvinit';
     } elsif ( -f '/etc/redhat-release' ){
 	$vendor = 'redhat';
 	$rcfilename = 'shorewallrc.redhat';
@@ -173,8 +143,7 @@ my $outfile;
 
 open $outfile, '>', 'shorewallrc' or die "Can't open 'shorewallrc' for output: $!";
 
-printf $outfile "#\n# Created by Shorewall Core version %s configure.pl - %s %2d %04d %02d:%02d:%02d\n", VERSION, $abbr[$localtime[4]], $localtime[3], 1900 + $localtime[5] , @localtime[2,1,0];
-print $outfile "# rc file: $rcfilename\n#\n";
+printf $outfile "#\n# Created by Shorewall Core version %s configure.pl - %s %2d %04d %02d:%02d:%02d\n#\n", VERSION, $abbr[$localtime[4]], $localtime[3], 1900 + $localtime[5] , @localtime[2,1,0];
 
 print  $outfile "# Input: @ARGV\n#\n" if @ARGV;
 

Shorewall-core/install.sh

@@ -66,6 +66,15 @@ mywhich() {
     return 2
 }
 
+run_install()
+{
+    if ! install $*; then
+	echo
+	echo "ERROR: Failed to install $*" >&2
+	exit 1
+    fi
+}
+
 cant_autostart()
 {
     echo
@@ -79,20 +88,7 @@ delete_file() # $1 = file to delete
 
 install_file() # $1 = source $2 = target $3 = mode
 {
-    if cp -f $1 $2; then
-	if chmod $3 $2; then
-	    if [ -n "$OWNER" ]; then
-		if chown $OWNER:$GROUP $2; then
-		    return
-		fi
-	    else
-		return 0
-	    fi
-	fi
-    fi
-
-    echo "ERROR: Failed to install $2" >&2
-    exit 1
+    run_install $T $OWNERSHIP -m $3 $1 ${2}
 }
 
 require()
@@ -185,6 +181,10 @@ done
 
 [ "${INITFILE}" != 'none/' ] && require INITSOURCE && require INITDIR
 
+T="-T"
+
+INSTALLD='-D'
+
 if [ -z "$BUILD" ]; then
     case $(uname) in
 	cygwin*|CYGWIN*)
@@ -226,8 +226,6 @@ if [ -z "$BUILD" ]; then
 		BUILD=suse
 	    elif [ -f /etc/arch-release ] ; then
 		BUILD=archlinux
-	    elif [ -f ${CONFDIR}/openwrt_release ] ; then
-		BUILD=openwrt
 	    else
 		BUILD=linux
 	    fi
@@ -254,15 +252,17 @@ case $BUILD in
 
 	[ -z "$OWNER" ] && OWNER=root
 	[ -z "$GROUP" ] && GROUP=wheel
+	INSTALLD=
+	T=
 	;;
     *)
-	if [ $(id -u) -eq 0 ]; then
-	    [ -z "$OWNER" ] && OWNER=root
-	    [ -z "$GROUP" ] && GROUP=root
-	fi
+	[ -z "$OWNER" ] && OWNER=root
+	[ -z "$GROUP" ] && GROUP=root
 	;;
 esac
 
+OWNERSHIP="-o $OWNER -g $GROUP"
+
 #
 # Determine where to install the firewall script
 #
@@ -276,7 +276,7 @@ case "$HOST" in
     apple)
 	echo "Installing Mac-specific configuration...";
 	;;
-    debian|gentoo|redhat|slackware|archlinux|linux|suse|openwrt)
+    debian|gentoo|redhat|slackware|archlinux|linux|suse)
 	;;
     *)
 	echo "ERROR: Unknown HOST \"$HOST\"" >&2
@@ -305,6 +305,7 @@ if [ -n "$DESTDIR" ]; then
     if [ $BUILD != cygwin ]; then
 	if [ `id -u` != 0 ] ; then
 	    echo "Not setting file owner/group permissions, not running as root."
+	    OWNERSHIP=""
 	fi
     fi
 fi
@@ -406,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

@@ -143,63 +143,29 @@ timed_read ()
 }
 
 #
-# Determine if 'syslogd -C' or logd -S is running
+# Determine if 'syslog -C' is running
 #
 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
-	    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
-		    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
+    ps ax 2> /dev/null | while read pid tty flags cputime path args; do
+	case $path in
+	    syslogd|*/syslogd)
+		for arg in $args; do
+		    if [ x$arg = x-C ]; then
+			echo Yes
+			return
+		    fi
+		done
+		;;
+	esac
+    done
 }
 
 #
@@ -207,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
 }
 
@@ -342,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')
@@ -1052,13 +1000,11 @@ show_command() {
 		conntrack -f ipv6 -L $@ | show_connections_filter
 	    else
 		[ $# -gt 1 ] && usage 1
-		if [ -f /proc/sys/net/netfilter/nf_conntrack_count -a -f /proc/sys/net/nf_conntrack ]; then
-		    local count=$(cat /proc/sys/net/netfilter/nf_conntrack_count)
-		    local max=$(cat /proc/sys/net/netfilter/nf_conntrack_max)
-		    echo "$g_product $SHOREWALL_VERSION Connections ($count of $max) at $g_hostname - $(date)"
-		    echo
-		    grep '^ipv6' /proc/net/nf_conntrack | sed -r 's/0000:/:/g; s/:::+/::/g; s/:0+/:/g' | show_connections_filter
-		fi
+		local count=$(cat /proc/sys/net/netfilter/nf_conntrack_count)
+		local max=$(cat /proc/sys/net/netfilter/nf_conntrack_max)
+		echo "$g_product $SHOREWALL_VERSION Connections ($count of $max) at $g_hostname - $(date)"
+		echo
+		grep '^ipv6' /proc/net/nf_conntrack | sed -r 's/0000:/:/g; s/:::+/::/g; s/:0+/:/g' | show_connections_filter
 	    fi
 	    ;;
 	nat)
@@ -1092,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
@@ -1471,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"
 
@@ -1626,7 +1592,7 @@ do_dump_command() {
 
     echo
 
-    qt mywhich ss && ss -${g_family}tunap || { qt mywhich netstat && netatat -tunap; }
+    ss -${g_family}tunap
 
     if [ -n "$TC_ENABLED" ]; then
 	heading "Traffic Control"
@@ -3529,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
 
@@ -3578,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
@@ -3640,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
@@ -3686,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
 #
@@ -3917,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)
@@ -316,7 +316,6 @@ reload_kernel_modules() {
     local moduleloader
     moduleloader=modprobe
     local uname
-    local extras
 
     if ! qt mywhich modprobe; then
 	moduleloader=insmod
@@ -324,25 +323,9 @@ reload_kernel_modules() {
 
     [ -n "${MODULE_SUFFIX:=ko ko.gz ko.xz o o.gz o.xz gz xz}" ]
 
-    if [ -n "$MODULESDIR" ]; then
-	case "$MODULESDIR" in
-	    +*)
-		extras="$MODULESDIR"
-		extras=${extras#+}
-		MODULESDIR=
-		;;
-	esac
-    fi
-
-    if [ -z "$MODULESDIR" ]; then
-	uname=$(uname -r)
+    [ -z "$MODULESDIR" ] && \
+	uname=$(uname -r) && \
 	MODULESDIR=/lib/modules/$uname/kernel/net/ipv${g_family}/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset
-	if [ -n "$extras" ]; then
-	    for directory in $(split "$extras"); do
-		MODULESDIR="$MODULESDIR:/lib/modules/$uname/$directory"
-	    done
-	fi
-    fi
 
     [ -d /sys/module/ ] || MODULES=$(lsmod | cut -d ' ' -f1)
 
@@ -372,7 +355,6 @@ load_kernel_modules() # $1 = Yes, if we are to save moduleinfo in $VARDIR
     local savemoduleinfo
     savemoduleinfo=${1:-Yes} # So old compiled scripts still work
     local uname
-    local extras
 
     if ! qt mywhich modprobe; then
 	moduleloader=insmod
@@ -380,25 +362,9 @@ load_kernel_modules() # $1 = Yes, if we are to save moduleinfo in $VARDIR
 
     [ -n "${MODULE_SUFFIX:=o gz xz ko o.gz o.xz ko.gz ko.xz}" ]
 
-    if [ -n "$MODULESDIR" ]; then
-	case "$MODULESDIR" in
-	    +*)
-		extras="$MODULESDIR"
-		extras=${extras#+}
-		MODULESDIR=
-		;;
-	esac
-    fi
-
-    if [ -z "$MODULESDIR" ]; then
-	uname=$(uname -r)
+    [ -z "$MODULESDIR" ] && \
+	uname=$(uname -r) && \
 	MODULESDIR=/lib/modules/$uname/kernel/net/ipv${g_family}/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset
-	if [ -n "$extras" ]; then
-	    for directory in $(split "$extras"); do
-		MODULESDIR="$MODULESDIR:/lib/modules/$uname/$directory"
-	    done
-	fi
-    fi
 
     for directory in $(split $MODULESDIR); do
 	[ -d $directory ] && moduledirectories="$moduledirectories $directory"
@@ -743,15 +709,12 @@ mutex_on()
     local lockf
     lockf=${LOCKFILE:=${VARDIR}/lock}
     local lockpid
-    local lockd
 
     MUTEX_TIMEOUT=${MUTEX_TIMEOUT:-60}
 
     if [ $MUTEX_TIMEOUT -gt 0 ]; then
 
-	lockd=$(dirname $LOCKFILE)
-
-	[ -d "$lockd" ] || mkdir -p "$lockd"
+	[ -d ${VARDIR} ] || mkdir -p ${VARDIR}
 
 	if [ -f $lockf ]; then
 	    lockpid=`cat ${lockf} 2> /dev/null`
@@ -771,11 +734,6 @@ mutex_on()
 	    chmod u+w ${lockf}
 	    echo $$ > ${lockf}
 	    chmod u-w ${lockf}
-	elif qt mywhich lock; then
-            lock -${MUTEX_TIMEOUT} -r1 ${lockf}
-            chmod u+w ${lockf}
-            echo $$ > ${lockf}
-            chmod u-w ${lockf}
 	else
 	    while [ -f ${lockf} -a ${try} -lt ${MUTEX_TIMEOUT} ] ; do
 		sleep 1

Shorewall-core/shorewallrc.openwrt

@@ -1,26 +0,0 @@
-#
-# Created by Shorewall Core version 5.0.2-RC1 configure -  Fri, Nov 06, 2015 10:02:03 AM
-#
-# Input: host=openwrt
-#
-HOST=openwrt
-PREFIX=/usr                             
-SHAREDIR=${PREFIX}/share                
-LIBEXECDIR=${PREFIX}/share              
-PERLLIBDIR=${PREFIX}/share/shorewall    
-CONFDIR=/etc                            
-SBINDIR=/sbin                           
-MANDIR=${PREFIX}/man                    
-INITDIR=/etc/init.d                     
-INITSOURCE=init.openwrt.sh
-INITFILE=$PRODUCT                       
-AUXINITSOURCE=
-AUXINITFILE=
-SERVICEDIR=                             
-SERVICEFILE=                            
-SYSCONFFILE=default.openwrt
-SYSCONFDIR=${CONFDIR}/sysconfig
-SPARSE=                                 
-ANNOTATED=                              
-VARLIB=/lib
-VARDIR=${VARLIB}/$PRODUCT               

Shorewall-init/install.sh

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

Shorewall-init/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-init/uninstall.sh

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

Shorewall-lite/default.openwrt

@@ -1,25 +0,0 @@
-# sysV init file script configuration(/etc/sysconfdir/shorewall-lite)
-
-# startup option(default "-vvv")
-OPTIONS=
-
-# change default start run level(if none empty; /etc/init.d/shorewall-lite enable)
-START=50
-
-# change default stop run level(if none empty; /etc/init.d/shorewall-lite enable)
-STOP=
-
-# option to pass when shorewall start is executed
-STARTOPTIONS=
-
-# option to pass when shorewall restart is executed
-RESTARTOPTIONS=
-
-# option to pass when shorewall reload is executed
-RELOADOPTIONS=
-
-# option to pass when shorewall stop is executed
-STOPOPTIONS=
-
-# option to pass when shorewall status is executed
-STATUSOPTIONS=

Shorewall-lite/init.openwrt.sh

@@ -1,98 +0,0 @@
-#!/bin/sh /etc/rc.common
-#
-#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5
-#
-#     (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2012,2014 - Tom Eastep (teastep@shorewall.net)
-#     (c) 2015 - Matt Darfeuille - (matdarf@gmail.com)
-#
-#	On most distributions, this file should be called /etc/init.d/shorewall.
-#
-#	Complete documentation is available at http://shorewall.net
-#
-#       This program is part of Shorewall.
-#
-#	This program is free software; you can redistribute it and/or modify
-#	it under the terms of the GNU General Public License as published by the
-#       Free Software Foundation, either version 2 of the license or, at your
-#       option, any later version.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#	GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-#	If an error occurs while starting or restarting the firewall, the
-#	firewall is automatically stopped.
-#
-#	Commands are:
-#
-#	   shorewall-lite start			  Starts the firewall
-#	   shorewall-lite restart		  Restarts the firewall
-#	   shorewall-lite reload		  Reload the firewall
-#						  (same as restart)
-#	   shorewall-lite stop			  Stops the firewall
-#	   shorewall-lite status		  Displays firewall status
-#
-
-# description: Packet filtering firewall
-
-# openwrt stuph
-# start and stop runlevel variable
-#START=21
-#STOP=91
-# variable to display what the status command do when /etc/init.d/shorewall-lite is invoke without argument
-EXTRA_COMMANDS="status"
-EXTRA_HELP="Displays shorewall status"
-
-################################################################################
-# Get startup options (override default)
-################################################################################
-OPTIONS="-vvv"
-
-#
-# The installer may alter this
-#
-. /usr/share/shorewall/shorewallrc
-
-if [ -f ${SYSCONFDIR}/shorewall-lite ]; then
-    . ${SYSCONFDIR}/shorewall-lite
-fi
-
-START=${START:-21}
-STOP=${STOP:-91}
-
-SHOREWALL_INIT_SCRIPT=1
-
-################################################################################
-# E X E C U T I O N    B E G I N S   H E R E				       #
-################################################################################
-# arg1 of init script is arg2 when rc.common is sourced; set to action variable
-command="$action"
-
-start() {
-	exec ${SBINDIR}/shorewall-lite $OPTIONS $command ${STARTOPTIONS:-$@}
-}
-
-boot() {
-local command="start"
-start
-}
-
-restart() {
-	exec ${SBINDIR}/shorewall-lite $OPTIONS $command ${RESTARTOPTIONS:-$@}
-}
-
-reload() {
-	exec ${SBINDIR}/shorewall-lite $OPTIONS $command ${RELOADOPTION:-$@}
-}
-
-stop() {
-	exec ${SBINDIR}/shorewall-lite $OPTIONS $command ${STOPOPTIONS:-$@}
-}
-
-status() {
-	exec ${SBINDIR}/shorewall-lite $OPTIONS $command ${STATUSOPTIONS:-$@}
-}

Shorewall-lite/install.sh

@@ -67,6 +67,15 @@ mywhich() {
     return 2
 }
 
+run_install()
+{
+    if ! install $*; then
+	echo
+	echo "ERROR: Failed to install $*" >&2
+	exit 1
+    fi
+}
+
 cant_autostart()
 {
     echo
@@ -80,28 +89,7 @@ delete_file() # $1 = file to delete
 
 install_file() # $1 = source $2 = target $3 = mode
 {
-    if cp -f $1 $2; then
-	if chmod $3 $2; then
-	    if [ -n "$OWNER" ]; then
-		if chown $OWNER:$GROUP $2; then
-		    return
-		fi
-	    else
-		return 0
-	    fi
-	fi
-    fi
-
-    echo "ERROR: Failed to install $2" >&2
-    exit 1
-}
-
-make_directory() # $1 = directory , $2 = mode
-{
-    mkdir -p $1
-    chmod 755 $1
-    [ -n "$OWNERSHIP" ] && chown $OWNERSHIP $1
-
+    run_install $T $OWNERSHIP -m $3 $1 ${2}
 }
 
 require()
@@ -199,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
 
@@ -213,6 +201,8 @@ PATH=${SBINDIR}:/bin:/usr${SBINDIR}:/usr/bin:/usr/local/bin:/usr/local${SBINDIR}
 # Determine where to install the firewall script
 #
 cygwin=
+INSTALLD='-D'
+T='-T'
 
 if [ -z "$BUILD" ]; then
     case $(uname) in
@@ -255,8 +245,6 @@ if [ -z "$BUILD" ]; then
 		BUILD=slackware
 	    elif [ -f ${CONFDIR}/arch-release ] ; then
 		BUILD=archlinux
-	    elif [ -f ${CONFDIR}/openwrt_release ]; then
-		BUILD=openwrt
 	    else
 		BUILD=linux
 	    fi
@@ -272,16 +260,16 @@ case $BUILD in
     apple)
 	[ -z "$OWNER" ] && OWNER=root
 	[ -z "$GROUP" ] && GROUP=wheel
+	INSTALLD=
+	T=
 	;;
     *)
-	if [ $(id -u) -eq 0 ]; then
-	    [ -z "$OWNER" ] && OWNER=root
-	    [ -z "$GROUP" ] && GROUP=root
-	fi
+	[ -z "$OWNER" ] && OWNER=root
+	[ -z "$GROUP" ] && GROUP=root
 	;;
 esac
 
-[ -n "$OWNER" ] && OWNERSHIP="$OWNER:$GROUP"
+OWNERSHIP="-o $OWNER -g $GROUP"
 
 [ -n "$HOST" ] || HOST=$BUILD
 
@@ -312,9 +300,6 @@ case "$HOST" in
     suse)
 	echo "Installing Suse-specific configuration..."
 	;;
-    openwrt)
-	echo "Installing OpenWRT-specific configuration..."
-	;;
     linux)
 	;;
     *)
@@ -331,9 +316,8 @@ if [ -n "$DESTDIR" ]; then
 	OWNERSHIP=""
     fi
 
-    make_directory ${DESTDIR}${SBINDIR} 755
-    make_directory ${DESTDIR}${INITDIR} 755
-
+    install -d $OWNERSHIP -m 755 ${DESTDIR}/${SBINDIR}
+    install -d $OWNERSHIP -m 755 ${DESTDIR}${INITDIR}
 else
     if [ ! -f ${SHAREDIR}/shorewall/coreversion ]; then
 	echo "$PRODUCT $VERSION requires Shorewall Core which does not appear to be installed" >&2
@@ -373,7 +357,7 @@ fi
 delete_file ${DESTDIR}/usr/share/$PRODUCT/xmodules
 
 install_file $PRODUCT ${DESTDIR}${SBINDIR}/$PRODUCT 0544
-[ -n "${INITFILE}" ] && make_directory ${DESTDIR}${INITDIR} 755
+[ -n "${INITFILE}" ] && install -d $OWNERSHIP -m 755 ${DESTDIR}${INITDIR}
 
 echo "$Product control program installed in ${DESTDIR}${SBINDIR}/$PRODUCT"
 
@@ -415,7 +399,7 @@ fi
 if [ -n "$SERVICEDIR" ]; then
     mkdir -p ${DESTDIR}${SERVICEDIR}
     [ -z "$SERVICEFILE" ] && SERVICEFILE=$PRODUCT.service
-    install_file $SERVICEFILE ${DESTDIR}${SERVICEDIR}/$PRODUCT.service 644
+    run_install $OWNERSHIP -m 644 $SERVICEFILE ${DESTDIR}${SERVICEDIR}/$PRODUCT.service
     [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SERVICEDIR}/$PRODUCT.service
     echo "Service file $SERVICEFILE installed as ${DESTDIR}${SERVICEDIR}/$PRODUCT.service"
 fi
@@ -437,9 +421,9 @@ fi
 #
 # Install the  Makefile
 #
-install_file Makefile ${DESTDIR}${CONFDIR}/$PRODUCT/Makefile 0600
-[ $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
+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
 echo "Makefile installed as ${DESTDIR}${CONFDIR}/$PRODUCT/Makefile"
 
 #
@@ -454,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
 
@@ -467,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"
@@ -477,17 +461,17 @@ echo "Capability file builder installed in ${DESTDIR}${LIBEXECDIR}/$PRODUCT/shor
 #
 
 if [ -f modules ]; then
-    install_file modules ${DESTDIR}${SHAREDIR}/$PRODUCT/modules 0600
+    run_install $OWNERSHIP -m 0600 modules ${DESTDIR}${SHAREDIR}/$PRODUCT
     echo "Modules file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/modules"
 fi
 
 if [ -f helpers ]; then
-    install_file helpers ${DESTDIR}${SHAREDIR}/$PRODUCT/helpers 600
+    run_install $OWNERSHIP -m 0600 helpers ${DESTDIR}${SHAREDIR}/$PRODUCT
     echo "Helper modules file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/helpers"
 fi
 
 for f in modules.*; do
-    install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/$f 644
+    run_install $OWNERSHIP -m 0644 $f ${DESTDIR}${SHAREDIR}/$PRODUCT/$f
     echo "Module file $f installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/$f"
 done
 
@@ -498,17 +482,17 @@ done
 if [ -d manpages ]; then
     cd manpages
 
-    mkdir -p ${DESTDIR}${MANDIR}/man5/ ${DESTDIR}${MANDIR}/man8/
+    [ -n "$INSTALLD" ] || mkdir -p ${DESTDIR}${MANDIR}/man5/ ${DESTDIR}${MANDIR}/man8/
 
     for f in *.5; do
 	gzip -c $f > $f.gz
-	install_file $f.gz ${DESTDIR}${MANDIR}/man5/$f.gz 644
+	run_install $T $INSTALLD $OWNERSHIP -m 0644 $f.gz ${DESTDIR}${MANDIR}/man5/$f.gz
 	echo "Man page $f.gz installed to ${DESTDIR}${MANDIR}/man5/$f.gz"
     done
 
     for f in *.8; do
 	gzip -c $f > $f.gz
-	install_file $f.gz ${DESTDIR}${MANDIR}/man8/$f.gz 644
+	run_install $T $INSTALLD $OWNERSHIP -m 0644 $f.gz ${DESTDIR}${MANDIR}/man8/$f.gz
 	echo "Man page $f.gz installed to ${DESTDIR}${MANDIR}/man8/$f.gz"
     done
 
@@ -518,7 +502,7 @@ if [ -d manpages ]; then
 fi
 
 if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then
-    install_file logrotate ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT 644
+    run_install $OWNERSHIP -m 0644 logrotate ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT
     echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT"
 fi
 
@@ -549,13 +533,13 @@ if [ -n "$SYSCONFFILE" -a -f "$SYSCONFFILE" -a ! -f ${DESTDIR}${SYSCONFDIR}/${PR
 	chmod 755 ${DESTDIR}${SYSCONFDIR}
     fi
 
-    install_file ${SYSCONFFILE} ${DESTDIR}${SYSCONFDIR}/${PRODUCT} 0640
+    run_install $OWNERSHIP -m 0644 ${SYSCONFFILE} ${DESTDIR}${SYSCONFDIR}/${PRODUCT}
     echo "$SYSCONFFILE installed in ${DESTDIR}${SYSCONFDIR}/${PRODUCT}"
 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
@@ -603,13 +587,6 @@ if [ $configure -eq 1 -a -z "$DESTDIR" -a -n "$first_install" -a -z "${cygwin}${
 	else
 	    cant_autostart
 	fi
-    elif [ $HOST = openwrt -a -f ${CONFDIR}/rc.common ]; then
-	/etc/init.d/$PRODUCT enable
-	if /etc/init.d/$PRODUCT enabled; then
-            echo "$PRODUCT will start automatically at boot"
-	else
-            cant_autostart
-	fi
     elif [ "$INITFILE" != rc.${PRODUCT} ]; then #Slackware starts this automatically
 	cant_autostart
     fi

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,15 +168,7 @@ if [ $configure -eq 1 ]; then
 fi
 
 if [ -L ${SHAREDIR}/shorewall-lite/init ]; then
-    if [ $HOST = openwrt ]; then
-	if [ $configure -eq 1 ] && /etc/init.d/shorewall-lite enabled; then
-	    /etc/init.d/shorewall-lite disable
-	fi
-	
-	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
@@ -195,11 +187,9 @@ if [ -f "$FIREWALL" ]; then
     remove_file $FIREWALL
 fi
 
-[ -z "$SERVICEDIR" ] && SERVICEDIR="$SYSTEMD"
-
-if [ -n "$SERVICEDIR" ]; then
+if [ -n "$SYSTEMD" ]; then
     [ $configure -eq 1 ] && systemctl disable ${PRODUCT}
-    rm -f $SERVICEDIR/shorewall-lite.service
+    rm -f $SYSTEMD/shorewall-lite.service
 fi
 
 rm -f ${SBINDIR}/shorewall-lite
@@ -209,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
 #