Forward Firewall: edited GPL-header

diff --git a/config/forwardfw/convert-dmz b/config/forwardfw/convert-dmz
index 3d91364259a437d3c478b8a36f5027c04b14a10f..efc4386b4d123cdca978101f4812c1cdb154bdee 100755 (executable)
--- a/config/forwardfw/convert-dmz
+++ b/config/forwardfw/convert-dmz
@@ -3,7 +3,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2013                                                          #
+# Copyright (C) 2013 Alexander Marx <amarx@ipfire.org>                        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -19,8 +19,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
-# Author: Alexander Marx (amarx@ipfire.org)                                   #
-###############################################################################
 #                                                                             #
 # This script converts old dmz holes rules from old firewall                  #
 # to the new one. This is a 2-step process.                                   #

diff --git a/config/forwardfw/convert-outgoingfw b/config/forwardfw/convert-outgoingfw
index c9077a8713dbbc4f2f403436269e93eb89d205ce..bd33059301c37f56d8ff08e5d3943eab5e85bad2 100755 (executable)
--- a/config/forwardfw/convert-outgoingfw
+++ b/config/forwardfw/convert-outgoingfw
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2013                                                          #
+# Copyright (C) 2013 Alexander Marx <amarx@ipfire.org>                        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -18,8 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
-# Author: Alexander Marx (amarx@ipfire.org)                                   #
-###############################################################################
 #                                                                             #
 # This script converts old groups and firewallrules                           #
 # to the new one. This is a 3-step process.                                   #

diff --git a/config/forwardfw/convert-portfw b/config/forwardfw/convert-portfw
index e741c3d8de193c7306ef52023d5ddf9edd4f9607..a37383e3124e49413a7d47fdbe6648d64a395476 100755 (executable)
--- a/config/forwardfw/convert-portfw
+++ b/config/forwardfw/convert-portfw
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2013                                                          #
+# Copyright (C) 2013 Alexander Marx <amarx@ipfire.org>                        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -18,8 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
-# Author: Alexander Marx (amarx@ipfire.org)                                   #
-###############################################################################
 #                                                                             #
 # This script converts old portforwarding rules from old Firewall             #
 # to the new one. This is a 3-step process.                                   #

diff --git a/config/forwardfw/convert-xtaccess b/config/forwardfw/convert-xtaccess
index 23fb226c692d359ba4d8438dcd0422524fb2fd17..d86c445afc2067b905f93181e0977c28543d6e97 100755 (executable)
--- a/config/forwardfw/convert-xtaccess
+++ b/config/forwardfw/convert-xtaccess
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2013                                                          #
+# Copyright (C) 2013 Alexander Marx <amarx@ipfire.org>                        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -18,8 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
-# Author: Alexander Marx (amarx@ipfire.org)                                   #
-###############################################################################
 #                                                                             #
 #This script converts old xtaccess rules to new firewall                      #
 #Logfiles are created under /var/log/converters                               #

diff --git a/config/forwardfw/firewall-lib.pl b/config/forwardfw/firewall-lib.pl
index e616d7efa9c9025d8f1e0540bf4e1336d7f6b5cd..f1e8403daa171b03deb17757fe358eae8402205d 100755 (executable)
--- a/config/forwardfw/firewall-lib.pl
+++ b/config/forwardfw/firewall-lib.pl
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2013                                                          #
+# Copyright (C) 2013 Alexander Marx <amarx@ipfire.org>                        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -18,8 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
-# Author: Alexander Marx (amarx@ipfire.org)                                   #
-###############################################################################
 
 use strict;
 no warnings 'uninitialized';

diff --git a/config/forwardfw/firewall-policy b/config/forwardfw/firewall-policy
index f6c88e4afafe171745b5c53e34a17e31d2926b82..0fcfaa471aa5a4ec7edf8ee2efae61d3321f9684 100755 (executable)
--- a/config/forwardfw/firewall-policy
+++ b/config/forwardfw/firewall-policy
@@ -3,7 +3,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2013                                                          #
+# Copyright (C) 2013 Alexander Marx <amarx@ipfire.org>                        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -19,8 +19,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
-# Author: Alexander Marx (amarx@ipfire.org)                                   #
-###############################################################################
 
 
 eval $(/usr/local/bin/readhash /var/ipfire/forward/settings)

diff --git a/config/forwardfw/rules.pl b/config/forwardfw/rules.pl
index e3592701caf329ce6baae2153d7104cbb53dff30..370b7ecfb17d938848739a3fbc489c469741a03c 100755 (executable)
--- a/config/forwardfw/rules.pl
+++ b/config/forwardfw/rules.pl
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2013                                                          #
+# Copyright (C) 2013 Alexander Marx <amarx@ipfire.org>                        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -18,8 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
-# Author: Alexander Marx (amarx@ipfire.org)                                   #
-###############################################################################
 
 use strict;
 use Time::Local;

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index 88e16086f9af0b2c74228a1d34f9a6a962c9726c..0907fba9bd5591da5d3b34bb2d6055ea82f1d24d 100755 (executable)
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2013                                                          #
+# Copyright (C) 2013 Alexander Marx <amarx@ipfire.org>                        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -18,8 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
-# Author: Alexander Marx (amarx@ipfire.org)                                   #
-###############################################################################
 
 use strict;
 use Sort::Naturally;
@@ -65,7 +63,7 @@ my %aliases=();
 my %optionsfw=();
 my %ifaces=();
 
-my $VERSION='0.9.9.13';
+my $VERSION='0.9.9.14';
 my $color;
 my $confignet          = "${General::swroot}/fwhosts/customnetworks";
 my $confighost         = "${General::swroot}/fwhosts/customhosts";

diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index fffa9353ebfde82eb1d846b330bb1c9b0cc31918..dec649bdd4f7173435ba29d5407fc18e7dff80e9 100755 (executable)
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2013                                                          #
+# Copyright (C) 2013 Alexander Marx <amarx@ipfire.org>                        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -18,8 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
-# Author: Alexander Marx  (amarx@ipfire.org)                                  #
-###############################################################################
 use strict;
 
 # enable only the following on debugging purpose

diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi
index 7d34feab0893d16bc4a9bc9c07f73d7c17d59ee1..713f37f9fd7d6df885346fac97e7dddaeeae2018 100644 (file)
--- a/html/cgi-bin/optionsfw.cgi
+++ b/html/cgi-bin/optionsfw.cgi
@@ -11,10 +11,6 @@
 # $Id: optionsfw.cgi,v 1.1.2.10 2005/10/03 00:34:10 gespinasse Exp $
 #
 #
-########################################################################
-#  Modifications for new Firewall (C) 2013 by amarx@ipfire.org
-########################################################################
-
 # enable only the following on debugging purpose
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';

diff --git a/html/cgi-bin/p2p-block.cgi b/html/cgi-bin/p2p-block.cgi
index 79417502b5955166d1378deec8e7d440798c7cc5..7c6f7b3a469cb754c684c4f864dd6c07672eccce 100755 (executable)
--- a/html/cgi-bin/p2p-block.cgi
+++ b/html/cgi-bin/p2p-block.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2013                                                          #
+# Copyright (C) 2013 Alexander Marx <amarx@ipfire.org>                        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -18,8 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
-# Author: Alexander Marx (Amarx@ipfire.org)                                   #
-###############################################################################
 
 use strict;
 no warnings 'uninitialized';