Copyright fixups

bazsi · bazsi · commit 1c2a299f966f · 2011-08-22T16:35:46.000+02:00
* relicense SCL under GPLv2+
 * fixed debian/copyright
 * fixed FSF addresses
diff --git a/debian/copyright b/debian/copyright
@@ -4,7 +4,8 @@ on Sat, 03 Mar 2007 16:07:59 +0100
 The original source can always be found at:
 	http://www.balabit.hu/downloads/files/syslog-ng
 
-Copyright (C) 2002-2008 BalaBit IT Security Ltd
+Copyright (C) 2002-2011 BalaBit IT Security Ltd
+Copyright (C) 1998-2011 Balazs Scheidler
 
  * 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,4 +19,4 @@ Copyright (C) 2002-2008 BalaBit IT Security Ltd
  *
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/modules/dbparser/patternize.h b/modules/dbparser/patternize.h
@@ -18,7 +18,7 @@
  *
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef PATTERNIZE_H_INCLUDED
diff --git a/scl/pacct/plugin.conf b/scl/pacct/plugin.conf
@@ -3,9 +3,7 @@
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as published
-# by the Free Software Foundation.
-#
-# Note that this permission is granted for only version 2 of the GPL.
+# by the Free Software Foundation, or (at your option) any later version.
 #
 # As an additional exemption you are allowed to compile & link against the
 # OpenSSL libraries as published by the OpenSSL project. See the file
@@ -18,7 +16,7 @@
 #
 # 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #############################################################################
 
diff --git a/scl/scl.conf b/scl/scl.conf
@@ -3,9 +3,7 @@
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as published
-# by the Free Software Foundation.
-#
-# Note that this permission is granted for only version 2 of the GPL.
+# by the Free Software Foundation, or (at your option) any later version.
 #
 # As an additional exemption you are allowed to compile & link against the
 # OpenSSL libraries as published by the OpenSSL project. See the file
@@ -18,7 +16,7 @@
 #
 # 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #############################################################################
 #
diff --git a/scl/syslogconf/plugin.conf b/scl/syslogconf/plugin.conf
@@ -3,9 +3,7 @@
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as published
-# by the Free Software Foundation.
-#
-# Note that this permission is granted for only version 2 of the GPL.
+# by the Free Software Foundation, or (at your option) any later version.
 #
 # As an additional exemption you are allowed to compile & link against the
 # OpenSSL libraries as published by the OpenSSL project. See the file
@@ -18,7 +16,7 @@
 #
 # 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #############################################################################
 
diff --git a/scl/system/generate-system-source.sh b/scl/system/generate-system-source.sh
@@ -4,9 +4,7 @@
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as published
-# by the Free Software Foundation.
-#
-# Note that this permission is granted for only version 2 of the GPL.
+# by the Free Software Foundation, or (at your option) any later version.
 #
 # As an additional exemption you are allowed to compile & link against the
 # OpenSSL libraries as published by the OpenSSL project. See the file
@@ -19,7 +17,7 @@
 #
 # 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #############################################################################
 
diff --git a/scl/system/plugin.conf b/scl/system/plugin.conf
@@ -3,9 +3,7 @@
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as published
-# by the Free Software Foundation.
-#
-# Note that this permission is granted for only version 2 of the GPL.
+# by the Free Software Foundation, or (at your option) any later version.
 #
 # As an additional exemption you are allowed to compile & link against the
 # OpenSSL libraries as published by the OpenSSL project. See the file
@@ -18,7 +16,7 @@
 #
 # 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #############################################################################
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*`
`19`	`19`	`* You should have received a copy of the GNU General Public License`
`20`	`20`	`* along with this program; if not, write to the Free Software`
`21`		`- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.`
	`21`	`+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA`
`22`	`22`	`*/`
`23`	`23`
`24`	`24`	`#ifndef PATTERNIZE_H_INCLUDED`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,7 @@`
`3`	`3`	`#`
`4`	`4`	`# This program is free software; you can redistribute it and/or modify it`
`5`	`5`	`# under the terms of the GNU General Public License version 2 as published`
`6`		`-# by the Free Software Foundation.`
`7`		`-#`
`8`		`-# Note that this permission is granted for only version 2 of the GPL.`
	`6`	`+# by the Free Software Foundation, or (at your option) any later version.`
`9`	`7`	`#`
`10`	`8`	`# As an additional exemption you are allowed to compile & link against the`
`11`	`9`	`# OpenSSL libraries as published by the OpenSSL project. See the file`
`@@ -18,7 +16,7 @@`
`18`	`16`	`#`
`19`	`17`	`# You should have received a copy of the GNU General Public License`
`20`	`18`	`# along with this program; if not, write to the Free Software`
`21`		`-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.`
	`19`	`+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA`
`22`	`20`	`#`
`23`	`21`	`#############################################################################`
`24`	`22`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# This program is free software; you can redistribute it and/or modify it`
`6`	`6`	`# under the terms of the GNU General Public License version 2 as published`
`7`		`-# by the Free Software Foundation.`
`8`		`-#`
`9`		`-# Note that this permission is granted for only version 2 of the GPL.`
	`7`	`+# by the Free Software Foundation, or (at your option) any later version.`
`10`	`8`	`#`
`11`	`9`	`# As an additional exemption you are allowed to compile & link against the`
`12`	`10`	`# OpenSSL libraries as published by the OpenSSL project. See the file`
`@@ -19,7 +17,7 @@`
`19`	`17`	`#`
`20`	`18`	`# You should have received a copy of the GNU General Public License`
`21`	`19`	`# along with this program; if not, write to the Free Software`
`22`		`-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.`
	`20`	`+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA`
`23`	`21`	`#`
`24`	`22`	`#############################################################################`
`25`	`23`