Update Matthias Andree's copyright; summarize external licenses.

svn path=/branches/BRANCH_6-3/; revision=5180

1 files changed, 11 insertions, 7 deletions

diff --git a/COPYING b/COPYING
index ad2883a7..d7d13073 100644
--- a/COPYING
+++ b/COPYING
@@ -2,25 +2,28 @@ This collective work is Copyright (C) 2002, 2003 by Eric S. Raymond
 and Copyright (C) 2004 by Matthias Andree, Eric S. Raymond,
                           Robert M. Funk and Graham Wilson
 and Copyright (C) 2005 by Matthias Andree and Sunil Shetye
-and Copyright (C) 2006 - 2007 by Matthias Andree.
+and Copyright (C) 2006 - 2008 by Matthias Andree.
 
 Some older portions not explicitly mentioned above are copyrighted by
 Carl E. Harris, George M. Sipe, Graham Wilson, Matthias Andree and Sunil Shetye.
 
 The support for SMB authentication is copyright by Andrew Tridgell and
-is under GPL version 2.  Andrew Tridgell has granted a specific
-exemption for his GPL-licensed code to be linked with non-GPL-compliant
-code in fetchmail.  The relevant files are smb*.[ch] and ntlm.h.
+is under GPL version 2 (or any later version).  Andrew Tridgell has
+granted a specific exemption for his GPL-licensed code to be linked with
+non-GPL-compliant code in fetchmail.  The relevant files are smb*.[ch]
+and ntlm.h.
 
 The following files are public-domain: acconfig.h, md5c.c, md5.h.
 
-The following files are explicitly GPL-licensed: getopt1.c, getopt.c, getopt.h.
+The following files are explicitly GPL-licensed (v2 or any later
+version): getopt1.c, getopt.c, getopt.h.
 
 The file m4-local/ac_ma_search_package.m4 is copyright by Caolan
 McNamara <caolan@skynet.ie> with fixes from Alexandre Duret-Lutz
 <duret_g@lrde.epita.fr>, Matthew Mueller <donut@azstarnet.com> and
 Matthias Andree <matthias.andree@gmx.de>
-The license is detailed in m4-local/ac-archive-license.txt.
+The license is detailed in m4-local/ac-archive-license.txt and is a
+relaxed GPLv2-or-later version.
 
 The *.c files in the ucs/ directory are Copyright (C) 2002, 2003 by
 Markus Kuhn, with a liberal license as follows:
@@ -40,7 +43,8 @@ Stenberg and also under a liberal license:
  | CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
 
 The m4/gethostbyname_r.m4 and libesmtp/* files functions are (C) by
-Brian Stafford, see the respective file headers for details.
+Brian Stafford, see the respective file headers for details (LGPL v2.1
+or later).
 
 The KAME/* files are (C) Copyright (C) 1995, 1996, 1997, and 1998 WIDE
 Project, see the respective file headers for details.