diff options
| author |   Mingli Yu <mingli.yu@windriver.com> | 2020-10-14 15:17:10 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2020-10-14 08:39:34 -0700 |
| commit | 2fffe8c60f0e2af215e594074be92b22d6b2a97e (patch) | |
| tree | 8633298bdc7fed952601d228d3443c9defdfc388 /meta-oe/recipes-dbs/mysql/mariadb | |
| parent | 17bc2a137f1c249a167a478f596d61b5489e7fa4 (diff) | |
| download | meta-openembedded-contrib-2fffe8c60f0e2af215e594074be92b22d6b2a97e.tar.gz | |
mariadb: Upgrade to 10.5.6
Fixes for the following security vulnerabilities:
- CVE-2020-15180
Rebase one patch and remove one backported patch
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-dbs/mysql/mariadb')
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch | 4 | ||||
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch | 48 |
2 files changed, 2 insertions, 50 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch index 574dfd317a..0cf0560e11 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch @@ -14,12 +14,12 @@ index e97dd63e2b0..2f4694e727c 100644 +++ b/cmake/FindLZ4.cmake @@ -1,5 +1,10 @@ -find_path(LZ4_INCLUDE_DIR NAMES lz4.h) --find_library(LZ4_LIBRARY NAMES lz4) +-find_library(LZ4_LIBRARIES NAMES lz4) +find_path(LZ4_INCLUDE_DIR + NAMES lz4.h + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) + -+find_library(LZ4_LIBRARY ++find_library(LZ4_LIBRARIES + NAMES lz4 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch deleted file mode 100644 index 1856c1af76..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d88ea260882ca414e940cd6af225617f00503f71 Mon Sep 17 00:00:00 2001 -From: Krunal Bauskar <krunalbauskar@gmail.com> -Date: Mon, 27 Jul 2020 18:38:10 +0800 -Subject: [PATCH] MDEV-23137: RocksDB: undefined reference to crc32c_arm64 - -RocksDB fails to build on arm64: undefined reference to - `crc32c_arm64(unsigned int, unsigned char const*, unsigned int)' - -MariaDB uses storage/rocksdb/build_rocksdb.cmake to compile RocksDB. -Said cmake missed adding crc32c_arm64 compilation target so if -machine native architecture supported crc32 then complier would enable -usage of function defined in crc32c_arm64 causing the listed error. - -Added crc32c_arm64 complition target. - -closes #1642 - -Upstream-Status: Backport - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - storage/rocksdb/build_rocksdb.cmake | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake -index 3f3dca7e990..7d2252c5f77 100644 ---- a/storage/rocksdb/build_rocksdb.cmake -+++ b/storage/rocksdb/build_rocksdb.cmake -@@ -442,6 +442,16 @@ else() - util/crc32c_ppc.c - util/crc32c_ppc_asm.S) - endif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") -+ # aarch -+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64") -+ CHECK_CXX_COMPILER_FLAG("-march=armv8-a+crc+crypto" HAS_ARMV8_CRC) -+ if(HAS_ARMV8_CRC) -+ message(STATUS " HAS_ARMV8_CRC yes") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crc+crypto -Wno-unused-function") -+ list(APPEND ROCKSDB_SOURCES -+ util/crc32c_arm64.cc) -+ endif(HAS_ARMV8_CRC) -+ endif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64") - endif() - SET(SOURCES) - FOREACH(s ${ROCKSDB_SOURCES}) --- -2.17.1 - |