summaryrefslogtreecommitdiffstats
path: root/package/libopenssl/0005-apps-ocsp.c-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch
diff options
context:
space:
mode:
authorPeter Seiderer <ps.report@gmx.net>2019-01-29 10:39:19 +0100
committerPeter Korsgaard <peter@korsgaard.com>2019-02-04 21:57:54 +0100
commita8e3f5da86fd6a375f9509e81610c10aea791797 (patch)
tree8f921da7cae2541e4652e5dac5edeb4e43de8b6f /package/libopenssl/0005-apps-ocsp.c-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch
parent306f507f9d8655356598de7546b74a3c32cc1935 (diff)
downloadbuildroot-a8e3f5da86fd6a375f9509e81610c10aea791797.tar.gz
buildroot-a8e3f5da86fd6a375f9509e81610c10aea791797.zip
libopenssl: bump version to 1.1.1a
- 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>
Diffstat (limited to 'package/libopenssl/0005-apps-ocsp.c-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch')
-rw-r--r--package/libopenssl/0005-apps-ocsp.c-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/package/libopenssl/0005-apps-ocsp.c-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch b/package/libopenssl/0005-apps-ocsp.c-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch
new file mode 100644
index 0000000000..83989fe742
--- /dev/null
+++ b/package/libopenssl/0005-apps-ocsp.c-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch
@@ -0,0 +1,46 @@
+From 4c992673890f1d1ecb9aa46112b2ca80db016b67 Mon Sep 17 00:00:00 2001
+From: Richard Levitte <levitte@openssl.org>
+Date: Mon, 12 Nov 2018 18:16:27 +0100
+Subject: [PATCH] apps/ocsp.c Use the same HAVE_FORK / NO_FORK as in speed.c
+
+This allows the user to override our defaults if needed, and in a
+consistent manner.
+
+Partial fix for #7607
+
+Upstream: https://github.com/openssl/openssl/pull/7624
+Signed-off-by: Patrick Havelange <patrick.havelange@essensium.com>
+---
+ apps/ocsp.c | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/apps/ocsp.c b/apps/ocsp.c
+index 7fd78624bb..315b072932 100644
+--- a/apps/ocsp.c
++++ b/apps/ocsp.c
+@@ -36,7 +36,21 @@ NON_EMPTY_TRANSLATION_UNIT
+ # include <openssl/x509v3.h>
+ # include <openssl/rand.h>
+
+-# if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_NO_SOCK) \
++#ifndef HAVE_FORK
++# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS)
++# define HAVE_FORK 0
++# else
++# define HAVE_FORK 1
++# endif
++#endif
++
++#if HAVE_FORK
++# undef NO_FORK
++#else
++# define NO_FORK
++#endif
++
++# if !defined(NO_FORK) && !defined(OPENSSL_NO_SOCK) \
+ && !defined(OPENSSL_NO_POSIX_IO)
+ # define OCSP_DAEMON
+ # include <sys/types.h>
+--
+2.17.1
+
OpenPOWER on IntegriCloud