Merge branch 'legacy_63'

[~andy/fetchmail] / COPYING

diff --git a/COPYING b/COPYING
index c2df4621088ea300eed6da8f165f000d232a814a..9597f544eb257bb575b2dffd3f3b549a2c6696f7 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,20 +1,34 @@
-This collective work is Copyright (C) 2002, 2003 by Eric S. Raymond.
-Portions are copyrighted by Carl E. Harris and George M. Sipe.
+This collective work is
+Copyright (C) 2002, 2003 Eric S. Raymond
+Copyright (C) 2004 Matthias Andree, Eric S. Raymond,
+                   Robert M. Funk, Graham Wilson
+Copyright (C) 2005 - 2012 Sunil Shetye
+Copyright (C) 2005 - 2013 Matthias Andree
+
+If enabled at configure/compile time, the following clause applies:
+| This product includes software developed by the OpenSSL Project
+| for use in the OpenSSL Toolkit. (http://www.openssl.org/)
+
+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
 
 The support for SMB authentication is copyright by Andrew Tridgell and

-is under GPL version 2.  Tridge 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 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 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:
 
 The *.c files in the ucs/ directory are Copyright (C) 2002, 2003 by
 Markus Kuhn, with a liberal license as follows:


@@ -34,7 +48,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
  | 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.
 
 The KAME/* files are (C) Copyright (C) 1995, 1996, 1997, and 1998 WIDE
 Project, see the respective file headers for details.