diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 8fa2147114..714fe2d8df 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=exim -PKG_VERSION:=4.97.1 +PKG_VERSION:=4.98 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://ftp.exim.org/pub/exim/exim4/ -PKG_HASH:=bd782057509a793593508528590626d185ea160ce32cb34beda262e99cefdfa9 +PKG_HASH:=0ebc108a779f9293ba4b423c20818f9a3db79b60286d96abc6ba6b85a15852f7 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=GPL-2.0-or-later diff --git a/mail/exim/patches/030-openssl-deprecated.patch b/mail/exim/patches/030-openssl-deprecated.patch index b3ecb56626..1fb90087b6 100644 --- a/mail/exim/patches/030-openssl-deprecated.patch +++ b/mail/exim/patches/030-openssl-deprecated.patch @@ -34,7 +34,7 @@ #ifndef OPENSSL_NO_ECDH # include #endif -@@ -944,8 +947,9 @@ pkey = EVP_RSA_gen(2048); +@@ -947,8 +950,9 @@ pkey = EVP_RSA_gen(2048); X509_set_version(x509, 2); /* N+1 - version 3 */ ASN1_INTEGER_set(X509_get_serialNumber(x509), 1); @@ -46,7 +46,7 @@ X509_set_pubkey(x509, pkey); name = X509_get_subject_name(x509); -@@ -4979,8 +4983,8 @@ return string_fmt_append(g, +@@ -4972,8 +4976,8 @@ return string_fmt_append(g, " Runtime: %s\n" " : %s\n", OPENSSL_VERSION_TEXT, @@ -57,7 +57,7 @@ /* third line is 38 characters for the %s and the line is 73 chars long; the OpenSSL output includes a "built on: " prefix already. */ } -@@ -5022,8 +5026,6 @@ if (pidnow != pidlast) +@@ -5015,8 +5019,6 @@ if (pidnow != pidlast) is unique for each thread", this doesn't apparently apply across processes, so our own warning from vaguely_random_number_fallback() applies here too. Fix per PostgreSQL. */ diff --git a/mail/exim/patches/100-localscan_dlopen.patch b/mail/exim/patches/100-localscan_dlopen.patch index 69f62ed38e..cdf3e3eacd 100644 --- a/mail/exim/patches/100-localscan_dlopen.patch +++ b/mail/exim/patches/100-localscan_dlopen.patch @@ -10,7 +10,7 @@ Last-Update: 2021-07-28 --- a/src/EDITME +++ b/src/EDITME -@@ -904,6 +904,21 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -913,6 +913,21 @@ HEADERS_CHARSET="ISO-8859-1" #------------------------------------------------------------------------------ @@ -275,7 +275,7 @@ Last-Update: 2021-07-28 /* End of local_scan.h */ --- a/src/readconf.c +++ b/src/readconf.c -@@ -216,6 +216,9 @@ static optionlist optionlist_config[] = +@@ -219,6 +219,9 @@ static optionlist optionlist_config[] = { "local_from_prefix", opt_stringptr, {&local_from_prefix} }, { "local_from_suffix", opt_stringptr, {&local_from_suffix} }, { "local_interfaces", opt_stringptr, {&local_interfaces} }, @@ -287,7 +287,7 @@ Last-Update: 2021-07-28 #endif --- a/src/string.c +++ b/src/string.c -@@ -453,6 +453,7 @@ return ss; +@@ -455,6 +455,7 @@ return ss; #if (defined(HAVE_LOCAL_SCAN) || defined(EXPAND_DLFUNC)) \ && !defined(MACRO_PREDEF) && !defined(COMPILE_UTILITY) @@ -295,7 +295,7 @@ Last-Update: 2021-07-28 /************************************************* * Copy and save string * *************************************************/ -@@ -498,6 +499,7 @@ string_copyn_function(const uschar * s, +@@ -500,6 +501,7 @@ string_copyn_function(const uschar * s, { return string_copyn(s, n); } diff --git a/mail/exim/patches/200-fix-build.patch b/mail/exim/patches/200-fix-build.patch index e5c63c32d8..25a5298c71 100644 --- a/mail/exim/patches/200-fix-build.patch +++ b/mail/exim/patches/200-fix-build.patch @@ -1,6 +1,6 @@ --- a/src/exim.c +++ b/src/exim.c -@@ -642,13 +642,15 @@ exim_nullstd(void) +@@ -647,13 +647,15 @@ exim_nullstd(void) { int devnull = -1; struct stat statbuf; diff --git a/mail/exim/patches/300-avoid-time-printf.patch b/mail/exim/patches/300-avoid-time-printf.patch deleted file mode 100644 index f4f1c88ec0..0000000000 --- a/mail/exim/patches/300-avoid-time-printf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/transports/smtp.c -+++ b/src/transports/smtp.c -@@ -938,7 +938,7 @@ if ( sx->early_pipe_active - if (!(er = dbfn_read_enforce_length(dbm_file, ehlo_resp_key, sizeof(dbdata_ehlo_resp)))) - debug_printf("no ehlo-resp record!\n"); - else -- debug_printf("ehlo-resp record is %d seconds old\n", time(NULL) - er->time_stamp); -+ debug_printf("ehlo-resp record is %.0f seconds old\n", difftime(time(NULL), er->time_stamp)); - } - - dbfn_delete(dbm_file, ehlo_resp_key);