diff options
| -rw-r--r-- | main/mariadb/APKBUILD | 23 | ||||
| -rw-r--r-- | main/mariadb/fix-pthread-detach.patch | 39 | ||||
| -rw-r--r-- | main/mariadb/fix-ucontext-check.patch | 18 |
3 files changed, 16 insertions, 64 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD index 03256605b7..61bf8efd1c 100644 --- a/main/mariadb/APKBUILD +++ b/main/mariadb/APKBUILD @@ -5,8 +5,8 @@ # Contributor: TBK <alpine@jjtc.eu> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mariadb -pkgver=10.3.10 -pkgrel=1 +pkgver=10.3.11 +pkgrel=0 pkgdesc="A fast SQL database server" url="http://www.mariadb.org" pkgusers="mysql" @@ -41,8 +41,6 @@ source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariad $pkgname.initd fix-c11-atomics-check.patch fix-mysql-install-db-path.patch - fix-ucontext-check.patch - fix-pthread-detach.patch ppc-remove-glibc-dep.patch pcre.cmake.patch " @@ -51,6 +49,19 @@ source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariad builddir="$srcdir/$pkgname-$pkgver" # secfixes: +# 10.3.11-r0: +# - CVE-2018-3282 +# - CVE-2016-9843 +# - CVE-2018-3174 +# - CVE-2018-3143 +# - CVE-2018-3156 +# - CVE-2018-3251 +# - CVE-2018-3185 +# - CVE-2018-3277 +# - CVE-2018-3162 +# - CVE-2018-3173 +# - CVE-2018-3200 +# - CVE-2018-3284 # 10.2.15-r0: # - CVE-2018-2786 # - CVE-2018-2759 @@ -405,11 +416,9 @@ _plugin_rocksdb() { "$subpkgdir"/usr/lib/mariadb/plugin/ha_rocksdb.so } -sha512sums="dee7789dff359a6352ceacb2db6bcb4730940e9458adda4e23894f9bfa0a7ff8c238060bffca58a60b662275e52a31ea1784d51fae114312b003c024e9412b31 mariadb-10.3.10.tar.gz +sha512sums="1adc1f9bbabf848726c669a7a0ab01257ba31882758b53fbf3b1316f2295670dba1c3d1f3292d7c1a749c701504588694a55d020839e690595897b0e20435298 mariadb-10.3.11.tar.gz 06751768cb00d2e433655635c38d267ef25084a5830ff40e719ac579223c7192dc34b43f919ab6faf480094632327511cbd22456064dde2d04dc15648b9e3b9f mariadb.initd b4469f2f0299e71c09b65c91373f2d72b7fe9a9cd58ad24737a78a8097473b29c32b7267e173a2dfe1158f2f7d40a7fb02fb1b35caeda44d16ae3b9e2602a75f fix-c11-atomics-check.patch 0c08198b907dad18c5a7ab89f37ff53da7cb102b0848fb58912900bd92468a0d4f853bc5c0116f655c500d5ed20dcbf20d3884dcd0040634e23c911dfeaf7001 fix-mysql-install-db-path.patch -2d42a3e4051aaeee49da52947dbc354d44d975ca50571777a0aba8bed032ccd6a07c29e0cbb9f74c396dce9937b5d16af19ab310638c285e418e0281361024f3 fix-ucontext-check.patch -60450ccc3b089953cb20ddd7c81aa1afbb52aa9d28211eeec0b9c04653b2bf5f56561315d8c8e0444d263cd412c28df91936d78daf1919dda9e402beb2243a43 fix-pthread-detach.patch e9ae4613f1d8c5f0a59b39a3548c46e50674ae78e7457d0e64c49f7e1573125c13634bbce7e29179bb8865a423171f852f43b96f7ef95619a95f02edcfc71efd ppc-remove-glibc-dep.patch 70da971aa78815495098205bcbd28428430aa83c3f1050fec0231ca86af9d9def2d2108a48ee08d86812c8dc5ad8ab1ef4e17a49b4936ed5187ae0f6a7ef8f63 pcre.cmake.patch" diff --git a/main/mariadb/fix-pthread-detach.patch b/main/mariadb/fix-pthread-detach.patch deleted file mode 100644 index 6729d096ae..0000000000 --- a/main/mariadb/fix-pthread-detach.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c45b4a774b6d1404a080a1c1759f780fa78f223b Mon Sep 17 00:00:00 2001 -From: Sergey Vojtovich <svoj@mariadb.org> -Date: Fri, 21 Sep 2018 16:04:16 +0400 -Subject: [PATCH] MDEV-17200 - pthread_detach called for already detached - threads - -pthread_detach_this_thread() was intended to be defined to something -meaningful only on some ancient unixes, which don't have -pthread_attr_setdetachstate() defined. Otherwise, on normal unixes, -threads are created detached in the first place. - -This was broken in 0f01bf267680244ec488adaf65a42838756ed48e so that -we started calling pthread_detach() for already detached threads. -Intention was to detach aria checkpoint thread. - -However in 87007dc2f71634cc460271eb277ad851ec69c04b aria service threads -were made joinable with appropriate handling, which makes breaking -revision unneccessary. - -Revert remnants of 0f01bf267680244ec488adaf65a42838756ed48e, so that -pthread_detach_this_thread() is meaningful only on some ancient unixes -again. ---- - include/my_pthread.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/my_pthread.h b/include/my_pthread.h -index 6b830ca36d24..ae2f912f979b 100644 ---- a/include/my_pthread.h -+++ b/include/my_pthread.h -@@ -184,7 +184,7 @@ int pthread_cancel(pthread_t thread); - #define pthread_key(T,V) pthread_key_t V - #define my_pthread_getspecific_ptr(T,V) my_pthread_getspecific(T,(V)) - #define my_pthread_setspecific_ptr(T,V) pthread_setspecific(T,(void*) (V)) --#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(tmp); } -+#define pthread_detach_this_thread() - #define pthread_handler_t EXTERNC void * - typedef void *(* pthread_handler)(void *); - diff --git a/main/mariadb/fix-ucontext-check.patch b/main/mariadb/fix-ucontext-check.patch deleted file mode 100644 index 7763ad6681..0000000000 --- a/main/mariadb/fix-ucontext-check.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/configure.cmake -+++ b/configure.cmake -@@ -1018,9 +1018,12 @@ - - 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_UCONTEXT_HEADER) -+IF(NOT HAVE_UCONTEXT_HEADER) -+ CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_UCONTEXT_HEADER) -+ENDIF() -+IF(HAVE_UCONTEXT_HEADER) -+ CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H) - ENDIF() - IF(HAVE_UCONTEXT_H) - CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H) |