From 2fa60e3e6d9467e04d72f40f99d5036dbfbbfaa5 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 1 Jan 2019 13:52:01 -0800 Subject: [PATCH] mariadb: Fix compilation without deprecated OpenSSL APIs Signed-off-by: Rosen Penev --- utils/mariadb/Makefile | 2 +- utils/mariadb/patches/200-openssl-deprecated.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 utils/mariadb/patches/200-openssl-deprecated.patch diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index b499769fc..6ee7894b4 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mariadb PKG_VERSION:=10.2.19 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL := \ diff --git a/utils/mariadb/patches/200-openssl-deprecated.patch b/utils/mariadb/patches/200-openssl-deprecated.patch new file mode 100644 index 000000000..2e499188c --- /dev/null +++ b/utils/mariadb/patches/200-openssl-deprecated.patch @@ -0,0 +1,14 @@ +--- a/libmariadb/libmariadb/secure/openssl.c ++++ b/libmariadb/libmariadb/secure/openssl.c +@@ -419,8 +419,10 @@ void ma_tls_end() + if (mariadb_deinitialize_ssl) + { + #ifndef HAVE_OPENSSL_1_1_API +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10000000L + ERR_remove_state(0); ++#else ++ ERR_remove_thread_state(NULL); + #endif + EVP_cleanup(); + CRYPTO_cleanup_all_ex_data();