* [meta-oe][PATCH] mariadb: Upgrade to 10.5.6
[not found] <20201013090826.23778-1-mingli.yu@windriver.com>
@ 2020-10-13 9:07 ` Yu, Mingli
2020-10-13 17:37 ` [oe] " Khem Raj
0 siblings, 1 reply; 3+ messages in thread
From: Yu, Mingli @ 2020-10-13 9:07 UTC (permalink / raw)
To: openembeded-devel
From: Mingli Yu <mingli.yu@windriver.com>
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>
---
...ive_10.5.4.bb => mariadb-native_10.5.6.bb} | 0
meta-oe/recipes-dbs/mysql/mariadb.inc | 3 +-
.../mariadb/0001-Fix-library-LZ4-lookup.patch | 4 +-
...DB-undefined-reference-to-crc32c_arm.patch | 48 -------------------
.../{mariadb_10.5.4.bb => mariadb_10.5.6.bb} | 0
5 files changed, 3 insertions(+), 52 deletions(-)
rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.5.4.bb =>
mariadb-native_10.5.6.bb} (100%)
delete mode 100644
meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch
rename meta-oe/recipes-dbs/mysql/{mariadb_10.5.4.bb =>
mariadb_10.5.6.bb} (100%)
diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.4.bb
b/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.5.4.bb
rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc
b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 46a64006d..7c92bbaad 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -19,9 +19,8 @@ SRC_URI =
"https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz
file://clang_version_header_conflict.patch \
file://fix-arm-atomic.patch \
file://0001-Fix-library-LZ4-lookup.patch \
-
file://0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch \
"
-SRC_URI[sha256sum] =
"26db2becc9cec37e99a4e73390bd2eaa74568e21f9cf110359f4f68b37154c72"
+SRC_URI[sha256sum] =
"ff05dd69e9f6992caf1053242db704f04eda6f9accbcc98b74edfaf6013c45c4"
UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
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 574dfd317..0cf0560e1 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 1856c1af7..000000000
---
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
-
diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.5.4.bb
b/meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb_10.5.4.bb
rename to meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [oe] [meta-oe][PATCH] mariadb: Upgrade to 10.5.6
2020-10-13 9:07 ` [meta-oe][PATCH] mariadb: Upgrade to 10.5.6 Yu, Mingli
@ 2020-10-13 17:37 ` Khem Raj
2020-10-14 7:17 ` [meta-oe][PATCH v2] " Yu, Mingli
0 siblings, 1 reply; 3+ messages in thread
From: Khem Raj @ 2020-10-13 17:37 UTC (permalink / raw)
To: Yu, Mingli; +Cc: openembeded-devel
please rebase it on master or master-next and resend.
On Tue, Oct 13, 2020 at 2:10 AM Yu, Mingli <mingli.yu@windriver.com> wrote:
>
> From: Mingli Yu <mingli.yu@windriver.com>
>
> 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>
> ---
> ...ive_10.5.4.bb => mariadb-native_10.5.6.bb} | 0
> meta-oe/recipes-dbs/mysql/mariadb.inc | 3 +-
> .../mariadb/0001-Fix-library-LZ4-lookup.patch | 4 +-
> ...DB-undefined-reference-to-crc32c_arm.patch | 48 -------------------
> .../{mariadb_10.5.4.bb => mariadb_10.5.6.bb} | 0
> 5 files changed, 3 insertions(+), 52 deletions(-)
> rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.5.4.bb =>
> mariadb-native_10.5.6.bb} (100%)
> delete mode 100644
> meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch
> rename meta-oe/recipes-dbs/mysql/{mariadb_10.5.4.bb =>
> mariadb_10.5.6.bb} (100%)
>
> diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.4.bb
> b/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb
> similarity index 100%
> rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.5.4.bb
> rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb
> diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc
> b/meta-oe/recipes-dbs/mysql/mariadb.inc
> index 46a64006d..7c92bbaad 100644
> --- a/meta-oe/recipes-dbs/mysql/mariadb.inc
> +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
> @@ -19,9 +19,8 @@ SRC_URI =
> "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz
> file://clang_version_header_conflict.patch \
> file://fix-arm-atomic.patch \
> file://0001-Fix-library-LZ4-lookup.patch \
> -
> file://0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch \
> "
> -SRC_URI[sha256sum] =
> "26db2becc9cec37e99a4e73390bd2eaa74568e21f9cf110359f4f68b37154c72"
> +SRC_URI[sha256sum] =
> "ff05dd69e9f6992caf1053242db704f04eda6f9accbcc98b74edfaf6013c45c4"
> UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
> 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 574dfd317..0cf0560e1 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 1856c1af7..000000000
> ---
> 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
> -
> diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.5.4.bb
> b/meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb
> similarity index 100%
> rename from meta-oe/recipes-dbs/mysql/mariadb_10.5.4.bb
> rename to meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb
> --
> 2.17.1
>
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [meta-oe][PATCH v2] mariadb: Upgrade to 10.5.6
2020-10-13 17:37 ` [oe] " Khem Raj
@ 2020-10-14 7:17 ` Yu, Mingli
0 siblings, 0 replies; 3+ messages in thread
From: Yu, Mingli @ 2020-10-14 7:17 UTC (permalink / raw)
To: openembedded-devel
From: Mingli Yu <mingli.yu@windriver.com>
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>
---
...ive_10.5.4.bb => mariadb-native_10.5.6.bb} | 0
meta-oe/recipes-dbs/mysql/mariadb.inc | 3 +-
.../mariadb/0001-Fix-library-LZ4-lookup.patch | 4 +-
...DB-undefined-reference-to-crc32c_arm.patch | 48 -------------------
.../{mariadb_10.5.4.bb => mariadb_10.5.6.bb} | 0
5 files changed, 3 insertions(+), 52 deletions(-)
rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.5.4.bb => mariadb-native_10.5.6.bb} (100%)
delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch
rename meta-oe/recipes-dbs/mysql/{mariadb_10.5.4.bb => mariadb_10.5.6.bb} (100%)
diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.4.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.5.4.bb
rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 46a64006d..7c92bbaad 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -19,9 +19,8 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz
file://clang_version_header_conflict.patch \
file://fix-arm-atomic.patch \
file://0001-Fix-library-LZ4-lookup.patch \
- file://0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch \
"
-SRC_URI[sha256sum] = "26db2becc9cec37e99a4e73390bd2eaa74568e21f9cf110359f4f68b37154c72"
+SRC_URI[sha256sum] = "ff05dd69e9f6992caf1053242db704f04eda6f9accbcc98b74edfaf6013c45c4"
UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
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 574dfd317..0cf0560e1 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 1856c1af7..000000000
--- 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
-
diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.5.4.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb_10.5.4.bb
rename to meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-14 7:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20201013090826.23778-1-mingli.yu@windriver.com>
2020-10-13 9:07 ` [meta-oe][PATCH] mariadb: Upgrade to 10.5.6 Yu, Mingli
2020-10-13 17:37 ` [oe] " Khem Raj
2020-10-14 7:17 ` [meta-oe][PATCH v2] " Yu, Mingli
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.