From 67589cab69a5f7524331a32521da80f9a0fc1321 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 28 Jul 2015 10:59:11 -0700 Subject: [PATCH] More version changes Signed-off-by: Tom Eastep --- Shorewall-core/INSTALL | 2 +- Shorewall-core/lib.base | 4 ++-- Shorewall-core/lib.cli | 4 ++-- Shorewall-core/lib.common | 4 ++-- Shorewall-lite/configpath | 2 +- Shorewall/INSTALL | 2 +- Shorewall/Macros/macro.AMQP | 2 +- Shorewall/Macros/macro.A_AllowICMPs | 2 +- Shorewall/Macros/macro.A_DropDNSrep | 2 +- Shorewall/Macros/macro.A_DropUPnP | 2 +- Shorewall/Macros/macro.ActiveDir | 2 +- Shorewall/Macros/macro.AllowICMPs | 2 +- Shorewall/Macros/macro.Amanda | 2 +- Shorewall/Macros/macro.Auth | 2 +- Shorewall/Macros/macro.BGP | 2 +- Shorewall/Macros/macro.BLACKLIST | 2 +- Shorewall/Macros/macro.BitTorrent | 2 +- Shorewall/Macros/macro.BitTorrent32 | 2 +- Shorewall/Macros/macro.CVS | 2 +- Shorewall/Macros/macro.Citrix | 2 +- Shorewall/Macros/macro.DAAP | 2 +- Shorewall/Macros/macro.DCC | 2 +- Shorewall/Macros/macro.DHCPfwd | 2 +- Shorewall/Macros/macro.DNS | 2 +- Shorewall/Macros/macro.Distcc | 2 +- Shorewall/Macros/macro.Drop | 2 +- Shorewall/Macros/macro.DropDNSrep | 2 +- Shorewall/Macros/macro.DropUPnP | 2 +- Shorewall/Macros/macro.Edonkey | 2 +- Shorewall/Macros/macro.FTP | 2 +- Shorewall/Macros/macro.Finger | 2 +- Shorewall/Macros/macro.GNUnet | 2 +- Shorewall/Macros/macro.GRE | 2 +- Shorewall/Macros/macro.Git | 2 +- Shorewall/Macros/macro.Gnutella | 2 +- Shorewall/Macros/macro.Goto-Meeting | 2 +- Shorewall/Macros/macro.HKP | 2 +- Shorewall/Macros/macro.HTTP | 2 +- Shorewall/Macros/macro.HTTPS | 2 +- Shorewall/Macros/macro.ICPV2 | 2 +- Shorewall/Macros/macro.ICQ | 2 +- Shorewall/Macros/macro.ILO | 2 +- Shorewall/Macros/macro.IMAP | 2 +- Shorewall/Macros/macro.IMAPS | 2 +- Shorewall/Macros/macro.IPIP | 2 +- Shorewall/Macros/macro.IPMI | 2 +- Shorewall/Macros/macro.IPPbrd | 2 +- Shorewall/Macros/macro.IPPserver | 2 +- Shorewall/Macros/macro.IPsec | 2 +- Shorewall/Macros/macro.IPsecah | 2 +- Shorewall/Macros/macro.IPsecnat | 2 +- Shorewall/Macros/macro.IRC | 2 +- Shorewall/Macros/macro.JAP | 2 +- Shorewall/Macros/macro.Jabber | 2 +- Shorewall/Macros/macro.JabberPlain | 2 +- Shorewall/Macros/macro.JabberSecure | 2 +- Shorewall/Macros/macro.Kerberos | 2 +- Shorewall/Macros/macro.L2TP | 2 +- Shorewall/Macros/macro.LDAP | 2 +- Shorewall/Macros/macro.LDAPS | 2 +- Shorewall/Macros/macro.MSNP | 2 +- Shorewall/Macros/macro.MSSQL | 2 +- Shorewall/Macros/macro.Mail | 2 +- Shorewall/Macros/macro.MongoDB | 2 +- Shorewall/Macros/macro.Munin | 2 +- Shorewall/Macros/macro.MySQL | 2 +- Shorewall/Macros/macro.NNTP | 2 +- Shorewall/Macros/macro.NNTPS | 2 +- Shorewall/Macros/macro.NTP | 2 +- Shorewall/Macros/macro.NTPbi | 2 +- Shorewall/Macros/macro.NTPbrd | 2 +- Shorewall/Macros/macro.OSPF | 2 +- Shorewall/Macros/macro.OpenVPN | 2 +- Shorewall/Macros/macro.PCA | 2 +- Shorewall/Macros/macro.POP3 | 2 +- Shorewall/Macros/macro.POP3S | 2 +- Shorewall/Macros/macro.PPtP | 2 +- Shorewall/Macros/macro.Ping | 2 +- Shorewall/Macros/macro.PostgreSQL | 2 +- Shorewall/Macros/macro.Puppet | 2 +- Shorewall/Macros/macro.QUIC | 2 +- Shorewall/Macros/macro.RIPbi | 2 +- Shorewall/Macros/macro.RNDC | 2 +- Shorewall/Macros/macro.Razor | 2 +- Shorewall/Macros/macro.Rdate | 2 +- Shorewall/Macros/macro.Redis | 2 +- Shorewall/Macros/macro.Reject | 2 +- Shorewall/Macros/macro.Rfc1918 | 2 +- Shorewall/Macros/macro.Rsync | 2 +- Shorewall/Macros/macro.SANE | 2 +- Shorewall/Macros/macro.SIP | 2 +- Shorewall/Macros/macro.SMB | 2 +- Shorewall/Macros/macro.SMBBI | 2 +- Shorewall/Macros/macro.SMBswat | 2 +- Shorewall/Macros/macro.SMTP | 2 +- Shorewall/Macros/macro.SMTPS | 2 +- Shorewall/Macros/macro.SNMP | 2 +- Shorewall/Macros/macro.SNMPTrap | 2 +- Shorewall/Macros/macro.SPAMD | 2 +- Shorewall/Macros/macro.SSH | 2 +- Shorewall/Macros/macro.SVN | 2 +- Shorewall/Macros/macro.Sieve | 2 +- Shorewall/Macros/macro.SixXS | 2 +- Shorewall/Macros/macro.Squid | 2 +- Shorewall/Macros/macro.Submission | 2 +- Shorewall/Macros/macro.Syslog | 2 +- Shorewall/Macros/macro.Telnet | 2 +- Shorewall/Macros/macro.Telnets | 2 +- Shorewall/Macros/macro.Teredo | 2 +- Shorewall/Macros/macro.Time | 2 +- Shorewall/Macros/macro.Tinc | 2 +- Shorewall/Macros/macro.Trcrt | 2 +- Shorewall/Macros/macro.VNC | 2 +- Shorewall/Macros/macro.VNCL | 2 +- Shorewall/Macros/macro.VRRP | 2 +- Shorewall/Macros/macro.Web | 2 +- Shorewall/Macros/macro.Webcache | 2 +- Shorewall/Macros/macro.Webmin | 2 +- Shorewall/Macros/macro.Whois | 2 +- Shorewall/Macros/macro.Xymon | 2 +- Shorewall/Macros/macro.Zabbix | 2 +- Shorewall/Macros/macro.mDNS | 2 +- Shorewall/Macros/macro.mDNSbi | 2 +- Shorewall/Macros/macro.template | 2 +- Shorewall/Perl/Shorewall/Misc.pm | 2 +- Shorewall/action.A_Drop | 2 +- Shorewall/action.A_Reject | 2 +- Shorewall/action.AutoBL | 2 +- Shorewall/action.AutoBLL | 2 +- Shorewall/action.Drop | 2 +- Shorewall/action.DropSmurfs | 2 +- Shorewall/action.IfEvent | 2 +- Shorewall/action.Reject | 2 +- Shorewall/action.ResetEvent | 2 +- Shorewall/action.SetEvent | 2 +- Shorewall/action.TCPFlags | 2 +- Shorewall/action.template | 2 +- Shorewall/actions.std | 2 +- Shorewall/configpath | 2 +- Shorewall/helpers | 2 +- Shorewall/lib.cli-std | 4 ++-- Shorewall/modules | 2 +- Shorewall/modules.essential | 2 +- Shorewall/modules.extensions | 2 +- Shorewall/modules.ipset | 2 +- Shorewall/modules.tc | 2 +- Shorewall/modules.xtables | 2 +- Shorewall/shorewall | 4 ++-- Shorewall6-lite/configpath | 2 +- Shorewall6/INSTALL | 2 +- Shorewall6/Macros/macro.Ping | 2 +- Shorewall6/Macros/macro.Trcrt | 2 +- Shorewall6/Macros/macro.mDNS | 2 +- Shorewall6/action.A_AllowICMPs | 2 +- Shorewall6/action.A_Drop | 2 +- Shorewall6/action.A_Reject | 2 +- Shorewall6/action.AllowICMPs | 2 +- Shorewall6/action.Drop | 2 +- Shorewall6/action.Reject | 2 +- Shorewall6/action.template | 2 +- Shorewall6/actions.std | 2 +- Shorewall6/configpath | 2 +- Shorewall6/helpers | 2 +- Shorewall6/modules | 2 +- Shorewall6/modules.essential | 2 +- Shorewall6/modules.extensions | 2 +- Shorewall6/modules.ipset | 2 +- Shorewall6/modules.tc | 2 +- Shorewall6/modules.xtables | 2 +- 169 files changed, 174 insertions(+), 174 deletions(-) diff --git a/Shorewall-core/INSTALL b/Shorewall-core/INSTALL index 195ba27c2..cafad7870 100644 --- a/Shorewall-core/INSTALL +++ b/Shorewall-core/INSTALL @@ -1,4 +1,4 @@ -Shoreline Firewall (Shorewall) Version 4 +Shoreline Firewall (Shorewall) Version 5 ----- ---- ----------------------------------------------------------------------------- diff --git a/Shorewall-core/lib.base b/Shorewall-core/lib.base index 602e1c3b6..dd5380c23 100644 --- a/Shorewall-core/lib.base +++ b/Shorewall-core/lib.base @@ -1,7 +1,7 @@ # -# Shorewall 4.5 -- /usr/share/shorewall/lib.base +# Shorewall 5.0 -- /usr/share/shorewall/lib.base # -# (c) 1999-2014 - Tom Eastep (teastep@shorewall.net) +# (c) 1999-2015 - Tom Eastep (teastep@shorewall.net) # # Complete documentation is available at http://shorewall.net # diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli index e92def989..ac2be0a6d 100644 --- a/Shorewall-core/lib.cli +++ b/Shorewall-core/lib.cli @@ -1,7 +1,7 @@ # -# Shorewall 4.5 -- /usr/share/shorewall/lib.cli. +# Shorewall 5.0 -- /usr/share/shorewall/lib.cli. # -# (c) 1999-2014 - Tom Eastep (teastep@shorewall.net) +# (c) 1999-2015 - Tom Eastep (teastep@shorewall.net) # # Complete documentation is available at http://shorewall.net # diff --git a/Shorewall-core/lib.common b/Shorewall-core/lib.common index 85ff740cd..f16be5dac 100644 --- a/Shorewall-core/lib.common +++ b/Shorewall-core/lib.common @@ -1,7 +1,7 @@ # -# Shorewall 4.5 -- /usr/share/shorewall/lib.common. +# Shorewall 5.0 -- /usr/share/shorewall/lib.common. # -# (c) 2010-2014 - Tom Eastep (teastep@shorewall.net) +# (c) 2010-2015 - Tom Eastep (teastep@shorewall.net) # # Complete documentation is available at http://shorewall.net # diff --git a/Shorewall-lite/configpath b/Shorewall-lite/configpath index 2e64e3bf1..5dee4954a 100644 --- a/Shorewall-lite/configpath +++ b/Shorewall-lite/configpath @@ -1,5 +1,5 @@ # -# Shorewall Lite version 4.1 - Default Config Path +# Shorewall Lite version 5 - Default Config Path # # /usr/share/shorewall-lite/configpath # diff --git a/Shorewall/INSTALL b/Shorewall/INSTALL index 195ba27c2..cafad7870 100644 --- a/Shorewall/INSTALL +++ b/Shorewall/INSTALL @@ -1,4 +1,4 @@ -Shoreline Firewall (Shorewall) Version 4 +Shoreline Firewall (Shorewall) Version 5 ----- ---- ----------------------------------------------------------------------------- diff --git a/Shorewall/Macros/macro.AMQP b/Shorewall/Macros/macro.AMQP index 4ee756374..509d08305 100644 --- a/Shorewall/Macros/macro.AMQP +++ b/Shorewall/Macros/macro.AMQP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - AMQP Macro +# Shorewall version 5 - AMQP Macro # # /usr/share/shorewall/macro.AMQP # diff --git a/Shorewall/Macros/macro.A_AllowICMPs b/Shorewall/Macros/macro.A_AllowICMPs index 304de76b1..901d00394 100644 --- a/Shorewall/Macros/macro.A_AllowICMPs +++ b/Shorewall/Macros/macro.A_AllowICMPs @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Audited AllowICMPs Macro +# Shorewall version 5 - Audited AllowICMPs Macro # # /usr/share/shorewall/macro.A_AllowICMPs # diff --git a/Shorewall/Macros/macro.A_DropDNSrep b/Shorewall/Macros/macro.A_DropDNSrep index 134f20dc4..f9b28088a 100644 --- a/Shorewall/Macros/macro.A_DropDNSrep +++ b/Shorewall/Macros/macro.A_DropDNSrep @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Audited DropDNSrep Macro +# Shorewall version 5 - Audited DropDNSrep Macro # # /usr/share/shorewall/macro.A_DropDNSrep # diff --git a/Shorewall/Macros/macro.A_DropUPnP b/Shorewall/Macros/macro.A_DropUPnP index 284132c7b..ae0c1da2b 100644 --- a/Shorewall/Macros/macro.A_DropUPnP +++ b/Shorewall/Macros/macro.A_DropUPnP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - ADropUPnP Macro +# Shorewall version 5 - ADropUPnP Macro # # /usr/share/shorewall/macro.A_DropUPnP # diff --git a/Shorewall/Macros/macro.ActiveDir b/Shorewall/Macros/macro.ActiveDir index 8c60fceb8..4acb4aacb 100644 --- a/Shorewall/Macros/macro.ActiveDir +++ b/Shorewall/Macros/macro.ActiveDir @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Samba 4 Macro +# Shorewall version 5 - Samba 4 Macro # # /usr/share/shorewall/macro.ActiveDir # diff --git a/Shorewall/Macros/macro.AllowICMPs b/Shorewall/Macros/macro.AllowICMPs index 4a0b02251..d993d1f34 100644 --- a/Shorewall/Macros/macro.AllowICMPs +++ b/Shorewall/Macros/macro.AllowICMPs @@ -1,5 +1,5 @@ # -# Shorewall version 4 - AllowICMPs Macro +# Shorewall version 5 - AllowICMPs Macro # # /usr/share/shorewall/macro.AllowICMPs # diff --git a/Shorewall/Macros/macro.Amanda b/Shorewall/Macros/macro.Amanda index b8d2aa3aa..e2fb69cd5 100644 --- a/Shorewall/Macros/macro.Amanda +++ b/Shorewall/Macros/macro.Amanda @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Amanda Macro +# Shorewall version 5 - Amanda Macro # # /usr/share/shorewall/macro.Amanda # diff --git a/Shorewall/Macros/macro.Auth b/Shorewall/Macros/macro.Auth index 613b9bcae..5ddf7a337 100644 --- a/Shorewall/Macros/macro.Auth +++ b/Shorewall/Macros/macro.Auth @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Auth Macro +# Shorewall version 5 - Auth Macro # # /usr/share/shorewall/macro.Auth # diff --git a/Shorewall/Macros/macro.BGP b/Shorewall/Macros/macro.BGP index d0870885a..15be4856f 100644 --- a/Shorewall/Macros/macro.BGP +++ b/Shorewall/Macros/macro.BGP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - BGP Macro +# Shorewall version 5 - BGP Macro # # /usr/share/shorewall/macro.BGP # diff --git a/Shorewall/Macros/macro.BLACKLIST b/Shorewall/Macros/macro.BLACKLIST index 97732afc0..e5999b0b5 100644 --- a/Shorewall/Macros/macro.BLACKLIST +++ b/Shorewall/Macros/macro.BLACKLIST @@ -1,5 +1,5 @@ # -# Shorewall version 4 - blacklist Macro +# Shorewall version 5 - blacklist Macro # # /usr/share/shorewall/macro.blacklist # diff --git a/Shorewall/Macros/macro.BitTorrent b/Shorewall/Macros/macro.BitTorrent index 527d9500f..b41e8bafd 100644 --- a/Shorewall/Macros/macro.BitTorrent +++ b/Shorewall/Macros/macro.BitTorrent @@ -1,5 +1,5 @@ # -# Shorewall version 4 - BitTorrent Macro +# Shorewall version 5 - BitTorrent Macro # # /usr/share/shorewall/macro.BitTorrent # diff --git a/Shorewall/Macros/macro.BitTorrent32 b/Shorewall/Macros/macro.BitTorrent32 index dbaab9b80..87843d0ad 100644 --- a/Shorewall/Macros/macro.BitTorrent32 +++ b/Shorewall/Macros/macro.BitTorrent32 @@ -1,5 +1,5 @@ # -# Shorewall version 4 - BitTorrent 3.2 Macro +# Shorewall version 5 - BitTorrent 3.2 Macro # # /usr/share/shorewall/macro.BitTorrent32 # diff --git a/Shorewall/Macros/macro.CVS b/Shorewall/Macros/macro.CVS index 071645e18..4566480d1 100644 --- a/Shorewall/Macros/macro.CVS +++ b/Shorewall/Macros/macro.CVS @@ -1,5 +1,5 @@ # -# Shorewall version 4 - CVS Macro +# Shorewall version 5 - CVS Macro # # /usr/share/shorewall/macro.CVS # diff --git a/Shorewall/Macros/macro.Citrix b/Shorewall/Macros/macro.Citrix index 57c955d87..55fa37d8f 100644 --- a/Shorewall/Macros/macro.Citrix +++ b/Shorewall/Macros/macro.Citrix @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Citrix/ICA Macro +# Shorewall version 5 - Citrix/ICA Macro # # /usr/share/shorewall/macro.Citrix # diff --git a/Shorewall/Macros/macro.DAAP b/Shorewall/Macros/macro.DAAP index bdccd7d52..78ca8dd6e 100644 --- a/Shorewall/Macros/macro.DAAP +++ b/Shorewall/Macros/macro.DAAP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - DAAP Macro +# Shorewall version 5 - DAAP Macro # # /usr/share/shorewall/macro.DAAP # diff --git a/Shorewall/Macros/macro.DCC b/Shorewall/Macros/macro.DCC index cbfe1d037..ca81464b0 100644 --- a/Shorewall/Macros/macro.DCC +++ b/Shorewall/Macros/macro.DCC @@ -1,5 +1,5 @@ # -# Shorewall version 4 - DCC Macro +# Shorewall version 5 - DCC Macro # # /usr/share/shorewall/macro.DCC # diff --git a/Shorewall/Macros/macro.DHCPfwd b/Shorewall/Macros/macro.DHCPfwd index ac70c77f1..437de4c84 100644 --- a/Shorewall/Macros/macro.DHCPfwd +++ b/Shorewall/Macros/macro.DHCPfwd @@ -1,5 +1,5 @@ # -# Shorewall version 4 - DHCPfwd Macro +# Shorewall version 5 - DHCPfwd Macro # # /usr/share/shorewall/macro.DHCPfwd # diff --git a/Shorewall/Macros/macro.DNS b/Shorewall/Macros/macro.DNS index bd59e8c2c..ec30f1263 100644 --- a/Shorewall/Macros/macro.DNS +++ b/Shorewall/Macros/macro.DNS @@ -1,5 +1,5 @@ # -# Shorewall version 4 - DNS Macro +# Shorewall version 5 - DNS Macro # # /usr/share/shorewall/macro.DNS # diff --git a/Shorewall/Macros/macro.Distcc b/Shorewall/Macros/macro.Distcc index 732fa9f51..55b00d33d 100644 --- a/Shorewall/Macros/macro.Distcc +++ b/Shorewall/Macros/macro.Distcc @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Distcc Macro +# Shorewall version 5 - Distcc Macro # # /usr/share/shorewall/macro.Distcc # diff --git a/Shorewall/Macros/macro.Drop b/Shorewall/Macros/macro.Drop index 3fdae526a..8da228c09 100644 --- a/Shorewall/Macros/macro.Drop +++ b/Shorewall/Macros/macro.Drop @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Drop Macro +# Shorewall version 5 - Drop Macro # # /usr/share/shorewall/macro.Drop # diff --git a/Shorewall/Macros/macro.DropDNSrep b/Shorewall/Macros/macro.DropDNSrep index 0d1d7853f..d8e929c59 100644 --- a/Shorewall/Macros/macro.DropDNSrep +++ b/Shorewall/Macros/macro.DropDNSrep @@ -1,5 +1,5 @@ # -# Shorewall version 4 - DropDNSrep Macro +# Shorewall version 5 - DropDNSrep Macro # # /usr/share/shorewall/macro.DropDNSrep # diff --git a/Shorewall/Macros/macro.DropUPnP b/Shorewall/Macros/macro.DropUPnP index 8a6b5b81a..51379de93 100644 --- a/Shorewall/Macros/macro.DropUPnP +++ b/Shorewall/Macros/macro.DropUPnP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - DropUPnP Macro +# Shorewall version 5 - DropUPnP Macro # # /usr/share/shorewall/macro.DropUPnP # diff --git a/Shorewall/Macros/macro.Edonkey b/Shorewall/Macros/macro.Edonkey index fc188c5ba..7de77111c 100644 --- a/Shorewall/Macros/macro.Edonkey +++ b/Shorewall/Macros/macro.Edonkey @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Edonkey Macro +# Shorewall version 5 - Edonkey Macro # # /usr/share/shorewall/macro.Edonkey # diff --git a/Shorewall/Macros/macro.FTP b/Shorewall/Macros/macro.FTP index 7133179a3..b49ef4450 100644 --- a/Shorewall/Macros/macro.FTP +++ b/Shorewall/Macros/macro.FTP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - FTP Macro +# Shorewall version 5 - FTP Macro # # /usr/share/shorewall/macro.FTP # diff --git a/Shorewall/Macros/macro.Finger b/Shorewall/Macros/macro.Finger index 7ab7aea4e..92ea2652c 100644 --- a/Shorewall/Macros/macro.Finger +++ b/Shorewall/Macros/macro.Finger @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Finger Macro +# Shorewall version 5 - Finger Macro # # /usr/share/shorewall/macro.Finger # diff --git a/Shorewall/Macros/macro.GNUnet b/Shorewall/Macros/macro.GNUnet index ab1f62d08..8b9cbf812 100644 --- a/Shorewall/Macros/macro.GNUnet +++ b/Shorewall/Macros/macro.GNUnet @@ -1,5 +1,5 @@ # -# Shorewall version 4 - GNUnet Macro +# Shorewall version 5 - GNUnet Macro # # /usr/share/shorewall/macro.GNUnet # diff --git a/Shorewall/Macros/macro.GRE b/Shorewall/Macros/macro.GRE index 16b3b80f1..42ebd8d5d 100644 --- a/Shorewall/Macros/macro.GRE +++ b/Shorewall/Macros/macro.GRE @@ -1,5 +1,5 @@ # -# Shorewall version 4 - GRE Macro +# Shorewall version 5 - GRE Macro # # /usr/share/shorewall/macro.GRE # diff --git a/Shorewall/Macros/macro.Git b/Shorewall/Macros/macro.Git index 8d2309dbb..6de416427 100644 --- a/Shorewall/Macros/macro.Git +++ b/Shorewall/Macros/macro.Git @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Git Macro +# Shorewall version 5 - Git Macro # # /usr/share/shorewall/macro.Git # diff --git a/Shorewall/Macros/macro.Gnutella b/Shorewall/Macros/macro.Gnutella index 39231e990..91368de5c 100644 --- a/Shorewall/Macros/macro.Gnutella +++ b/Shorewall/Macros/macro.Gnutella @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Gnutella Macro +# Shorewall version 5 - Gnutella Macro # # /usr/share/shorewall/macro.Gnutella # diff --git a/Shorewall/Macros/macro.Goto-Meeting b/Shorewall/Macros/macro.Goto-Meeting index a5976d588..6f6a34a6e 100644 --- a/Shorewall/Macros/macro.Goto-Meeting +++ b/Shorewall/Macros/macro.Goto-Meeting @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Citrix/Goto Meeting macro +# Shorewall version 5 - Citrix/Goto Meeting macro # # /usr/share/shorewall/macro.Goto-Meeting # by Eric Teeter diff --git a/Shorewall/Macros/macro.HKP b/Shorewall/Macros/macro.HKP index b91f7f67c..140b1991b 100644 --- a/Shorewall/Macros/macro.HKP +++ b/Shorewall/Macros/macro.HKP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - HKP Macro +# Shorewall version 5 - HKP Macro # # /usr/share/shorewall/macro.HKP # diff --git a/Shorewall/Macros/macro.HTTP b/Shorewall/Macros/macro.HTTP index f1d8608ad..a99ec99a2 100644 --- a/Shorewall/Macros/macro.HTTP +++ b/Shorewall/Macros/macro.HTTP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - HTTP Macro +# Shorewall version 5 - HTTP Macro # # /usr/share/shorewall/macro.HTTP # diff --git a/Shorewall/Macros/macro.HTTPS b/Shorewall/Macros/macro.HTTPS index aec174bb1..2685bd85c 100644 --- a/Shorewall/Macros/macro.HTTPS +++ b/Shorewall/Macros/macro.HTTPS @@ -1,5 +1,5 @@ # -# Shorewall version 4 - HTTPS Macro +# Shorewall version 5 - HTTPS Macro # # /usr/share/shorewall/macro.HTTPS # diff --git a/Shorewall/Macros/macro.ICPV2 b/Shorewall/Macros/macro.ICPV2 index 46839373d..41470853b 100644 --- a/Shorewall/Macros/macro.ICPV2 +++ b/Shorewall/Macros/macro.ICPV2 @@ -1,5 +1,5 @@ # -# Shorewall version 4 - ICPV2 Macro +# Shorewall version 5 - ICPV2 Macro # # /usr/share/shorewall/macro.ICPV2 # diff --git a/Shorewall/Macros/macro.ICQ b/Shorewall/Macros/macro.ICQ index ddf92ef73..b3f1c21d1 100644 --- a/Shorewall/Macros/macro.ICQ +++ b/Shorewall/Macros/macro.ICQ @@ -1,5 +1,5 @@ # -# Shorewall version 4 - ICQ Macro +# Shorewall version 5 - ICQ Macro # # /usr/share/shorewall/macro.ICQ # diff --git a/Shorewall/Macros/macro.ILO b/Shorewall/Macros/macro.ILO index 9cd352ad4..de45e5a3f 100644 --- a/Shorewall/Macros/macro.ILO +++ b/Shorewall/Macros/macro.ILO @@ -1,5 +1,5 @@ # -# Shorewall version 4 - ILO Macro +# Shorewall version 5 - ILO Macro # # /usr/share/shorewall/macro.ILO # diff --git a/Shorewall/Macros/macro.IMAP b/Shorewall/Macros/macro.IMAP index 177d56bc4..77a3b0998 100644 --- a/Shorewall/Macros/macro.IMAP +++ b/Shorewall/Macros/macro.IMAP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - IMAP Macro +# Shorewall version 5 - IMAP Macro # # /usr/share/shorewall/macro.IMAP # diff --git a/Shorewall/Macros/macro.IMAPS b/Shorewall/Macros/macro.IMAPS index 3a88dab2b..cfdf6b016 100644 --- a/Shorewall/Macros/macro.IMAPS +++ b/Shorewall/Macros/macro.IMAPS @@ -1,5 +1,5 @@ # -# Shorewall version 4 - IMAPS Macro +# Shorewall version 5 - IMAPS Macro # # /usr/share/shorewall/macro.IMAPS # diff --git a/Shorewall/Macros/macro.IPIP b/Shorewall/Macros/macro.IPIP index beea45a8a..6bf2ac047 100644 --- a/Shorewall/Macros/macro.IPIP +++ b/Shorewall/Macros/macro.IPIP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - IPIP Macro +# Shorewall version 5 - IPIP Macro # # /usr/share/shorewall/macro.IPIP # diff --git a/Shorewall/Macros/macro.IPMI b/Shorewall/Macros/macro.IPMI index 97cdd4cfc..8b64f0d30 100644 --- a/Shorewall/Macros/macro.IPMI +++ b/Shorewall/Macros/macro.IPMI @@ -1,5 +1,5 @@ # -# Shorewall version 4 - IPMI Macro +# Shorewall version 5 - IPMI Macro # # /usr/share/shorewall/macro.IPMI # diff --git a/Shorewall/Macros/macro.IPPbrd b/Shorewall/Macros/macro.IPPbrd index cd4460b70..379644dea 100644 --- a/Shorewall/Macros/macro.IPPbrd +++ b/Shorewall/Macros/macro.IPPbrd @@ -1,5 +1,5 @@ # -# Shorewall version 4 - IPP Broadcast Macro +# Shorewall version 5 - IPP Broadcast Macro # # /usr/share/shorewall/macro.IPPbrd # diff --git a/Shorewall/Macros/macro.IPPserver b/Shorewall/Macros/macro.IPPserver index e095a8604..a6fd2000f 100644 --- a/Shorewall/Macros/macro.IPPserver +++ b/Shorewall/Macros/macro.IPPserver @@ -1,5 +1,5 @@ # -# Shorewall version 4 - IPPserver Macro +# Shorewall version 5 - IPPserver Macro # # /usr/share/shorewall/macro.IPPserver # diff --git a/Shorewall/Macros/macro.IPsec b/Shorewall/Macros/macro.IPsec index aeda55d54..50d32e6bb 100644 --- a/Shorewall/Macros/macro.IPsec +++ b/Shorewall/Macros/macro.IPsec @@ -1,5 +1,5 @@ # -# Shorewall version 4 - IPsec Macro +# Shorewall version 5 - IPsec Macro # # /usr/share/shorewall/macro.IPsec # diff --git a/Shorewall/Macros/macro.IPsecah b/Shorewall/Macros/macro.IPsecah index fa834781d..f2356e777 100644 --- a/Shorewall/Macros/macro.IPsecah +++ b/Shorewall/Macros/macro.IPsecah @@ -1,5 +1,5 @@ # -# Shorewall version 4 - IPsecah Macro +# Shorewall version 5 - IPsecah Macro # # /usr/share/shorewall/macro.IPsecah # diff --git a/Shorewall/Macros/macro.IPsecnat b/Shorewall/Macros/macro.IPsecnat index c99eef31c..2d62d4455 100644 --- a/Shorewall/Macros/macro.IPsecnat +++ b/Shorewall/Macros/macro.IPsecnat @@ -1,5 +1,5 @@ # -# Shorewall version 4 - IPsecnat Macro +# Shorewall version 5 - IPsecnat Macro # # /usr/share/shorewall/macro.IPsecnat # diff --git a/Shorewall/Macros/macro.IRC b/Shorewall/Macros/macro.IRC index f8faf92ca..a48b7feec 100644 --- a/Shorewall/Macros/macro.IRC +++ b/Shorewall/Macros/macro.IRC @@ -1,5 +1,5 @@ # -# Shorewall version 4 IRC Macro +# Shorewall version 5 IRC Macro # # /usr/share/shorewall/macro.IRC # diff --git a/Shorewall/Macros/macro.JAP b/Shorewall/Macros/macro.JAP index 62fb43d86..41ccc909b 100644 --- a/Shorewall/Macros/macro.JAP +++ b/Shorewall/Macros/macro.JAP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - JAP Macro +# Shorewall version 5 - JAP Macro # # /usr/share/shorewall/macro.JAP # diff --git a/Shorewall/Macros/macro.Jabber b/Shorewall/Macros/macro.Jabber index 6ae762c40..6f38f02e5 100644 --- a/Shorewall/Macros/macro.Jabber +++ b/Shorewall/Macros/macro.Jabber @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Jabber Macro +# Shorewall version 5 - Jabber Macro # # /usr/share/shorewall/macro.Jabber # diff --git a/Shorewall/Macros/macro.JabberPlain b/Shorewall/Macros/macro.JabberPlain index 89d221afb..4281e2315 100644 --- a/Shorewall/Macros/macro.JabberPlain +++ b/Shorewall/Macros/macro.JabberPlain @@ -1,5 +1,5 @@ # -# Shorewall version 4 - JabberPlain Macro +# Shorewall version 5 - JabberPlain Macro # # /usr/share/shorewall/macro.JabberPlain # diff --git a/Shorewall/Macros/macro.JabberSecure b/Shorewall/Macros/macro.JabberSecure index b9af33df1..2a5f8c78c 100644 --- a/Shorewall/Macros/macro.JabberSecure +++ b/Shorewall/Macros/macro.JabberSecure @@ -1,5 +1,5 @@ # -# Shorewall version 4 - JabberSecure (SSL) Macro +# Shorewall version 5 - JabberSecure (SSL) Macro # # /usr/share/shorewall/macro.JabberSecure # diff --git a/Shorewall/Macros/macro.Kerberos b/Shorewall/Macros/macro.Kerberos index a2f0c740c..05eed3b3b 100644 --- a/Shorewall/Macros/macro.Kerberos +++ b/Shorewall/Macros/macro.Kerberos @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Kerberos Macro +# Shorewall version 5 - Kerberos Macro # # /usr/share/shorewall/macro.Kerberos # diff --git a/Shorewall/Macros/macro.L2TP b/Shorewall/Macros/macro.L2TP index b9ecdec09..8c9b0acbf 100644 --- a/Shorewall/Macros/macro.L2TP +++ b/Shorewall/Macros/macro.L2TP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - L2TP Macro +# Shorewall version 5 - L2TP Macro # # /usr/share/shorewall/macro.L2TP # diff --git a/Shorewall/Macros/macro.LDAP b/Shorewall/Macros/macro.LDAP index 9030afb6d..95d24aec4 100644 --- a/Shorewall/Macros/macro.LDAP +++ b/Shorewall/Macros/macro.LDAP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - LDAP Macro +# Shorewall version 5 - LDAP Macro # # /usr/share/shorewall/macro.LDAP # diff --git a/Shorewall/Macros/macro.LDAPS b/Shorewall/Macros/macro.LDAPS index 975afba99..42819e2f2 100644 --- a/Shorewall/Macros/macro.LDAPS +++ b/Shorewall/Macros/macro.LDAPS @@ -1,5 +1,5 @@ # -# Shorewall version 4 - LDAPS Macro +# Shorewall version 5 - LDAPS Macro # # /usr/share/shorewall/macro.LDAPS # diff --git a/Shorewall/Macros/macro.MSNP b/Shorewall/Macros/macro.MSNP index 4431b8146..fa1c41351 100644 --- a/Shorewall/Macros/macro.MSNP +++ b/Shorewall/Macros/macro.MSNP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - MSNP Macro +# Shorewall version 5 - MSNP Macro # # /usr/share/shorewall/macro.MSNP # diff --git a/Shorewall/Macros/macro.MSSQL b/Shorewall/Macros/macro.MSSQL index 70be935ca..8d9ebfbb5 100644 --- a/Shorewall/Macros/macro.MSSQL +++ b/Shorewall/Macros/macro.MSSQL @@ -1,5 +1,5 @@ # -# Shorewall version 4 - MSSQL Macro +# Shorewall version 5 - MSSQL Macro # # /usr/share/shorewall/macro.MSSQL # diff --git a/Shorewall/Macros/macro.Mail b/Shorewall/Macros/macro.Mail index 4ac525698..b81fe6186 100644 --- a/Shorewall/Macros/macro.Mail +++ b/Shorewall/Macros/macro.Mail @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Mail Macro +# Shorewall version 5 - Mail Macro # # /usr/share/shorewall/macro.Mail # diff --git a/Shorewall/Macros/macro.MongoDB b/Shorewall/Macros/macro.MongoDB index 8d14bb4a0..3e30f6848 100644 --- a/Shorewall/Macros/macro.MongoDB +++ b/Shorewall/Macros/macro.MongoDB @@ -1,5 +1,5 @@ # -# Shorewall version 4 - MongoDB Macro +# Shorewall version 5 - MongoDB Macro # # /usr/share/shorewall/macro.MongoDB # diff --git a/Shorewall/Macros/macro.Munin b/Shorewall/Macros/macro.Munin index 2f7b537b1..a09c36c64 100644 --- a/Shorewall/Macros/macro.Munin +++ b/Shorewall/Macros/macro.Munin @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Munin Macro +# Shorewall version 5 - Munin Macro # # /usr/share/shorewall/macro.Munin # diff --git a/Shorewall/Macros/macro.MySQL b/Shorewall/Macros/macro.MySQL index 390885c6c..4a047bbe2 100644 --- a/Shorewall/Macros/macro.MySQL +++ b/Shorewall/Macros/macro.MySQL @@ -1,5 +1,5 @@ # -# Shorewall version 4 - MySQL Macro +# Shorewall version 5 - MySQL Macro # # /usr/share/shorewall/macro.MySQL # diff --git a/Shorewall/Macros/macro.NNTP b/Shorewall/Macros/macro.NNTP index f53bacbbd..d43043ac5 100644 --- a/Shorewall/Macros/macro.NNTP +++ b/Shorewall/Macros/macro.NNTP @@ -1,5 +1,5 @@ # -# Shorewall version 4 NNTP Macro +# Shorewall version 5 NNTP Macro # # /usr/share/shorewall/macro.NNTP # diff --git a/Shorewall/Macros/macro.NNTPS b/Shorewall/Macros/macro.NNTPS index 2df93f3a3..27915b859 100644 --- a/Shorewall/Macros/macro.NNTPS +++ b/Shorewall/Macros/macro.NNTPS @@ -1,5 +1,5 @@ # -# Shorewall version 4 NNTPS Macro +# Shorewall version 5 NNTPS Macro # # /usr/share/shorewall/macro.NNTPS # diff --git a/Shorewall/Macros/macro.NTP b/Shorewall/Macros/macro.NTP index a6ef8d72f..04a409604 100644 --- a/Shorewall/Macros/macro.NTP +++ b/Shorewall/Macros/macro.NTP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - NTP Macro +# Shorewall version 5 - NTP Macro # # /usr/share/shorewall/macro.NTP # diff --git a/Shorewall/Macros/macro.NTPbi b/Shorewall/Macros/macro.NTPbi index bfa7f7dbc..669cb7f9c 100644 --- a/Shorewall/Macros/macro.NTPbi +++ b/Shorewall/Macros/macro.NTPbi @@ -1,5 +1,5 @@ # -# Shorewall version 4 - NTPbi Macro +# Shorewall version 5 - NTPbi Macro # # /usr/share/shorewall/macro.NTPbi # diff --git a/Shorewall/Macros/macro.NTPbrd b/Shorewall/Macros/macro.NTPbrd index 1defb9ee6..994d20919 100644 --- a/Shorewall/Macros/macro.NTPbrd +++ b/Shorewall/Macros/macro.NTPbrd @@ -1,5 +1,5 @@ # -# Shorewall version 4 - NTPbrd Macro +# Shorewall version 5 - NTPbrd Macro # # /usr/share/shorewall/macro.NTPbrd # diff --git a/Shorewall/Macros/macro.OSPF b/Shorewall/Macros/macro.OSPF index 5dc321b1a..dcddf095f 100644 --- a/Shorewall/Macros/macro.OSPF +++ b/Shorewall/Macros/macro.OSPF @@ -1,5 +1,5 @@ # -# Shorewall version 4 - OSPF Macro +# Shorewall version 5 - OSPF Macro # # /usr/share/shorewall/macro.OSPF # diff --git a/Shorewall/Macros/macro.OpenVPN b/Shorewall/Macros/macro.OpenVPN index 4f91c4c92..a405d6978 100644 --- a/Shorewall/Macros/macro.OpenVPN +++ b/Shorewall/Macros/macro.OpenVPN @@ -1,5 +1,5 @@ # -# Shorewall version 4 - OpenVPN Macro +# Shorewall version 5 - OpenVPN Macro # # /usr/share/shorewall/macro.OpenVPN Macro # diff --git a/Shorewall/Macros/macro.PCA b/Shorewall/Macros/macro.PCA index 9fe9516f4..b4f13f16a 100644 --- a/Shorewall/Macros/macro.PCA +++ b/Shorewall/Macros/macro.PCA @@ -1,5 +1,5 @@ # -# Shorewall version 4 - PCA Macro +# Shorewall version 5 - PCA Macro # # /usr/share/shorewall/macro.PCA # diff --git a/Shorewall/Macros/macro.POP3 b/Shorewall/Macros/macro.POP3 index c10f86d43..56e09ecce 100644 --- a/Shorewall/Macros/macro.POP3 +++ b/Shorewall/Macros/macro.POP3 @@ -1,5 +1,5 @@ # -# Shorewall version 4 - POP3 Macro +# Shorewall version 5 - POP3 Macro # # /usr/share/shorewall/macro.POP3 # diff --git a/Shorewall/Macros/macro.POP3S b/Shorewall/Macros/macro.POP3S index 31aedcd4a..f8ffd0905 100644 --- a/Shorewall/Macros/macro.POP3S +++ b/Shorewall/Macros/macro.POP3S @@ -1,5 +1,5 @@ # -# Shorewall version 4 - POP3S Macro +# Shorewall version 5 - POP3S Macro # # /usr/share/shorewall/macro.POP3S # diff --git a/Shorewall/Macros/macro.PPtP b/Shorewall/Macros/macro.PPtP index cf95bcbd2..487cb5fdc 100644 --- a/Shorewall/Macros/macro.PPtP +++ b/Shorewall/Macros/macro.PPtP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - PPTP Macro +# Shorewall version 5 - PPTP Macro # # /usr/share/shorewall/macro.PPtP Macro # diff --git a/Shorewall/Macros/macro.Ping b/Shorewall/Macros/macro.Ping index 7d0f1d681..adac4800c 100644 --- a/Shorewall/Macros/macro.Ping +++ b/Shorewall/Macros/macro.Ping @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Ping Macro +# Shorewall version 5 - Ping Macro # # /usr/share/shorewall/macro.Ping # diff --git a/Shorewall/Macros/macro.PostgreSQL b/Shorewall/Macros/macro.PostgreSQL index d90d51661..6d1339dcd 100644 --- a/Shorewall/Macros/macro.PostgreSQL +++ b/Shorewall/Macros/macro.PostgreSQL @@ -1,5 +1,5 @@ # -# Shorewall version 4 - PostgreSQL Macro +# Shorewall version 5 - PostgreSQL Macro # # /usr/share/shorewall/macro.PostgreSQL # diff --git a/Shorewall/Macros/macro.Puppet b/Shorewall/Macros/macro.Puppet index 499be4ef9..d8d6bc787 100644 --- a/Shorewall/Macros/macro.Puppet +++ b/Shorewall/Macros/macro.Puppet @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Puppet Macro +# Shorewall version 5 - Puppet Macro # # /usr/share/shorewall/macro.Puppet # diff --git a/Shorewall/Macros/macro.QUIC b/Shorewall/Macros/macro.QUIC index 00b061d1e..71ff164dd 100644 --- a/Shorewall/Macros/macro.QUIC +++ b/Shorewall/Macros/macro.QUIC @@ -1,5 +1,5 @@ # -# Shorewall version 4 - QUIC Macro +# Shorewall version 5 - QUIC Macro # # /usr/share/shorewall/macro.QUIC # diff --git a/Shorewall/Macros/macro.RIPbi b/Shorewall/Macros/macro.RIPbi index 95f6bd505..2823908d2 100644 --- a/Shorewall/Macros/macro.RIPbi +++ b/Shorewall/Macros/macro.RIPbi @@ -1,5 +1,5 @@ # -# Shorewall version 4 - RIPbi Macro +# Shorewall version 5 - RIPbi Macro # # /usr/share/shorewall/macro.RIPbi # diff --git a/Shorewall/Macros/macro.RNDC b/Shorewall/Macros/macro.RNDC index 5bc5cb660..333039dbd 100644 --- a/Shorewall/Macros/macro.RNDC +++ b/Shorewall/Macros/macro.RNDC @@ -1,5 +1,5 @@ # -# Shorewall version 4 - RNDC Macro +# Shorewall version 5 - RNDC Macro # # /usr/share/shorewall/macro.RNDC # diff --git a/Shorewall/Macros/macro.Razor b/Shorewall/Macros/macro.Razor index 115c458f0..95d41fdd7 100644 --- a/Shorewall/Macros/macro.Razor +++ b/Shorewall/Macros/macro.Razor @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Razor Macro +# Shorewall version 5 - Razor Macro # # /usr/share/shorewall/macro.Razor # diff --git a/Shorewall/Macros/macro.Rdate b/Shorewall/Macros/macro.Rdate index c25fbba01..27cf3c699 100644 --- a/Shorewall/Macros/macro.Rdate +++ b/Shorewall/Macros/macro.Rdate @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Rdate Macro +# Shorewall version 5 - Rdate Macro # # /usr/share/shorewall/macro.Rdate # diff --git a/Shorewall/Macros/macro.Redis b/Shorewall/Macros/macro.Redis index 79af00fc8..8d7acbd6f 100644 --- a/Shorewall/Macros/macro.Redis +++ b/Shorewall/Macros/macro.Redis @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Redis Macro +# Shorewall version 5 - Redis Macro # # /usr/share/shorewall/macro.Redis # diff --git a/Shorewall/Macros/macro.Reject b/Shorewall/Macros/macro.Reject index 39f99a235..c5ca208c1 100644 --- a/Shorewall/Macros/macro.Reject +++ b/Shorewall/Macros/macro.Reject @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Reject Macro +# Shorewall version 5 - Reject Macro # # /usr/share/shorewall/macro.Reject # diff --git a/Shorewall/Macros/macro.Rfc1918 b/Shorewall/Macros/macro.Rfc1918 index 9817a99f5..0599a21d7 100644 --- a/Shorewall/Macros/macro.Rfc1918 +++ b/Shorewall/Macros/macro.Rfc1918 @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Macro Template +# Shorewall version 5 - Macro Template # # /usr/share/shorewall/macro.Rfc1918 # diff --git a/Shorewall/Macros/macro.Rsync b/Shorewall/Macros/macro.Rsync index c8983ce5f..4f58fe566 100644 --- a/Shorewall/Macros/macro.Rsync +++ b/Shorewall/Macros/macro.Rsync @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Rsync Macro +# Shorewall version 5 - Rsync Macro # # /usr/share/shorewall/macro.Rsync # diff --git a/Shorewall/Macros/macro.SANE b/Shorewall/Macros/macro.SANE index d190c4b3e..d8e91aa5c 100644 --- a/Shorewall/Macros/macro.SANE +++ b/Shorewall/Macros/macro.SANE @@ -1,5 +1,5 @@ # -# Shorewall version 4 - SANE Macro +# Shorewall version 5 - SANE Macro # # /usr/share/shorewall/macro.SANE # diff --git a/Shorewall/Macros/macro.SIP b/Shorewall/Macros/macro.SIP index 9a8c5654e..ba9585ca9 100644 --- a/Shorewall/Macros/macro.SIP +++ b/Shorewall/Macros/macro.SIP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - SIP Macro +# Shorewall version 5 - SIP Macro # # /usr/share/shorewall/macro.SIP # diff --git a/Shorewall/Macros/macro.SMB b/Shorewall/Macros/macro.SMB index c33f40109..5c0a60bc4 100644 --- a/Shorewall/Macros/macro.SMB +++ b/Shorewall/Macros/macro.SMB @@ -1,5 +1,5 @@ # -# Shorewall version 4 - SMB Macro +# Shorewall version 5 - SMB Macro # # /usr/share/shorewall/macro.SMB # diff --git a/Shorewall/Macros/macro.SMBBI b/Shorewall/Macros/macro.SMBBI index 645732bcf..3e976d00e 100644 --- a/Shorewall/Macros/macro.SMBBI +++ b/Shorewall/Macros/macro.SMBBI @@ -1,5 +1,5 @@ # -# Shorewall version 4 - SMB Bi-directional Macro +# Shorewall version 5 - SMB Bi-directional Macro # # /usr/share/shorewall/macro.SMBBI # diff --git a/Shorewall/Macros/macro.SMBswat b/Shorewall/Macros/macro.SMBswat index 524caa90c..43fd48a30 100644 --- a/Shorewall/Macros/macro.SMBswat +++ b/Shorewall/Macros/macro.SMBswat @@ -1,5 +1,5 @@ # -# Shorewall version 4 - SMBswat Macro +# Shorewall version 5 - SMBswat Macro # # /usr/share/shorewall/macro.SMBswat # diff --git a/Shorewall/Macros/macro.SMTP b/Shorewall/Macros/macro.SMTP index ff3d53b88..bcad0b076 100644 --- a/Shorewall/Macros/macro.SMTP +++ b/Shorewall/Macros/macro.SMTP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - SMTP Macro +# Shorewall version 5 - SMTP Macro # # /usr/share/shorewall/macro.SMTP # diff --git a/Shorewall/Macros/macro.SMTPS b/Shorewall/Macros/macro.SMTPS index df260b702..f7ea1824f 100644 --- a/Shorewall/Macros/macro.SMTPS +++ b/Shorewall/Macros/macro.SMTPS @@ -1,5 +1,5 @@ # -# Shorewall version 4 - SMTPS Macro +# Shorewall version 5 - SMTPS Macro # # /usr/share/shorewall/macro.SMTPS # diff --git a/Shorewall/Macros/macro.SNMP b/Shorewall/Macros/macro.SNMP index 64a811bbe..42274b74a 100644 --- a/Shorewall/Macros/macro.SNMP +++ b/Shorewall/Macros/macro.SNMP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - SNMP Macro +# Shorewall version 5 - SNMP Macro # # /usr/share/shorewall/macro.SNMP # diff --git a/Shorewall/Macros/macro.SNMPTrap b/Shorewall/Macros/macro.SNMPTrap index 09e417a38..74fac9cb4 100644 --- a/Shorewall/Macros/macro.SNMPTrap +++ b/Shorewall/Macros/macro.SNMPTrap @@ -1,5 +1,5 @@ # -# Shorewall version 4 - SNMP Trap Macro +# Shorewall version 5 - SNMP Trap Macro # # /usr/share/shorewall/macro.SNMPtrap # diff --git a/Shorewall/Macros/macro.SPAMD b/Shorewall/Macros/macro.SPAMD index ec2b557da..3c72119c9 100644 --- a/Shorewall/Macros/macro.SPAMD +++ b/Shorewall/Macros/macro.SPAMD @@ -1,5 +1,5 @@ # -# Shorewall version 4 - SPAMD Macro +# Shorewall version 5 - SPAMD Macro # # /usr/share/shorewall/macro.SPAMD # diff --git a/Shorewall/Macros/macro.SSH b/Shorewall/Macros/macro.SSH index bc8a29d4d..46c09e32c 100644 --- a/Shorewall/Macros/macro.SSH +++ b/Shorewall/Macros/macro.SSH @@ -1,5 +1,5 @@ # -# Shorewall version 4 - SSH Macro +# Shorewall version 5 - SSH Macro # # /usr/share/shorewall/macro.SSH # diff --git a/Shorewall/Macros/macro.SVN b/Shorewall/Macros/macro.SVN index e3bd4bdc6..4c11c3f5d 100644 --- a/Shorewall/Macros/macro.SVN +++ b/Shorewall/Macros/macro.SVN @@ -1,5 +1,5 @@ # -# Shorewall version 4 - SVN Macro +# Shorewall version 5 - SVN Macro # # /usr/share/shorewall/macro.SVN # diff --git a/Shorewall/Macros/macro.Sieve b/Shorewall/Macros/macro.Sieve index 85bbbbe18..fc3aab0d9 100644 --- a/Shorewall/Macros/macro.Sieve +++ b/Shorewall/Macros/macro.Sieve @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Sieve Macro +# Shorewall version 5 - Sieve Macro # # /usr/share/shorewall/macro.Sieve # diff --git a/Shorewall/Macros/macro.SixXS b/Shorewall/Macros/macro.SixXS index 71bc97894..2848de192 100644 --- a/Shorewall/Macros/macro.SixXS +++ b/Shorewall/Macros/macro.SixXS @@ -1,5 +1,5 @@ # -# Shorewall version 4 - SIXXS Macro +# Shorewall version 5 - SIXXS Macro # # /usr/share/shorewall/macro.SixXS # diff --git a/Shorewall/Macros/macro.Squid b/Shorewall/Macros/macro.Squid index f92e3b8a0..4d0a25755 100644 --- a/Shorewall/Macros/macro.Squid +++ b/Shorewall/Macros/macro.Squid @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Squid Macro +# Shorewall version 5 - Squid Macro # # /usr/share/shorewall/macro.Squid # diff --git a/Shorewall/Macros/macro.Submission b/Shorewall/Macros/macro.Submission index db664248f..378a3180c 100644 --- a/Shorewall/Macros/macro.Submission +++ b/Shorewall/Macros/macro.Submission @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Submission Macro +# Shorewall version 5 - Submission Macro # # /usr/share/shorewall/macro.Submission # diff --git a/Shorewall/Macros/macro.Syslog b/Shorewall/Macros/macro.Syslog index 3f3228d27..74c6adfd0 100644 --- a/Shorewall/Macros/macro.Syslog +++ b/Shorewall/Macros/macro.Syslog @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Syslog Macro +# Shorewall version 5 - Syslog Macro # # /usr/share/shorewall/macro.Syslog # diff --git a/Shorewall/Macros/macro.Telnet b/Shorewall/Macros/macro.Telnet index 2dcf18e6f..64ceb2c74 100644 --- a/Shorewall/Macros/macro.Telnet +++ b/Shorewall/Macros/macro.Telnet @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Telnet Macro +# Shorewall version 5 - Telnet Macro # # /usr/share/shorewall/macro.Telnet # diff --git a/Shorewall/Macros/macro.Telnets b/Shorewall/Macros/macro.Telnets index 4c02de183..aaf24c86e 100644 --- a/Shorewall/Macros/macro.Telnets +++ b/Shorewall/Macros/macro.Telnets @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Telnet Macro +# Shorewall version 5 - Telnet Macro # # /usr/share/shorewall/macro.Telnets # diff --git a/Shorewall/Macros/macro.Teredo b/Shorewall/Macros/macro.Teredo index fd349435a..737cc43bc 100644 --- a/Shorewall/Macros/macro.Teredo +++ b/Shorewall/Macros/macro.Teredo @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Teredo Macro +# Shorewall version 5 - Teredo Macro # # /usr/share/shorewall/macro.Teredo # diff --git a/Shorewall/Macros/macro.Time b/Shorewall/Macros/macro.Time index 002bb34b0..fa3e4f292 100644 --- a/Shorewall/Macros/macro.Time +++ b/Shorewall/Macros/macro.Time @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Time Macro +# Shorewall version 5 - Time Macro # # /usr/share/shorewall/macro.Time # diff --git a/Shorewall/Macros/macro.Tinc b/Shorewall/Macros/macro.Tinc index a64f645cc..a4726835f 100644 --- a/Shorewall/Macros/macro.Tinc +++ b/Shorewall/Macros/macro.Tinc @@ -1,5 +1,5 @@ # -# Shorewall version 4 - tinc Macro +# Shorewall version 5 - tinc Macro # # /usr/share/shorewall/macro.Tinc Macro # diff --git a/Shorewall/Macros/macro.Trcrt b/Shorewall/Macros/macro.Trcrt index 579924ac3..bbbab1b1a 100644 --- a/Shorewall/Macros/macro.Trcrt +++ b/Shorewall/Macros/macro.Trcrt @@ -1,5 +1,5 @@ # -# Shorewall version 4 -Trcrt Macro +# Shorewall version 5 -Trcrt Macro # # /usr/share/shorewall/macro.Trcrt # diff --git a/Shorewall/Macros/macro.VNC b/Shorewall/Macros/macro.VNC index a65490fbe..87d44b364 100644 --- a/Shorewall/Macros/macro.VNC +++ b/Shorewall/Macros/macro.VNC @@ -1,5 +1,5 @@ # -# Shorewall version 4 - VNC Macro +# Shorewall version 5 - VNC Macro # # /usr/share/shorewall/macro.VNC # diff --git a/Shorewall/Macros/macro.VNCL b/Shorewall/Macros/macro.VNCL index 39695066f..0adb9fc2a 100644 --- a/Shorewall/Macros/macro.VNCL +++ b/Shorewall/Macros/macro.VNCL @@ -1,5 +1,5 @@ # -# Shorewall version 4 -VNCL Macro +# Shorewall version 5 -VNCL Macro # # /usr/share/shorewall/macro.VNCL # diff --git a/Shorewall/Macros/macro.VRRP b/Shorewall/Macros/macro.VRRP index 065b59d6b..1f5ecf7bf 100644 --- a/Shorewall/Macros/macro.VRRP +++ b/Shorewall/Macros/macro.VRRP @@ -1,5 +1,5 @@ # -# Shorewall version 4 - VRRP Macro +# Shorewall version 5 - VRRP Macro # # /usr/share/shorewall/macro.VRRP # diff --git a/Shorewall/Macros/macro.Web b/Shorewall/Macros/macro.Web index 7c395dedc..848a1c3f7 100644 --- a/Shorewall/Macros/macro.Web +++ b/Shorewall/Macros/macro.Web @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Web Macro +# Shorewall version 5 - Web Macro # # /usr/share/shorewall/macro.Web # diff --git a/Shorewall/Macros/macro.Webcache b/Shorewall/Macros/macro.Webcache index 6d06cc810..412824d76 100644 --- a/Shorewall/Macros/macro.Webcache +++ b/Shorewall/Macros/macro.Webcache @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Web Cache Macro +# Shorewall version 5 - Web Cache Macro # # /usr/share/shorewall/macro.WebCache # diff --git a/Shorewall/Macros/macro.Webmin b/Shorewall/Macros/macro.Webmin index c64ad33ce..70598fe30 100644 --- a/Shorewall/Macros/macro.Webmin +++ b/Shorewall/Macros/macro.Webmin @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Webmin Macro +# Shorewall version 5 - Webmin Macro # # /usr/share/shorewall/macro.Webmin # diff --git a/Shorewall/Macros/macro.Whois b/Shorewall/Macros/macro.Whois index 324faaa43..46cb6df52 100644 --- a/Shorewall/Macros/macro.Whois +++ b/Shorewall/Macros/macro.Whois @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Whois Macro +# Shorewall version 5 - Whois Macro # # /usr/share/shorewall/macro.Whois # diff --git a/Shorewall/Macros/macro.Xymon b/Shorewall/Macros/macro.Xymon index 41dd99cbd..21d128876 100644 --- a/Shorewall/Macros/macro.Xymon +++ b/Shorewall/Macros/macro.Xymon @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Xymon Macro +# Shorewall version 5 - Xymon Macro # # /usr/share/shorewall/macro.Xymon # diff --git a/Shorewall/Macros/macro.Zabbix b/Shorewall/Macros/macro.Zabbix index ea5bb8ee0..f6f7a8008 100644 --- a/Shorewall/Macros/macro.Zabbix +++ b/Shorewall/Macros/macro.Zabbix @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Zabbix Macro +# Shorewall version 5 - Zabbix Macro # # /usr/share/shorewall/macro.Zabbix # diff --git a/Shorewall/Macros/macro.mDNS b/Shorewall/Macros/macro.mDNS index 49f9f11c3..4e11feb22 100644 --- a/Shorewall/Macros/macro.mDNS +++ b/Shorewall/Macros/macro.mDNS @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Multicast DNS Macro -- this macro assumes that only +# Shorewall version 5 - Multicast DNS Macro -- this macro assumes that only # the DEST zone sends mDNS queries. If both zones send # queries, use the mDNSbi macro. # diff --git a/Shorewall/Macros/macro.mDNSbi b/Shorewall/Macros/macro.mDNSbi index 3a687b9d4..bb271512d 100644 --- a/Shorewall/Macros/macro.mDNSbi +++ b/Shorewall/Macros/macro.mDNSbi @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Bi-directional Multicast DNS Macro. +# Shorewall version 5 - Bi-directional Multicast DNS Macro. # # /usr/share/shorewall/macro.mDNSbi # diff --git a/Shorewall/Macros/macro.template b/Shorewall/Macros/macro.template index 70e4215cc..bcc40367c 100644 --- a/Shorewall/Macros/macro.template +++ b/Shorewall/Macros/macro.template @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Macro Template +# Shorewall version 5 - Macro Template # # /usr/share/shorewall/macro.template # diff --git a/Shorewall/Perl/Shorewall/Misc.pm b/Shorewall/Perl/Shorewall/Misc.pm index 59c6f42cf..334fe0582 100644 --- a/Shorewall/Perl/Shorewall/Misc.pm +++ b/Shorewall/Perl/Shorewall/Misc.pm @@ -481,7 +481,7 @@ sub convert_blacklist() { open $blrules, '>', $fn1 or fatal_error "Unable to open $fn1: $!"; print $blrules <<'EOF'; # -# Shorewall version 4.5 - Blacklist Rules File +# Shorewall version 5.0 - Blacklist Rules File # # For information about entries in this file, type "man shorewall-blrules" # diff --git a/Shorewall/action.A_Drop b/Shorewall/action.A_Drop index 1de1334e3..68813f988 100644 --- a/Shorewall/action.A_Drop +++ b/Shorewall/action.A_Drop @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Drop Action +# Shorewall version 5 - Drop Action # # /usr/share/shorewall/action.A_Drop # diff --git a/Shorewall/action.A_Reject b/Shorewall/action.A_Reject index cf84fa466..e02c9e9d5 100644 --- a/Shorewall/action.A_Reject +++ b/Shorewall/action.A_Reject @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Reject Action +# Shorewall version 5 - Reject Action # # /usr/share/shorewall/action.A_Reject # diff --git a/Shorewall/action.AutoBL b/Shorewall/action.AutoBL index c5e0f77b6..93bac6f54 100644 --- a/Shorewall/action.AutoBL +++ b/Shorewall/action.AutoBL @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Auto Blacklist Action +# Shorewall version 5 - Auto Blacklist Action # # Parameters are: # diff --git a/Shorewall/action.AutoBLL b/Shorewall/action.AutoBLL index 1bccfb828..f7773b67e 100644 --- a/Shorewall/action.AutoBLL +++ b/Shorewall/action.AutoBLL @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Auto Blacklisting Logger Action +# Shorewall version 5 - Auto Blacklisting Logger Action # # Arguments are # diff --git a/Shorewall/action.Drop b/Shorewall/action.Drop index 4b52beca9..3fdb85c5d 100644 --- a/Shorewall/action.Drop +++ b/Shorewall/action.Drop @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Drop Action +# Shorewall version 5 - Drop Action # # /usr/share/shorewall/action.Drop # diff --git a/Shorewall/action.DropSmurfs b/Shorewall/action.DropSmurfs index 317c023aa..beed6bd39 100644 --- a/Shorewall/action.DropSmurfs +++ b/Shorewall/action.DropSmurfs @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Drop Smurfs Action +# Shorewall version 5 - Drop Smurfs Action # # /usr/share/shorewall/action.DropSmurfs # diff --git a/Shorewall/action.IfEvent b/Shorewall/action.IfEvent index 87e208f57..7cbe6e429 100644 --- a/Shorewall/action.IfEvent +++ b/Shorewall/action.IfEvent @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Perform an Action based on a Event +# Shorewall version 5 - Perform an Action based on a Event # # /etc/shorewall/action.IfEvent # diff --git a/Shorewall/action.Reject b/Shorewall/action.Reject index 27a402de6..8c2d5c95f 100644 --- a/Shorewall/action.Reject +++ b/Shorewall/action.Reject @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Reject Action +# Shorewall version 5 - Reject Action # # /usr/share/shorewall/action.Reject # diff --git a/Shorewall/action.ResetEvent b/Shorewall/action.ResetEvent index 95b908d83..603023d9d 100644 --- a/Shorewall/action.ResetEvent +++ b/Shorewall/action.ResetEvent @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Reset an Event +# Shorewall version 5 - Reset an Event # # /etc/shorewall/action.ResetEvent # diff --git a/Shorewall/action.SetEvent b/Shorewall/action.SetEvent index 46d6862a0..dcd6277d7 100644 --- a/Shorewall/action.SetEvent +++ b/Shorewall/action.SetEvent @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Set an Event +# Shorewall version 5 - Set an Event # # /etc/shorewall/action.SetEvent # diff --git a/Shorewall/action.TCPFlags b/Shorewall/action.TCPFlags index 8efd5da0a..b1248b90b 100644 --- a/Shorewall/action.TCPFlags +++ b/Shorewall/action.TCPFlags @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Drop TCPFlags Action +# Shorewall version 5 - Drop TCPFlags Action # # /usr/share/shorewall/action.TCPFlags # diff --git a/Shorewall/action.template b/Shorewall/action.template index 7708ff188..8e297e2b9 100644 --- a/Shorewall/action.template +++ b/Shorewall/action.template @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Action Template +# Shorewall version 5 - Action Template # # /etc/shorewall/action.template # diff --git a/Shorewall/actions.std b/Shorewall/actions.std index 0926e6d95..6ee042c11 100644 --- a/Shorewall/actions.std +++ b/Shorewall/actions.std @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Actions.std File +# Shorewall version 5 - Actions.std File # # /usr/share/shorewall/actions.std # diff --git a/Shorewall/configpath b/Shorewall/configpath index fa6300a1e..7163dc915 100644 --- a/Shorewall/configpath +++ b/Shorewall/configpath @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Default Config Path +# Shorewall version 5 - Default Config Path # # /usr/share/shorewall/configpath # diff --git a/Shorewall/helpers b/Shorewall/helpers index aba5ed08b..8839dc02b 100644 --- a/Shorewall/helpers +++ b/Shorewall/helpers @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Helpers File +# Shorewall version 5 - Helpers File # # /usr/share/shorewall/helpers # diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std index 88f39b598..14a88361a 100644 --- a/Shorewall/lib.cli-std +++ b/Shorewall/lib.cli-std @@ -1,7 +1,7 @@ # -# Shorewall 4.5 -- /usr/share/shorewall/lib.cli-std. +# Shorewall 5.0 -- /usr/share/shorewall/lib.cli-std. # -# (c) 1999-2014 - Tom Eastep (teastep@shorewall.net) +# (c) 1999-2015 - Tom Eastep (teastep@shorewall.net) # # Complete documentation is available at http://shorewall.net # diff --git a/Shorewall/modules b/Shorewall/modules index a15d9b9f6..a35d9dce5 100644 --- a/Shorewall/modules +++ b/Shorewall/modules @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Modules File +# Shorewall version 5 - Modules File # # /usr/share/shorewall/modules # diff --git a/Shorewall/modules.essential b/Shorewall/modules.essential index 7b0408cb4..b6edaede9 100644 --- a/Shorewall/modules.essential +++ b/Shorewall/modules.essential @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Essential Modules File +# Shorewall version 5 - Essential Modules File # # /usr/share/shorewall/modules.essential # diff --git a/Shorewall/modules.extensions b/Shorewall/modules.extensions index 716710ad0..95bfb4f3f 100644 --- a/Shorewall/modules.extensions +++ b/Shorewall/modules.extensions @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Extensions Modules File +# Shorewall version 5 - Extensions Modules File # # /usr/share/shorewall/modules.extensions # diff --git a/Shorewall/modules.ipset b/Shorewall/modules.ipset index 6049fdcb3..020b2152a 100644 --- a/Shorewall/modules.ipset +++ b/Shorewall/modules.ipset @@ -1,5 +1,5 @@ # -# Shorewall version 4 - IP Set Modules File +# Shorewall version 5 - IP Set Modules File # # /usr/share/shorewall/modules.ipset # diff --git a/Shorewall/modules.tc b/Shorewall/modules.tc index b65c5c222..e6f6dc92a 100644 --- a/Shorewall/modules.tc +++ b/Shorewall/modules.tc @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Traffic Shaping Modules File +# Shorewall version 5 - Traffic Shaping Modules File # # /usr/share/shorewall/modules.tc # diff --git a/Shorewall/modules.xtables b/Shorewall/modules.xtables index 039ec2835..a6df8886d 100644 --- a/Shorewall/modules.xtables +++ b/Shorewall/modules.xtables @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Xtables Modules File +# Shorewall version 5 - Xtables Modules File # # /usr/share/shorewall/modules.xtables # diff --git a/Shorewall/shorewall b/Shorewall/shorewall index fad713e6c..3a1035bdb 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -1,8 +1,8 @@ #!/bin/sh # -# Shorewall Packet Filtering Firewall Control Program - V4.5 +# Shorewall Packet Filtering Firewall Control Program - V5.0 # -# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2014 - +# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2014,2015 - # Tom Eastep (teastep@shorewall.net) # # Shorewall documentation is available at http://www.shorewall.net diff --git a/Shorewall6-lite/configpath b/Shorewall6-lite/configpath index c8ceb670e..3814baee0 100644 --- a/Shorewall6-lite/configpath +++ b/Shorewall6-lite/configpath @@ -1,5 +1,5 @@ # -# Shorewall6 Lite version 4.1 - Default Config Path +# Shorewall6 Lite version 5 - Default Config Path # # /usr/share/shorewall-lite/configpath # diff --git a/Shorewall6/INSTALL b/Shorewall6/INSTALL index 195ba27c2..cafad7870 100644 --- a/Shorewall6/INSTALL +++ b/Shorewall6/INSTALL @@ -1,4 +1,4 @@ -Shoreline Firewall (Shorewall) Version 4 +Shoreline Firewall (Shorewall) Version 5 ----- ---- ----------------------------------------------------------------------------- diff --git a/Shorewall6/Macros/macro.Ping b/Shorewall6/Macros/macro.Ping index c95818f76..fe4bd4bad 100644 --- a/Shorewall6/Macros/macro.Ping +++ b/Shorewall6/Macros/macro.Ping @@ -1,5 +1,5 @@ # -# Shorewall6 version 4 - Ping Macro +# Shorewall6 version 5 - Ping Macro # # /usr/share/shorewall6/macro.Ping # diff --git a/Shorewall6/Macros/macro.Trcrt b/Shorewall6/Macros/macro.Trcrt index 7e5750b17..e7c5df5d7 100644 --- a/Shorewall6/Macros/macro.Trcrt +++ b/Shorewall6/Macros/macro.Trcrt @@ -1,5 +1,5 @@ # -# Shorewall version 4 -Trcrt Macro +# Shorewall version 5 -Trcrt Macro # # /usr/share/shorewall/macro.Trcrt # diff --git a/Shorewall6/Macros/macro.mDNS b/Shorewall6/Macros/macro.mDNS index 45fc31d79..c6b7e08bb 100644 --- a/Shorewall6/Macros/macro.mDNS +++ b/Shorewall6/Macros/macro.mDNS @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Multicast DNS Macro +# Shorewall version 5 - Multicast DNS Macro # # /usr/share/shorewall6/macro.mDNS # diff --git a/Shorewall6/action.A_AllowICMPs b/Shorewall6/action.A_AllowICMPs index 8d3f19769..cff65edde 100644 --- a/Shorewall6/action.A_AllowICMPs +++ b/Shorewall6/action.A_AllowICMPs @@ -1,5 +1,5 @@ # -# Shorewall6 version 4 - Audited AllowICMPs Action +# Shorewall6 version 5 - Audited AllowICMPs Action # # /usr/share/shorewall6/action.A_AllowICMPs # diff --git a/Shorewall6/action.A_Drop b/Shorewall6/action.A_Drop index 7e0a17a8b..379f85a19 100644 --- a/Shorewall6/action.A_Drop +++ b/Shorewall6/action.A_Drop @@ -1,5 +1,5 @@ # -# Shorewall6 version 4 - Audited Drop Action +# Shorewall6 version 5 - Audited Drop Action # # /usr/share/shorewall6/action.ADrop # diff --git a/Shorewall6/action.A_Reject b/Shorewall6/action.A_Reject index 70bb8426e..30b541c54 100644 --- a/Shorewall6/action.A_Reject +++ b/Shorewall6/action.A_Reject @@ -1,5 +1,5 @@ # -# Shorewall6 version 4 - Audited Reject Action +# Shorewall6 version 5 - Audited Reject Action # # /usr/share/shorewall6/action.A_Reject # diff --git a/Shorewall6/action.AllowICMPs b/Shorewall6/action.AllowICMPs index 610059533..f4b4082de 100644 --- a/Shorewall6/action.AllowICMPs +++ b/Shorewall6/action.AllowICMPs @@ -1,5 +1,5 @@ # -# Shorewall6 version 4 - AllowICMPs Action +# Shorewall6 version 5 - AllowICMPs Action # # /usr/share/shorewall6/action.AllowICMPs # diff --git a/Shorewall6/action.Drop b/Shorewall6/action.Drop index 5e4b6e6d6..d0a3f8f01 100644 --- a/Shorewall6/action.Drop +++ b/Shorewall6/action.Drop @@ -1,5 +1,5 @@ # -# Shorewall6 version 4 - Drop Action +# Shorewall6 version 5 - Drop Action # # /usr/share/shorewall6/action.Drop # diff --git a/Shorewall6/action.Reject b/Shorewall6/action.Reject index a55ddb466..c948f2a96 100644 --- a/Shorewall6/action.Reject +++ b/Shorewall6/action.Reject @@ -1,5 +1,5 @@ # -# Shorewall6 version 4 - Reject Action +# Shorewall6 version 5 - Reject Action # # /usr/share/shorewall6/action.Reject # diff --git a/Shorewall6/action.template b/Shorewall6/action.template index 030532500..dc6da240f 100644 --- a/Shorewall6/action.template +++ b/Shorewall6/action.template @@ -1,5 +1,5 @@ # -# Shorewall version 4 - Action Template +# Shorewall version 5 - Action Template # # /etc/shorewall6/action.template # diff --git a/Shorewall6/actions.std b/Shorewall6/actions.std index 00f853def..45b504ba2 100644 --- a/Shorewall6/actions.std +++ b/Shorewall6/actions.std @@ -1,5 +1,5 @@ # -# Shorewall6 version 4 - Actions.std File +# Shorewall6 version 5 - Actions.std File # # /usr/share/shorewall6/actions.std # diff --git a/Shorewall6/configpath b/Shorewall6/configpath index 0c93600ba..6e3209453 100644 --- a/Shorewall6/configpath +++ b/Shorewall6/configpath @@ -1,5 +1,5 @@ # -# Shorewall6 version 4 - Default Config Path +# Shorewall6 version 5 - Default Config Path # # /usr/share/shorewall6/configpath # diff --git a/Shorewall6/helpers b/Shorewall6/helpers index eb0ed22a9..12ad91f72 100644 --- a/Shorewall6/helpers +++ b/Shorewall6/helpers @@ -1,5 +1,5 @@ # -# Shorewall6 version 4 - Helpers File +# Shorewall6 version 5 - Helpers File # # /usr/share/shorewall6/helpers # diff --git a/Shorewall6/modules b/Shorewall6/modules index 7f6ef91c0..19c663abc 100644 --- a/Shorewall6/modules +++ b/Shorewall6/modules @@ -1,5 +1,5 @@ # -# Shorewall6 version 4 - Modules File +# Shorewall6 version 5 - Modules File # # /usr/share/shorewall6/modules # diff --git a/Shorewall6/modules.essential b/Shorewall6/modules.essential index 3c4dd277c..cefea32ae 100644 --- a/Shorewall6/modules.essential +++ b/Shorewall6/modules.essential @@ -1,5 +1,5 @@ # -# Shorewall6 version 4 - Essential Modules File +# Shorewall6 version 5 - Essential Modules File # # /usr/share/shorewall6/modules.essential # diff --git a/Shorewall6/modules.extensions b/Shorewall6/modules.extensions index 9c61d94a5..0eff4ed6b 100644 --- a/Shorewall6/modules.extensions +++ b/Shorewall6/modules.extensions @@ -1,5 +1,5 @@ # -# Shorewall6 version 4 - Extensions Modules File +# Shorewall6 version 5 - Extensions Modules File # # /usr/share/shorewall6/modules.extension # diff --git a/Shorewall6/modules.ipset b/Shorewall6/modules.ipset index fae840f31..b112e5bfe 100644 --- a/Shorewall6/modules.ipset +++ b/Shorewall6/modules.ipset @@ -1,5 +1,5 @@ # -# Shorewall version 4 - IP Set Modules File +# Shorewall version 5 - IP Set Modules File # # /usr/share/shorewall6/modules.ipset # diff --git a/Shorewall6/modules.tc b/Shorewall6/modules.tc index d3ecff2e7..e9fcc0921 100644 --- a/Shorewall6/modules.tc +++ b/Shorewall6/modules.tc @@ -1,5 +1,5 @@ # -# Shorewall6 version 4 - Traffic Shaping Modules File +# Shorewall6 version 5 - Traffic Shaping Modules File # # /usr/share/shorewall6/modules.tc # diff --git a/Shorewall6/modules.xtables b/Shorewall6/modules.xtables index 9b77602f8..f785aaf81 100644 --- a/Shorewall6/modules.xtables +++ b/Shorewall6/modules.xtables @@ -1,5 +1,5 @@ # -# Shorewall6 version 4 - Xtables Modules File +# Shorewall6 version 5 - Xtables Modules File # # /usr/share/shorewall6/modules.xtables #