Hello, Here is an update to exim.This also fixed a long standing bug where the Makefile was overriding CFLAGS for exim.
Warning, this release might break some configs as exim is now checking the variables to see if there is no unintended user input which can be used in a variable.
Regards
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/exim/Makefile,v
retrieving revision 1.126
diff -u -p -r1.126 Makefile
--- Makefile 29 Sep 2019 18:08:55 -0000 1.126
+++ Makefile 9 Dec 2019 19:06:25 -0000
@@ -3,7 +3,7 @@
COMMENT-main = flexible mail transfer agent
COMMENT-eximon = X11 monitor tool for Exim MTA
-VERSION = 4.92.3
+VERSION = 4.93
DISTNAME = exim-${VERSION}
PKGNAME-main = exim-${VERSION}
FULLPKGNAME-eximon = exim-eximon-${VERSION}
@@ -90,7 +90,7 @@ EXIM_MAKECAT += "CONFIGURE_FILE=${SYSCO
EXIM_MAKECAT += "LOOKUP_INCLUDE=${EXIM_LOOKUP_INCLUDE}\n"
EXIM_MAKECAT += "LOOKUP_LIBS=${EXIM_LOOKUP_LIBS}\n"
EXIM_MAKECAT += "EXTRALIBS_EXIM=${EXIM_EXTRA_LIBS}\n"
-EXIM_MAKECAT += "CFLAGS=${CFLAGS} ${EXIM_CFLAGS}\n"
+EXIM_MAKECAT += "CFLAGS+=${CFLAGS} ${EXIM_CFLAGS}\n"
EXIM_MAKECAT += "INCLUDE=-I${LOCALBASE}/include\n"
NO_TEST = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/exim/distinfo,v
retrieving revision 1.37
diff -u -p -r1.37 distinfo
--- distinfo 29 Sep 2019 18:08:55 -0000 1.37
+++ distinfo 9 Dec 2019 19:06:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (exim-4.92.3.tar.gz) = 6/rNFPxqdIugdlZxanWq815QoeGqOwYvpOukOSVRk3s=
-SIZE (exim-4.92.3.tar.gz) = 2434898
+SHA256 (exim-4.93.tar.gz) = ZKJnPigfl/72n+Liz9Glap9xhMgLw63XwJyMeodZ7UM=
+SIZE (exim-4.93.tar.gz) = 2478903
Index: patches/patch-Local_Makefile
===================================================================
RCS file: /cvs/ports/mail/exim/patches/patch-Local_Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Local_Makefile
--- patches/patch-Local_Makefile 28 Mar 2019 12:48:09 -0000 1.2
+++ patches/patch-Local_Makefile 9 Dec 2019 19:06:25 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-Local_Makefile,v 1.2 201
Index: Local/Makefile
--- Local/Makefile.orig
+++ Local/Makefile
-@@ -98,7 +98,7 @@
+@@ -100,7 +100,7 @@
# /usr/local/sbin. The installation script will try to create this directory,
# and any superior directories, if they do not exist.
@@ -12,7 +12,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -114,7 +114,7 @@ BIN_DIRECTORY=/usr/exim/bin
+@@ -116,7 +116,7 @@ BIN_DIRECTORY=/usr/exim/bin
# don't exist. It will also install a default runtime configuration if this
# file does not exist.
@@ -21,7 +21,7 @@ Index: Local/Makefile
# It is possible to specify a colon-separated list of files for
CONFIGURE_FILE.
# In this case, Exim will use the first of them that exists when it is run.
-@@ -131,7 +131,7 @@ CONFIGURE_FILE=/usr/exim/configure
+@@ -133,7 +133,7 @@ CONFIGURE_FILE=/usr/exim/configure
# deliveries. (Local deliveries run as various non-root users, typically as
the
# owner of a local mailbox.) Specifying these values as root is not supported.
@@ -30,7 +30,21 @@ Index: Local/Makefile
# If you specify EXIM_USER as a name, this is looked up at build time, and the
# uid number is built into the binary. However, you can specify that this
-@@ -237,7 +237,7 @@ TRANSPORT_SMTP=yes
+@@ -211,11 +211,11 @@ SPOOL_DIRECTORY=/var/spool/exim
+ # If you are buliding with TLS, the library configuration must be done:
+
+ # Uncomment this if you are using OpenSSL
+-# USE_OPENSSL=yes
++USE_OPENSSL=yes
+ # Uncomment one of these settings if you are using OpenSSL; pkg-config vs not
+ # and an optional location.
+ # USE_OPENSSL_PC=openssl
+-# TLS_LIBS=-lssl -lcrypto
++TLS_LIBS=-lssl -lcrypto
+ # TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto
+
+ # Uncomment this if you are using GnuTLS
+@@ -338,7 +338,7 @@ TRANSPORT_SMTP=yes
# This one is special-purpose, and commonly not required, so it is not
# included by default.
@@ -39,7 +53,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -246,9 +246,9 @@ TRANSPORT_SMTP=yes
+@@ -347,9 +347,9 @@ TRANSPORT_SMTP=yes
# MBX, is included only when requested. If you do not know what this is about,
# leave these settings commented out.
@@ -52,7 +66,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -306,16 +306,16 @@ LOOKUP_DBM=yes
+@@ -407,17 +407,17 @@ LOOKUP_DBM=yes
LOOKUP_LSEARCH=yes
LOOKUP_DNSDB=yes
@@ -61,6 +75,7 @@ Index: Local/Makefile
+LOOKUP_CDB=yes
+LOOKUP_DSEARCH=yes
# LOOKUP_IBASE=yes
+ # LOOKUP_JSON=yes
# LOOKUP_LDAP=yes
# LOOKUP_MYSQL=yes
# LOOKUP_MYSQL_PC=mariadb
@@ -73,16 +88,7 @@ Index: Local/Makefile
# LOOKUP_PGSQL=yes
# LOOKUP_REDIS=yes
# LOOKUP_SQLITE=yes
-@@ -392,7 +392,7 @@ PCRE_CONFIG=yes
- # files are defaulted in the OS/Makefile-Default file, but can be overridden
in
- # local OS-specific make files.
-
--EXIM_MONITOR=eximon.bin
-+# EXIM_MONITOR=eximon.bin
-
-
-
#------------------------------------------------------------------------------
-@@ -402,7 +402,7 @@ EXIM_MONITOR=eximon.bin
+@@ -509,7 +509,7 @@ SUPPORT_DANE=yes
# and the MIME ACL. Please read the documentation to learn more about these
# features.
@@ -91,7 +97,7 @@ Index: Local/Makefile
# If you have content scanning you may wish to only include some of the
scanner
# interfaces. Uncomment any of these lines to remove that code.
-@@ -640,16 +640,16 @@ FIXED_NEVER_USERS=root
+@@ -752,18 +752,18 @@ FIXED_NEVER_USERS=root
# included in the Exim binary. You will then need to set up the run time
# configuration to make use of the mechanism(s) selected.
@@ -100,6 +106,7 @@ Index: Local/Makefile
# AUTH_CYRUS_SASL=yes
-# AUTH_DOVECOT=yes
+AUTH_DOVECOT=yes
+ # AUTH_EXTERNAL=yes
# AUTH_GSASL=yes
# AUTH_GSASL_PC=libgsasl
# AUTH_HEIMDAL_GSSAPI=yes
@@ -107,12 +114,14 @@ Index: Local/Makefile
# AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi heimdal-krb5
-# AUTH_PLAINTEXT=yes
-# AUTH_SPA=yes
+-# AUTH_TLS=yes
+AUTH_PLAINTEXT=yes
+AUTH_SPA=yes
- # AUTH_TLS=yes
++AUTH_TLS=yes
# Heimdal through 1.5 required pkg-config 'heimdal-gssapi'; Heimdal 7.1
-@@ -694,7 +694,7 @@ HEADERS_CHARSET="ISO-8859-1"
+ # requires multiple pkg-config files to work with Exim, so the second example
+@@ -807,7 +807,7 @@ HEADERS_CHARSET="ISO-8859-1"
# the Sieve filter support. For those OS where iconv() is known to be
installed
# as standard, the file in OS/Makefile-xxxx contains
#
@@ -121,21 +130,7 @@ Index: Local/Makefile
#
# If you are not using one of those systems, but have installed iconv(), you
# need to uncomment that line above. In some cases, you may find that iconv()
-@@ -763,11 +763,11 @@ HEADERS_CHARSET="ISO-8859-1"
- # leave these settings commented out.
-
- # This setting is required for any TLS support (either OpenSSL or GnuTLS)
--# SUPPORT_TLS=yes
-+SUPPORT_TLS=yes
-
- # Uncomment one of these settings if you are using OpenSSL; pkg-config vs not
- # USE_OPENSSL_PC=openssl
--# TLS_LIBS=-lssl -lcrypto
-+TLS_LIBS=-lssl -lcrypto
-
- # Uncomment the first and either the second or the third of these if you
- # are using GnuTLS. If you have pkg-config, then the second, else the third.
-@@ -852,7 +852,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -896,7 +896,7 @@ HEADERS_CHARSET="ISO-8859-1"
# %s. This will be replaced by one of the strings "main", "panic", or "reject"
# to form the final file names. Some installations may want something like
this:
@@ -144,7 +139,7 @@ Index: Local/Makefile
# which results in files with names /var/log/exim_mainlog, etc. The directory
# in which the log files are placed must exist; Exim does not try to create
-@@ -924,7 +924,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -968,7 +968,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
# Perl costs quite a lot of resources. Only do this if you really need it.
@@ -153,7 +148,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -985,9 +985,9 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -1029,9 +1029,9 @@ ZCAT_COMMAND=/usr/bin/zcat
# installed on your system (www.libspf2.org). Depending on where it is
installed
# you may have to edit the CFLAGS and LDFLAGS lines.
@@ -165,7 +160,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -1052,7 +1052,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -1096,7 +1096,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# group. Once you have installed saslauthd, you should arrange for it to be
# started by root at boot time.
@@ -174,7 +169,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -1100,7 +1100,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -1144,7 +1144,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# aliases). The following setting can be changed to specify a different
# location for the system alias file.
@@ -183,7 +178,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -1365,7 +1365,7 @@ EXIM_TMPDIR="/tmp"
+@@ -1409,7 +1409,7 @@ EXIM_TMPDIR="/tmp"
# (process id) to a file so that it can easily be identified. The path of the
# file can be specified here. Some installations may want something like this:
Index: patches/patch-src_lookups_spf_c
===================================================================
RCS file: /cvs/ports/mail/exim/patches/patch-src_lookups_spf_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_lookups_spf_c
--- patches/patch-src_lookups_spf_c 28 Mar 2019 12:48:09 -0000 1.1
+++ patches/patch-src_lookups_spf_c 9 Dec 2019 19:06:25 -0000
@@ -7,8 +7,8 @@ Index: src/lookups/spf.c
#else
#include "lf_functions.h"
--#ifndef HAVE_NS_TYPE
--#define HAVE_NS_TYPE
+-#if !defined(HAVE_NS_TYPE) && defined(NS_INADDRSZ)
+-# define HAVE_NS_TYPE
-#endif
#include <spf2/spf.h>
#include <spf2/spf_dns_resolv.h>
Index: patches/patch-src_spf_h
===================================================================
RCS file: /cvs/ports/mail/exim/patches/patch-src_spf_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_spf_h
--- patches/patch-src_spf_h 28 Mar 2019 12:48:09 -0000 1.1
+++ patches/patch-src_spf_h 9 Dec 2019 19:06:25 -0000
@@ -8,7 +8,7 @@ Index: src/spf.h
#ifdef SUPPORT_SPF
-/* Yes, we do have ns_type. spf.h redefines it if we don't set this. Doh */
--#ifndef HAVE_NS_TYPE
+-#if !defined(HAVE_NS_TYPE) && defined(NS_INADDRSZ)
-# define HAVE_NS_TYPE
-#endif
#include <spf2/spf.h>
smime.p7s
Description: S/MIME Cryptographic Signature
