summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch
diff options
context:
space:
mode:
authorMingli Yu <mingli.yu@windriver.com>2020-10-14 15:17:10 +0800
committerKhem Raj <raj.khem@gmail.com>2020-10-14 08:39:34 -0700
commit2fffe8c60f0e2af215e594074be92b22d6b2a97e (patch)
tree8633298bdc7fed952601d228d3443c9defdfc388 /meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch
parent17bc2a137f1c249a167a478f596d61b5489e7fa4 (diff)
downloadmeta-openembedded-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/0001-Fix-library-LZ4-lookup.patch')
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch4
1 files changed, 2 insertions, 2 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
14+++ b/cmake/FindLZ4.cmake 14+++ b/cmake/FindLZ4.cmake
15@@ -1,5 +1,10 @@ 15@@ -1,5 +1,10 @@
16-find_path(LZ4_INCLUDE_DIR NAMES lz4.h) 16-find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
17-find_library(LZ4_LIBRARY NAMES lz4) 17-find_library(LZ4_LIBRARIES NAMES lz4)
18+find_path(LZ4_INCLUDE_DIR 18+find_path(LZ4_INCLUDE_DIR
19+ NAMES lz4.h 19+ NAMES lz4.h
20+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) 20+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
21+ 21+
22+find_library(LZ4_LIBRARY 22+find_library(LZ4_LIBRARIES
23+ NAMES lz4 23+ NAMES lz4
24+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) 24+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
25 25