Import Debian changes 4.89-2+deb9u3~bpo8+1

[hcoop/debian/exim4.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 453276d..cd123f2 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -55,7 +55,7 @@ important feedback:
 
 
 -----------------------------------------------------------------
-exim is copyright (c) 1999 University of Cambridge.
+exim is copyright (c) 1995 - 2017 University of Cambridge.
 
 The original licence is as follows (from the file NOTICE in the upstream
 distribution); a copy of the GNU GPL version 2 is available in 
@@ -65,7 +65,7 @@ _________________________________________________________________________
 THE EXIM MAIL TRANSFER AGENT
 ----------------------------
 
-Copyright (c) 2002 University of Cambridge
+Copyright (c) 2004 University of Cambridge
 
 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
@@ -83,7 +83,7 @@ GNU General Public License for more details.
 
 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., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 UNSOLICITED EMAIL
@@ -101,14 +101,6 @@ INCORPORATED CODE
 
 A number of pieces of external code are included in the Exim distribution.
 
- .   Regular expressions are supported in the main Exim program and in the
-     Exim monitor using the freely-distributable PCRE library, copyright (c)
-     2003 University of Cambridge. The source is distributed in the directory
-     src/pcre. However, this is a cut-down version of PCRE. If you want to use
-     the PCRE library in other programs, you should obtain and install the
-     full version from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre.
-
-
  .   Support for the cdb (Constant DataBase) lookup method is provided by code
      contributed by Nigel Metheringham of Planet Online Ltd. which contains
      the following statements:
@@ -222,34 +214,34 @@ A number of pieces of external code are included in the Exim distribution.
 
 --
 Philip Hazel            University of Cambridge Computing Service,
-ph10@cus.cam.ac.uk      Cambridge, England. Phone: +44 1223 334714.
------------------------------------------------------------------
-
-
-
 -----------------------------------------------------------------
 src/pdkim/*
 
 PDKIM - a RFC4871 (DKIM) implementation
 http://duncanthrax.net/pdkim/
-Copyright (C) 2009      Tom Kistner <tom@duncanthrax.net>
+Copyright (C) 2009 - 2016  Tom Kistner <tom@duncanthrax.net>
+Copyright (C) 2016 - 2017 Jeremy Harris <jgh@exim.org>
 
 Includes code from the PolarSSL project.
 http://polarssl.org
 Copyright (C) 2009      Paul Bakker <polarssl_maintainer@polarssl.org>
 Copyright (C) 2006-2008 Christophe Devine
+Copyright (C) 2006-2010, Brainspark B.V.
 
 This copy of PDKIM is included with Exim. For a standalone distribution,
 visit http://duncanthrax.net/pdkim/.
 
 License: Both the parts from PolarSSL and the original code are licensed
 under GPLv2+.
+
+Please note that the parts copied from PolarSSL are only used with ancient
+(< 2.10) GnuTLS.
 -----------------------------------------------------------------
 
 -----------------------------------------------------------------
 Generating a tarball from CVS snapshot.
 
-Upstream is keeping sourcecode and documention (including changelog) in
+Upstream is keeping sourcecode and documentation (including changelog) in
 separate CVS modules: exim-src and exim-doc. However the release tarball
 contains parts from both modules.