[COMMIT LOGREPORT] service AUTHORS,1.38,1.39

[Joost van Baal]

Update of /cvsroot/logreport/service
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11756

Modified Files:
	AUTHORS 
Log Message:
more exact representation of license conditions

Index: AUTHORS
===================================================================
RCS file: /cvsroot/logreport/service/AUTHORS,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- AUTHORS	23 Jul 2006 13:15:43 -0000	1.38
+++ AUTHORS	5 Mar 2008 06:46:17 -0000	1.39
@@ -22,65 +22,6 @@
 decided to transfer its copyright ownership to Stichting NLnet (
 http://www.nlnet.nl/ ).
 
-
-Various contributors hold copyright on parts of the Lire code:
-
-
-Time, which may be in extras/ is Copyright (C) 1996-1999 David Muir
-Sharnoff <muir at idiom.com>.
-
-extras/unicode.tex is Copyright (C) Bruno Haible 1991, 1999
-<haible at ilog.fr> It is part of utf8-tex 0.1 which can be obtained from
-ftp://ftp.ilog.fr/pub/Users/haible/utf8/utf8-tex-0.1.tar.gz
-
-dnszone/script/bind8_named2dlf.in, msgstore/script/dbmail2dlf.in,
-spamfilter/spamfilter.xml, spamfilter/script/spamassassin2dlf.in are Copyright
-(C) 2002 Edwin Groothuis <edwin at mavetju.org>.
-
-email/script/nms2dlf.in and msgstore/script/nmsmmp2dlf.in are Copyright (C)
-2002 Stichting LogReport Foundation <logreport at LogReport.org>, Arnaud Taddei
-and Arnaud Gaillard.  msgstore/script/nmsmmp2dlf.in and nmsstore2dlf.in are
-Copyright (C) 2002 Arnaud Taddei and Arnaud Gaillard.
-
-firewall/script/cisco_ios2dlf.in is Copyright (C) 2001 Joost Bekkers
-<joost at jodocus.org>.  firewall/script/watchguard2dlf.in is Copyright (C)
-2001,2002 Joost Bekkers <joost at jodocus.org>.  proxy/script/squid_access2dlf.in
-is Copyright (C) 2001 Joost Bekkers <joost at jodocus.org> and Copyright (C)
-2001-2002 Stichting LogReport Foundation LogReport at LogReport.org.
-
-firewall/script/fw1_lea2dlf.in and firewall/script/snort2dlf is Copyright (C)
-2003 Torsten Fellhauer <torsten at fellhauer-web.de>.
-
-ftp/reports/bytes-by-dir-by-user-by-period.xml and
-messagestore/messagestore.xml  is Copyright (C) 2002 Cedric Gross
-<cgross at 2blc.com>
-
-dns/script/bind9_query2dlf.in is Copyright (C) 2001 Joost Bekkers
-<joost at jodocus.org>, and Copyright (C) 2000, 2001 Stichting LogReport
-Foundation LogReport at LogReport.org.
-
-www/lib/Lire/WWW/UserAgent/Browser.pm and UserAgent/OS.pm
-are Copyright (C) 2000, 2001 Laurent Destailleur
-<eldy at users.sourceforge.net>, and Copyright (C) 2001-2002 Stichting
-LogReport Foundation LogReport at LogReport.org.
-
-all/lib/WWW/UserAgent/Robot.pm is Copyright (C) Martijn Koster, and
-Copyright (C) 2001 Stichting LogReport Foundation LogReport at LogReport.org.
-
-all/lib/Lire/ReportParser/ExcelWriter.pm contains snippets from
-Spreadsheet::WriteExcel which is Copyright (C) 2000, Andrew Benham.
-
-The SGML XML declaration xml.dcl in all/lib/xml is from the OpenJade
-project (http://openjade.sourceforge.net/) and is Copyright (c) 1994,
-1995, 1996, 1997, 1998 James Clark.
-
-firewall/filters/select-from-ip.xml, firewall/filters/select-to-ip.xml
-and firewall/reports/top-pkt-by-dst-by-port.xml are Copyright (C) 2003
-Tilburg University.
-
-Copyright notices are in the individual files.
-
-
 Lire is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
@@ -96,3 +37,114 @@
 http://www.gnu.org/copyleft/gpl.html or write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
+Various contributors hold copyright on parts of the Lire code (the exact
+copyright notices and license conditions are in the individual files):
+
+Files: extras/Time/Timezone.pm
+Copyright: © 1996-1999 David Muir Sharnoff <muir at idiom.com>
+License: PD
+ David Muir Sharnoff disclaims any copyright and puts his contribution
+ to this module in the public domain.
+
+Files: extras/unicode.tex
+Copyright: © Bruno Haible 1991, 1999 <haible at ilog.fr>
+License: GPL
+ This file is under GPL, i.e. if you distribute a .fmt file containing it,
+ you must distribute complete source of the .fmt file.
+
+Files: dnszone/script/bind8_named2dlf.in, msgstore/script/dbmail2dlf.in,
+ spamfilter/spamfilter.xml, spamfilter/script/spamassassin2dlf.in
+Copyright: © 2002 Edwin Groothuis <edwin at mavetju.org>
+License: BSD-3
+ On Debian systems, the complete text of the three-clause BSD license
+ can be found in /usr/share/common-licenses/BSD.
+
+Files: msgstore/script/nmsmmp2dlf.in, msgstore/script/nmsstore2dlf.in
+Copyright: © 2002 Arnaud Taddei <Arnaud.Taddei at sun.com>, Arnaud Gaillard
+ <Arnaud.Gaillard at orange.ch>, Elie Dufraiche <Elie.Dufraiche at sun.com>
+License: GPL-2+
+
+Files: firewall/script/cisco_ios2dlf.in
+Copyright: © 2001 Joost Bekkers <joost at jodocus.org>
+License: GPL-2+
+
+Files: firewall/script/watchguard2dlf.in
+Copyright: © 2001, 2002 Joost Bekkers <joost at jodocus.org>
+License: GPL-2+
+
+Files: proxy/script/squid_access2dlf.in
+Copyright: © 2001 Joost Bekkers <joost at jodocus.org>, © 2001-2002 Stichting
+ LogReport Foundation LogReport at LogReport.org.
+License: GPL-2+
+
+Files: firewall/script/fw1_lea2dlf.in, firewall/script/snort2dlf
+Copyright: © 2003 Torsten Fellhauer <torsten at fellhauer-web.de>
+License: GPL-2+
+
+Files: ftp/reports/bytes-by-dir-by-user-by-period.xml,
+ messagestore/messagestore.xml
+Copyright: © 2002 Cedric Gross <cgross at 2blc.com>
+License: GPL-2+
+
+Files: dns/script/bind9_query2dlf.in
+Copyright: © 2001 Joost Bekkers <joost at jodocus.org>, © 2000, 2001 Stichting
+ LogReport Foundation LogReport at LogReport.org
+License: GPL-2+
+
+Files: www/lib/Lire/WWW/UserAgent/Browser.pm, www/lib/Lire/WWW/UserAgent/OS.pm
+Copyright: © 2000, 2001 Laurent Destailleur <eldy at users.sourceforge.net>,
+ © 2001-2002 Stichting LogReport Foundation LogReport at LogReport.org.
+License: GPL-2+
+
+Files: all/lib/WWW/UserAgent/Robot.pm
+Copyright: © Martijn Koster, © 2001 Stichting LogReport Foundation
+ LogReport at LogReport.org.
+License: GPL-2+
+ I don't want you modifying this data and then naming it in such
+ a way that confuses people into thinking they are looking at my
+ data. So be clear where you modify things.
+
+Files: all/lib/Lire/ReportParser/ExcelWriter.pm
+Copyright: © 2000 Andrew Benham, © 2000-2004 Stichting LogReport Foundation
+ <logreport at logreport.org>
+License: GPL-1+ | Artistic, GPL-2+
+ This code was inspired by the comments and programs datecalc1.pl
+ included in Spreadsheet::WriteExcel.
+
+Files: all/lib/xml/xml.dcl
+Copyright: © 1994, 1995, 1996, 1997, 1998 James Clark
+License: MIT
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  ''Software''), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+  .
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+  .
+  THE SOFTWARE IS PROVIDED ''AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL JAMES CLARK BE LIABLE FOR ANY CLAIM, DAMAGES OR
+  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  OTHER DEALINGS IN THE SOFTWARE.
+  .
+  Except as contained in this notice, the name of James Clark shall
+  not be used in advertising or otherwise to promote the sale, use or
+  other dealings in this Software without prior written authorization
+  from James Clark.
+
+Files: firewall/filters/select-from-ip.xml, firewall/filters/select-to-ip.xml,
+ firewall/reports/top-pkt-by-dst-by-port.xml
+Copyright: © 2003 Tilburg University
+License: GPL-2+
+
+Files: all/script/lr_vendor_cron
+Copyright: © 2005 Joost van Baal, © 2000-2004 Stichting LogReport Foundation
+ <logreport at logreport.org>
+License: GPL-2+
+