diff --git a/package/mariadb/0001-add-extra-check-for-librt.patch b/package/mariadb/0001-add-extra-check-for-librt.patch index 0dd4c546fb..6e3fc70276 100644 --- a/package/mariadb/0001-add-extra-check-for-librt.patch +++ b/package/mariadb/0001-add-extra-check-for-librt.patch @@ -8,6 +8,8 @@ https://jira.mariadb.org/browse/MDEV-10841 Signed-off-by: Ryan Coe <bluemrp9@gmail.com> [Rebased on mariadb-10.3.30] Signed-off-by: Peter Seiderer <ps.report@gmx.net> +[Rebased on mariadb-10.3.36] +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- configure.cmake | 3 +++ 1 file changed, 3 insertions(+) @@ -23,9 +25,9 @@ index 1b85c31b..4a1cd847 100644 + IF(NOT LIBRT) + MY_SEARCH_LIBS(posix_spawn_file_actions_addclose rt LIBRT) + ENDIF() - set(THREADS_PREFER_PTHREAD_FLAG ON) - FIND_PACKAGE(Threads) + MY_SEARCH_LIBS(backtrace_symbols_fd execinfo LIBEXECINFO) + set(THREADS_PREFER_PTHREAD_FLAG ON) -- 2.32.0 diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index f7e3c7b744..c4064cff66 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,5 +1,5 @@ -# From https://downloads.mariadb.org/mariadb/10.3.35 -sha512 9355de944eccef4e0bc01b19ffc3c0c72cf88befae7385c6f0ee1ea47dbd98d23f6bb46af9c140acc48d9d9613552870684bc0b7ca1f3cff1dc09c1a2c801573 mariadb-10.3.35.tar.gz +# From https://downloads.mariadb.org/mariadb/10.3.36 +sha512 321b4c48fcea4413eb239c4904c806306de660f2844edfa1d2a2a15213db287070d0f923db976588dfe329559d565bd98bddef3aaf8f14502f8c3db2ee27757a mariadb-10.3.36.tar.gz # Hash for license files sha256 084aa0007efac6dda6aafffb3f3ef8b66b105862dad7ee23f6a4b52813f84464 README.md diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 4c855985b1..5fb8876278 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MARIADB_VERSION = 10.3.35 +MARIADB_VERSION = 10.3.36 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