1d3fe88d08
Fixes CVE-2019-13917: http://www.exim.org/static/doc/security/CVE-2019-13917.txtd185889f47
added new code to "Prebuild the data structure for builtin macros". This function needs a host-built binary called macro_predef, it depends on host-berkeleydb, host-pcre and optionally on host-openssl. With an openssl-enabled exim the host build of macro_predef will fail if host-openssl is missing: /usr/bin/gcc -DMACRO_PREDEF macro_predef.c In file included from hash.h:14, from exim.h:485, from macro_predef.c:11: sha_ver.h:37:12: fatal error: openssl/ssl.h: No such file or directory because macro_predef also has the an optional dependency on openssl: https://github.com/Exim/exim/blob/exim-4.92%2Bfixes/src/src/macro_predef.c#L130 Removed patches applied upstream: 0004:98913c8ea2
0005:cf3cd30606
0007:7ea1237c78 (diff-58af16fe62ea674adf1730edc078d175R6243)
Added patch to fix uClibc build. Added license hash, switched _SITE to https. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
36 lines
941 B
Diff
36 lines
941 B
Diff
From 68ea4fc7ca53bf010e5ec738ad078452f0eaa639 Mon Sep 17 00:00:00 2001
|
||
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||
Date: Tue, 23 Jul 2019 18:48:06 +0200
|
||
Subject: [PATCH] Fix uClibc build
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
structs.h:757:18: error: ‘NS_MAXMSG’ undeclared here (not in a function); did you mean ‘N_MASC’?
|
||
uschar answer[NS_MAXMSG]; /* the answer itself */
|
||
|
||
Patch sent upstream: https://github.com/Exim/exim/pull/70
|
||
|
||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||
---
|
||
OS/os.h-Linux | 4 ++++
|
||
1 file changed, 4 insertions(+)
|
||
|
||
diff --git a/OS/os.h-Linux b/OS/os.h-Linux
|
||
index 63cf9babd..1d82e9bad 100644
|
||
--- a/OS/os.h-Linux
|
||
+++ b/OS/os.h-Linux
|
||
@@ -87,5 +87,9 @@ then change the 0 to 1 in the next block. */
|
||
# define TCPI_OPT_SYN_DATA 32
|
||
#endif
|
||
|
||
+/* Needed for uClibc */
|
||
+#ifndef NS_MAXMSG
|
||
+# define NS_MAXMSG 65535
|
||
+#endif
|
||
|
||
/* End */
|
||
--
|
||
2.20.1
|
||
|