diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index 89d92fa55..cd153d0b1 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mariadb -PKG_VERSION:=10.2.21 +PKG_VERSION:=10.2.22 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -18,7 +18,7 @@ PKG_SOURCE_URL := \ https://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/$(PKG_NAME)-$(PKG_VERSION)/source \ https://downloads.mariadb.org/interstitial/$(PKG_NAME)-$(PKG_VERSION)/source -PKG_HASH:=637f0808b65ec06902897a2f885a60377828d019d35802402dca541f8113536c +PKG_HASH:=42f4c54c29b7c196bd105bbf4d2ea721f869b14cb7ba436c3566e6dd2760614c PKG_MAINTAINER:=Sebastian Kemper PKG_LICENSE:=GPL-2.0 LGPL-2.1 PKG_LICENSE_FILES:=COPYING libmariadb/COPYING.LIB diff --git a/utils/mariadb/patches/100-fix_hostname.patch b/utils/mariadb/patches/100-fix_hostname.patch index 829b98fb2..d428a7b7e 100644 --- a/utils/mariadb/patches/100-fix_hostname.patch +++ b/utils/mariadb/patches/100-fix_hostname.patch @@ -1,6 +1,6 @@ --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh -@@ -388,7 +388,7 @@ fi +@@ -399,7 +399,7 @@ fi # Try to determine the hostname diff --git a/utils/mariadb/patches/200-openssl-deprecated.patch b/utils/mariadb/patches/200-openssl-deprecated.patch deleted file mode 100644 index 2e499188c..000000000 --- a/utils/mariadb/patches/200-openssl-deprecated.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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();