diff options
Diffstat (limited to 'user/mariadb')
| -rw-r--r-- | user/mariadb/APKBUILD | 12 | ||||
| -rw-r--r-- | user/mariadb/libedit.patch | 57 | ||||
| -rw-r--r-- | user/mariadb/ppchax.patch | 4 |
3 files changed, 9 insertions, 64 deletions
diff --git a/user/mariadb/APKBUILD b/user/mariadb/APKBUILD index 9dced4d5f..815a44faa 100644 --- a/user/mariadb/APKBUILD +++ b/user/mariadb/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=mariadb -pkgver=10.4.8 +pkgver=10.4.12 pkgrel=0 pkgdesc="Open source database server" url="https://mariadb.org/" @@ -27,12 +27,15 @@ subpackages="$pkgname-client $pkgname-server $pkgname-libs $pkgname-embedded source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz crc32-power.patch gcc_builtins_ppc.h - libedit.patch ppchax.patch mariadb.initd mariadb-server.limits " +# secfixes: +# 10.4.12-r0: +# - CVE-2020-7221 + build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" @@ -262,10 +265,9 @@ doc() { default_doc } -sha512sums="1aa7117734f4ebeb08395289ff1295e1d2ed2f89e8ccf3224cd60afaf2be56f81e8f0448e7619eeb6c858355a2b1e224efe42a0f400941f138342318adb66c42 mariadb-10.4.8.tar.gz +sha512sums="518dae18c04a1f7fcc6fd4d2dfbfbfbdf5e83e72ca41e66e1074328df8d92ab41b458e6a9973771419ac09a7348f264f158916cd198c335085d6e823e707bbc6 mariadb-10.4.12.tar.gz 03a4f60674cb45bcccb59971260c56f0f5f64eb79ad4078c485bc8112df2b9ee2b4eb08350530443b318440787b672b2947bc439783e813a32350f9179417cd0 crc32-power.patch 15ae6d4564c5c8b8583502acd54bf0019e8a62ebcf87278015506e58848cb6996ff61ca055897f9192b8818808adeeac15b8f786065cfd071cc264ca1922f7e3 gcc_builtins_ppc.h -41dc407cc16e7af5a8b9527489016a052a8bce85bd3d00f0d06b98b3fef16a693849d15a9a15136ee8148829fe4570d03df65dfb6fe9f0bccc447cab1bd666f4 libedit.patch -0725c1c04ce01d6035d4fef5018709c8814228bf250503455c2aa7c972278fcb78b47e681a721cb42dc61508075e1485116d8c7ac924c584b4bf5ca6b27b6594 ppchax.patch +0cb265173923cb85517a1144cfa904dafe059c1f859e13b4415442cabbb414db5904f2dcee0e865914b0f9c181d1d61d220834cb187b14f8538a0d2552025a9d ppchax.patch 1a2b058aad5fd6d6964db58b663591299a5bf82e7ad21a105d53a3e7ad1c3674c737caf3ee12799cce947cf8ead1f3e789dd8afcfc769891f08208b3006f9654 mariadb.initd d47324b34a87410eddb554f65199d145dfba9ae40407a62fb77df4e1ebf13087d15eb28e61e5e7cc9139eb42f093a0955136edae4020822652a1f0b4e219849e mariadb-server.limits" diff --git a/user/mariadb/libedit.patch b/user/mariadb/libedit.patch deleted file mode 100644 index 14dc9db49..000000000 --- a/user/mariadb/libedit.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d9342e88289fa588ea2f1a094dbfc32f0693e23d Mon Sep 17 00:00:00 2001 -From: Sebastian Kemper <sebastian_ml@gmx.net> -Date: Tue, 9 Apr 2019 22:28:10 +0200 -Subject: [PATCH] cmake: support new libedit interface - -libedit changed it's interface a while ago. MariaDB's cmake file doesn't -recognize the new interface, the compile test fails: - -/mariadb-10.2.19/CMakeFiles/CMakeTmp/src.cxx: In function 'int main(int, char**)': -/mariadb-10.2.19/CMakeFiles/CMakeTmp/src.cxx:6:47: error: invalid conversion from 'char*' to 'int' [-fpermissive] - int res= (*rl_completion_entry_function)(0,0); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ - -Fix this by adding a detection for the new interface as well. - -Run-tested on a MIPS machine. - -Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net> ---- - cmake/readline.cmake | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/cmake/readline.cmake b/cmake/readline.cmake -index 12a8980b6a90..a2b2cc4c241f 100644 ---- a/cmake/readline.cmake -+++ b/cmake/readline.cmake -@@ -160,8 +160,20 @@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT) - int res= (*rl_completion_entry_function)(0,0); - completion_matches(0,0); - }" -- LIBEDIT_INTERFACE) -- SET(USE_LIBEDIT_INTERFACE ${LIBEDIT_INTERFACE}) -+ LIBEDIT_HAVE_COMPLETION_INT) -+ -+ CHECK_CXX_SOURCE_COMPILES(" -+ #include <stdio.h> -+ #include <readline.h> -+ int main(int argc, char **argv) -+ { -+ char res= *(*rl_completion_entry_function)(0,0); -+ completion_matches(0,0); -+ }" -+ LIBEDIT_HAVE_COMPLETION_CHAR) -+ IF(LIBEDIT_HAVE_COMPLETION_INT OR LIBEDIT_HAVE_COMPLETION_CHAR) -+ SET(USE_LIBEDIT_INTERFACE 1) -+ ENDIF() - ENDIF() - ENDMACRO() - -@@ -187,6 +199,7 @@ MACRO (MYSQL_CHECK_READLINE) - IF(USE_LIBEDIT_INTERFACE) - SET(MY_READLINE_INCLUDE_DIR ${LIBEDIT_INCLUDE_DIR}) - SET(MY_READLINE_LIBRARY ${LIBEDIT_LIBRARY} ${CURSES_LIBRARY}) -+ SET(USE_NEW_READLINE_INTERFACE ${LIBEDIT_HAVE_COMPLETION_CHAR}) - ELSE() - MYSQL_USE_BUNDLED_READLINE() - ENDIF() diff --git a/user/mariadb/ppchax.patch b/user/mariadb/ppchax.patch index 26ffb5189..4ce0d304b 100644 --- a/user/mariadb/ppchax.patch +++ b/user/mariadb/ppchax.patch @@ -1,6 +1,6 @@ --- mariadb-10.4.6/configure.cmake.old 2019-06-17 22:00:31.000000000 +0000 +++ mariadb-10.4.6/configure.cmake 2019-07-06 23:21:57.705655766 +0000 -@@ -922,6 +922,10 @@ +@@ -867,6 +867,10 @@ return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); }" HAVE_GCC_C11_ATOMICS) @@ -13,7 +13,7 @@ SET(HAVE_valgrind 1) --- mariadb-10.4.6/mysys/CMakeLists.txt.old 2019-06-17 22:00:32.000000000 +0000 +++ mariadb-10.4.6/mysys/CMakeLists.txt 2019-07-07 00:03:56.956394100 +0000 -@@ -91,6 +91,10 @@ +@@ -92,6 +92,10 @@ TARGET_LINK_LIBRARIES(mysys pthread) ENDIF() |