Browse Source

Merge pull request #7833 from neheb/m

mariadb: Fix compilation without deprecated OpenSSL APIs
lilik-openwrt-22.03
Hannu Nyman 6 years ago
committed by GitHub
parent
commit
f1561b309d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
  1. +1
    -1
      utils/mariadb/Makefile
  2. +14
    -0
      utils/mariadb/patches/200-openssl-deprecated.patch

+ 1
- 1
utils/mariadb/Makefile View File

@ -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 := \


+ 14
- 0
utils/mariadb/patches/200-openssl-deprecated.patch View File

@ -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();

Loading…
Cancel
Save