Hello, Here is a diff for mail/exim 4.97
The exim devs confirmed me that they are not tracking LibreSSL anymore. So I had to disable OCSP.
Best Regards
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/exim/Makefile,v
retrieving revision 1.145
diff -u -p -r1.145 Makefile
--- Makefile 16 Oct 2023 07:49:41 -0000 1.145
+++ Makefile 9 Nov 2023 08:50:22 -0000
@@ -1,7 +1,7 @@
COMMENT-main = flexible mail transfer agent
COMMENT-eximon = X11 monitor tool for Exim MTA
-VERSION = 4.96.2
+VERSION = 4.97
DISTNAME = exim-${VERSION}
PKGNAME-main = exim-${VERSION}
FULLPKGNAME-eximon = exim-eximon-${VERSION}
@@ -32,7 +32,7 @@ LIB_DEPENDS-main = converters/libiconv \
RUN_DEPENDS-eximon = ${PKGPATH},-main
LIB_DEPENDS-eximon = devel/pcre2
-MAKE_FLAGS += FULLECHO= CC="${CC}" CFLAGS="${CFLAGS}"
+MAKE_FLAGS += FULLECHO= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="-lexecinfo"
PSEUDO_FLAVORS = no_eximon
FLAVORS = mysql postgresql sqlite3 ldap sasl
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/exim/distinfo,v
retrieving revision 1.46
diff -u -p -r1.46 distinfo
--- distinfo 16 Oct 2023 07:49:41 -0000 1.46
+++ distinfo 9 Nov 2023 08:50:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (exim-4.96.2.tar.gz) = oOX7lRDU4HcE0ffKi0Mq4GnTxSKzHOfvX3tJmK53elM=
-SIZE (exim-4.96.2.tar.gz) = 2587523
+SHA256 (exim-4.97.tar.gz) = E0WPz4mtofvTiP1pT2x//lKA4/zgQJEecgI5AOTHNnU=
+SIZE (exim-4.97.tar.gz) = 2629882
Index: patches/patch-Local_Makefile
===================================================================
RCS file: /cvs/ports/mail/exim/patches/patch-Local_Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 patch-Local_Makefile
--- patches/patch-Local_Makefile 2 Oct 2023 21:17:01 -0000 1.9
+++ patches/patch-Local_Makefile 9 Nov 2023 08:50:22 -0000
@@ -1,7 +1,7 @@
Index: Local/Makefile
--- Local/Makefile.orig
+++ Local/Makefile
-@@ -99,7 +99,7 @@
+@@ -101,7 +101,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
#------------------------------------------------------------------------------
-@@ -115,7 +115,7 @@ BIN_DIRECTORY=/usr/exim/bin
+@@ -117,7 +117,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.
-@@ -132,7 +132,7 @@ CONFIGURE_FILE=/usr/exim/configure
+@@ -134,7 +134,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
-@@ -210,11 +210,11 @@ SPOOL_DIRECTORY=/var/spool/exim
+@@ -212,11 +212,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
-@@ -340,7 +340,7 @@ TRANSPORT_SMTP=yes
+@@ -342,7 +342,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
#------------------------------------------------------------------------------
-@@ -349,9 +349,9 @@ TRANSPORT_SMTP=yes
+@@ -351,9 +351,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
#------------------------------------------------------------------------------
-@@ -409,8 +409,8 @@ LOOKUP_DBM=yes
+@@ -411,8 +411,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
-@@ -418,10 +418,10 @@ LOOKUP_DNSDB=yes
+@@ -420,10 +420,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
-@@ -521,7 +521,7 @@ SUPPORT_DANE=yes
+@@ -523,7 +523,7 @@ SUPPORT_DANE=yes
# and the MIME ACL. Please read the documentation to learn more about these
# features.
@@ -97,7 +97,16 @@ 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.
-@@ -754,18 +754,18 @@ FIXED_NEVER_USERS=root
+@@ -564,7 +564,7 @@ DISABLE_MAL_MKS=yes
+ # from Exim. Note it can only be supported when built with
+ # GnuTLS 3.1.3 or later, or OpenSSL
+
+-# DISABLE_OCSP=yes
++DISABLE_OCSP=yes
+
+ #------------------------------------------------------------------------------
+ # By default, Exim has support for checking the AD bit in a DNS response, to
+@@ -785,18 +785,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.
@@ -120,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
-@@ -812,7 +812,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -843,7 +843,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
#
@@ -129,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()
-@@ -901,7 +901,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -932,7 +932,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:
@@ -138,7 +147,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
-@@ -973,7 +973,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -1004,7 +1004,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.
@@ -147,7 +156,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -1101,7 +1101,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -1132,7 +1132,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.
@@ -156,7 +165,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -1149,7 +1149,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -1180,7 +1180,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# aliases). The following setting can be changed to specify a different
# location for the system alias file.
@@ -165,7 +174,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -1414,7 +1414,7 @@ EXIM_TMPDIR="/tmp"
+@@ -1445,7 +1445,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-OS_Makefile-Default
===================================================================
RCS file: /cvs/ports/mail/exim/patches/patch-OS_Makefile-Default,v
retrieving revision 1.10
diff -u -p -r1.10 patch-OS_Makefile-Default
--- patches/patch-OS_Makefile-Default 11 Mar 2022 19:34:36 -0000 1.10
+++ patches/patch-OS_Makefile-Default 9 Nov 2023 08:50:22 -0000
@@ -1,7 +1,7 @@
Index: OS/Makefile-Default
--- OS/Makefile-Default.orig
+++ OS/Makefile-Default
-@@ -71,7 +71,7 @@ PERL_COMMAND=/usr/bin/perl
+@@ -74,7 +74,7 @@ PERL_COMMAND=/usr/bin/perl
# CC contains the name of the C compiler to be used.
@@ -10,7 +10,7 @@ Index: OS/Makefile-Default
# CFLAGS contains flags to be passed to the compiler. Nothing is defaulted
-@@ -84,7 +84,7 @@ CC=gcc
+@@ -87,7 +87,7 @@ CC=gcc
# here; instead each OS-dependent Makefile contains a default setting if one
# is needed.
Index: patches/patch-OS_Makefile-OpenBSD
===================================================================
RCS file: patches/patch-OS_Makefile-OpenBSD
diff -N patches/patch-OS_Makefile-OpenBSD
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-OS_Makefile-OpenBSD 9 Nov 2023 08:50:22 -0000
@@ -0,0 +1,10 @@
+--- OS/Makefile-OpenBSD.orig Tue Nov 7 10:22:10 2023
++++ OS/Makefile-OpenBSD Tue Nov 7 10:23:09 2023
+@@ -24,7 +24,6 @@ EXIWHAT_EGREP_ARG='/exim( |$$)'
+ EXIWHAT_KILL_SIGNAL=-USR1
+
+ HAVE_IPV6=YES
+-CFLAGS += -DNO_EXECINFO
+
+ # OpenBSD ships with a too-old Berkeley DB. NDBM is the default if we don't specify one.
+ #USE_DB=yes
Index: patches/patch-scripts_exim_install
===================================================================
RCS file: /cvs/ports/mail/exim/patches/patch-scripts_exim_install,v
retrieving revision 1.14
diff -u -p -r1.14 patch-scripts_exim_install
--- patches/patch-scripts_exim_install 11 Mar 2022 19:34:36 -0000 1.14
+++ patches/patch-scripts_exim_install 9 Nov 2023 08:50:22 -0000
@@ -1,7 +1,7 @@
Index: scripts/exim_install
--- scripts/exim_install.orig
+++ scripts/exim_install
-@@ -216,7 +216,7 @@ while [ $# -gt 0 ]; do
+@@ -219,7 +219,7 @@ while [ $# -gt 0 ]; do
# The exim binary is handled specially
Index: patches/patch-src_dmarc_c
===================================================================
RCS file: patches/patch-src_dmarc_c
diff -N patches/patch-src_dmarc_c
--- patches/patch-src_dmarc_c 9 Aug 2022 13:51:10 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-patch around opendmarc API change introduced in
-https://github.com/trusteddomainproject/OpenDMARC/commit/dbd87868f2ca9c2ef11529cd757d1cc5ab228833
-
-Index: src/dmarc.c
---- src/dmarc.c.orig
-+++ src/dmarc.c
-@@ -459,7 +459,7 @@ if (!dmarc_abort && !sender_host_authenticated)
- vs == PDKIM_VERIFY_INVALID ? DMARC_POLICY_DKIM_OUTCOME_TMPFAIL :
- DMARC_POLICY_DKIM_OUTCOME_NONE;
- libdm_status = opendmarc_policy_store_dkim(dmarc_pctx, US sig->domain,
-- dkim_result, US"");
-+ sig->selector, dkim_result, US"");
- DEBUG(D_receive)
- debug_printf("DMARC adding DKIM sender domain = %s\n", sig->domain);
- if (libdm_status != DMARC_PARSE_OKAY)
Index: patches/patch-src_lookups_spf_c
===================================================================
RCS file: /cvs/ports/mail/exim/patches/patch-src_lookups_spf_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_lookups_spf_c
--- patches/patch-src_lookups_spf_c 9 Aug 2022 13:51:10 -0000 1.5
+++ patches/patch-src_lookups_spf_c 9 Nov 2023 08:50:22 -0000
@@ -1,7 +1,7 @@
Index: src/lookups/spf.c
--- src/lookups/spf.c.orig
+++ src/lookups/spf.c
-@@ -23,9 +23,6 @@ static void dummy(int x) { dummy2(x-1); }
+@@ -24,9 +24,6 @@ static void dummy(int x) { dummy2(x-1); }
#else
#include "lf_functions.h"
Index: patches/patch-src_spf_h
===================================================================
RCS file: /cvs/ports/mail/exim/patches/patch-src_spf_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_spf_h
--- patches/patch-src_spf_h 11 Mar 2022 19:34:36 -0000 1.3
+++ patches/patch-src_spf_h 9 Nov 2023 08:50:22 -0000
@@ -1,7 +1,7 @@
Index: src/spf.h
--- src/spf.h.orig
+++ src/spf.h
-@@ -10,10 +10,6 @@
+@@ -11,10 +11,6 @@
#ifdef SUPPORT_SPF
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/mail/exim/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST-main
--- pkg/PLIST-main 8 Nov 2022 11:14:49 -0000 1.6
+++ pkg/PLIST-main 9 Nov 2023 08:50:22 -0000
@@ -20,7 +20,9 @@ bin/exim_checkaccess
@bin bin/exim_dbmbuild
@bin bin/exim_dumpdb
@bin bin/exim_fixdb
+bin/exim_id_update
@bin bin/exim_lock
+bin/exim_msgdate
@bin bin/exim_tidydb
bin/eximstats
bin/exinext
smime.p7s
Description: S/MIME Cryptographic Signature
