Download raw body.
[update ] mail/exim 4.99
Hello,
Here is a diff for mail/exim 4.99
Most OpenBSD patches have been incorporated into official sources.
Slightly tested on amd64
Best Regards
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/exim/Makefile,v
diff -u -p -r1.154 Makefile
--- Makefile 22 Jul 2025 12:50:55 -0000 1.154
+++ Makefile 28 Oct 2025 14:53:20 -0000
@@ -1,8 +1,7 @@
COMMENT-main = flexible mail transfer agent
COMMENT-eximon = X11 monitor tool for Exim MTA
-VERSION = 4.98.2
-REVISION-main = 0
+VERSION = 4.99
DISTNAME = exim-${VERSION}
PKGNAME-main = exim-${VERSION}
FULLPKGNAME-eximon = exim-eximon-${VERSION}
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/exim/distinfo,v
diff -u -p -r1.51 distinfo
--- distinfo 26 Mar 2025 14:22:49 -0000 1.51
+++ distinfo 28 Oct 2025 14:53:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (exim-4.98.2.tar.gz) = BFAB/kcK4xLkApX0j3p2i6BhEMhlxxWU5GyCW0PZ1uA=
-SIZE (exim-4.98.2.tar.gz) = 2655163
+SHA256 (exim-4.99.tar.gz) = 5dURoxB7qkInHaA6jCz6BkxLak7APrEBHClXLbI2m8o=
+SIZE (exim-4.99.tar.gz) = 2664019
Index: patches/patch-Local_Makefile
===================================================================
RCS file: /cvs/ports/mail/exim/patches/patch-Local_Makefile,v
diff -u -p -r1.11 patch-Local_Makefile
--- patches/patch-Local_Makefile 20 Aug 2024 19:53:09 -0000 1.11
+++ patches/patch-Local_Makefile 28 Oct 2025 14:53:20 -0000
@@ -1,7 +1,7 @@
Index: Local/Makefile
--- Local/Makefile.orig
+++ Local/Makefile
-@@ -103,7 +103,7 @@
+@@ -104,7 +104,7 @@
# /usr/local/sbin. The installation script will try to create this directory,
# and any superior directories, if they do not exist.
@@ -10,7 +10,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -119,7 +119,7 @@ BIN_DIRECTORY=/usr/exim/bin
+@@ -120,7 +120,7 @@ BIN_DIRECTORY=/usr/exim/bin
# don't exist. It will also install a default runtime configuration if this
# file does not exist.
@@ -19,7 +19,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.
-@@ -136,7 +136,7 @@ CONFIGURE_FILE=/usr/exim/configure
+@@ -137,7 +137,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.
@@ -28,7 +28,7 @@ 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
-@@ -214,11 +214,11 @@ SPOOL_DIRECTORY=/var/spool/exim
+@@ -215,11 +215,11 @@ SPOOL_DIRECTORY=/var/spool/exim
# If you are building with TLS, the library configuration must be done:
# Uncomment this if you are using OpenSSL
@@ -42,7 +42,7 @@ Index: Local/Makefile
# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto
# Uncomment this if you are using GnuTLS
-@@ -344,7 +344,7 @@ TRANSPORT_SMTP=yes
+@@ -362,7 +362,7 @@ TRANSPORT_SMTP=yes
# This one is special-purpose, and commonly not required, so it is not
# included by default.
@@ -51,7 +51,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -353,9 +353,9 @@ TRANSPORT_SMTP=yes
+@@ -371,9 +371,9 @@ TRANSPORT_SMTP=yes
# MBX, is included only when requested. If you do not know what this is about,
# leave these settings commented out.
@@ -64,7 +64,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -413,8 +413,8 @@ LOOKUP_DBM=yes
+@@ -434,8 +434,8 @@ LOOKUP_DBM=yes
LOOKUP_LSEARCH=yes
LOOKUP_DNSDB=yes
@@ -75,7 +75,7 @@ Index: Local/Makefile
# LOOKUP_IBASE=yes
# LOOKUP_JSON=yes
# LOOKUP_LDAP=yes
-@@ -422,10 +422,10 @@ LOOKUP_DNSDB=yes
+@@ -443,10 +443,10 @@ LOOKUP_DNSDB=yes
# LOOKUP_MYSQL=yes
# LOOKUP_MYSQL_PC=mariadb
@@ -88,7 +88,7 @@ Index: Local/Makefile
# LOOKUP_PGSQL=yes
# LOOKUP_REDIS=yes
# LOOKUP_SQLITE=yes
-@@ -525,7 +525,7 @@ SUPPORT_DANE=yes
+@@ -583,7 +583,7 @@ SUPPORT_DANE=yes
# and the MIME ACL. Please read the documentation to learn more about these
# features.
@@ -97,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.
-@@ -566,7 +566,7 @@ DISABLE_MAL_MKS=yes
+@@ -628,7 +628,7 @@ DISABLE_MAL_MKS=yes
# from Exim. Note it can only be supported when built with
# GnuTLS 3.1.3 or later, or OpenSSL
@@ -106,9 +106,9 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
# By default, Exim has support for checking the AD bit in a DNS response, to
-@@ -794,18 +794,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.
+@@ -879,18 +879,18 @@ FIXED_NEVER_USERS=root
+ # core exim build. This gets them linked with the module instead.
+ # The heimdal does build but we have no test coverage so it is not know to work.
-# AUTH_CRAM_MD5=yes
+AUTH_CRAM_MD5=yes
@@ -129,7 +129,7 @@ Index: Local/Makefile
# Heimdal through 1.5 required pkg-config 'heimdal-gssapi'; Heimdal 7.1
# requires multiple pkg-config files to work with Exim, so the second example
-@@ -852,7 +852,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -937,7 +937,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
#
@@ -138,7 +138,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()
-@@ -941,7 +941,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -1026,7 +1026,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:
@@ -147,16 +147,16 @@ 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
-@@ -1013,7 +1013,7 @@ ZCAT_COMMAND=/usr/bin/zcat
- # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
+@@ -1099,7 +1099,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# Perl costs quite a lot of resources. Only do this if you really need it.
+ #
-# EXIM_PERL=perl.o
+EXIM_PERL=perl.o
-
- #------------------------------------------------------------------------------
-@@ -1141,7 +1141,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+ # For a dynamic module build add also SUPPORT_PERL=2 and SUPPORT_PAM_(INCLUED,LIBS)
+ #SUPPORT_PERL=2
+@@ -1246,7 +1246,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.
@@ -165,7 +165,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -1189,7 +1189,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -1269,7 +1269,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# aliases). The following setting can be changed to specify a different
# location for the system alias file.
@@ -174,7 +174,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -1454,7 +1454,7 @@ EXIM_TMPDIR="/tmp"
+@@ -1534,7 +1534,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_dane-openssl_c
===================================================================
RCS file: patches/patch-src_dane-openssl_c
diff -N patches/patch-src_dane-openssl_c
--- patches/patch-src_dane-openssl_c 15 Jan 2024 08:09:12 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,52 +0,0 @@
-Index: src/dane-openssl.c
---- src/dane-openssl.c.orig
-+++ src/dane-openssl.c
-@@ -22,7 +22,7 @@
- # error "OpenSSL 1.0.0 or higher required"
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- # define X509_up_ref(x) CRYPTO_add(&((x)->references), 1, CRYPTO_LOCK_X509)
- #endif
-
-@@ -30,6 +30,7 @@
- #ifdef LIBRESSL_VERSION_NUMBER
- # if LIBRESSL_VERSION_NUMBER >= 0x2090000fL
- # define EXIM_HAVE_ASN1_MACROS
-+# define EXIM_OPAQUE_X509
- # endif
- #endif
- /* OpenSSL */
-@@ -38,6 +39,7 @@
- # define EXIM_OPAQUE_X509
- /* Older OpenSSL and all LibreSSL */
- #else
-+# if LIBRESSL_VERSION_NUMBER < 0x3050000fL
- # define X509_STORE_CTX_get_verify(ctx) (ctx)->verify
- # define X509_STORE_CTX_get_verify_cb(ctx) (ctx)->verify_cb
- # define X509_STORE_CTX_get0_cert(ctx) (ctx)->cert
-@@ -52,6 +54,7 @@
- # define ASN1_STRING_get0_data ASN1_STRING_data
- # define X509_getm_notBefore X509_get_notBefore
- # define X509_getm_notAfter X509_get_notAfter
-+# endif /* LibreSSL < 3.5.0 */
-
- # define CRYPTO_ONCE_STATIC_INIT 0
- # define CRYPTO_THREAD_run_once run_once
-@@ -1636,6 +1639,7 @@ if (err_lib_dane > 0)
- }
- #endif
-
-+#ifndef LIBRESSL_VERSION_NUMBER
- /*
- * Register SHA-2 digests, if implemented and not already registered.
- */
-@@ -1646,6 +1650,7 @@ if (!EVP_get_digestbyname(LN_sha256)) EVP_add_digest(E
- #if defined(LN_sha512) && defined(NID_sha512) && !defined(OPENSSL_NO_SHA512)
- if (!EVP_get_digestbyname(LN_sha384)) EVP_add_digest(EVP_sha384());
- if (!EVP_get_digestbyname(LN_sha512)) EVP_add_digest(EVP_sha512());
-+#endif
- #endif
-
- /*
Index: patches/patch-src_lookups_spf_c
===================================================================
RCS file: patches/patch-src_lookups_spf_c
diff -N patches/patch-src_lookups_spf_c
--- patches/patch-src_lookups_spf_c 15 Nov 2023 10:15:29 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-Index: src/lookups/spf.c
---- src/lookups/spf.c.orig
-+++ src/lookups/spf.c
-@@ -24,9 +24,6 @@ static void dummy(int x) { dummy2(x-1); }
- #else
-
- #include "lf_functions.h"
--#if !defined(HAVE_NS_TYPE) && defined(NS_INADDRSZ)
--# define HAVE_NS_TYPE
--#endif
- #include <spf2/spf.h>
- #include <spf2/spf_dns_resolv.h>
- #include <spf2/spf_dns_cache.h>
Index: patches/patch-src_osfunctions_h
===================================================================
RCS file: patches/patch-src_osfunctions_h
diff -N patches/patch-src_osfunctions_h
--- patches/patch-src_osfunctions_h 20 Aug 2024 19:53:09 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-https://github.com/Exim/exim/commit/ede1cf66682ae379346aa4681c5f6294f2b7e6a5
-
-Index: src/osfunctions.h
---- src/osfunctions.h.orig
-+++ src/osfunctions.h
-@@ -41,4 +41,8 @@ extern int os_unsetenv(const uschar *);
- extern uschar *os_getcwd(uschar *, size_t);
- #endif
-
-+#ifndef EXIM_HAVE_STRCHRNUL
-+extern char * strchrnul(const char *, int);
-+#endif
-+
- /* End of osfunctions.h */
Index: patches/patch-src_spf_h
===================================================================
RCS file: patches/patch-src_spf_h
diff -N patches/patch-src_spf_h
--- patches/patch-src_spf_h 15 Nov 2023 10:15:29 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Index: src/spf.h
---- src/spf.h.orig
-+++ src/spf.h
-@@ -11,10 +11,6 @@
-
- #ifdef SUPPORT_SPF
-
--/* Yes, we do have ns_type. spf.h redefines it if we don't set this. Doh */
--#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_tls-openssl_c
===================================================================
RCS file: patches/patch-src_tls-openssl_c
diff -N patches/patch-src_tls-openssl_c
--- patches/patch-src_tls-openssl_c 20 Aug 2024 19:53:09 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-Index: src/tls-openssl.c
---- src/tls-openssl.c.orig
-+++ src/tls-openssl.c
-@@ -96,6 +96,7 @@ change this guard and punt the issue for a while longe
-
- #if LIBRESSL_VERSION_NUMBER >= 0x3040000fL
- # define EXIM_HAVE_OPENSSL_CIPHER_GET_ID
-+# define OPENSSL_AUTO_SHA256
- #endif
- #if LIBRESSL_VERSION_NUMBER >= 0x3050000fL
- # define EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS
[update ] mail/exim 4.99