mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 07:28:39 +01:00
mariadb: security bump to 10.2.19
Many, many bug fixes, see release notes for details: https://mariadb.com/kb/en/library/mariadb-10219-release-notes/ Fixed CVEs: 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 OpenWrt package changes: - include sha256_password in libmariadb package - upstream provided new pkgconfig file libmariadb.pc - refreshed one patch, dropped two others (included in upstream source now) Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
@@ -1,18 +0,0 @@
|
||||
--- a/configure.cmake
|
||||
+++ b/configure.cmake
|
||||
@@ -1018,9 +1018,12 @@ CHECK_STRUCT_HAS_MEMBER("struct sockaddr
|
||||
|
||||
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)
|
||||
@@ -75,7 +75,7 @@ Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
|
||||
#define make_atomic_store_body(S) *a= v
|
||||
--- a/mysys/CMakeLists.txt
|
||||
+++ b/mysys/CMakeLists.txt
|
||||
@@ -80,6 +80,10 @@ IF(HAVE_BFD_H)
|
||||
@@ -81,6 +81,10 @@ IF(HAVE_BFD_H)
|
||||
TARGET_LINK_LIBRARIES(mysys bfd)
|
||||
ENDIF(HAVE_BFD_H)
|
||||
|
||||
|
||||
@@ -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 *);
|
||||
|
||||
Reference in New Issue
Block a user