shorewall[6]: remove version from shorewall6 and macros

2015-10-13 12:17:18 +03:00 · 2015-10-13 12:17:18 +03:00 · dc7082b7a1
commit dc7082b7a1
parent a8e4671668
40 changed files with 42 additions and 42 deletions
--- a/Shorewall6/Macros/macro.Ping
+++ b/Shorewall6/Macros/macro.Ping
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Ping Macro
+# Shorewall6 - Ping Macro
 #
 # /usr/share/shorewall6/macro.Ping
 #
--- a/Shorewall6/Macros/macro.Trcrt
+++ b/Shorewall6/Macros/macro.Trcrt
@ -1,7 +1,7 @@
 #
-# Shorewall version 5 -Trcrt Macro
+# Shorewall6 - Trcrt Macro
 #
-# /usr/share/shorewall/macro.Trcrt
+# /usr/share/shorewall6/macro.Trcrt
 #
 #	This macro handles Traceroute (for up to 30 hops).
 #
--- a/Shorewall6/Macros/macro.mDNS
+++ b/Shorewall6/Macros/macro.mDNS
@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Multicast DNS Macro
+# Shorewall6 - Multicast DNS Macro
 #
 # /usr/share/shorewall6/macro.mDNS
 #
--- a/Shorewall6/configfiles/accounting
+++ b/Shorewall6/configfiles/accounting
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Accounting File
+# Shorewall6 - Accounting File
 #
 # For information about entries in this file, type "man shorewall6-accounting"
 #
--- a/Shorewall6/configfiles/actions
+++ b/Shorewall6/configfiles/actions
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Actions File
+# Shorewall6 - Actions File
 #
 # /etc/shorewall6/actions
 #
--- a/Shorewall6/configfiles/blrules
+++ b/Shorewall6/configfiles/blrules
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Blacklist File
+# Shorewall6 - Blacklist File
 #
 # For information about entries in this file, type "man shorewall6-blrules"
 #
--- a/Shorewall6/configfiles/clear
+++ b/Shorewall6/configfiles/clear
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - clear File
+# Shorewall6 - clear File
 #
 # /etc/shorewall6/clear
 #
--- a/Shorewall6/configfiles/hosts
+++ b/Shorewall6/configfiles/hosts
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Hosts file
+# Shorewall6 - Hosts file
 #
 # For information about entries in this file, type "man shorewall6-hosts"
 #
--- a/Shorewall6/configfiles/init
+++ b/Shorewall6/configfiles/init
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Init File
+# Shorewall6 - Init File
 #
 # /etc/shorewall6/init
 #
--- a/Shorewall6/configfiles/interfaces
+++ b/Shorewall6/configfiles/interfaces
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Interfaces File
+# Shorewall6 - Interfaces File
 #
 # For information about entries in this file, type "man shorewall6-interfaces"
 #
--- a/Shorewall6/configfiles/isusable
+++ b/Shorewall6/configfiles/isusable
@ -1,10 +1,10 @@
 #
-# Shorewall6 version 5 - isusable File
+# Shorewall6 - isusable File
 #
 # /etc/shorewall6/isusable
 #
 #	This script is called when Shorewall6 is attempting to determine
-#	if an interface named in /etc/shorewall/providers is usable.
+#	if an interface named in /etc/shorewall6/providers is usable.
 #
 #	The script is invoked inside a function that accepts an interface
 #	name as a single argument. The file below is designed to work with
--- a/Shorewall6/configfiles/lib.private
+++ b/Shorewall6/configfiles/lib.private
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - lib.private File
+# Shorewall6 - lib.private File
 #
 # /etc/shorewall6/lib.private
 #
--- a/Shorewall6/configfiles/maclist
+++ b/Shorewall6/configfiles/maclist
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Maclist file
+# Shorewall6 - Maclist file
 #
 # For information about entries in this file, type "man shorewall6-maclist"
 #
--- a/Shorewall6/configfiles/mangle
+++ b/Shorewall6/configfiles/mangle
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Mangle File
+# Shorewall6 - Mangle File
 #
 # For information about entries in this file, type "man shorewall6-mangle"
 #
--- a/Shorewall6/configfiles/masq
+++ b/Shorewall6/configfiles/masq
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - MASQUERADE/SNAT file
+# Shorewall6 - MASQUERADE/SNAT file
 #
 # For information about entries in this file, type "man shorewall6-masq"
 #
--- a/Shorewall6/configfiles/nat
+++ b/Shorewall6/configfiles/nat
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Nat File
+# Shorewall6 - Nat File
 #
 # For information about entries in this file, type "man shorewall6-nat"
 #
--- a/Shorewall6/configfiles/netmap
+++ b/Shorewall6/configfiles/netmap
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5	 - Netmap File
+# Shorewall6	 - Netmap File
 #
 # For information about entries in this file, type "man shorewall-netmap"
 #
--- a/Shorewall6/configfiles/params
+++ b/Shorewall6/configfiles/params
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Params File
+# Shorewall6 - Params File
 #
 # /etc/shorewall6/params
 #
