Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/exim/Makefile,v
retrieving revision 1.136
diff -u -p -r1.136 Makefile
--- Makefile 5 May 2021 15:08:15 -0000 1.136
+++ Makefile 29 Sep 2021 06:19:48 -0000
@@ -3,12 +3,11 @@
COMMENT-main = flexible mail transfer agent
COMMENT-eximon = X11 monitor tool for Exim MTA
-VERSION = 4.94.2
+VERSION = 4.95
DISTNAME = exim-${VERSION}
PKGNAME-main = exim-${VERSION}
FULLPKGNAME-eximon = exim-eximon-${VERSION}
FULLPKGPATH-eximon = ${PKGPATH},-eximon
-REVISION-main = 1
CATEGORIES = mail
@@ -90,8 +89,6 @@ EXIM_EXTRA_LIBS += -L${LOCALBASE}/lib -l
LIB_DEPENDS-main += security/cyrus-sasl2
WANTLIB-main += sasl2
.endif
-
-CFLAGS += -DEXIM_HAVE_OPENSSL_CIPHER_GET_ID
# Needed to build with base-gcc
.if !${PROPERTIES:Mclang}
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/exim/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo 4 May 2021 13:49:04 -0000 1.42
+++ distinfo 29 Sep 2021 06:19:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (exim-4.94.2.tar.gz) = OpHNalQTyICEKlhIOW00wu5/l+XDONmOXV+xO2r/KjA=
-SIZE (exim-4.94.2.tar.gz) = 2528512
+SHA256 (exim-4.95.tar.gz) = b92D7de/U73AoggYdkOqDEGGGrqaCaAm94NRrI52i5w=
+SIZE (exim-4.95.tar.gz) = 2566707
Index: patches/patch-Local_Makefile
===================================================================
RCS file: /cvs/ports/mail/exim/patches/patch-Local_Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Local_Makefile
--- patches/patch-Local_Makefile 19 Mar 2021 15:59:50 -0000 1.5
+++ patches/patch-Local_Makefile 29 Sep 2021 06:19:48 -0000
@@ -31,7 +31,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
- # If you are buliding with TLS, the library configuration must be done:
+ # If you are building with TLS, the library configuration must be done:
# Uncomment this if you are using OpenSSL
-# USE_OPENSSL=yes
@@ -44,7 +44,7 @@ Index: Local/Makefile
# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto
# Uncomment this if you are using GnuTLS
-@@ -337,7 +337,7 @@ TRANSPORT_SMTP=yes
+@@ -340,7 +340,7 @@ TRANSPORT_SMTP=yes
# This one is special-purpose, and commonly not required, so it is not
# included by default.
@@ -53,7 +53,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -346,9 +346,9 @@ TRANSPORT_SMTP=yes
+@@ -349,9 +349,9 @@ TRANSPORT_SMTP=yes
# MBX, is included only when requested. If you do not know what this is about,
# leave these settings commented out.
@@ -66,7 +66,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -406,17 +406,17 @@ LOOKUP_DBM=yes
+@@ -409,8 +409,8 @@ LOOKUP_DBM=yes
LOOKUP_LSEARCH=yes
LOOKUP_DNSDB=yes
@@ -77,6 +77,8 @@ Index: Local/Makefile
# LOOKUP_IBASE=yes
# LOOKUP_JSON=yes
# LOOKUP_LDAP=yes
+@@ -418,10 +418,10 @@ LOOKUP_DNSDB=yes
+
# LOOKUP_MYSQL=yes
# LOOKUP_MYSQL_PC=mariadb
-# LOOKUP_NIS=yes
@@ -88,7 +90,7 @@ Index: Local/Makefile
# LOOKUP_PGSQL=yes
# LOOKUP_REDIS=yes
# LOOKUP_SQLITE=yes
-@@ -508,7 +508,7 @@ SUPPORT_DANE=yes
+@@ -514,7 +514,7 @@ SUPPORT_DANE=yes
# and the MIME ACL. Please read the documentation to learn more about these
# features.
@@ -97,19 +99,20 @@ 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.
-@@ -595,9 +595,9 @@ DISABLE_MAL_MKS=yes
-
- # Uncomment the following line to add DMARC checking capability, implemented
+@@ -607,9 +607,9 @@ DISABLE_MAL_MKS=yes
# using libopendmarc libraries. You must have SPF and DKIM support enabled also.
+ # Library version libopendmarc-1.4.1-1.fc33.x86_64 (on Fedora 33) is known broken;
+ # 1.3.2-3 works. I seems that the OpenDMARC project broke their API.
-# SUPPORT_DMARC=yes
-+SUPPORT_DMARC=yes
- # CFLAGS += -I/usr/local/include
+-# CFLAGS += -I/usr/local/include
-# LDFLAGS += -lopendmarc
++SUPPORT_DMARC=yes
++# CFLAGS += -I/usr/local/include
+LDFLAGS += -lopendmarc
# Uncomment the following if you need to change the default. You can
# override it at runtime (main config option dmarc_tld_file)
# DMARC_TLD_FILE=/etc/exim/opendmarc.tlds
-@@ -758,18 +758,18 @@ FIXED_NEVER_USERS=root
+@@ -764,18 +764,18 @@ ALLOW_INSECURE_TAINTED_DATA=yes
# included in the Exim binary. You will then need to set up the run time
# configuration to make use of the mechanism(s) selected.
@@ -133,7 +136,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
-@@ -816,7 +816,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -822,7 +822,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
#
@@ -142,7 +145,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()
-@@ -905,7 +905,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -911,7 +911,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:
@@ -151,7 +154,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
-@@ -977,7 +977,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -983,7 +983,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.
@@ -160,7 +163,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -1038,9 +1038,9 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -1044,9 +1044,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.
@@ -172,7 +175,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -1105,7 +1105,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -1111,7 +1111,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.
@@ -181,7 +184,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -1153,7 +1153,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -1159,7 +1159,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# aliases). The following setting can be changed to specify a different
# location for the system alias file.
@@ -190,7 +193,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
-@@ -1418,7 +1418,7 @@ EXIM_TMPDIR="/tmp"
+@@ -1424,7 +1424,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_os_h-OpenBSD
===================================================================
RCS file: patches/patch-OS_os_h-OpenBSD
diff -N patches/patch-OS_os_h-OpenBSD
--- patches/patch-OS_os_h-OpenBSD 27 Mar 2021 13:49:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-OS_os_h-OpenBSD,v 1.1 2021/03/27 13:49:13 sthen Exp $
-
-Index: OS/os.h-OpenBSD
---- OS/os.h-OpenBSD.orig
-+++ OS/os.h-OpenBSD
-@@ -6,7 +6,7 @@
- #define HAVE_BSD_GETLOADAVG
- #define HAVE_MMAP
- #define HAVE_SYS_MOUNT_H
--#define SIOCGIFCONF_GIVES_ADDR
-+#define HAVE_GETIFADDRS
- #define HAVE_ARC4RANDOM
- /* In May 2014, OpenBSD 5.5 was released which cleaned up the arc4random_* API
- which removed the arc4random_stir() function. Set NOT_HAVE_ARC4RANDOM_STIR
Index: patches/patch-src_dmarc_c
===================================================================
RCS file: /cvs/ports/mail/exim/patches/patch-src_dmarc_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_dmarc_c
--- patches/patch-src_dmarc_c 4 May 2021 15:48:53 -0000 1.1
+++ patches/patch-src_dmarc_c 29 Sep 2021 06:19:48 -0000
@@ -6,7 +6,7 @@ https://github.com/trusteddomainproject/
Index: src/dmarc.c
--- src/dmarc.c.orig
+++ src/dmarc.c
-@@ -446,7 +446,7 @@ if (!dmarc_abort && !sender_host_authenticated)
+@@ -461,7 +461,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,
Hi,
This is an update for mail/exim to version 4.95.
It includes the patch from sthen@ to disable the printf %n checks (by
default in 4.95 source).
It also includes a patch to be able to compile properly with libressl
3.4.0, therefore removing the hack in the Makefile
The specific OpenBSD os.h patch can also be removed as this has been
included in exim by default too.
Best Regards
No comments:
Post a Comment