From 88c7359f65381d49fa497f9e33bf54bb31a14e6c Mon Sep 17 00:00:00 2001 From: Danny Wood Date: Tue, 20 Jun 2023 12:18:55 +0100 Subject: [PATCH] package/mariadb: update to version 10.11.4 Remove 0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch as it is now upstream. Update README.md hash for minor formatting changes. Release notes: https://mariadb.com/kb/en/mariadb-10-11-4-release-notes/ Changelog: https://mariadb.com/kb/en/mariadb-10-11-4-changelog/ Signed-off-by: Danny Wood Signed-off-by: Peter Korsgaard --- ...mpat.h-fix-build-with-libressl-3.5.0.patch | 39 ------------------- package/mariadb/mariadb.hash | 6 +-- package/mariadb/mariadb.mk | 2 +- 3 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch diff --git a/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch b/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch deleted file mode 100644 index fd3e6e6607..0000000000 --- a/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 79ed770a37c8669390a58a4485dd8f5565fe2497 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 15 Jan 2023 19:12:05 +0100 -Subject: [PATCH] include/ssl_compat.h: fix build with libressl >= 3.5.0 - -Fix the following build failure with libressl >= 3.5.0: - -In file included from /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c:18: -/tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c: In function 'get_dh2048': -/tmp/instance-10/output-1/build/mariadb-10.3.36/include/ssl_compat.h:68:45: error: invalid use of incomplete typedef 'DH' {aka 'struct dh_st'} - 68 | #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) - | ^~ - -Fixes: - - http://autobuild.buildroot.org/results/524198344aafca58d214537af64c5961c407b0f8 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/MariaDB/server/pull/2435] ---- - include/ssl_compat.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/ssl_compat.h b/include/ssl_compat.h -index 664f3aac87c..3678e5fa084 100644 ---- a/include/ssl_compat.h -+++ b/include/ssl_compat.h -@@ -19,7 +19,8 @@ - /* OpenSSL version specific definitions */ - #if defined(OPENSSL_VERSION_NUMBER) - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ -+ !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) - #define HAVE_OPENSSL11 1 - #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) - #define ERR_remove_state(X) ERR_clear_error() --- -2.39.0 - diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index c4064cff66..03ce5a968a 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,6 +1,6 @@ -# From https://downloads.mariadb.org/mariadb/10.3.36 -sha512 321b4c48fcea4413eb239c4904c806306de660f2844edfa1d2a2a15213db287070d0f923db976588dfe329559d565bd98bddef3aaf8f14502f8c3db2ee27757a mariadb-10.3.36.tar.gz +# From https://downloads.mariadb.org/mariadb/10.11.4 +sha512 62fc05395857dd036ebeed53b1ff0ecd9abd95ce8e5316194286521caae0f9452cf96a93613adec809e39e1d8ef20c330b24fee82b3bb90ee27a84f2bbd0d8d2 mariadb-10.11.4.tar.gz # Hash for license files -sha256 084aa0007efac6dda6aafffb3f3ef8b66b105862dad7ee23f6a4b52813f84464 README.md +sha256 2b278a3a2f20696113a7c57c4f3e6a5cdb9a25f2a827e72e0c089a2f805ff91a README.md sha256 240a15a1d0f34d3abca462cdb7e5fb89470967563f16b0e71169e51c1e74cf2b COPYING diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 5fb8876278..a743d020c0 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MARIADB_VERSION = 10.3.36 +MARIADB_VERSION = 10.11.4 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text