From dc7082b7a19fa20dc8156f151fa8f91a95dece3f Mon Sep 17 00:00:00 2001 From: Tuomo Soini Date: Tue, 13 Oct 2015 12:17:18 +0300 Subject: [PATCH] shorewall[6]: remove version from shorewall6 and macros --- Shorewall6/Macros/macro.Ping | 2 +- Shorewall6/Macros/macro.Trcrt | 4 ++-- Shorewall6/Macros/macro.mDNS | 2 +- Shorewall6/configfiles/accounting | 2 +- Shorewall6/configfiles/actions | 2 +- Shorewall6/configfiles/blrules | 2 +- Shorewall6/configfiles/clear | 2 +- Shorewall6/configfiles/hosts | 2 +- Shorewall6/configfiles/init | 2 +- Shorewall6/configfiles/interfaces | 2 +- Shorewall6/configfiles/isusable | 4 ++-- Shorewall6/configfiles/lib.private | 2 +- Shorewall6/configfiles/maclist | 2 +- Shorewall6/configfiles/mangle | 2 +- Shorewall6/configfiles/masq | 2 +- Shorewall6/configfiles/nat | 2 +- Shorewall6/configfiles/netmap | 2 +- Shorewall6/configfiles/params | 2 +- Shorewall6/configfiles/policy | 2 +- Shorewall6/configfiles/providers | 2 +- Shorewall6/configfiles/refresh | 2 +- Shorewall6/configfiles/refreshed | 2 +- Shorewall6/configfiles/routes | 2 +- Shorewall6/configfiles/routestopped | 2 +- Shorewall6/configfiles/rtrules | 2 +- Shorewall6/configfiles/rules | 2 +- Shorewall6/configfiles/secmarks | 2 +- Shorewall6/configfiles/start | 2 +- Shorewall6/configfiles/started | 2 +- Shorewall6/configfiles/stop | 2 +- Shorewall6/configfiles/stopped | 2 +- Shorewall6/configfiles/stoppedrules | 2 +- Shorewall6/configfiles/tcclasses | 2 +- Shorewall6/configfiles/tcclear | 2 +- Shorewall6/configfiles/tcdevices | 2 +- Shorewall6/configfiles/tcfilters | 2 +- Shorewall6/configfiles/tcinterfaces | 2 +- Shorewall6/configfiles/tcpri | 2 +- Shorewall6/configfiles/tunnels | 2 +- Shorewall6/configfiles/zones | 2 +- 40 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Shorewall6/Macros/macro.Ping b/Shorewall6/Macros/macro.Ping index 54ec5c51a..aef7ff0d3 100644 --- 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 # diff --git a/Shorewall6/Macros/macro.Trcrt b/Shorewall6/Macros/macro.Trcrt index 97f0b8044..9141e4443 100644 --- 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). # diff --git a/Shorewall6/Macros/macro.mDNS b/Shorewall6/Macros/macro.mDNS index 8ef99d442..73bcf30f6 100644 --- 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 # diff --git a/Shorewall6/configfiles/accounting b/Shorewall6/configfiles/accounting index 926fda73f..2d7bd2cdc 100644 --- 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" # diff --git a/Shorewall6/configfiles/actions b/Shorewall6/configfiles/actions index 36be1cb6e..aeea3c6d1 100644 --- a/Shorewall6/configfiles/actions +++ b/Shorewall6/configfiles/actions @@ -1,5 +1,5 @@ # -# Shorewall6 version 5 - Actions File +# Shorewall6 - Actions File # # /etc/shorewall6/actions # diff --git a/Shorewall6/configfiles/blrules b/Shorewall6/configfiles/blrules index 3729f939c..9b7bb4d82 100644 --- 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" # diff --git a/Shorewall6/configfiles/clear b/Shorewall6/configfiles/clear index f7c21a4c5..e9c525c5f 100644 --- a/Shorewall6/configfiles/clear +++ b/Shorewall6/configfiles/clear @@ -1,5 +1,5 @@ # -# Shorewall6 version 5 - clear File +# Shorewall6 - clear File # # /etc/shorewall6/clear # diff --git a/Shorewall6/configfiles/hosts b/Shorewall6/configfiles/hosts index e7f5d884a..2388e1951 100644 --- 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" # diff --git a/Shorewall6/configfiles/init b/Shorewall6/configfiles/init index d2a5ffd6a..723dcea0f 100644 --- a/Shorewall6/configfiles/init +++ b/Shorewall6/configfiles/init @@ -1,5 +1,5 @@ # -# Shorewall6 version 5 - Init File +# Shorewall6 - Init File # # /etc/shorewall6/init # diff --git a/Shorewall6/configfiles/interfaces b/Shorewall6/configfiles/interfaces index 6b603f4f9..5bee50c7d 100644 --- 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" # diff --git a/Shorewall6/configfiles/isusable b/Shorewall6/configfiles/isusable index 3f0ad7de3..2edb17d69 100644 --- 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 diff --git a/Shorewall6/configfiles/lib.private b/Shorewall6/configfiles/lib.private index fcb67e64b..1f6f1588e 100644 --- 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 # diff --git a/Shorewall6/configfiles/maclist b/Shorewall6/configfiles/maclist index 3ffc478e0..a071328b3 100644 --- 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" # diff --git a/Shorewall6/configfiles/mangle b/Shorewall6/configfiles/mangle index cc8d0adcb..19d42313f 100644 --- 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" # diff --git a/Shorewall6/configfiles/masq b/Shorewall6/configfiles/masq index 4b8b207b2..f5129ac19 100644 --- 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" # diff --git a/Shorewall6/configfiles/nat b/Shorewall6/configfiles/nat index aee1ee3e5..f45896436 100644 --- 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" # diff --git a/Shorewall6/configfiles/netmap b/Shorewall6/configfiles/netmap index acae947ad..1b070d9c3 100644 --- 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" # diff --git a/Shorewall6/configfiles/params b/Shorewall6/configfiles/params index 3daf3bde5..2e0c1a696 100644 --- a/Shorewall6/configfiles/params +++ b/Shorewall6/configfiles/params @@ -1,5 +1,5 @@ # -# Shorewall6 version 5 - Params File +# Shorewall6 - Params File # # /etc/shorewall6/params # diff --git a/Shorewall6/configfiles/policy b/Shorewall6/configfiles/policy index 32266a606..1bd333fdd 100644 --- 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" # diff --git a/Shorewall6/configfiles/providers b/Shorewall6/configfiles/providers index ceb925313..0970a7fe4 100644 --- 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" # diff --git a/Shorewall6/configfiles/refresh b/Shorewall6/configfiles/refresh index 3d8217da8..39f4827ef 100644 --- a/Shorewall6/configfiles/refresh +++ b/Shorewall6/configfiles/refresh @@ -1,5 +1,5 @@ # -# Shorewall6 version 5 - refresh File +# Shorewall6 - refresh File # # /etc/shorewall6/refresh # diff --git a/Shorewall6/configfiles/refreshed b/Shorewall6/configfiles/refreshed index 103385a0c..2ee371cf1 100644 --- a/Shorewall6/configfiles/refreshed +++ b/Shorewall6/configfiles/refreshed @@ -1,5 +1,5 @@ # -# Shorewall6 version 5 - refreshed File +# Shorewall6 - refreshed File # # /etc/shorewall6/refreshed # diff --git a/Shorewall6/configfiles/routes b/Shorewall6/configfiles/routes index 7e857ebc1..1a6ab5d16 100644 --- 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" # diff --git a/Shorewall6/configfiles/routestopped b/Shorewall6/configfiles/routestopped index 6fda1f797..a075fbef1 100644 --- 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. # diff --git a/Shorewall6/configfiles/rtrules b/Shorewall6/configfiles/rtrules index d9fec4aa5..ea4b021a4 100644 --- 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" # diff --git a/Shorewall6/configfiles/rules b/Shorewall6/configfiles/rules index 16dcd81f0..7a2f0049d 100644 --- 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" # diff --git a/Shorewall6/configfiles/secmarks b/Shorewall6/configfiles/secmarks index ce07705f8..8e091288f 100644 --- 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" # diff --git a/Shorewall6/configfiles/start b/Shorewall6/configfiles/start index e1de1d735..8e6d8b030 100644 --- a/Shorewall6/configfiles/start +++ b/Shorewall6/configfiles/start @@ -1,5 +1,5 @@ # -# Shorewall6 version 5 - Start File +# Shorewall6 - Start File # # /etc/shorewall6/start # diff --git a/Shorewall6/configfiles/started b/Shorewall6/configfiles/started index 74a95e033..8bca48bc1 100644 --- a/Shorewall6/configfiles/started +++ b/Shorewall6/configfiles/started @@ -1,5 +1,5 @@ # -# Shorewall6 version 5 - Started File +# Shorewall6 - Started File # # /etc/shorewall6/started # diff --git a/Shorewall6/configfiles/stop b/Shorewall6/configfiles/stop index 1c22113b3..d13d8ed96 100644 --- a/Shorewall6/configfiles/stop +++ b/Shorewall6/configfiles/stop @@ -1,5 +1,5 @@ # -# Shorewall6 version 5 - Stop File +# Shorewall6 - Stop File # # /etc/shorewall6/stop # diff --git a/Shorewall6/configfiles/stopped b/Shorewall6/configfiles/stopped index 922d77b97..9ab1a9083 100644 --- a/Shorewall6/configfiles/stopped +++ b/Shorewall6/configfiles/stopped @@ -1,5 +1,5 @@ # -# Shorewall6 version 5 - Stopped File +# Shorewall6 - Stopped File # # /etc/shorewall6/stopped # diff --git a/Shorewall6/configfiles/stoppedrules b/Shorewall6/configfiles/stoppedrules index 31b1329db..d2b2ea817 100644 --- 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" # diff --git a/Shorewall6/configfiles/tcclasses b/Shorewall6/configfiles/tcclasses index 28dae21d7..34359d6a1 100644 --- 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" # diff --git a/Shorewall6/configfiles/tcclear b/Shorewall6/configfiles/tcclear index f723506d4..e75b48c16 100644 --- a/Shorewall6/configfiles/tcclear +++ b/Shorewall6/configfiles/tcclear @@ -1,5 +1,5 @@ # -# Shorewall6 version 5 - tcclear File +# Shorewall6 - tcclear File # # /etc/shorewall6/tcclear # diff --git a/Shorewall6/configfiles/tcdevices b/Shorewall6/configfiles/tcdevices index 9dc7e6a21..fcded3e27 100644 --- 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" # diff --git a/Shorewall6/configfiles/tcfilters b/Shorewall6/configfiles/tcfilters index d6b28a48f..70b22e103 100644 --- 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" # diff --git a/Shorewall6/configfiles/tcinterfaces b/Shorewall6/configfiles/tcinterfaces index 409d1ba01..d994da668 100644 --- 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" # diff --git a/Shorewall6/configfiles/tcpri b/Shorewall6/configfiles/tcpri index ea605340f..ff90f2510 100644 --- 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" # diff --git a/Shorewall6/configfiles/tunnels b/Shorewall6/configfiles/tunnels index fd27c8f06..316f63ac4 100644 --- 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" # diff --git a/Shorewall6/configfiles/zones b/Shorewall6/configfiles/zones index 7e427af48..40b129d0f 100644 --- 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" #