Update exim to 4.86. Exim version 4.86 ----------------- JH/01 Bug 1545: The smtp transport option "retry_include_ip_address" is now expanded. JH/02 The smtp transport option "multi_domain" is now expanded. JH/03 The smtp transport now requests PRDR by default, if the server offers it. JH/04 Certificate name checking on server certificates, when exim is a client, is now done by default. The transport option tls_verify_cert_hostnames can be used to disable this per-host. The build option EXPERIMENTAL_CERTNAMES is withdrawn. JH/05 The value of the tls_verify_certificates smtp transport and main options default to the word "system" to access the system default CA bundle. For GnuTLS, only version 3.0.20 or later. JH/06 Verification of the server certificate for a TLS connection is now tried (but not required) by default. The verification status is now logged by default, for both outbound TLS and client-certificate supplying inbound TLS connections JH/07 Changed the default rfc1413 lookup settings to disable calls. Few sites use this now. JH/08 The EXPERIMENTAL_DSN compile option is no longer needed; all Delivery Status Notification (bounce) messages are now MIME format per RFC 3464. Support for RFC 3461 DSN options NOTIFY,ENVID,RET,ORCPT can be advertised under the control of the dsn_advertise_hosts option, and routers may have a dsn_lasthop option. JH/09 A timeout of 2 minutes is now applied to all malware scanner types by default, modifiable by a malware= option. The list separator for the options can now be changed in the usual way. Bug 68. JH/10 The smtp_receive_timeout main option is now expanded before use. JH/11 The incoming_interface log option now also enables logging of the local interface on delivery outgoing connections. JH/12 The cutthrough-routing facility now supports multi-recipient mails, if the interface and destination host and port all match. JH/13 Bug 344: The verify = reverse_host_lookup ACL condition now accepts a /defer_ok option. JH/14 Bug 1573: The spam= ACL condition now additionally supports Rspamd. Patch from Andrew Lewis. JH/15 Bug 670: The spamd_address main option (for the spam= ACL condition) now supports optional time-restrictions, weighting, and priority modifiers per server. Patch originally by <rommer@active.by>. JH/16 The spamd_address main option now supports a mixed list of local and remote servers. Remote servers can be IPv6 addresses, and specify a port-range. JH/17 Bug 68: The spamd_address main option now supports an optional timeout value per server. JH/18 Bug 1581: Router and transport options headers_add/remove can now have the list separator specified. JH/19 Bug 392: spamd_address, and clamd av_scanner, now support retry option values. JH/20 Bug 1571: Ensure that $tls_in_peerdn is set, when verification fails under OpenSSL. JH/21 Support for the A6 type of dns record is withdrawn. JH/22 Bug 608: The result of a QUIT or not-QUIT toplevel ACL now matters rather than the verbs used. JH/23 Bug 1572: Increase limit on SMTP confirmation message copy size from 255 to 1024 chars. JH/24 Verification callouts now attempt to use TLS by default. HS/01 DNSSEC options (dnssec_require_domains, dnssec_request_domains) are generic router options now. The defaults didn't change. JH/25 Bug 466: Add RFC2322 support for MIME attachment filenames. Original patch from Alexander Shikoff, worked over by JH. HS/02 Bug 1575: exigrep falls back to autodetection of compressed files if ZCAT_COMMAND is not executable. JH/26 Bug 1539: Add timout/retry options on dnsdb lookups. JH/27 Bug 286: Support SOA lookup in dnsdb lookups. JH/28 Bug 1588: Do not use the A lookup following an AAAA for setting the FQDN. Normally benign, it bites when the pair was led to by a CNAME; modern usage is to not canoicalize the domain to a CNAME target (and we were inconsistent anyway for A-only vs AAAA+A). JH/29 Bug 1632: Removed the word "rejected" from line logged for ACL discards. JH/30 Check the forward DNS lookup for DNSSEC, in addition to the reverse, when evaluating $sender_host_dnssec. JH/31 Check the HELO verification lookup for DNSSEC, adding new $sender_helo_dnssec variable. JH/32 Bug 1397: Enable ECDHE on OpenSSL, just the NIST P-256 curve. JH/33 Bug 1346: Note MAIL cmd seen in -bS batch, to avoid smtp_no_mail log. JH/34 Bug 1648: Fix a memory leak seen with "mailq" and large queues. JH/35 Bug 1642: Fix support of $spam_ variables at delivery time. Was documented as working, but never had. Support all but $spam_report. JH/36 Bug 1659: Guard checking of input smtp commands again pseudo-command added for tls authenticator.diff -r1.141 -r1.142 pkgsrc/mail/exim/Makefile
(bsiegert)
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.141 2015/10/10 01:58:12 ryoon Exp $ | 1 | # $NetBSD: Makefile,v 1.142 2016/01/10 20:55:56 bsiegert Exp $ | |
2 | 2 | |||
3 | DISTNAME= exim-4.85 | 3 | DISTNAME= exim-4.86 | |
4 | PKGREVISION= 3 | |||
5 | CATEGORIES= mail net | 4 | CATEGORIES= mail net | |
6 | MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \ | 5 | MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \ | |
7 | http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/ | 6 | http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/ | |
8 | EXTRACT_SUFX= .tar.bz2 | 7 | EXTRACT_SUFX= .tar.bz2 | |
9 | 8 | |||
10 | MAINTAINER= abs@NetBSD.org | 9 | MAINTAINER= abs@NetBSD.org | |
11 | HOMEPAGE= http://www.exim.org/ | 10 | HOMEPAGE= http://www.exim.org/ | |
12 | COMMENT= The Exim mail transfer agent, a replacement for sendmail | 11 | COMMENT= The Exim mail transfer agent, a replacement for sendmail | |
13 | LICENSE= gnu-gpl-v2 | 12 | LICENSE= gnu-gpl-v2 | |
14 | 13 | |||
15 | CONFLICTS+= exim-exiscan-[0-9]* | 14 | CONFLICTS+= exim-exiscan-[0-9]* | |
16 | 15 | |||
17 | USE_TOOLS+= perl:run | 16 | USE_TOOLS+= perl:run |
@@ -1,11 +1,11 @@ | @@ -1,11 +1,11 @@ | |||
1 | $NetBSD: distinfo,v 1.62 2015/11/03 23:27:05 agc Exp $ | 1 | $NetBSD: distinfo,v 1.63 2016/01/10 20:55:56 bsiegert Exp $ | |
2 | 2 | |||
3 | SHA1 (exim-4.85.tar.bz2) = 6b40d5a6ae59f86b4780ad50aaf0d930330d7b67 | 3 | SHA1 (exim-4.86.tar.bz2) = 5e2c2e5fcc83646e7d7dd308f1d13da0e49db924 | |
4 | RMD160 (exim-4.85.tar.bz2) = 334e5eeb9242b3fff49bd581b8cb22c12c0e8215 | 4 | RMD160 (exim-4.86.tar.bz2) = bbcf683eb1397f350ff5b8789869ad8c34ff28ea | |
5 | SHA512 (exim-4.85.tar.bz2) = 2c5846528ee98e4aff5dbabe49dfa5ba6753fa64154b9671a7849db8a17773917fe13bcb9e5f732c43d7479debfadd8012b8650823eb12504a6b1b28be456161 | 5 | SHA512 (exim-4.86.tar.bz2) = 0b90cd1b4d99bbb976336ccf9c2c3375f453a74bb306f1b0215f7ecca80fbda83cf5cc38c502516c2903c5d753f1f559c534fc4f4b1b32ee3300db86de6610ab | |
6 | Size (exim-4.85.tar.bz2) = 1784150 bytes | 6 | Size (exim-4.86.tar.bz2) = 1804807 bytes | |
7 | SHA1 (patch-aa) = 24a12631b7df17930349b8a0d03adc80d27efbe2 | 7 | SHA1 (patch-aa) = 4df21c2497e9fee8dfbcd4386bb1b70d69ca2932 | |
8 | SHA1 (patch-ab) = 6af17f036ed02a3bc37c1f303269eea447fcb691 | 8 | SHA1 (patch-ab) = 6af17f036ed02a3bc37c1f303269eea447fcb691 | |
9 | SHA1 (patch-ae) = 7daf63727e222bbaa7e5b8289c4fcb6a8c0272cf | 9 | SHA1 (patch-ae) = 7daf63727e222bbaa7e5b8289c4fcb6a8c0272cf | |
10 | SHA1 (patch-ag) = dd93bb718c996f18b4e985806eb6d4ff5f25a67f | 10 | SHA1 (patch-ag) = dd93bb718c996f18b4e985806eb6d4ff5f25a67f | |
11 | SHA1 (patch-lookups_Makefile) = cfc40dba3f75ef37b9887f7767139ad50cf9d4e5 | 11 | SHA1 (patch-lookups_Makefile) = cfc40dba3f75ef37b9887f7767139ad50cf9d4e5 |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: patch-aa,v 1.23 2012/06/11 11:41:25 adam Exp $ | 1 | $NetBSD: patch-aa,v 1.24 2016/01/10 20:55:56 bsiegert Exp $ | |
2 | 2 | |||
3 | --- Local/Makefile.pkgsrc.orig 2012-06-11 11:27:45.000000000 +0000 | 3 | --- Local/Makefile.pkgsrc.orig 2016-01-10 20:50:29.000000000 +0000 | |
4 | +++ Local/Makefile.pkgsrc | 4 | +++ Local/Makefile.pkgsrc | |
5 | @@ -98,7 +98,7 @@ | 5 | @@ -98,7 +98,7 @@ | |
6 | # /usr/local/sbin. The installation script will try to create this directory, | 6 | # /usr/local/sbin. The installation script will try to create this directory, | |
7 | # and any superior directories, if they do not exist. | 7 | # and any superior directories, if they do not exist. | |
8 | 8 | |||
9 | -BIN_DIRECTORY=/usr/exim/bin | 9 | -BIN_DIRECTORY=/usr/exim/bin | |
10 | +BIN_DIRECTORY=@PREFIX@/sbin | 10 | +BIN_DIRECTORY=@PREFIX@/sbin | |
11 | 11 | |||
12 | 12 | |||
13 | #------------------------------------------------------------------------------ | 13 | #------------------------------------------------------------------------------ | |
14 | @@ -114,7 +114,7 @@ BIN_DIRECTORY=/usr/exim/bin | 14 | @@ -114,7 +114,7 @@ BIN_DIRECTORY=/usr/exim/bin | |
15 | # don't exist. It will also install a default runtime configuration if this | 15 | # don't exist. It will also install a default runtime configuration if this | |
16 | # file does not exist. | 16 | # file does not exist. | |
@@ -46,82 +46,83 @@ $NetBSD: patch-aa,v 1.23 2012/06/11 11:4 | @@ -46,82 +46,83 @@ $NetBSD: patch-aa,v 1.23 2012/06/11 11:4 | |||
46 | +SPOOL_DIRECTORY=@VARBASE@/spool/exim | 46 | +SPOOL_DIRECTORY=@VARBASE@/spool/exim | |
47 | 47 | |||
48 | 48 | |||
49 | 49 | |||
50 | @@ -373,7 +373,7 @@ PCRE_CONFIG=yes | 50 | @@ -373,7 +373,7 @@ PCRE_CONFIG=yes | |
51 | # files are defaulted in the OS/Makefile-Default file, but can be overridden in | 51 | # files are defaulted in the OS/Makefile-Default file, but can be overridden in | |
52 | # local OS-specific make files. | 52 | # local OS-specific make files. | |
53 | 53 | |||
54 | -EXIM_MONITOR=eximon.bin | 54 | -EXIM_MONITOR=eximon.bin | |
55 | +# EXIM_MONITOR=eximon.bin | 55 | +# EXIM_MONITOR=eximon.bin | |
56 | 56 | |||
57 | 57 | |||
58 | #------------------------------------------------------------------------------ | 58 | #------------------------------------------------------------------------------ | |
59 | @@ -578,15 +578,15 @@ FIXED_NEVER_USERS=root | 59 | @@ -628,16 +628,16 @@ FIXED_NEVER_USERS=root | |
60 | # included in the Exim binary. You will then need to set up the run time | 60 | # included in the Exim binary. You will then need to set up the run time | |
61 | # configuration to make use of the mechanism(s) selected. | 61 | # configuration to make use of the mechanism(s) selected. | |
62 | 62 | |||
63 | -# AUTH_CRAM_MD5=yes | 63 | -# AUTH_CRAM_MD5=yes | |
64 | +AUTH_CRAM_MD5=yes | 64 | +AUTH_CRAM_MD5=yes | |
65 | # AUTH_CYRUS_SASL=yes | 65 | # AUTH_CYRUS_SASL=yes | |
66 | # AUTH_DOVECOT=yes | 66 | # AUTH_DOVECOT=yes | |
67 | # AUTH_GSASL=yes | 67 | # AUTH_GSASL=yes | |
68 | # AUTH_GSASL_PC=libgsasl | 68 | # AUTH_GSASL_PC=libgsasl | |
69 | # AUTH_HEIMDAL_GSSAPI=yes | 69 | # AUTH_HEIMDAL_GSSAPI=yes | |
70 | # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi | 70 | # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi | |
71 | -# AUTH_PLAINTEXT=yes | 71 | -# AUTH_PLAINTEXT=yes | |
72 | -# AUTH_SPA=yes | 72 | -# AUTH_SPA=yes | |
73 | +AUTH_PLAINTEXT=yes | 73 | +AUTH_PLAINTEXT=yes | |
74 | +AUTH_SPA=yes | 74 | +AUTH_SPA=yes | |
75 | # AUTH_TLS=yes | |||
75 | 76 | |||
76 | 77 | |||
77 | #------------------------------------------------------------------------------ | 78 | #------------------------------------------------------------------------------ | |
78 | @@ -764,7 +764,7 @@ HEADERS_CHARSET="ISO-8859-1" | 79 | @@ -822,7 +822,7 @@ HEADERS_CHARSET="ISO-8859-1" | |
79 | # %s. This will be replaced by one of the strings "main", "panic", or "reject" | 80 | # %s. This will be replaced by one of the strings "main", "panic", or "reject" | |
80 | # to form the final file names. Some installations may want something like this: | 81 | # to form the final file names. Some installations may want something like this: | |
81 | 82 | |||
82 | -# LOG_FILE_PATH=/var/log/exim_%slog | 83 | -# LOG_FILE_PATH=/var/log/exim_%slog | |
83 | +LOG_FILE_PATH=@VARBASE@/log/exim/%s | 84 | +LOG_FILE_PATH=@VARBASE@/log/exim/%s | |
84 | 85 | |||
85 | # which results in files with names /var/log/exim_mainlog, etc. The directory | 86 | # which results in files with names /var/log/exim_mainlog, etc. The directory | |
86 | # in which the log files are placed must exist; Exim does not try to create | 87 | # in which the log files are placed must exist; Exim does not try to create | |
87 | @@ -1016,13 +1016,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases | 88 | @@ -1080,13 +1080,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases | |
88 | # haven't got Perl, Exim will still build and run; you just won't be able to | 89 | # haven't got Perl, Exim will still build and run; you just won't be able to | |
89 | # use those utilities. | 90 | # use those utilities. | |
90 | 91 | |||
91 | -# CHOWN_COMMAND=/usr/bin/chown | 92 | -# CHOWN_COMMAND=/usr/bin/chown | |
92 | -# CHGRP_COMMAND=/usr/bin/chgrp | 93 | -# CHGRP_COMMAND=/usr/bin/chgrp | |
93 | -# CHMOD_COMMAND=/usr/bin/chmod | 94 | -# CHMOD_COMMAND=/usr/bin/chmod | |
94 | -# MV_COMMAND=/bin/mv | 95 | -# MV_COMMAND=/bin/mv | |
95 | -# RM_COMMAND=/bin/rm | 96 | -# RM_COMMAND=/bin/rm | |
96 | -# TOUCH_COMMAND=/usr/bin/touch | 97 | -# TOUCH_COMMAND=/usr/bin/touch | |
97 | -# PERL_COMMAND=/usr/bin/perl | 98 | -# PERL_COMMAND=/usr/bin/perl | |
98 | +CHOWN_COMMAND=@CHOWN@ | 99 | +CHOWN_COMMAND=@CHOWN@ | |
99 | +CHGRP_COMMAND=@CHGRP@ | 100 | +CHGRP_COMMAND=@CHGRP@ | |
100 | +CHMOD_COMMAND=@CHMOD@ | 101 | +CHMOD_COMMAND=@CHMOD@ | |
101 | +MV_COMMAND=@MV@ | 102 | +MV_COMMAND=@MV@ | |
102 | +RM_COMMAND=@RM@ | 103 | +RM_COMMAND=@RM@ | |
103 | +TOUCH_COMMAND=@TOUCH@ | 104 | +TOUCH_COMMAND=@TOUCH@ | |
104 | +PERL_COMMAND=@PERL5@ | 105 | +PERL_COMMAND=@PERL5@ | |
105 | 106 | |||
106 | 107 | |||
107 | #------------------------------------------------------------------------------ | 108 | #------------------------------------------------------------------------------ | |
108 | @@ -1222,7 +1222,7 @@ TMPDIR="/tmp" | 109 | @@ -1286,7 +1286,7 @@ TMPDIR="/tmp" | |
109 | # (process id) to a file so that it can easily be identified. The path of the | 110 | # (process id) to a file so that it can easily be identified. The path of the | |
110 | # file can be specified here. Some installations may want something like this: | 111 | # file can be specified here. Some installations may want something like this: | |
111 | 112 | |||
112 | -# PID_FILE_PATH=/var/lock/exim.pid | 113 | -# PID_FILE_PATH=/var/lock/exim.pid | |
113 | +PID_FILE_PATH=/var/run/exim.pid | 114 | +PID_FILE_PATH=/var/run/exim.pid | |
114 | 115 | |||
115 | # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory | 116 | # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory | |
116 | # using the name "exim-daemon.pid". | 117 | # using the name "exim-daemon.pid". | |
117 | @@ -1294,3 +1294,10 @@ TMPDIR="/tmp" | 118 | @@ -1358,3 +1358,10 @@ TMPDIR="/tmp" | |
118 | # ENABLE_DISABLE_FSYNC=yes | 119 | # ENABLE_DISABLE_FSYNC=yes | |
119 | 120 | |||
120 | # End of EDITME for Exim 4. | 121 | # End of EDITME for Exim 4. | |
121 | + | 122 | + | |
122 | +EXTRALIBS_EXIM=-liconv | 123 | +EXTRALIBS_EXIM=-liconv | |
123 | + | 124 | + | |
124 | +@EXIM_USE_DB_CONFIG@ | 125 | +@EXIM_USE_DB_CONFIG@ | |
125 | +@EXIM_DBMLIB@ | 126 | +@EXIM_DBMLIB@ | |
126 | +INCLUDE=@EXIM_INCLUDE@ | 127 | +INCLUDE=@EXIM_INCLUDE@ | |
127 | +LOOKUP_LIBS=@LOOKUP_LIBS@ | 128 | +LOOKUP_LIBS=@LOOKUP_LIBS@ |