Thu Mar 8 20:22:06 2018 UTC ()
Pullup ticket #5719 - requested by maya
mail/exim-html: security update

Revisions pulled up:
- mail/exim-html/Makefile                                       1.36
- mail/exim-html/PLIST                                          1.17
- mail/exim-html/distinfo                                       1.29
- mail/exim/Makefile                                            1.158
- mail/exim/distinfo                                            1.68
- mail/exim/files/Makefile-DragonFly                            deleted
- mail/exim/files/os.h-DragonFly                                deleted

-------------------------------------------------------------------
   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


(spz)
diff -r1.156 -r1.156.2.1 pkgsrc/mail/exim/Makefile
diff -r1.67 -r1.67.10.1 pkgsrc/mail/exim/distinfo
diff -r1.35 -r1.35.10.1 pkgsrc/mail/exim-html/Makefile
diff -r1.16 -r1.16.10.1 pkgsrc/mail/exim-html/PLIST
diff -r1.28 -r1.28.10.1 pkgsrc/mail/exim-html/distinfo
diff -r1.1 -r0 pkgsrc/mail/exim/files/Makefile-DragonFly
diff -r1.1 -r0 pkgsrc/mail/exim/files/os.h-DragonFly
cvs diff -r1.156 -r1.156.2.1 pkgsrc/mail/exim/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/exim/Makefile 2017/11/30 16:45:30 1.156
+++ pkgsrc/mail/exim/Makefile 2018/03/08 20:22:06 1.156.2.1
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.156 2017/11/30 16:45:30 adam Exp $ 1# $NetBSD: Makefile,v 1.156.2.1 2018/03/08 20:22:06 spz Exp $
2 2
3DISTNAME= exim-4.89 3DISTNAME= exim-4.90.1
4PKGREVISION= 3 
5CATEGORIES= mail net 4CATEGORIES= mail net
6MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ 5MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/
7MASTER_SITES+= http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/ 6MASTER_SITES+= https://ftp.exim.org/pub/exim/exim4/
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.xz
9 8
10MAINTAINER= abs@NetBSD.org 9MAINTAINER= abs@NetBSD.org
11HOMEPAGE= http://www.exim.org/ 10HOMEPAGE= http://www.exim.org/
12COMMENT= The Exim mail transfer agent, a replacement for sendmail 11COMMENT= The Exim mail transfer agent, a replacement for sendmail
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15CONFLICTS+= exim-exiscan-[0-9]* 14CONFLICTS+= exim-exiscan-[0-9]*
16 15
17USE_TOOLS+= perl:run 16USE_TOOLS+= perl:run
18BUILD_DEFS+= VARBASE 17BUILD_DEFS+= VARBASE
19 18
20MAKE_ENV+= SSLBASE=${SSLBASE:Q} 19MAKE_ENV+= SSLBASE=${SSLBASE:Q}
21MAKE_ENV+= INST_CHOWN=${CHOWN:Q} 20MAKE_ENV+= INST_CHOWN=${CHOWN:Q}
@@ -64,31 +63,30 @@ SUBST_VARS.exim= PKGSRC_EXIM_VERSION @@ -64,31 +63,30 @@ SUBST_VARS.exim= PKGSRC_EXIM_VERSION
64 63
65SUBST_CLASSES+= cflags 64SUBST_CLASSES+= cflags
66SUBST_STAGE.cflags= post-patch 65SUBST_STAGE.cflags= post-patch
67SUBST_MESSAGE.cflags= Removing hard-coded CFLAGS 66SUBST_MESSAGE.cflags= Removing hard-coded CFLAGS
68SUBST_FILES.cflags= OS/Makefile-* 67SUBST_FILES.cflags= OS/Makefile-*
69SUBST_SED.cflags= -e 's,^CFLAGS=.*,,' 68SUBST_SED.cflags= -e 's,^CFLAGS=.*,,'
70 69
71INSTALL_ARG= INSTALL_ARG=-no_chown 70INSTALL_ARG= INSTALL_ARG=-no_chown
72INSTALL_ENV+= ${INSTALL_ARG:Q} 71INSTALL_ENV+= ${INSTALL_ARG:Q}
73 72
74.include "options.mk" 73.include "options.mk"
75 74
76post-extract: 75post-extract:
 76 mv ${WRKSRC}/OS/unsupported/*-* ${WRKSRC}/OS/
77 mkdir ${WRKSRC}/Local 77 mkdir ${WRKSRC}/Local
78 cp ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.pkgsrc 78 cp ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.pkgsrc
79 cp ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf.pkgsrc 79 cp ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf.pkgsrc
80 cp ${FILESDIR}/Makefile-DragonFly ${FILESDIR}/os.h-DragonFly \ 
81 ${WRKSRC}/OS/ 
82 80
83pre-configure: 81pre-configure:
84 sed -e 's:@PREFIX@:${PREFIX}:' \ 82 sed -e 's:@PREFIX@:${PREFIX}:' \
85 -e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \ 83 -e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
86 -e 's:@EXIM_USER@:${EXIM_USER}:' \ 84 -e 's:@EXIM_USER@:${EXIM_USER}:' \
87 -e 's:@EXIM_GROUP@:${EXIM_GROUP}:' \ 85 -e 's:@EXIM_GROUP@:${EXIM_GROUP}:' \
88 -e 's:@EXIM_USE_DB_CONFIG@:${EXIM_USE_DB_CONFIG}:' \ 86 -e 's:@EXIM_USE_DB_CONFIG@:${EXIM_USE_DB_CONFIG}:' \
89 -e 's:@EXIM_DBMLIB@:${EXIM_DBMLIB}:' \ 87 -e 's:@EXIM_DBMLIB@:${EXIM_DBMLIB}:' \
90 -e 's:@EXIM_INCLUDE@:${EXIM_INCLUDE}:' \ 88 -e 's:@EXIM_INCLUDE@:${EXIM_INCLUDE}:' \
91 -e 's:@LOOKUP_LIBS@:${LOOKUP_LIBS}:' \ 89 -e 's:@LOOKUP_LIBS@:${LOOKUP_LIBS}:' \
92 -e 's:@CHOWN@:${CHOWN}:' \ 90 -e 's:@CHOWN@:${CHOWN}:' \
93 -e 's:@CHGRP@:${CHGRP}:' \ 91 -e 's:@CHGRP@:${CHGRP}:' \
94 -e 's:@CHMOD@:${CHMOD}:' \ 92 -e 's:@CHMOD@:${CHMOD}:' \
cvs diff -r1.67 -r1.67.10.1 pkgsrc/mail/exim/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/exim/distinfo 2017/03/18 07:08:23 1.67
+++ pkgsrc/mail/exim/distinfo 2018/03/08 20:22:06 1.67.10.1
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.67 2017/03/18 07:08:23 adam Exp $ 1$NetBSD: distinfo,v 1.67.10.1 2018/03/08 20:22:06 spz Exp $
2 2
3SHA1 (exim-4.89.tar.bz2) = 6e4c042d55c57152d56dfa9745abd9e9665a85f5 3SHA1 (exim-4.90.1.tar.xz) = ae89fd6fe0d377f68b4c4b96d9e3d0d630226aba
4RMD160 (exim-4.89.tar.bz2) = db87de7a5bef115efe062153a8a14e10b4ee884b 4RMD160 (exim-4.90.1.tar.xz) = 3d3e2c9a04d26e5dbd1f8f01c30fa38198b784a3
5SHA512 (exim-4.89.tar.bz2) = 1e059966a93b47f055ab4ec2a4556f2c918aff56ea0367585f3a853f00411e9c275e13be4f9ae615a468fa06263135cd6a138fa1753f1b7fb3259a3321fcca65 5SHA512 (exim-4.90.1.tar.xz) = b4830a2e03023b2bafc9e62535f467bb61b0f1398b6b3af0a7ef6f49e6cba60a9496e6762d0898b7ac1c2823db8cf96ed9f37e26b05809b4ba01725d9e72b806
6Size (exim-4.89.tar.bz2) = 1844430 bytes 6Size (exim-4.90.1.tar.xz) = 1721460 bytes
7SHA1 (patch-Local_Makefile.pkgsrc) = de19076443c4d89a7ead97a0cabdec9bb784dd9f 7SHA1 (patch-Local_Makefile.pkgsrc) = de19076443c4d89a7ead97a0cabdec9bb784dd9f
8SHA1 (patch-OS_Makefile-Default) = 6af17f036ed02a3bc37c1f303269eea447fcb691 8SHA1 (patch-OS_Makefile-Default) = 6af17f036ed02a3bc37c1f303269eea447fcb691
9SHA1 (patch-lookups_Makefile) = cfc40dba3f75ef37b9887f7767139ad50cf9d4e5 9SHA1 (patch-lookups_Makefile) = cfc40dba3f75ef37b9887f7767139ad50cf9d4e5
10SHA1 (patch-scripts_exim__install) = aa0a31e77d5f76e33bc92140c14d39c79f710b95 10SHA1 (patch-scripts_exim__install) = aa0a31e77d5f76e33bc92140c14d39c79f710b95
cvs diff -r1.35 -r1.35.10.1 pkgsrc/mail/exim-html/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/exim-html/Makefile 2017/03/18 07:08:23 1.35
+++ pkgsrc/mail/exim-html/Makefile 2018/03/08 20:22:05 1.35.10.1
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.35 2017/03/18 07:08:23 adam Exp $ 1# $NetBSD: Makefile,v 1.35.10.1 2018/03/08 20:22:05 spz Exp $
2 2
3DISTNAME= exim-html-4.89 3DISTNAME= exim-html-4.90.1
4CATEGORIES= mail net 4CATEGORIES= mail net
5MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ 5MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/
6MASTER_SITES+= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ 6MASTER_SITES+= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= abs@NetBSD.org 9MAINTAINER= abs@NetBSD.org
10HOMEPAGE= http://www.exim.org/ 10HOMEPAGE= http://www.exim.org/
11COMMENT= HTML documentation for the Exim mail transfer agent 11COMMENT= HTML documentation for the Exim mail transfer agent
12 12
13NO_BUILD= yes 13NO_BUILD= yes
14INSTALLATION_DIRS= share/doc/exim/html 14INSTALLATION_DIRS= share/doc/exim/html
15 15
16USE_TOOLS+= pax 16USE_TOOLS+= pax
17 17
18do-install: 18do-install:
19 cd ${WRKSRC}/doc && pax -rw html ${DESTDIR}${PREFIX}/share/doc/exim 19 cd ${WRKSRC}/doc && pax -rw html ${DESTDIR}${PREFIX}/share/doc/exim
20 20
cvs diff -r1.16 -r1.16.10.1 pkgsrc/mail/exim-html/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/exim-html/PLIST 2017/03/18 07:08:23 1.16
+++ pkgsrc/mail/exim-html/PLIST 2018/03/08 20:22:05 1.16.10.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.16 2017/03/18 07:08:23 adam Exp $ 1@comment $NetBSD: PLIST,v 1.16.10.1 2018/03/08 20:22:05 spz Exp $
2share/doc/exim/html/spec_html/ch-access_control_lists.html 2share/doc/exim/html/spec_html/ch-access_control_lists.html
3share/doc/exim/html/spec_html/ch-adding_a_local_scan_function_to_exim.html 3share/doc/exim/html/spec_html/ch-adding_a_local_scan_function_to_exim.html
4share/doc/exim/html/spec_html/ch-adding_new_drivers_or_lookup_types.html 4share/doc/exim/html/spec_html/ch-adding_new_drivers_or_lookup_types.html
5share/doc/exim/html/spec_html/ch-address_batching_in_local_transports.html 5share/doc/exim/html/spec_html/ch-address_batching_in_local_transports.html
6share/doc/exim/html/spec_html/ch-address_rewriting.html 6share/doc/exim/html/spec_html/ch-address_rewriting.html
7share/doc/exim/html/spec_html/ch-building_and_installing_exim.html 7share/doc/exim/html/spec_html/ch-building_and_installing_exim.html
8share/doc/exim/html/spec_html/ch-concept_index.html 8share/doc/exim/html/spec_html/ch-concept_index.html
9share/doc/exim/html/spec_html/ch-content_scanning_at_acl_time.html 9share/doc/exim/html/spec_html/ch-content_scanning_at_acl_time.html
10share/doc/exim/html/spec_html/ch-customizing_bounce_and_warning_messages.html 10share/doc/exim/html/spec_html/ch-customizing_bounce_and_warning_messages.html
11share/doc/exim/html/spec_html/ch-domain_host_address_and_local_part_lists.html 11share/doc/exim/html/spec_html/ch-domain_host_address_and_local_part_lists.html
12share/doc/exim/html/spec_html/ch-embedded_perl.html 12share/doc/exim/html/spec_html/ch-embedded_perl.html
13share/doc/exim/html/spec_html/ch-encrypted_smtp_connections_using_tlsssl.html 13share/doc/exim/html/spec_html/ch-encrypted_smtp_connections_using_tlsssl.html
14share/doc/exim/html/spec_html/ch-environment_for_running_local_transports.html 14share/doc/exim/html/spec_html/ch-environment_for_running_local_transports.html
@@ -138,14 +138,17 @@ share/doc/exim/html/spec_html/filter_toc @@ -138,14 +138,17 @@ share/doc/exim/html/spec_html/filter_toc
138share/doc/exim/html/spec_html/index.html 138share/doc/exim/html/spec_html/index.html
139share/doc/exim/html/spec_html/index_toc.xml 139share/doc/exim/html/spec_html/index_toc.xml
140share/doc/exim/html/static/css/common.css 140share/doc/exim/html/static/css/common.css
141share/doc/exim/html/static/css/index.css 141share/doc/exim/html/static/css/index.css
142share/doc/exim/html/static/doc/CVE-2016-1531.txt 142share/doc/exim/html/static/doc/CVE-2016-1531.txt
143share/doc/exim/html/static/doc/CVE-2016-9963.txt 143share/doc/exim/html/static/doc/CVE-2016-9963.txt
144share/doc/exim/html/static/doc/chapter.css 144share/doc/exim/html/static/doc/chapter.css
145share/doc/exim/html/static/doc/chapter.js 145share/doc/exim/html/static/doc/chapter.js
146share/doc/exim/html/static/doc/contents.png 146share/doc/exim/html/static/doc/contents.png
147share/doc/exim/html/static/doc/index.css 147share/doc/exim/html/static/doc/index.css
148share/doc/exim/html/static/doc/index.js 148share/doc/exim/html/static/doc/index.js
149share/doc/exim/html/static/doc/minus-12x12.png 149share/doc/exim/html/static/doc/minus-12x12.png
150share/doc/exim/html/static/doc/plus-12x12.png 150share/doc/exim/html/static/doc/plus-12x12.png
 151share/doc/exim/html/static/doc/security/CVE-2016-1531.txt
 152share/doc/exim/html/static/doc/security/CVE-2016-9963.txt
 153share/doc/exim/html/static/doc/security/CVE-2018-6789.txt
151share/doc/exim/html/static/js/common.js 154share/doc/exim/html/static/js/common.js
cvs diff -r1.28 -r1.28.10.1 pkgsrc/mail/exim-html/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/exim-html/distinfo 2017/03/18 07:08:23 1.28
+++ pkgsrc/mail/exim-html/distinfo 2018/03/08 20:22:05 1.28.10.1
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.28 2017/03/18 07:08:23 adam Exp $ 1$NetBSD: distinfo,v 1.28.10.1 2018/03/08 20:22:05 spz Exp $
2 2
3SHA1 (exim-html-4.89.tar.bz2) = 3a3979fba7df3697cec10d3dee846b18384e5de7 3SHA1 (exim-html-4.90.1.tar.xz) = ded60f8741511fed7f6057ccb33f7a8bb7df9d72
4RMD160 (exim-html-4.89.tar.bz2) = de3d3b70f4a653880e8b2d6fe4c407cf37a7eb14 4RMD160 (exim-html-4.90.1.tar.xz) = 2d2c6f7613aff06ac945c7995723b394b708295a
5SHA512 (exim-html-4.89.tar.bz2) = 083678e5dc5acc23cd7f72b6b3e2e6d4e60bab8af25b21e2e6c8f4c1f07e070f9fabc9c8a337784e6d7436cc4aa8d7674700c61030b0c23e4b9c7d3c909e5db0 5SHA512 (exim-html-4.90.1.tar.xz) = 736f358c081e51ec542f18f04e6e18ff938b5b14336777798ad3607a7a1962d522a710e772af014d3c3f88ded9ade4d505f480439305abffd1b4c1bde342ea1a
6Size (exim-html-4.89.tar.bz2) = 480222 bytes 6Size (exim-html-4.90.1.tar.xz) = 478876 bytes
File Deleted: pkgsrc/mail/exim/files/Attic/Makefile-DragonFly
File Deleted: pkgsrc/mail/exim/files/Attic/os.h-DragonFly