--- a/Shorewall6/configfiles/policy
+++ b/Shorewall6/configfiles/policy
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Policy File
+# Shorewall6 - Policy File
 #
 # For information about entries in this file, type "man shorewall6-policy"
 #
--- a/Shorewall6/configfiles/providers
+++ b/Shorewall6/configfiles/providers
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Providers File
+# Shorewall6 - Providers File
 #
 # For information about entries in this file, type "man shorewall6-providers"
 #
--- a/Shorewall6/configfiles/refresh
+++ b/Shorewall6/configfiles/refresh
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - refresh File
+# Shorewall6 - refresh File
 #
 # /etc/shorewall6/refresh
 #
--- a/Shorewall6/configfiles/refreshed
+++ b/Shorewall6/configfiles/refreshed
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - refreshed File
+# Shorewall6 - refreshed File
 #
 # /etc/shorewall6/refreshed
 #
--- a/Shorewall6/configfiles/routes
+++ b/Shorewall6/configfiles/routes
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - routes File
+# Shorewall6 - routes File
 #
 # For information about entries in this file, type "man shorewall6-routes"
 #
--- a/Shorewall6/configfiles/routestopped
+++ b/Shorewall6/configfiles/routestopped
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Routestopped File
+# Shorewall6 - Routestopped File
 #
 # This file is deprecated in favor of the stoppedrules file.
 #
--- a/Shorewall6/configfiles/rtrules
+++ b/Shorewall6/configfiles/rtrules
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - route rules File
+# Shorewall6 - route rules File
 #
 # For information about entries in this file, type "man shorewall6-rtrules"
 #
--- a/Shorewall6/configfiles/rules
+++ b/Shorewall6/configfiles/rules
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Rules File
+# Shorewall6 - Rules File
 #
 # For information on the settings in this file, type "man shorewall6-rules"
 #
--- a/Shorewall6/configfiles/secmarks
+++ b/Shorewall6/configfiles/secmarks
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Secmarks File
+# Shorewall6 - Secmarks File
 #
 # For information about entries in this file, type "man shorewall-secmarks"
 #
--- a/Shorewall6/configfiles/start
+++ b/Shorewall6/configfiles/start
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Start File
+# Shorewall6 - Start File
 #
 # /etc/shorewall6/start
 #
--- a/Shorewall6/configfiles/started
+++ b/Shorewall6/configfiles/started
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Started File
+# Shorewall6 - Started File
 #
 # /etc/shorewall6/started
 #
--- a/Shorewall6/configfiles/stop
+++ b/Shorewall6/configfiles/stop
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Stop File
+# Shorewall6 - Stop File
 #
 # /etc/shorewall6/stop
 #
--- a/Shorewall6/configfiles/stopped
+++ b/Shorewall6/configfiles/stopped
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Stopped File
+# Shorewall6 - Stopped File
 #
 # /etc/shorewall6/stopped
 #
--- a/Shorewall6/configfiles/stoppedrules
+++ b/Shorewall6/configfiles/stoppedrules
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Stopped Rules File
+# Shorewall6 - Stopped Rules File
 #
 # For information about entries in this file, type "man shorewall6-stoppedrules"
 #
--- a/Shorewall6/configfiles/tcclasses
+++ b/Shorewall6/configfiles/tcclasses
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Tcclasses File
+# Shorewall6 - Tcclasses File
 #
 # For information about entries in this file, type "man shorewall6-tcclasses"
 #
--- a/Shorewall6/configfiles/tcclear
+++ b/Shorewall6/configfiles/tcclear
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - tcclear File
+# Shorewall6 - tcclear File
 #
 # /etc/shorewall6/tcclear
 #
--- a/Shorewall6/configfiles/tcdevices
+++ b/Shorewall6/configfiles/tcdevices
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Tcdevices File
+# Shorewall6 - Tcdevices File
 #
 # For information about entries in this file, type "man shorewall6-tcdevices"
 #
--- a/Shorewall6/configfiles/tcfilters
+++ b/Shorewall6/configfiles/tcfilters
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Tcfilters File
+# Shorewall6 - Tcfilters File
 #
 # For information about entries in this file, type "man shorewall6-tcfilters"
 #
--- a/Shorewall6/configfiles/tcinterfaces
+++ b/Shorewall6/configfiles/tcinterfaces
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Tcinterfaces File
+# Shorewall6 - Tcinterfaces File
 #
 # For information about entries in this file, type "man shorewall6-tcinterfaces"
 #
--- a/Shorewall6/configfiles/tcpri
+++ b/Shorewall6/configfiles/tcpri
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Tcpri File
+# Shorewall6 - Tcpri File
 #
 # For information about entries in this file, type "man shorewall6-tcpri"
 #
--- a/Shorewall6/configfiles/tunnels
+++ b/Shorewall6/configfiles/tunnels
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Tunnels File
+# Shorewall6 - Tunnels File
 #
 # For information about entries in this file, type "man shorewall6-tunnels"
 #
--- a/Shorewall6/configfiles/zones
+++ b/Shorewall6/configfiles/zones
@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Zones File
+# Shorewall6 - Zones File
 #
 # For information about this file, type "man shorewall6-zones"
 #