From 60f1004339583b53a5277360a83f10e1f3937f90 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 17 Mar 2012 17:51:56 -0700 Subject: [PATCH] Eliminate prog.header6 Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Compiler.pm | 7 +------ Shorewall/Perl/prog.header6 | 26 -------------------------- 2 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 Shorewall/Perl/prog.header6 diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm index 5fc887f19..b4c2af66e 100644 --- a/Shorewall/Perl/Shorewall/Compiler.pm +++ b/Shorewall/Perl/Shorewall/Compiler.pm @@ -89,12 +89,7 @@ sub generate_script_1( $ ) { emit "#!$config{SHOREWALL_SHELL}\n#\n# Compiled firewall script generated by Shorewall $globals{VERSION} - $date\n#"; - if ( $family == F_IPV4 ) { - copy $globals{SHAREDIRPL} . 'prog.header'; - } else { - copy $globals{SHAREDIRPL} . 'prog.header6'; - } - + copy $globals{SHAREDIRPL} . 'prog.header'; copy2 $globals{SHAREDIRPL} . '/lib.core', 0; copy2 $globals{SHAREDIRPL} . '/lib.common', 0; } diff --git a/Shorewall/Perl/prog.header6 b/Shorewall/Perl/prog.header6 deleted file mode 100644 index 3dc9a2d32..000000000 --- a/Shorewall/Perl/prog.header6 +++ /dev/null @@ -1,26 +0,0 @@ -# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] -# -# (c) 1999-2012 - Tom Eastep (teastep@shorewall.net) -# -# Options are: -# -# -n Don't alter Routing -# -v and -q Standard Shorewall Verbosity control -# -t Timestamp progress messages -# -p Purge conntrack table -# -r Recover from failed start/restart -# -V Set verbosity level explicitly -# -R Overrides RESTOREFILE setting -# -# Commands are: -# -# start Starts the firewall -# refresh Refresh the firewall -# restart Restarts the firewall -# reload Reload the firewall -# clear Removes all firewall rules -# stop Stops the firewall -# status Displays firewall status -# version Displays the version of Shorewall that -# generated this program -#