diff options
| author | Mingli Yu <mingli.yu@windriver.com> | 2021-09-15 13:43:56 +0800 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2021-09-15 07:45:38 -0700 |
| commit | aa137e3344daea3643e446204bffc461c41f9708 (patch) | |
| tree | 227c1ac42211484c7452d51230da648d85ad3555 | |
| parent | dc262c52b0b10625bf7a2330e1c4e0fe2d8db6aa (diff) | |
| download | meta-openembedded-aa137e3344daea3643e446204bffc461c41f9708.tar.gz | |
mariadb: Upgrade to 10.5.12
Fixes for the following security vulnerabilities:
CVE-2021-2372
CVE-2021-2389
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb-native_10.5.12.bb (renamed from meta-oe/recipes-dbs/mysql/mariadb-native_10.5.11.bb) | 0 | ||||
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb.inc | 2 | ||||
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/clang_version_header_conflict.patch | 4 | ||||
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb_10.5.12.bb (renamed from meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.11.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.12.bb index 73b2a0980d..73b2a0980d 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.11.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.12.bb | |||
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 63ab940928..3ecb292560 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc | |||
| @@ -25,7 +25,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ | |||
| 25 | " | 25 | " |
| 26 | SRC_URI_append_libc-musl = " file://ppc-remove-glibc-dep.patch" | 26 | SRC_URI_append_libc-musl = " file://ppc-remove-glibc-dep.patch" |
| 27 | 27 | ||
| 28 | SRC_URI[sha256sum] = "761053605fe30ce393f324852117990350840a93b3e6305ef4d2f8c8305cc47a" | 28 | SRC_URI[sha256sum] = "ab4f1ca69a30c5372e191a68e8b543a74168327680fb1f4067e8cc0a5582e4bd" |
| 29 | 29 | ||
| 30 | UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" | 30 | UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" |
| 31 | 31 | ||
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/clang_version_header_conflict.patch b/meta-oe/recipes-dbs/mysql/mariadb/clang_version_header_conflict.patch index c77a869441..2b7afa34ef 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/clang_version_header_conflict.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/clang_version_header_conflict.patch | |||
| @@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 15 | set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR}) | 15 | set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR}) |
| 16 | endif() | 16 | endif() |
| 17 | 17 | ||
| 18 | -file(READ ${MRN_SOURCE_DIR}/version MRN_VERSION) | 18 | -file(READ ${MRN_SOURCE_DIR}/version_full MRN_VERSION) |
| 19 | +file(READ ${MRN_SOURCE_DIR}/ver MRN_VERSION) | 19 | +file(READ ${MRN_SOURCE_DIR}/ver MRN_VERSION) |
| 20 | file(READ ${MRN_SOURCE_DIR}/version_major MRN_VERSION_MAJOR) | 20 | file(READ ${MRN_SOURCE_DIR}/version_major MRN_VERSION_MAJOR) |
| 21 | file(READ ${MRN_SOURCE_DIR}/version_minor MRN_VERSION_MINOR) | 21 | file(READ ${MRN_SOURCE_DIR}/version_minor MRN_VERSION_MINOR) |
| @@ -25,7 +25,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 25 | @@ -0,0 +1 @@ | 25 | @@ -0,0 +1 @@ |
| 26 | +7.07 | 26 | +7.07 |
| 27 | \ No newline at end of file | 27 | \ No newline at end of file |
| 28 | --- a/storage/mroonga/version | 28 | --- a/storage/mroonga/version_full |
| 29 | +++ /dev/null | 29 | +++ /dev/null |
| 30 | @@ -1 +0,0 @@ | 30 | @@ -1 +0,0 @@ |
| 31 | -7.07 | 31 | -7.07 |
diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.5.12.bb index 57d7736ea3..57d7736ea3 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb_10.5.12.bb | |||