a8e3f5da86
- use BR2_TOOLCHAIN_HAS_UCONTEXT This is used to set -DOPENSSL_NO_ASYNC if needed. - apply the CFLAGS correctly when compiling with -Os (bugfix). - use -latomic when needed This fixes the build for br-sparc-uclibc-2018.05 - don't use madvise() if no MMU Trying to do so results in undefined reference to madvise() as it is not available on uclibc without MMU. The original openssl code checks if a macro used in the madvise call is defined. The problem comes from the fact that the code in crypto/mem_sec.c also includes a kernel header defining the same macro unconditionally. Thus the check is always true in that case. Upstream: https://github.com/openssl/openssl/pull/8089 - don't compile test/fuzzers These binaries introduced with 1.1.x sometimes do not compile. This is the case with the br-arm-cortex-m4-full toolchain - don't build ocsp daemon if no MMU. Patch from Richard Levitte. - correctly enable cryptodev engine Thanks to Arnout Vandecappelle for spotting this. - remove all parallel build patches (openssl build-system changed) - rebased 0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch to apply to Configurations/unix-Makefile.tmpl (Makefile template) - removed 0002-cryptodev-Fix-issue-with-signature-generation.patch (upstream applied) - rebased 0003-Reproducible-build-do-not-leak-compiler-path.patch to apply to crypto/build.info (Makefile template) - fix musl/uclibc build failure, use '-DOPENSSL_NO_ASYNC' - remove legacy enable-tlsext configure option - remove target/host libdir configure options, fixes openssl.pc installation path, fixes wget compile - change legacy INSTALL_PREFIX to DESTDIR - remove 'libraries gets installed read only, so strip fails' workaround (not needed anymore) - change engine directory from /usr/lib/engines to /usr/lib/engines-1.1 - change license file hash, no license change, only the following hint was removed: Actually both licenses are BSD-style Open Source licenses. In case of any license issues related to OpenSSL please contact openssl-core@openssl.org. Signed-off-by: Peter Seiderer <ps.report@gmx.net> Tested-by: Ryan Coe <bluemrp9@gmail.com> Signed-off-by: Vadim Kochan <vadim4j@gmail.com> Signed-off-by: Patrick Havelange <patrick.havelange@essensium.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
28 lines
889 B
Diff
28 lines
889 B
Diff
From 1281ffc7959bd2070563e17a52ee4424196d885c Mon Sep 17 00:00:00 2001
|
|
From: Patrick Havelange <patrick.havelange@essensium.com>
|
|
Date: Wed, 23 Jan 2019 12:21:21 +0100
|
|
Subject: [PATCH] Introduce the OPENSSL_NO_MADVISE to disable call to madvise()
|
|
|
|
Upstream: https://github.com/openssl/openssl/pull/8089
|
|
Signed-off-by: Patrick Havelange <patrick.havelange@essensium.com>
|
|
---
|
|
crypto/mem_sec.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
|
|
index 9e0f670..32c7282 100644
|
|
--- a/crypto/mem_sec.c
|
|
+++ b/crypto/mem_sec.c
|
|
@@ -485,7 +485,7 @@ static int sh_init(size_t size, int minsize)
|
|
if (mlock(sh.arena, sh.arena_size) < 0)
|
|
ret = 2;
|
|
#endif
|
|
-#ifdef MADV_DONTDUMP
|
|
+#if defined(MADV_DONTDUMP) && !defined(OPENSSL_NO_MADVISE)
|
|
if (madvise(sh.arena, sh.arena_size, MADV_DONTDUMP) < 0)
|
|
ret = 2;
|
|
#endif
|
|
--
|
|
2.17.1
|
|
|