From 13bf383ce885c27fe6431389c34ff48fb1458eca Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 17 Mar 2012 18:07:36 -0700 Subject: [PATCH] Eliminate prog.header Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Compiler.pm | 3 +-- Shorewall/Perl/prog.header | 26 ------------------- Shorewall/lib.core | 38 ++++++++++++++-------------- 3 files changed, 20 insertions(+), 47 deletions(-) delete mode 100644 Shorewall/Perl/prog.header diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm index b4c2af66e..a9f8bd481 100644 --- a/Shorewall/Perl/Shorewall/Compiler.pm +++ b/Shorewall/Perl/Shorewall/Compiler.pm @@ -89,8 +89,7 @@ sub generate_script_1( $ ) { emit "#!$config{SHOREWALL_SHELL}\n#\n# Compiled firewall script generated by Shorewall $globals{VERSION} - $date\n#"; - copy $globals{SHAREDIRPL} . 'prog.header'; - copy2 $globals{SHAREDIRPL} . '/lib.core', 0; + copy $globals{SHAREDIRPL} . '/lib.core', 0; copy2 $globals{SHAREDIRPL} . '/lib.common', 0; } diff --git a/Shorewall/Perl/prog.header b/Shorewall/Perl/prog.header deleted file mode 100644 index 6d1e819c8..000000000 --- a/Shorewall/Perl/prog.header +++ /dev/null @@ -1,26 +0,0 @@ -# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] -# -# (c) 1999-2011 - 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 -# diff --git a/Shorewall/lib.core b/Shorewall/lib.core index aefb37003..ed1a2479e 100644 --- a/Shorewall/lib.core +++ b/Shorewall/lib.core @@ -1,28 +1,28 @@ -# -# Shorewall 4.5 -- /usr/share/shorewall/lib.core. -# # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # -# (c) 2010-2012 - Tom Eastep (teastep@shorewall.net) +# (c) 1999-2012 - Tom Eastep (teastep@shorewall.net) # -# Complete documentation is available at http://shorewall.net +# Options are: # -# This program is free software; you can redistribute it and/or modify -# it under the terms of Version 2 of the GNU General Public License -# as published by the Free Software Foundation. +# -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 # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# Commands are: # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# The purpose of this library is to hold those functions used by the generated -# scripts (both IPv4 and IPv6 -- the functions that are specific to one or the other -# are found in prog.header and prog.header6). +# 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 # #########################################################################################