mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

exim: update to version 4.95 

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2021-10-09 04:08:28 +01:00
parent 264f7b2f5f
commit 40c71110f0
No known key found for this signature in database
GPG Key ID: 5A8F39C31C3217CA
3 changed files with 103 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/exim/Makefile
View File

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=exim PKG_NAME:=exim
PKG_VERSION:=4.94.2 PKG_VERSION:=4.95
PKG_RELEASE:=$(AUTORELEASE) PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://ftp.exim.org/pub/exim/exim4/ PKG_SOURCE_URL:=https://ftp.exim.org/pub/exim/exim4/
PKG_HASH:=051861fc89f06205162f12129fb7ebfe473383bb6194bf8642952bfd50329274 PKG_HASH:=cc9cb653fff2ea947c3702680b59c99ac0bd1bbf19976d37e22a463cd804f167
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org> PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE:=GPL-2.0-or-later

13
mail/exim/patches/030-openssl-deprecated.patch
View File

@ -13,7 +13,7 @@
} }
--- a/src/pdkim/signing.c --- a/src/pdkim/signing.c
+++ b/src/pdkim/signing.c +++ b/src/pdkim/signing.c
@@ -699,7 +699,6 @@ return NULL; @@ -704,7 +704,6 @@ return NULL;
void void
exim_dkim_init(void) exim_dkim_init(void)
{ {
@ -34,18 +34,19 @@
#ifndef OPENSSL_NO_ECDH #ifndef OPENSSL_NO_ECDH
# include <openssl/ec.h> # include <openssl/ec.h>
#endif #endif
@@ -1462,8 +1465,8 @@ if (!EVP_PKEY_assign_RSA(pkey, rsa)) @@ -834,8 +837,9 @@ if (!EVP_PKEY_assign_RSA(pkey, rsa))
X509_set_version(x509, 2); /* N+1 - version 3 */ X509_set_version(x509, 2); /* N+1 - version 3 */
ASN1_INTEGER_set(X509_get_serialNumber(x509), 1); ASN1_INTEGER_set(X509_get_serialNumber(x509), 1);
-X509_gmtime_adj(X509_get_notBefore(x509), 0); -X509_gmtime_adj(X509_get_notBefore(x509), 0);
-X509_gmtime_adj(X509_get_notAfter(x509), (long)60 * 60); /* 1 hour */ -X509_gmtime_adj(X509_get_notAfter(x509), (long)2 * 60 * 60); /* 2 hour */
+X509_gmtime_adj(X509_getm_notBefore(x509), 0); +X509_gmtime_adj(X509_getm_notBefore(x509), 0);
+X509_gmtime_adj(X509_getm_notAfter(x509), (long)60 * 60); /* 1 hour */ +X509_gmtime_adj(X509_getm_notAfter(x509), (long)2 * 60 * 60); /* 2 hour */
+
X509_set_pubkey(x509, pkey); X509_set_pubkey(x509, pkey);
name = X509_get_subject_name(x509); name = X509_get_subject_name(x509);
@@ -3897,8 +3900,8 @@ fprintf(f, "Library version: OpenSSL: Co @@ -4512,8 +4516,8 @@ fprintf(f, "Library version: OpenSSL: Co
" Runtime: %s\n" " Runtime: %s\n"
" : %s\n", " : %s\n",
OPENSSL_VERSION_TEXT, OPENSSL_VERSION_TEXT,
@ -56,7 +57,7 @@
/* third line is 38 characters for the %s and the line is 73 chars long; /* third line is 38 characters for the %s and the line is 73 chars long;
the OpenSSL output includes a "built on: " prefix already. */ the OpenSSL output includes a "built on: " prefix already. */
} }
@@ -3940,8 +3943,6 @@ if (pidnow != pidlast) @@ -4555,8 +4559,6 @@ if (pidnow != pidlast)
is unique for each thread", this doesn't apparently apply across processes, is unique for each thread", this doesn't apparently apply across processes,
so our own warning from vaguely_random_number_fallback() applies here too. so our own warning from vaguely_random_number_fallback() applies here too.
Fix per PostgreSQL. */ Fix per PostgreSQL. */

141
mail/exim/patches/100-localscan_dlopen.patch
View File

@ -1,17 +1,16 @@
--- a/src/config.h.defaults Description: Allow one to use and switch between different local_scan functions
+++ b/src/config.h.defaults without recompiling exim.
@@ -33,6 +33,8 @@ Do not put spaces between # and the 'def http://marc.merlins.org/linux/exim/files/sa-exim-current/ Original patch from
David Woodhouse, modified first by Derrick 'dman' Hudson and then by Marc
#define AUTH_VARS 3 MERLIN for SA-Exim and minor/major API version tracking
Author: David Woodhouse, Derrick 'dman' Hudson, Marc MERLIN
+#define DLOPEN_LOCAL_SCAN Origin: other, http://marc.merlins.org/linux/exim/files/sa-exim-current/
+ Forwarded: https://bugs.exim.org/show_bug.cgi?id=2671
#define BIN_DIRECTORY Last-Update: 2021-07-28
#define CONFIGURE_FILE
--- a/src/EDITME --- a/src/EDITME
+++ b/src/EDITME +++ b/src/EDITME
@@ -877,6 +877,24 @@ HEADERS_CHARSET="ISO-8859-1" @@ -883,6 +883,21 @@ HEADERS_CHARSET="ISO-8859-1"
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@ -20,54 +19,61 @@
+# to be recompiled with the desired local_scan function. For a full +# to be recompiled with the desired local_scan function. For a full
+# description of the API to this function, see the Exim specification. +# description of the API to this function, see the Exim specification.
+ +
+#DLOPEN_LOCAL_SCAN=yes +DLOPEN_LOCAL_SCAN=yes
+ +
+# If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the +# If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the
+# linker flags. Without it, the loaded .so won't be able to access any +# linker flags. Without it, the loaded .so won't be able to access any
+# functions from exim. +# functions from exim.
+ +
+LFLAGS = -rdynamic +LDFLAGS += -rdynamic
+ifeq ($(OSTYPE),Linux) +CFLAGS += -fvisibility=hidden
+LFLAGS += -ldl
+endif
+
+ +
+#------------------------------------------------------------------------------ +#------------------------------------------------------------------------------
# The default distribution of Exim contains only the plain text form of the # The default distribution of Exim contains only the plain text form of the
# documentation. Other forms are available separately. If you want to install # documentation. Other forms are available separately. If you want to install
# the documentation in "info" format, first fetch the Texinfo documentation # the documentation in "info" format, first fetch the Texinfo documentation
--- a/src/config.h.defaults
+++ b/src/config.h.defaults
@@ -35,6 +35,8 @@ Do not put spaces between # and the 'def
#define AUTH_VARS 4
+#define DLOPEN_LOCAL_SCAN
+
#define BIN_DIRECTORY
#define CONFIGURE_FILE
--- a/src/globals.c --- a/src/globals.c
+++ b/src/globals.c +++ b/src/globals.c
@@ -42,6 +42,10 @@ int optionlist_auths_size = nelem(op @@ -121,6 +121,10 @@ int dsn_ret = 0;
const pcre *regex_DSN = NULL;
uschar *no_aliases = NULL; uschar *dsn_advertise_hosts = NULL;
+#ifdef DLOPEN_LOCAL_SCAN +#ifdef DLOPEN_LOCAL_SCAN
+uschar *local_scan_path = NULL; +uschar *local_scan_path = NULL;
+#endif +#endif
+ +
#ifndef DISABLE_TLS
/* For comments on these variables, see globals.h. I'm too idle to BOOL gnutls_compat_mode = FALSE;
duplicate them here... */ BOOL gnutls_allow_auto_pkcs11 = FALSE;
--- a/src/globals.h --- a/src/globals.h
+++ b/src/globals.h +++ b/src/globals.h
@@ -162,6 +162,9 @@ extern int (*receive_feof)(void); @@ -156,6 +156,9 @@ extern int dsn_ret; /
extern int (*receive_ferror)(void); extern const pcre *regex_DSN; /* For recognizing DSN settings */
extern BOOL (*receive_smtp_buffered)(void); extern uschar *dsn_advertise_hosts; /* host for which TLS is advertised */
+#ifdef DLOPEN_LOCAL_SCAN +#ifdef DLOPEN_LOCAL_SCAN
+extern uschar *local_scan_path; /* Path to local_scan() library */ +extern uschar *local_scan_path; /* Path to local_scan() library */
+#endif +#endif
/* Input-reading functions for messages, so we can use special ones for
incoming TCP/IP. */
/* For clearing, saving, restoring address expansion variables. We have to have
the size of this vector set explicitly, because it is referenced from more than
--- a/src/local_scan.c --- a/src/local_scan.c
+++ b/src/local_scan.c +++ b/src/local_scan.c
@@ -5,61 +5,133 @@ @@ -6,58 +6,133 @@
/* Copyright (c) University of Cambridge 1995 - 2009 */
/* See the file NOTICE for conditions of use and distribution. */ /* See the file NOTICE for conditions of use and distribution. */
-
-/****************************************************************************** -/******************************************************************************
-This file contains a template local_scan() function that just returns ACCEPT. -This file contains a template local_scan() function that just returns ACCEPT.
-If you want to implement your own version, you should copy this file to, say -If you want to implement your own version, you should copy this file to, say
@ -84,10 +90,10 @@
-******************************************************************************/ -******************************************************************************/
- -
- -
-/* This is the only Exim header that you should include. The effect of /* This is the only Exim header that you should include. The effect of
-including any other Exim header is not defined, and may change from release to including any other Exim header is not defined, and may change from release to
-release. Use only the documented interface! */ release. Use only the documented interface! */
-
#include "local_scan.h" #include "local_scan.h"
- -
@ -116,19 +122,16 @@
- is used in the rejection message. - is used in the rejection message.
-*/ -*/
+#ifdef DLOPEN_LOCAL_SCAN +#ifdef DLOPEN_LOCAL_SCAN
+#include <stdlib.h>
+#include <dlfcn.h> +#include <dlfcn.h>
+static int (*local_scan_fn)(int fd, uschar **return_text) = NULL; +static int (*local_scan_fn)(int fd, uschar **return_text) = NULL;
+static int load_local_scan_library(void); +static int load_local_scan_library(void);
+extern uschar *local_scan_path; /* Path to local_scan() library */
+#endif +#endif
int int
local_scan(int fd, uschar **return_text) local_scan(int fd, uschar **return_text)
{ {
fd = fd; /* Keep picky compilers happy */
return_text = return_text;
-return LOCAL_SCAN_ACCEPT; -return LOCAL_SCAN_ACCEPT;
+
+#ifdef DLOPEN_LOCAL_SCAN +#ifdef DLOPEN_LOCAL_SCAN
+/* local_scan_path is defined AND not the empty string */ +/* local_scan_path is defined AND not the empty string */
+if (local_scan_path && *local_scan_path) +if (local_scan_path && *local_scan_path)
@ -159,8 +162,8 @@
+else +else
+#endif +#endif
+ return LOCAL_SCAN_ACCEPT; + return LOCAL_SCAN_ACCEPT;
} +}
+
+#ifdef DLOPEN_LOCAL_SCAN +#ifdef DLOPEN_LOCAL_SCAN
+ +
+static int load_local_scan_library(void) +static int load_local_scan_library(void)
@ -237,22 +240,66 @@
+ "local_scan() function - message temporarily rejected"); + "local_scan() function - message temporarily rejected");
+ return FALSE; + return FALSE;
+ } + }
+
+return TRUE; +return TRUE;
+} }
+
+#endif /* DLOPEN_LOCAL_SCAN */ +#endif /* DLOPEN_LOCAL_SCAN */
+ +
/* End of local_scan.c */ /* End of local_scan.c */
--- a/src/local_scan.h
+++ b/src/local_scan.h
@@ -27,6 +27,7 @@ settings, and the store functions. */
#include <stdarg.h>
#include <sys/types.h>
+#pragma GCC visibility push(default)
#include "config.h"
#include "mytypes.h"
#include "store.h"
@@ -166,6 +167,9 @@ extern header_line *header_list; /
extern BOOL host_checking; /* Set when checking a host */
extern uschar *interface_address; /* Interface for incoming call */
extern int interface_port; /* Port number for incoming call */
+#ifdef DLOPEN_LOCAL_SCAN
+extern uschar *local_scan_path;
+#endif
extern uschar *message_id; /* Internal id of message being handled */
extern uschar *received_protocol; /* Name of incoming protocol */
extern int recipients_count; /* Number of recipients */
@@ -235,4 +239,6 @@ extern pid_t child_open_exim2_functio
extern pid_t child_open_function(uschar **, uschar **, int, int *, int *, BOOL, const uschar *);
#endif
+#pragma GCC visibility pop
+
/* End of local_scan.h */
--- a/src/readconf.c --- a/src/readconf.c
+++ b/src/readconf.c +++ b/src/readconf.c
@@ -205,6 +205,9 @@ static optionlist optionlist_config[] = @@ -215,6 +215,9 @@ static optionlist optionlist_config[] =
{ "local_from_prefix", opt_stringptr, {&local_from_prefix} }, { "local_from_prefix", opt_stringptr, {&local_from_prefix} },
{ "local_from_suffix", opt_stringptr, {&local_from_suffix} }, { "local_from_suffix", opt_stringptr, {&local_from_suffix} },
{ "local_interfaces", opt_stringptr, {&local_interfaces} }, { "local_interfaces", opt_stringptr, {&local_interfaces} },
+#ifdef DLOPEN_LOCAL_SCAN +#ifdef DLOPEN_LOCAL_SCAN
+ { "local_scan_path", opt_stringptr, {&local_scan_path} }, + { "local_scan_path", opt_stringptr, &local_scan_path },
+#endif +#endif
#ifdef HAVE_LOCAL_SCAN #ifdef HAVE_LOCAL_SCAN
{ "local_scan_timeout", opt_time, {&local_scan_timeout} }, { "local_scan_timeout", opt_time, {&local_scan_timeout} },
#endif #endif
--- a/src/string.c
+++ b/src/string.c
@@ -418,6 +418,7 @@ return ss;
#if (defined(HAVE_LOCAL_SCAN) || defined(EXPAND_DLFUNC)) \
&& !defined(MACRO_PREDEF) && !defined(COMPILE_UTILITY)
+#pragma GCC visibility push(default)
/*************************************************
* Copy and save string *
*************************************************/
@@ -470,6 +471,7 @@ Ustrncpy(ss, s, n);
ss[n] = 0;
return ss;
}
+#pragma GCC visibility pop
#endif