From 2fffe8c60f0e2af215e594074be92b22d6b2a97e Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 14 Oct 2020 15:17:10 +0800 Subject: 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 Signed-off-by: Khem Raj --- ...RocksDB-undefined-reference-to-crc32c_arm.patch | 48 ---------------------- 1 file changed, 48 deletions(-) delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch (limited to 'meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch') 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 -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 ---- - 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 - -- cgit 1.2.3-korg