diff --git a/package/mariadb/0002-cmake-fix-ucontext-detection.patch b/package/mariadb/0002-cmake-fix-ucontext-detection.patch deleted file mode 100644 index fff43e821e..0000000000 --- a/package/mariadb/0002-cmake-fix-ucontext-detection.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3c8d309616295045745e778000c0185eec4b21d9 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 7 Oct 2018 14:25:59 +0200 -Subject: [PATCH] cmake: fix ucontext detection - -On some archs uclibc does not provide the ucontext structure despite -providing ucontext.h, for details see -https://git.buildroot.net/buildroot/commit/?id=f1cbfeea95e6287c7a666aafc182ffa318eff262 - -This patch improves the detection of ucontext by making sure that -HAVE_UCONTEXT_H is only set when makecontext() was found. - -Patch sent upstream: https://github.com/MariaDB/server/pull/878 - -Signed-off-by: Bernd Kuhls ---- - configure.cmake | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.cmake b/configure.cmake -index d840dd4e565..a5df355ac42 100644 ---- a/configure.cmake -+++ b/configure.cmake -@@ -986,12 +986,12 @@ CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in6" sin6_len - - SET(CMAKE_EXTRA_INCLUDE_FILES) - --CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_H) --IF(NOT HAVE_UCONTEXT_H) -- CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_UCONTEXT_H) -+CHECK_INCLUDE_FILE(ucontext.h HAVE_FILE_UCONTEXT_H) -+IF(NOT HAVE_FILE_UCONTEXT_H) -+ CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_FILE_UCONTEXT_H) - ENDIF() --IF(HAVE_UCONTEXT_H) -- CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H) -+IF(HAVE_FILE_UCONTEXT_H) -+ CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H) - ENDIF() - - CHECK_STRUCT_HAS_MEMBER("struct timespec" tv_sec "time.h" STRUCT_TIMESPEC_HAS_TV_SEC) --- -2.19.0 - diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index 5b01b03dfc..f68eb40224 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,9 +1,9 @@ -# From https://downloads.mariadb.org/mariadb/10.3.10 -md5 a63e00179d5e09b63bf71860a19a5507 mariadb-10.3.10.tar.gz -sha1 187b3e3d7bcc6a4b03a2ca79b8d1930a6fcc76b2 mariadb-10.3.10.tar.gz -sha256 57767c048982811c7ab21d8527f6f36aa897386e8c7235f11b5505a924d68eda mariadb-10.3.10.tar.gz -sha512 dee7789dff359a6352ceacb2db6bcb4730940e9458adda4e23894f9bfa0a7ff8c238060bffca58a60b662275e52a31ea1784d51fae114312b003c024e9412b31 mariadb-10.3.10.tar.gz +# From https://downloads.mariadb.org/mariadb/10.3.11 +md5 e13ab133060886cda814d68ebd1dc27b mariadb-10.3.11.tar.gz +sha1 7b75d7ec06642f26ce197e07f5ba16283061cc87 mariadb-10.3.11.tar.gz +sha256 211655b794c9d5397ba3be6c90737eac02e882f296268299239db47ba328f1b2 mariadb-10.3.11.tar.gz +sha512 1adc1f9bbabf848726c669a7a0ab01257ba31882758b53fbf3b1316f2295670dba1c3d1f3292d7c1a749c701504588694a55d020839e690595897b0e20435298 mariadb-10.3.11.tar.gz # Hash for license files -sha256 5baa5057c525cacc9f7814215582ac150e5bb0b0007aa8f6ebc50a5c1b7a496d README.md +sha256 a298aaf95cb7e594d15b29ae6b5a9ee22a2be4344379fd29304df4e0f19f695a README.md sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 06d6365fab..e17649209a 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MARIADB_VERSION = 10.3.10 +MARIADB_VERSION = 10.3.11 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