aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2020-11-04 18:05:47 +0100
committerMilan P. Stanić <mps@arvanta.net>2020-12-02 22:36:47 +0000
commit40b5d860a517a232f3eec2cc644135c19172196a (patch)
tree9631806ebdfc4098cdddc78b67c9db2a0aa4c9f0
parent9c57cee80c81eaf5260a4d2c6cb780491138f7f5 (diff)
downloadaports-40b5d860a517a232f3eec2cc644135c19172196a.tar.gz
aports-40b5d860a517a232f3eec2cc644135c19172196a.tar.bz2
aports-40b5d860a517a232f3eec2cc644135c19172196a.tar.xz
main/mariadb: security upgrade to 10.5.8
Co-authored-by: Bluemax <800-Bluemax@users.gitlab.alpinelinux.org>
-rw-r--r--main/mariadb/APKBUILD15
-rw-r--r--main/mariadb/disable-failing-test.patch11
-rw-r--r--main/mariadb/have_stacktrace.patch21
-rw-r--r--main/mariadb/ppc-remove-glibc-dep.patch10
4 files changed, 48 insertions, 9 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD
index d6a25dec8e..b48a7257c2 100644
--- a/main/mariadb/APKBUILD
+++ b/main/mariadb/APKBUILD
@@ -7,7 +7,7 @@
# Contributor: Jake Buchholz <tomalok@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mariadb
-pkgver=10.5.6
+pkgver=10.5.8
pkgrel=0
pkgdesc="A fast SQL database server"
url="https://www.mariadb.org/"
@@ -41,9 +41,15 @@ source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariad
$pkgname.initd
ppc-remove-glibc-dep.patch
disable-failing-test.patch
+ have_stacktrace.patch
"
# secfixes:
+# 10.5.8-r0:
+# - CVE-2020-14765
+# - CVE-2020-14776
+# - CVE-2020-14789
+# - CVE-2020-14812
# 10.5.6-r0:
# - CVE-2020-15180
# 10.4.13-r0:
@@ -444,7 +450,8 @@ _plugin_rocksdb() {
"$subpkgdir"/usr/lib/mariadb/plugin/ha_rocksdb.so
}
-sha512sums="c62bd6278d389baf179962bc6f617693cf3ba748382e96963b1ef5bbee8d1c9f0964025cf00fb7ff5de088a79362b65657ed30a8adbb61fe524bfd0d8d753421 mariadb-10.5.6.tar.gz
+sha512sums="9801a68440a3502b49655e34dcbfd09734f4a4f1ba8621ed9b895e194cea461a8c69fb0ff66488d5defd3065b43f73e5083a60142e11cc7e4a442f86769b06e5 mariadb-10.5.8.tar.gz
c352969f6665b0ffa387f7b185a5dea7751f4b16c12c809627857b27321efa09159369d7dd5c852d6159a9f173cb895fb601f0c52a1fa6e3527899520030964c mariadb.initd
-e9ae4613f1d8c5f0a59b39a3548c46e50674ae78e7457d0e64c49f7e1573125c13634bbce7e29179bb8865a423171f852f43b96f7ef95619a95f02edcfc71efd ppc-remove-glibc-dep.patch
-0f5f2147e80b21abe65ccdee72b7d820ea1459112802e44f63d00d9247704d6a5562fce146a255e02f7367bc5d81cffe4e7c39758d533bf5ec9a6544a2a25738 disable-failing-test.patch"
+b15d5cbe4e1547ad18cd1ce5a2d5a75d8dd8e017ca725154abdf28d3d1cae8403e0c3e93745441872f72e1ba9f2fef587f596231a231e374bd5a61ba3d8945ea ppc-remove-glibc-dep.patch
+598490b4bb45c9f7be46086d25c2b6c601d417c45f11aa519c2290065e7d6e98a7519f9860b823e67a8fd3e6ce3b4728af73ec3a2c66eec32b42fd4ad7cc07f7 disable-failing-test.patch
+4965275371e6d5e08e32a16fcfff2e68dfdcf6f4c30e5beffe18dcf56b503cbf373feeda814694e048964b16165ad65156c32fe27e974bed47201e8cf60736c6 have_stacktrace.patch"
diff --git a/main/mariadb/disable-failing-test.patch b/main/mariadb/disable-failing-test.patch
index 4eeac25107..6c546decbc 100644
--- a/main/mariadb/disable-failing-test.patch
+++ b/main/mariadb/disable-failing-test.patch
@@ -17,3 +17,14 @@ index a2da150..fd04ef4 100644
SET(ma_pagecache_single_src ma_pagecache_single.c test_file.c test_file.h)
SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- a/unittest/mysys/CMakeLists.txt 2020-11-10 14:15:06.000000000 +0100
++++ b/unittest/mysys/CMakeLists.txt 2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+ byte_order
+- queues stacktrace crc32 LINK_LIBRARIES mysys)
++ queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/main/mariadb/have_stacktrace.patch b/main/mariadb/have_stacktrace.patch
new file mode 100644
index 0000000000..e53734f070
--- /dev/null
+++ b/main/mariadb/have_stacktrace.patch
@@ -0,0 +1,21 @@
+https://jira.mariadb.org/browse/MDEV-24131
+
+diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
+index 8fa0db15b36..67eb099028e 100644
+--- a/unittest/mysys/stacktrace-t.c
++++ b/unittest/mysys/stacktrace-t.c
+@@ -22,6 +22,14 @@
+
+ char b_bss[10];
+
++#ifndef HAVE_STACKTRACE
++int my_safe_print_str(const char* val, size_t max_len)
++{
++ printf("%*s\n", (int) max_len, val);
++ return 0;
++}
++#endif
++
+ void test_my_safe_print_str()
+ {
+ char b_stack[10];
diff --git a/main/mariadb/ppc-remove-glibc-dep.patch b/main/mariadb/ppc-remove-glibc-dep.patch
index 57f5008b86..264ad96efe 100644
--- a/main/mariadb/ppc-remove-glibc-dep.patch
+++ b/main/mariadb/ppc-remove-glibc-dep.patch
@@ -26,14 +26,14 @@ index f2e26fca..94599b74 100644
#define HMT_high() asm volatile("or 3,3,3")
#else
@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
- */
- YieldProcessor();
+ __asm__ __volatile__ ("pause");
+ #endif
#elif defined(_ARCH_PWR8)
- __ppc_get_timebase();
+ __builtin_ppc_get_timebase();
- #else
- int32 var, oldval = 0;
- my_atomic_cas32_strong_explicit(&var, &oldval, 1, MY_MEMORY_ORDER_RELAXED,
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+ /* Mainly, prevent the compiler from optimizing away delay loops */
+ __asm__ __volatile__ ("":::"memory");
diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
index c4c45b8e..2f7a07f5 100644
--- a/storage/tokudb/PerconaFT/portability/toku_time.h