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

Correct L2TP documentation
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-10-26 07:55:30 -07:00 · 2015-10-26 07:43:28 -07:00 · 2015-10-26 07:42:47 -07:00 · 2015-10-26 10:22:37 +02:00 · 2015-10-26 10:20:11 +02:00 · 2015-10-25 16:45:11 -07:00
316 changed files with 864 additions and 862 deletions
--- a/Shorewall-core/lib.cli
+++ b/Shorewall-core/lib.cli
@@ -3590,7 +3590,13 @@ get_config() {
 	VERBOSITY=2
    fi

-    g_hostname=$(hostname 2> /dev/null)
+    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

    if [ -n "$IPSET" ]; then
 	case "$IPSET" in
--- a/Shorewall-init/shorewall-init.service
+++ b/Shorewall-init/shorewall-init.service
@@ -16,4 +16,4 @@ ExecStart=/sbin/shorewall-init start
 ExecStop=/sbin/shorewall-init stop

 [Install]
-WantedBy=network-pre.target
+WantedBy=basic.target
--- a/Shorewall-init/shorewall-init.service.214.debian
+++ b/Shorewall-init/shorewall-init.service.214.debian
@@ -2,6 +2,7 @@
 #     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)
@@ -15,3 +16,6 @@ EnvironmentFile=-/etc/default/shorewall-init
 StandardOutput=syslog
 ExecStart=/sbin/shorewall-init start
 ExecStop=/sbin/shorewall-init stop
+
+[Install]
+WantedBy=basic.target
--- a/Shorewall-init/shorewall-init.service.debian
+++ b/Shorewall-init/shorewall-init.service.debian
@@ -2,6 +2,7 @@
 #     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
 #
 #     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
+#     Copyright 2015 Tom Eastep <teastep@shorewall.net>
 #
 [Unit]
 Description=Shorewall firewall (bootup security)
--- a/Shorewall-lite/shorewall-lite.service.debian
+++ b/Shorewall-lite/shorewall-lite.service.debian
@@ -2,6 +2,7 @@
 #     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)
--- a/Shorewall/Macros/macro.AMQP
+++ b/Shorewall/Macros/macro.AMQP
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - AMQP Macro
+# Shorewall - AMQP Macro
 #
 # /usr/share/shorewall/macro.AMQP
 #
 #	This macro handles AMQP traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	5672
--- a/Shorewall/Macros/macro.A_AllowICMPs
+++ b/Shorewall/Macros/macro.A_AllowICMPs
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - Audited AllowICMPs Macro
+# Shorewall - Audited AllowICMPs Macro
 #
 # /usr/share/shorewall/macro.A_AllowICMPs
 #
 #	This macro A_ACCEPTs needed ICMP types
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION		SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #					PORT(S)	PORT(S)	DEST	LIMIT	GROUP

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

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

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

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

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

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

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

--- a/Shorewall/Macros/macro.JAP
+++ b/Shorewall/Macros/macro.JAP
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - JAP Macro
+# Shorewall - JAP Macro
 #
 # /usr/share/shorewall/macro.JAP
 #
@@ -8,8 +8,6 @@
 #	to browse anonymously!
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	8080 # HTTP port
--- a/Shorewall/Macros/macro.Jabber
+++ b/Shorewall/Macros/macro.Jabber
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - Jabber Macro
+# Shorewall - Jabber Macro
 #
 # /usr/share/shorewall/macro.Jabber
 #
 #	This macro accepts Jabber traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	5222
--- a/Shorewall/Macros/macro.JabberPlain
+++ b/Shorewall/Macros/macro.JabberPlain
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - JabberPlain Macro
+# Shorewall - JabberPlain Macro
 #
 # /usr/share/shorewall/macro.JabberPlain
 #
@@ -7,8 +7,6 @@
 #	deprecated - use of macro.Jabber instead is recommended.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 Jabber
--- a/Shorewall/Macros/macro.JabberSecure
+++ b/Shorewall/Macros/macro.JabberSecure
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - JabberSecure (SSL) Macro
+# Shorewall - JabberSecure (SSL) Macro
 #
 # /usr/share/shorewall/macro.JabberSecure
 #
@@ -8,8 +8,6 @@
 #	Jabber macro instead.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	5223
--- a/Shorewall/Macros/macro.Jabberd
+++ b/Shorewall/Macros/macro.Jabberd
@@ -1,13 +1,11 @@
 #
-# Shorewall version 3.4 - Jabberd (server intercommunication)
+# Shorewall - Jabberd (server intercommunication)
 #
 # /usr/share/shorewall/macro.Jabberd
 #
 #	This macro accepts Jabberd intercommunication traffic
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	5269
--- a/Shorewall/Macros/macro.Jetdirect
+++ b/Shorewall/Macros/macro.Jetdirect
@@ -1,13 +1,11 @@
 #
-# Shorewall version 3.2 - Jetdirect Macro
+# Shorewall - Jetdirect Macro
 #
 # /usr/share/shorewall/macro.Jetdirect
 #
 #	This macro handles HP Jetdirect printing.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	9100
--- a/Shorewall/Macros/macro.Kerberos
+++ b/Shorewall/Macros/macro.Kerberos
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - Kerberos Macro
+# Shorewall - Kerberos Macro
 #
 # /usr/share/shorewall/macro.Kerberos
 #
 #	This macro handles Kerberos traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	88
--- a/Shorewall/Macros/macro.L2TP
+++ b/Shorewall/Macros/macro.L2TP
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - L2TP Macro
+# Shorewall - L2TP Macro
 #
 # /usr/share/shorewall/macro.L2TP
 #
@@ -7,8 +7,6 @@
 #	(RFC 2661)
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	1701	# L2TP
--- a/Shorewall/Macros/macro.LDAP
+++ b/Shorewall/Macros/macro.LDAP
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - LDAP Macro
+# Shorewall - LDAP Macro
 #
 # /usr/share/shorewall/macro.LDAP
 #
@@ -11,8 +11,6 @@
 #	Consult your LDAP server documentation for details.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	389
--- a/Shorewall/Macros/macro.LDAPS
+++ b/Shorewall/Macros/macro.LDAPS
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - LDAPS Macro
+# Shorewall - LDAPS Macro
 #
 # /usr/share/shorewall/macro.LDAPS
 #
@@ -11,8 +11,6 @@
 #	Consult your LDAP server documentation for details.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	636
--- a/Shorewall/Macros/macro.MSNP
+++ b/Shorewall/Macros/macro.MSNP
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - MSNP Macro
+# Shorewall - MSNP Macro
 #
 # /usr/share/shorewall/macro.MSNP
 #
 #	This macro handles MSNP (MicroSoft Notification Protocol)
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	1863
--- a/Shorewall/Macros/macro.MSSQL
+++ b/Shorewall/Macros/macro.MSSQL
@@ -1,13 +1,12 @@
 #
-# Shorewall version 5 - MSSQL Macro
+# Shorewall - MSSQL Macro
 #
 # /usr/share/shorewall/macro.MSSQL
 #
 #	This macro handles MSSQL (Microsoft SQL Server)
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	1433
+PARAM	-	-	udp	1434
--- a/Shorewall/Macros/macro.Mail
+++ b/Shorewall/Macros/macro.Mail
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Mail Macro
+# Shorewall - Mail Macro
 #
 # /usr/share/shorewall/macro.Mail
 #
@@ -12,8 +12,6 @@
 #	the POP3 or IMAP macros.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	25
--- a/Shorewall/Macros/macro.MongoDB
+++ b/Shorewall/Macros/macro.MongoDB
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - MongoDB Macro
+# Shorewall - MongoDB Macro
 #
 # /usr/share/shorewall/macro.MongoDB
 #
 #	This macro handles MongoDB Daemon/Router traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	27017
--- a/Shorewall/Macros/macro.Munin
+++ b/Shorewall/Macros/macro.Munin
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - Munin Macro
+# Shorewall - Munin Macro
 #
 # /usr/share/shorewall/macro.Munin
 #
 #	This macro handles Munin networked resource monitoring traffic
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	4949
--- a/Shorewall/Macros/macro.MySQL
+++ b/Shorewall/Macros/macro.MySQL
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - MySQL Macro
+# Shorewall - MySQL Macro
 #
 # /usr/share/shorewall/macro.MySQL
 #
 #	This macro handles connections to the MySQL server.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	3306
--- a/Shorewall/Macros/macro.NNTP
+++ b/Shorewall/Macros/macro.NNTP
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 NNTP Macro
+# Shorewall NNTP Macro
 #
 # /usr/share/shorewall/macro.NNTP
 #
@@ -7,8 +7,6 @@
 #	encrypted NNTP, see macro.NNTPS.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	119
--- a/Shorewall/Macros/macro.NNTPS
+++ b/Shorewall/Macros/macro.NNTPS
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 NNTPS Macro
+# Shorewall NNTPS Macro
 #
 # /usr/share/shorewall/macro.NNTPS
 #
@@ -7,8 +7,6 @@
 #	plaintext NNTP, see macro.NNTP.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	563
--- a/Shorewall/Macros/macro.NTP
+++ b/Shorewall/Macros/macro.NTP
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - NTP Macro
+# Shorewall - NTP Macro
 #
 # /usr/share/shorewall/macro.NTP
 #
@@ -7,8 +7,6 @@
 #	For broadcast NTP traffic, use NTPbrd Macro.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	123
--- a/Shorewall/Macros/macro.NTPbi
+++ b/Shorewall/Macros/macro.NTPbi
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - NTPbi Macro
+# Shorewall - NTPbi Macro
 #
 # /usr/share/shorewall/macro.NTPbi
 #
 #        This macro handles  bi-directional NTP (for NTP peers)
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	123
--- a/Shorewall/Macros/macro.NTPbrd
+++ b/Shorewall/Macros/macro.NTPbrd
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - NTPbrd Macro
+# Shorewall - NTPbrd Macro
 #
 # /usr/share/shorewall/macro.NTPbrd
 #
@@ -11,8 +11,6 @@
 #	Netfilter doesn't track connections for broadcast traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-		-		udp	123
--- a/Shorewall/Macros/macro.OSPF
+++ b/Shorewall/Macros/macro.OSPF
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - OSPF Macro
+# Shorewall - OSPF Macro
 #
 # /usr/share/shorewall/macro.OSPF
 #
 #	This macro handles OSPF multicast traffic
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	89	# OSPF
--- a/Shorewall/Macros/macro.OpenVPN
+++ b/Shorewall/Macros/macro.OpenVPN
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - OpenVPN Macro
+# Shorewall - OpenVPN Macro
 #
 # /usr/share/shorewall/macro.OpenVPN Macro
 #
 #	This macro handles OpenVPN traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	1194
--- a/Shorewall/Macros/macro.PCA
+++ b/Shorewall/Macros/macro.PCA
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - PCA Macro
+# Shorewall - PCA Macro
 #
 # /usr/share/shorewall/macro.PCA
 #
 #	This macro handles PCAnywere (tm)
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	5632
--- a/Shorewall/Macros/macro.POP3
+++ b/Shorewall/Macros/macro.POP3
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - POP3 Macro
+# Shorewall - POP3 Macro
 #
 # /usr/share/shorewall/macro.POP3
 #
@@ -7,8 +7,6 @@
 #	see macro.POP3S.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	110
--- a/Shorewall/Macros/macro.POP3S
+++ b/Shorewall/Macros/macro.POP3S
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - POP3S Macro
+# Shorewall - POP3S Macro
 #
 # /usr/share/shorewall/macro.POP3S
 #
@@ -7,8 +7,6 @@
 #	see macro.POP3.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	995	# Secure POP3
--- a/Shorewall/Macros/macro.PPtP
+++ b/Shorewall/Macros/macro.PPtP
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - PPTP Macro
+# Shorewall - PPTP Macro
 #
 # /usr/share/shorewall/macro.PPtP Macro
 #
 #	This macro handles PPTP traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	47
--- a/Shorewall/Macros/macro.Ping
+++ b/Shorewall/Macros/macro.Ping
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - Ping Macro
+# Shorewall - Ping Macro
 #
 # /usr/share/shorewall/macro.Ping
 #
 #	This macro handles 'ping' requests.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	icmp	8
--- a/Shorewall/Macros/macro.PostgreSQL
+++ b/Shorewall/Macros/macro.PostgreSQL
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - PostgreSQL Macro
+# Shorewall - PostgreSQL Macro
 #
 # /usr/share/shorewall/macro.PostgreSQL
 #
 #	This macro handles connections to the PostgreSQL server.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	5432
--- a/Shorewall/Macros/macro.Printer
+++ b/Shorewall/Macros/macro.Printer
@@ -1,13 +1,11 @@
 #
-# Shorewall version 3.2 - Printer Macro
+# Shorewall - Printer Macro
 #
 # /usr/share/shorewall/macro.Printer
 #
 #	This macro handles Line Printer protocol printing.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	515
--- a/Shorewall/Macros/macro.Puppet
+++ b/Shorewall/Macros/macro.Puppet
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Puppet Macro
+# Shorewall - Puppet Macro
 #
 # /usr/share/shorewall/macro.Puppet
 #
@@ -7,8 +7,6 @@
 #	management system.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	8140
--- a/Shorewall/Macros/macro.QUIC
+++ b/Shorewall/Macros/macro.QUIC
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - QUIC Macro
+# Shorewall - QUIC Macro
 #
 # /usr/share/shorewall/macro.QUIC
 #
 #	This macro handles QUIC (Quick UDP Internet Connections).
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	80,443
--- a/Shorewall/Macros/macro.RDP
+++ b/Shorewall/Macros/macro.RDP
@@ -1,13 +1,11 @@
 #
-# Shorewall version 3.2 - RDP Macro
+# Shorewall - RDP Macro
 #
 # /usr/share/shorewall/macro.RDP
 #
 #	This macro handles Microsoft RDP (Remote Desktop) traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	3389
--- a/Shorewall/Macros/macro.RIPbi
+++ b/Shorewall/Macros/macro.RIPbi
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - RIPbi Macro
+# Shorewall - RIPbi Macro
 #
 # /usr/share/shorewall/macro.RIPbi
 #
 #        This macro handles RIP (Routing Information Protocol) - bidirectional
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	520
--- a/Shorewall/Macros/macro.RNDC
+++ b/Shorewall/Macros/macro.RNDC
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - RNDC Macro
+# Shorewall - RNDC Macro
 #
 # /usr/share/shorewall/macro.RNDC
 #
 #	This macro handles RNDC (BIND remote management protocol) traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	953
--- a/Shorewall/Macros/macro.Razor
+++ b/Shorewall/Macros/macro.Razor
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - Razor Macro
+# Shorewall - Razor Macro
 #
 # /usr/share/shorewall/macro.Razor
 #
 #	This macro handles traffic for the Razor Antispam System
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 ACCEPT	-	-	tcp	2703
--- a/Shorewall/Macros/macro.Rdate
+++ b/Shorewall/Macros/macro.Rdate
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Rdate Macro
+# Shorewall - Rdate Macro
 #
 # /usr/share/shorewall/macro.Rdate
 #
@@ -10,8 +10,6 @@
 #	use Time macro instead.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	37
--- a/Shorewall/Macros/macro.Redis
+++ b/Shorewall/Macros/macro.Redis
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - Redis Macro
+# Shorewall - Redis Macro
 #
 # /usr/share/shorewall/macro.Redis
 #
 #	This macro handles Redis traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	6379
--- a/Shorewall/Macros/macro.Reject
+++ b/Shorewall/Macros/macro.Reject
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Reject Macro
+# Shorewall - Reject Macro
 #
 # /usr/share/shorewall/macro.Reject
 #
@@ -12,8 +12,6 @@
 #
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 #
--- a/Shorewall/Macros/macro.Rfc1918
+++ b/Shorewall/Macros/macro.Rfc1918
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Macro Template
+# Shorewall - Macro Template
 #
 # /usr/share/shorewall/macro.Rfc1918
 #
@@ -7,8 +7,6 @@
 #	reserved by RFC 1918
 #
 #############################################################################################
-?FORMAT 2
-#############################################################################################
 #ACTION		SOURCE		DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #						PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM		SOURCE:10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 \
--- a/Shorewall/Macros/macro.Rsync
+++ b/Shorewall/Macros/macro.Rsync
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - Rsync Macro
+# Shorewall - Rsync Macro
 #
 # /usr/share/shorewall/macro.Rsync
 #
 #	This macro handles connections to the rsync server.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	873
--- a/Shorewall/Macros/macro.SANE
+++ b/Shorewall/Macros/macro.SANE
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - SANE Macro
+# Shorewall - SANE Macro
 #
 # /usr/share/shorewall/macro.SANE
 #
 #	This macro handles SANE network scanning.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP

--- a/Shorewall/Macros/macro.SIP
+++ b/Shorewall/Macros/macro.SIP
@@ -1,13 +1,11 @@
 #
-# Shorewall version 5 - SIP Macro
+# Shorewall - SIP Macro
 #
 # /usr/share/shorewall/macro.SIP
 #
 #	This macro handles SIP traffic.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP

--- a/Shorewall/Macros/macro.SMB
+++ b/Shorewall/Macros/macro.SMB
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - SMB Macro
+# Shorewall - SMB Macro
 #
 # /usr/share/shorewall/macro.SMB
 #
@@ -10,8 +10,6 @@
 #	between hosts you fully trust.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	135,445
--- a/Shorewall/Macros/macro.SMBBI
+++ b/Shorewall/Macros/macro.SMBBI
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - SMB Bi-directional Macro
+# Shorewall - SMB Bi-directional Macro
 #
 # /usr/share/shorewall/macro.SMBBI
 #
@@ -10,8 +10,6 @@
 #	allow SMB traffic between hosts you fully trust.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	udp	135,445
--- a/Shorewall/Macros/macro.SMBswat
+++ b/Shorewall/Macros/macro.SMBswat
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - SMBswat Macro
+# Shorewall - SMBswat Macro
 #
 # /usr/share/shorewall/macro.SMBswat
 #
@@ -7,8 +7,6 @@
 #	(SWAT).
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	901
--- a/Shorewall/Macros/macro.SMTP
+++ b/Shorewall/Macros/macro.SMTP
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - SMTP Macro
+# Shorewall - SMTP Macro
 #
 # /usr/share/shorewall/macro.SMTP
 #
@@ -14,8 +14,6 @@
 #	the POP3 or IMAP macros.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	25
--- a/Shorewall/Macros/macro.SMTPS
+++ b/Shorewall/Macros/macro.SMTPS
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - SMTPS Macro
+# Shorewall - SMTPS Macro
 #
 # /usr/share/shorewall/macro.SMTPS
 #
@@ -11,8 +11,6 @@
 #	the POP3(S) or IMAP(S) macros.
 #
 ###############################################################################
-?FORMAT 2
-###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGIN	RATE	USER/
 #				PORT(S)	PORT(S)	DEST	LIMIT	GROUP
 PARAM	-	-	tcp	465
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tom Eastep	514fe76fa5	Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code	2015-10-26 07:55:30 -07:00
Tom Eastep	6e7fc9bee4	Correct L2TP documentation Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-26 07:43:28 -07:00
Tom Eastep	56bf8b1572	Don't configure persistence if the interface has no address Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-26 07:42:47 -07:00
Tuomo Soini	2a064c7b7c	macro.MSSQL: allow udp/1434 Reference: https://technet.microsoft.com/en-us/library/ms181087%28v=sql.105%29.aspx Signed-off-by: Tuomo Soini <tis@foobar.fi>	2015-10-26 10:22:37 +02:00
Tuomo Soini	30682e63d8	Shorewall/Macros: remove version number Signed-off-by: Tuomo Soini <tis@foobar.fi>	2015-10-26 10:20:11 +02:00
Tom Eastep	69dd7ce0b9	Add 'persistent' provider option - Phase II - Also allow the creation of 'persistent' routing rules and routes Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-25 16:45:11 -07:00
Tom Eastep	39f6c4e74c	Merge branch 'master' of ssh://server.shorewall.net/home/teastep/shorewall/code	2015-10-22 06:59:11 -07:00
Tom Eastep	46c3db4f32	Add 'persistent' provider option - Phase I Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-22 06:58:32 -07:00
Tom Eastep	6e59fd5395	Correct permissions on certain files in $CONFDIR/$PRODUCT Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-22 06:58:05 -07:00
Tom Eastep	1e2cfcd9a3	Deal with missing 'hostname' utility Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-21 17:41:01 -07:00
Tom Eastep	87d94ae004	Correct typo in Dynamic article Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-21 17:32:57 -07:00
Tom Eastep	8dc16268a7	Delete main default routes when there are 'load=' or 'fallback=' interfaces Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-13 09:34:58 -07:00
Tuomo Soini	8771041a63	shorewall6: remove version from restored Signed-off-by: Tuomo Soini <tis@foobar.fi>	2015-10-13 12:51:00 +03:00
Tuomo Soini	dc7082b7a1	shorewall[6]: remove version from shorewall6 and macros	2015-10-13 12:17:18 +03:00
Tom Eastep	a8e4671668	Remove version from config files Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-12 15:02:50 -07:00
Tom Eastep	7388ff5154	Fix RESTART Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-12 14:08:24 -07:00
Tom Eastep	0dbe756e93	Manpage and Shorewall-5 changes for RESTART Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-12 13:49:24 -07:00
Tom Eastep	72d4637c22	Replace LEGACY_RESTART with RESTART Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-12 11:45:58 -07:00
Tom Eastep	bb538a7c10	Merge branch 'master' into 5.0.0 Conflicts: Shorewall-core/lib.common Shorewall-core/shorewallrc.debian.systemd Shorewall-lite/shorewall-lite.service.debian Shorewall/Perl/Shorewall/Chains.pm Shorewall/Perl/Shorewall/Compiler.pm Shorewall/Perl/Shorewall/Config.pm Shorewall/Perl/Shorewall/Misc.pm Shorewall/Perl/Shorewall/Raw.pm Shorewall/Perl/Shorewall/Tc.pm Shorewall/Perl/compiler.pl Shorewall/Perl/prog.footer Shorewall/lib.cli-std Shorewall/manpages/shorewall-mangle.xml Shorewall/manpages/shorewall.conf.xml Shorewall/manpages/shorewall.xml Shorewall/shorewall.service.debian Shorewall6-lite/shorewall6-lite.service.debian Shorewall6/manpages/shorewall6-mangle.xml Shorewall6/manpages/shorewall6.conf.xml Shorewall6/manpages/shorewall6.xml Shorewall6/shorewall6.service.debian docs/MultiISP.xml docs/Shorewall_Squid_Usage.xml	2015-10-12 10:55:36 -07:00
Tom Eastep	1db3bfb53e	Manpage updates Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-10 13:19:41 -07:00
Tom Eastep	97e821d12d	Use %e rather than %_d for busybox compatibility Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-08 13:16:32 -07:00
Tom Eastep	ec2f4362f3	More cleanup of the configuration file basics article Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-06 09:36:02 -07:00
Tom Eastep	dc79a74de5	Mention 'reload' in the Introduction Article Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-05 14:56:01 -07:00
Tom Eastep	af18896851	Remove options from 'update' warning messages Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-05 08:19:09 -07:00
Tom Eastep	35f33b325f	Update blacklisting article Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-05 08:18:52 -07:00
Tom Eastep	89122c0d55	Updates for routestopped -> stoppedrules Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-05 07:51:43 -07:00
Tom Eastep	0385b2cd37	Update URLs to tcrules Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-04 08:20:33 -07:00
Tom Eastep	fed6e7c352	Update Manpages for Shorewall5 Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-03 08:50:49 -07:00
Tom Eastep	141440147c	Merge branch '5.0.0' of ssh://git.code.sf.net/p/shorewall/code into 5.0.0	2015-09-24 14:19:15 -07:00
Tuomo Soini	f1d4ef495e	shorewall-init.service*: fix [Install] section Signed-off-by: Tuomo Soini <tis@foobar.fi>	2015-09-24 18:17:30 +03:00
Tom Eastep	7dd9beeeae	Remove FORMAT specifications from macros and actions Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-22 12:39:22 -07:00
Tom Eastep	85e44c70eb	Add the Meta-connection to Tinc - Both the macro and the tunnel type are updated Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-17 09:17:35 -07:00
Tom Eastep	03d99de8d5	Correct handling of reset Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-11 15:02:32 -07:00
Tom Eastep	426636458c	Correct shorewall6 mangle man page - Replace 'TTL' by 'HL' Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-08 12:25:59 -07:00
Tom Eastep	0aa5cb5086	Allow non-experts to use the user bits in the fw mark Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-07 11:35:47 -07:00
Tom Eastep	eddd58d459	Move a line of code Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-06 10:33:09 -07:00
Tom Eastep	1bf13e5fda	Provide default for SHOREWALL_SHELL Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-06 10:29:36 -07:00
Tom Eastep	682a449e7b	Correct more Mangle examples Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-02 13:08:05 -07:00
Tom Eastep	9e98d30c92	Correct handling of log levels with default actions Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-02 08:55:18 -07:00
Tom Eastep	582755edf4	Unconditionally get inline matches Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-02 08:03:22 -07:00
Tom Eastep	dea1f853ea	Correct progress messages Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-01 12:42:01 -07:00
Tom Eastep	e15a6f452e	Cosmetic changes to first_entry() calls Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-31 10:54:30 -07:00
Tom Eastep	656eaabce9	Correct a typo Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-31 09:39:40 -07:00
Tom Eastep	f42dc6def1	Uniform mechanism for inserting conversion comments Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-30 15:35:05 -07:00
Tom Eastep	6e303aef69	Fix $convert/$tcrules mess Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-29 18:52:11 -07:00
Tom Eastep	ab260dc5b1	Place a header in a created mangle file during update -t Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-29 12:52:21 -07:00
Tom Eastep	55ab498291	Don't enforce FASTACCEPT/BLACKLISTNEWONLY on convert Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-29 12:51:52 -07:00
Tom Eastep	10cda4cee7	Update man pages for 'minute' and 'second' in LOGLIMIT specifications Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-27 15:49:59 -07:00
Tom Eastep	de74273dbb	Assume EXPORTMODULES=No if it doesn't exist in old file during update Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-27 15:15:03 -07:00
Tom Eastep	af1e2f6c8b	Read capabilities file before the .conf file Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-27 11:26:26 -07:00
Tom Eastep	dc2406d25b	update -t also converts the 'tos' file Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-26 13:51:02 -07:00
Tom Eastep	e0734a45ee	Allow 'seconds' and 'minutes' in LOGLIMIT specifications Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-26 12:53:36 -07:00
Tom Eastep	28df894add	Improve 'update' - convert BLACKLISTNEWONLY - convert LOGRATE and LOGBURST - default USE_DEFAULT_RT to No Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-26 12:50:56 -07:00
Tom Eastep	1d8873d3d5	Correct the shorewall6-hosts man page Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-26 12:28:57 -07:00
Tom Eastep	ad06ec3eef	Correct IPV6 range parsing Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-26 11:52:51 -07:00
Tom Eastep	eae492cef5	Some rules manpage updates Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-22 09:24:47 -07:00
Tom Eastep	05f9f926c4	Move fatal_error() to lib.base Signed-off-by: Tom Eastep <teastep@shorewall.net> Conflicts: Shorewall-core/lib.common	2015-08-21 14:32:09 -07:00
Tom Eastep	a709395949	Allow 'none' in the log level argument to AutoBL Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-21 13:40:12 -07:00
Tom Eastep	7956c5f6e0	Update a message to refer to the 'mangle' file rather than 'tcrules' Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-20 14:48:29 -07:00
Tom Eastep	4b003163d6	Use NYTProf for profiling. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-19 14:05:15 -07:00
Tom Eastep	67aef659b5	Tweak tcrules references Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-19 12:57:36 -07:00
Tom Eastep	39982c20c4	Restore the text of tcrules warning message Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-19 12:34:35 -07:00
Tom Eastep	2b1f33c391	Don't unlink the tcrules file. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-19 11:48:23 -07:00
Tom Eastep	1c33717cf5	Reverse the change to delete host routes Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-19 11:06:28 -07:00
Tom Eastep	cd8fe38c85	Delete host routes added to the main routing table for providers Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-19 10:44:37 -07:00
Tom Eastep	d525419c65	Correct wording of an error message Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-19 10:44:00 -07:00
Tom Eastep	0e67357d63	Rewrite the trace/debugging section of the start/stop article Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-18 16:00:37 -07:00
Tom Eastep	537f53f611	Restore [Install] section in the Debian .service files Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-17 07:41:15 -07:00
Tom Eastep	3b1ad1e284	Delete 'conflicts=' from Shorewall-init .service files Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-17 06:40:36 -07:00
Tom Eastep	9d3f35a22d	Enable new update options in compiler.pl Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-16 11:57:36 -07:00
Tom Eastep	7c2a969de0	Correct handling of notrack file. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-14 09:26:45 -07:00
Tom Eastep	8bdea65325	Update manpages for new update options Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-13 16:12:28 -07:00
Tom Eastep	fd46c0ffed	Correct handling of termination after .conf file not updated Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-13 15:42:38 -07:00
Tom Eastep	60acddbb37	Add conversion version and date to the converted files. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-13 14:37:13 -07:00
Tom Eastep	306dc34b31	Correct convert_blacklist() Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-13 13:22:14 -07:00
Tom Eastep	f5c6a6fe82	Correct tcrules update Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-13 13:21:51 -07:00
Tom Eastep	af2b7910bd	Port update changes from 5.0.0 Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-12 12:33:09 -07:00
Tom Eastep	3b59e46799	Restore Debian-specific service files Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-12 10:19:07 -07:00
Tom Eastep	955a2e38b7	Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code	2015-08-10 17:49:40 -07:00
Tom Eastep	4c4c5a436a	Allow zero-valued options on multi-zoned interfaces Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-07 14:09:08 -07:00
Tom Eastep	d949824f94	Correct shorewall-mangle(5) examples Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-06 10:15:57 -07:00