CVS commit: pkgsrc/mail

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Mar  7 08:24:47 UTC 2018

Modified Files:
        pkgsrc/mail/exim: Makefile distinfo
        pkgsrc/mail/exim-html: Makefile PLIST distinfo
Removed Files:
        pkgsrc/mail/exim/files: Makefile-DragonFly os.h-DragonFly

Log Message:
exim: updated to 4.90.1

Exim version 4.90.1

JH/03 Fix pgsql lookup for multiple result-tuples with a single column.
      Previously only the last row was returned.

JH/04 Bug 2217: Tighten up the parsing of DKIM signature headers. Previously
      we assumed that tags in the header were well-formed, and parsed the
      element content after inspecting only the first char of the tag.
      Assumptions at that stage could crash the receive process on malformed
      input.

JH/05 Bug 2215: Fix crash associated with dnsdb lookup done from DKIM ACL.
      While running the DKIM ACL we operate on the Permanent memory pool so that
      variables created with "set" persist to the DATA ACL.  Also (at any time)
      DNS lookups that fail create cache records using the Permanent pool.  But
      expansions release any allocations made on the current pool - so a dnsdb
      lookup expansion done in the DKIM ACL releases the memory used for the
      DNS negative-cache, and bad things result.  Solution is to switch to the
      Main pool for expansions.
      While we're in that code, add checks on the DNS cache during store_reset,
      active in the testsuite.
      Problem spotted, and debugging aided, by Wolfgang Breyha.

JH/06 Fix issue with continued-connections when the DNS shifts unreliably.
      When none of the hosts presented to a transport match an already-open
      connection, close it and proceed with the list.  Previously we would
      queue the message.  Spotted by Lena with Yahoo, probably involving
      round-robin DNS.

JH/07 Bug 2214: Fix SMTP responses resulting from non-accept result of MIME ACL.
      Previously a spurious "250 OK id=" response was appended to the proper
      failure response.

JH/10 Bug 2223: Fix mysql lookup returns for the no-data case (when the number of
      rows affected is given instead).

JH/12 Bug 2230: Fix cutthrough routing for nonfirst messages in an initiating
      SMTP connection.  Previously, when one had more receipients than the
      first, an abortive onward connection was made.  Move to full support for
      multiple onward connections in sequence, handling cutthrough connection
      for all multi-message initiating connections.

JH/13 Bug 2229: Fix cutthrough routing for nonstandard port numbers defined by
      routers.  Previously, a multi-recipient message would fail to match the
      onward-connection opened for the first recipient, and cause its closure.

JH/14 Bug 2174: A timeout on connect for a callout was also erroneously seen as
      a timeout on read on a GnuTLS initiating connection, resulting in the
      initiating connection being dropped.  This mattered most when the callout
      was marked defer_ok.  Fix to keep the two timeout-detection methods
      separate.

HS/01 Fix Buffer overflow in base64d() (CVE-2018-6789)

JH/16 Fix bug in DKIM verify: a buffer overflow could corrupt the malloc
      metadata, resulting in a crash in free().

PP/01 Fix broken Heimdal GSSAPI authenticator integration.
      Broken in f2ed27cf5, missing an equals sign for specified-initialisers.
      Broken also in d185889f4, with init system revamp.


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 pkgsrc/mail/exim/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/mail/exim/distinfo
cvs rdiff -u -r1.35 -r1.36 pkgsrc/mail/exim-html/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/mail/exim-html/PLIST
cvs rdiff -u -r1.28 -r1.29 pkgsrc/mail/exim-html/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/mail/exim/files/Makefile-DragonFly \
    pkgsrc/mail/exim/files/os.h-DragonFly

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/exim/Makefile
diff -u pkgsrc/mail/exim/Makefile:1.157 pkgsrc/mail/exim/Makefile:1.158
--- pkgsrc/mail/exim/Makefile:1.157     Sun Jan 28 20:10:54 2018
+++ pkgsrc/mail/exim/Makefile   Wed Mar  7 08:24:47 2018
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.157 2018/01/28 20:10:54 wiz Exp $
+# $NetBSD: Makefile,v 1.158 2018/03/07 08:24:47 adam Exp $
 
-DISTNAME=      exim-4.89
-PKGREVISION=   4
+DISTNAME=      exim-4.90.1
 CATEGORIES=    mail net
 MASTER_SITES=  ftp://ftp.exim.org/pub/exim/exim4/
-MASTER_SITES+= http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES+= https://ftp.exim.org/pub/exim/exim4/
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    abs%NetBSD.org@localhost
 HOMEPAGE=      http://www.exim.org/
@@ -74,11 +73,10 @@ INSTALL_ENV+=               ${INSTALL_ARG:Q}
 .include "options.mk"
 
 post-extract:
+       mv ${WRKSRC}/OS/unsupported/*-* ${WRKSRC}/OS/
        mkdir ${WRKSRC}/Local
        cp ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.pkgsrc
        cp ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf.pkgsrc
-       cp ${FILESDIR}/Makefile-DragonFly ${FILESDIR}/os.h-DragonFly \
-               ${WRKSRC}/OS/
 
 pre-configure:
        sed     -e 's:@PREFIX@:${PREFIX}:' \

Index: pkgsrc/mail/exim/distinfo
diff -u pkgsrc/mail/exim/distinfo:1.67 pkgsrc/mail/exim/distinfo:1.68
--- pkgsrc/mail/exim/distinfo:1.67      Sat Mar 18 07:08:23 2017
+++ pkgsrc/mail/exim/distinfo   Wed Mar  7 08:24:47 2018
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.67 2017/03/18 07:08:23 adam Exp $
+$NetBSD: distinfo,v 1.68 2018/03/07 08:24:47 adam Exp $
 
-SHA1 (exim-4.89.tar.bz2) = 6e4c042d55c57152d56dfa9745abd9e9665a85f5
-RMD160 (exim-4.89.tar.bz2) = db87de7a5bef115efe062153a8a14e10b4ee884b
-SHA512 (exim-4.89.tar.bz2) = 1e059966a93b47f055ab4ec2a4556f2c918aff56ea0367585f3a853f00411e9c275e13be4f9ae615a468fa06263135cd6a138fa1753f1b7fb3259a3321fcca65
-Size (exim-4.89.tar.bz2) = 1844430 bytes
+SHA1 (exim-4.90.1.tar.xz) = ae89fd6fe0d377f68b4c4b96d9e3d0d630226aba
+RMD160 (exim-4.90.1.tar.xz) = 3d3e2c9a04d26e5dbd1f8f01c30fa38198b784a3
+SHA512 (exim-4.90.1.tar.xz) = b4830a2e03023b2bafc9e62535f467bb61b0f1398b6b3af0a7ef6f49e6cba60a9496e6762d0898b7ac1c2823db8cf96ed9f37e26b05809b4ba01725d9e72b806
+Size (exim-4.90.1.tar.xz) = 1721460 bytes
 SHA1 (patch-Local_Makefile.pkgsrc) = de19076443c4d89a7ead97a0cabdec9bb784dd9f
 SHA1 (patch-OS_Makefile-Default) = 6af17f036ed02a3bc37c1f303269eea447fcb691
 SHA1 (patch-lookups_Makefile) = cfc40dba3f75ef37b9887f7767139ad50cf9d4e5

Index: pkgsrc/mail/exim-html/Makefile
diff -u pkgsrc/mail/exim-html/Makefile:1.35 pkgsrc/mail/exim-html/Makefile:1.36
--- pkgsrc/mail/exim-html/Makefile:1.35 Sat Mar 18 07:08:23 2017
+++ pkgsrc/mail/exim-html/Makefile      Wed Mar  7 08:24:47 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.35 2017/03/18 07:08:23 adam Exp $
+# $NetBSD: Makefile,v 1.36 2018/03/07 08:24:47 adam Exp $
 
-DISTNAME=      exim-html-4.89
+DISTNAME=      exim-html-4.90.1
 CATEGORIES=    mail net
 MASTER_SITES=  ftp://ftp.exim.org/pub/exim/exim4/
 MASTER_SITES+= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/
-EXTRACT_SUFX=  .tar.bz2
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    abs%NetBSD.org@localhost
 HOMEPAGE=      http://www.exim.org/

Index: pkgsrc/mail/exim-html/PLIST
diff -u pkgsrc/mail/exim-html/PLIST:1.16 pkgsrc/mail/exim-html/PLIST:1.17
--- pkgsrc/mail/exim-html/PLIST:1.16    Sat Mar 18 07:08:23 2017
+++ pkgsrc/mail/exim-html/PLIST Wed Mar  7 08:24:47 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2017/03/18 07:08:23 adam Exp $
+@comment $NetBSD: PLIST,v 1.17 2018/03/07 08:24:47 adam Exp $
 share/doc/exim/html/spec_html/ch-access_control_lists.html
 share/doc/exim/html/spec_html/ch-adding_a_local_scan_function_to_exim.html
 share/doc/exim/html/spec_html/ch-adding_new_drivers_or_lookup_types.html
@@ -148,4 +148,7 @@ share/doc/exim/html/static/doc/index.css
 share/doc/exim/html/static/doc/index.js
 share/doc/exim/html/static/doc/minus-12x12.png
 share/doc/exim/html/static/doc/plus-12x12.png
+share/doc/exim/html/static/doc/security/CVE-2016-1531.txt
+share/doc/exim/html/static/doc/security/CVE-2016-9963.txt
+share/doc/exim/html/static/doc/security/CVE-2018-6789.txt
 share/doc/exim/html/static/js/common.js

Index: pkgsrc/mail/exim-html/distinfo
diff -u pkgsrc/mail/exim-html/distinfo:1.28 pkgsrc/mail/exim-html/distinfo:1.29
--- pkgsrc/mail/exim-html/distinfo:1.28 Sat Mar 18 07:08:23 2017
+++ pkgsrc/mail/exim-html/distinfo      Wed Mar  7 08:24:47 2018
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.28 2017/03/18 07:08:23 adam Exp $
+$NetBSD: distinfo,v 1.29 2018/03/07 08:24:47 adam Exp $
 
-SHA1 (exim-html-4.89.tar.bz2) = 3a3979fba7df3697cec10d3dee846b18384e5de7
-RMD160 (exim-html-4.89.tar.bz2) = de3d3b70f4a653880e8b2d6fe4c407cf37a7eb14
-SHA512 (exim-html-4.89.tar.bz2) = 083678e5dc5acc23cd7f72b6b3e2e6d4e60bab8af25b21e2e6c8f4c1f07e070f9fabc9c8a337784e6d7436cc4aa8d7674700c61030b0c23e4b9c7d3c909e5db0
-Size (exim-html-4.89.tar.bz2) = 480222 bytes
+SHA1 (exim-html-4.90.1.tar.xz) = ded60f8741511fed7f6057ccb33f7a8bb7df9d72
+RMD160 (exim-html-4.90.1.tar.xz) = 2d2c6f7613aff06ac945c7995723b394b708295a
+SHA512 (exim-html-4.90.1.tar.xz) = 736f358c081e51ec542f18f04e6e18ff938b5b14336777798ad3607a7a1962d522a710e772af014d3c3f88ded9ade4d505f480439305abffd1b4c1bde342ea1a
+Size (exim-html-4.90.1.tar.xz) = 478876 bytes