mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-14 05:49:57 +00:00
Code Issues Projects Releases Wiki Activity

mariadb: update to 10.4.17 for cve fixes

Browse Source 
Source: mariadb.org
MR: 107836, 107837, 107838, 107839, 107840, 107852, 106414, 106414, 107864, 107876, 107888
Type: Security Fix
Disposition: Backport from mariadb.org
ChangeID: 75fb83ced15990b94659af6e107c063d288cb037
Description:

refresh several patches
Drop 0001-Fix-build-breakage-from-lock_guard-error-6161.patch as fix included in update

Bugfix only update including these cves:

10.4.13
CVE-2020-2752
CVE-2020-2812
CVE-2020-2814
CVE-2020-2760
CVE-2020-13249

10.4.15
CVE-2020-15180

10.4.16
CVE-2020-14812
CVE-2020-14765
CVE-2020-14776
CVE-2020-14789
CVE-2020-28912 (MDEV-24040)

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2021-01-12 08:42:41 -08:00
parent b64ba801a5
commit aecc12c22e
11 changed files with 51 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-dbs/mysql/mariadb-native_10.4.12.bb → meta-oe/recipes-dbs/mysql/mariadb-native_10.4.17.bb
View File
meta-oe/recipes-dbs/mysql/mariadb.inc
+2 -4
View File
@@ -18,11 +18,9 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz
file://c11_atomics.patch \
file://clang_version_header_conflict.patch \
file://fix-arm-atomic.patch \
file://0001-Fix-build-breakage-from-lock_guard-error-6161.patch \
file://0001-Fix-library-LZ4-lookup.patch \
"
SRC_URI[md5sum] = "97d7c0f508c04a31c138fdb24e95dbc4"
SRC_URI[sha256sum] = "fef1e1d38aa253dd8a51006bd15aad184912fce31c446bb69434fcde735aa208"
SRC_URI[md5sum] = "e8193b9cd008b6d7f177f5a5c44c7a9f"
SRC_URI[sha256sum] = "a7b104e264311cd46524ae546ff0c5107978373e4a01cf7fd8a241454548d16e"
UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-build-breakage-from-lock_guard-error-6161.patch
-32
View File
@@ -1,32 +0,0 @@
Subject: [PATCH] Fix build breakage from lock_guard error (#6161)
Summary:
This change fixes a source issue that caused compile time error which
breaks build for many fbcode services in that setup. The size() member
function of channel is a const member, so member variables accessed
within it are implicitly const as well. This caused error when clang
fails to resolve to a constructor that takes std::mutex because the
suitable constructor got rejected due to loss of constness for its
argument. The fix is to add mutable modifier to the lock_ member of
channel.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6161
Differential Revision: D18967685
Pulled By: maysamyabandeh
Upstream-Status: Backport
fbshipit-source-id:698b6a5153c3c92eeacb842c467aa28cc350d432
--- a/storage/rocksdb/rocksdb/util/channel.h
+++ b/storage/rocksdb/rocksdb/util/channel.h
@@ -60,7 +60,7 @@ class channel {
private:
std::condition_variable cv_;
- std::mutex lock_;
+ mutable std::mutex lock_;
std::queue<T> buffer_;
bool eof_;
};
meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch
+8 -11
View File
@@ -8,15 +8,15 @@ Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
cmake/FindLZ4.cmake | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/cmake/FindLZ4.cmake b/cmake/FindLZ4.cmake
index e97dd63e2b0..2f4694e727c 100644
--- a/cmake/FindLZ4.cmake
+++ b/cmake/FindLZ4.cmake
@@ -1,5 +1,10 @@
-find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
-find_library(LZ4_LIBRARY NAMES lz4)
Index: mariadb-10.4.17/cmake/FindLZ4.cmake
===================================================================
--- mariadb-10.4.17.orig/cmake/FindLZ4.cmake
+++ mariadb-10.4.17/cmake/FindLZ4.cmake
@@ -1,5 +1,11 @@
find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
-find_library(LZ4_LIBRARIES NAMES lz4)
+find_path(LZ4_INCLUDE_DIR
+ NAMES lz4.h
+ NAMES lz4.h
+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+
+find_library(LZ4_LIBRARY
@@ -25,6 +25,3 @@ index e97dd63e2b0..2f4694e727c 100644
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(
--
2.17.1
meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch
+15 -9
View File
@@ -10,9 +10,11 @@ Date: Fri Dec 21 19:14:04 2018 +0200
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- a/configure.cmake
+++ b/configure.cmake
@@ -926,7 +926,25 @@ int main()
Index: mariadb-10.4.17/configure.cmake
===================================================================
--- mariadb-10.4.17.orig/configure.cmake
+++ mariadb-10.4.17/configure.cmake
@@ -863,7 +863,25 @@ int main()
long long int *ptr= &var;
return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
}"
@@ -39,10 +41,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
IF(WITH_VALGRIND)
SET(HAVE_valgrind 1)
--- a/mysys/CMakeLists.txt
+++ b/mysys/CMakeLists.txt
Index: mariadb-10.4.17/mysys/CMakeLists.txt
===================================================================
--- mariadb-10.4.17.orig/mysys/CMakeLists.txt
+++ mariadb-10.4.17/mysys/CMakeLists.txt
@@ -78,6 +78,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY})
${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY})
DTRACE_INSTRUMENT(mysys)
+IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
@@ -52,9 +56,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
IF(HAVE_BFD_H)
TARGET_LINK_LIBRARIES(mysys bfd)
ENDIF(HAVE_BFD_H)
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -178,6 +178,10 @@ ELSE()
Index: mariadb-10.4.17/sql/CMakeLists.txt
===================================================================
--- mariadb-10.4.17.orig/sql/CMakeLists.txt
+++ mariadb-10.4.17/sql/CMakeLists.txt
@@ -196,6 +196,10 @@ ELSE()
SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL})
ENDIF()
meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch
+5 -5
View File
@@ -21,11 +21,11 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
configure.cmake | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/configure.cmake b/configure.cmake
index 3cfc4b31..d017b3b3 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -930,10 +930,9 @@ HAVE_GCC_C11_ATOMICS)
Index: mariadb-10.4.17/configure.cmake
===================================================================
--- mariadb-10.4.17.orig/configure.cmake
+++ mariadb-10.4.17/configure.cmake
@@ -867,10 +867,9 @@ HAVE_GCC_C11_ATOMICS)
IF(WITH_VALGRIND)
SET(HAVE_valgrind 1)
meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch
+5 -8
View File
@@ -14,11 +14,11 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
CMakeLists.txt | 5 -----
1 file changed, 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc30750..4f9110e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -347,11 +347,6 @@ CHECK_PCRE()
Index: mariadb-10.4.17/CMakeLists.txt
===================================================================
--- mariadb-10.4.17.orig/CMakeLists.txt
+++ mariadb-10.4.17/CMakeLists.txt
@@ -376,11 +376,6 @@ CHECK_PCRE()
CHECK_SYSTEMD()
@@ -30,6 +30,3 @@ index fc30750..4f9110e 100644
#
# Setup maintainer mode options. Platform checks are
# not run with the warning options as to not perturb fragile checks
--
2.17.1
meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch
+5 -8
View File
@@ -15,11 +15,11 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
storage/rocksdb/build_rocksdb.cmake | 3 +++
1 file changed, 3 insertions(+)
diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
index d7895b0..3bcd52a 100644
--- a/storage/rocksdb/build_rocksdb.cmake
+++ b/storage/rocksdb/build_rocksdb.cmake
@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
Index: mariadb-10.4.17/storage/rocksdb/build_rocksdb.cmake
===================================================================
--- mariadb-10.4.17.orig/storage/rocksdb/build_rocksdb.cmake
+++ mariadb-10.4.17/storage/rocksdb/build_rocksdb.cmake
@@ -498,6 +498,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINA
ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
@@ -29,6 +29,3 @@ index d7895b0..3bcd52a 100644
IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error")
endif()
--
2.7.4
meta-oe/recipes-dbs/mysql/mariadb/sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch
+6 -6
View File
@@ -15,11 +15,11 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
sql/CMakeLists.txt | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index c6910f46..bf51f4cb 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -50,11 +50,16 @@ ${WSREP_INCLUDES}
Index: mariadb-10.4.17/sql/CMakeLists.txt
===================================================================
--- mariadb-10.4.17.orig/sql/CMakeLists.txt
+++ mariadb-10.4.17/sql/CMakeLists.txt
@@ -55,11 +55,16 @@ ${CMAKE_BINARY_DIR}/sql
@@ -41,7 +41,7 @@ index c6910f46..bf51f4cb 100644
ADD_DEFINITIONS(-DMYSQL_SERVER -DHAVE_EVENT_SCHEDULER)
@@ -370,11 +375,16 @@ IF(NOT CMAKE_CROSSCOMPILING)
@@ -364,11 +369,16 @@ IF(NOT CMAKE_CROSSCOMPILING)
ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
ENDIF()
meta-oe/recipes-dbs/mysql/mariadb/support-files-CMakeLists.txt-fix-do_populate_sysroot.patch
+5 -5
View File
@@ -15,11 +15,11 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
support-files/CMakeLists.txt | 7 -------
1 file changed, 7 deletions(-)
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
index b5767432..56733de1 100644
--- a/support-files/CMakeLists.txt
+++ b/support-files/CMakeLists.txt
@@ -165,12 +165,5 @@ IF(UNIX)
Index: mariadb-10.4.17/support-files/CMakeLists.txt
===================================================================
--- mariadb-10.4.17.orig/support-files/CMakeLists.txt
+++ mariadb-10.4.17/support-files/CMakeLists.txt
@@ -192,12 +192,5 @@ IF(UNIX)
INSTALL(FILES rpm/enable_encryption.preset DESTINATION ${INSTALL_SYSCONF2DIR}
COMPONENT IniFiles)
ENDIF()
meta-oe/recipes-dbs/mysql/mariadb_10.4.12.bb → meta-oe/recipes-dbs/mysql/mariadb_10.4.17.bb
View File