diff options
| author |   Armin Kuster <akuster@mvista.com> | 2022-04-14 15:34:15 -0700 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2022-04-18 07:37:42 -0700 |
| commit | df8259cc49bbfef9c33e96bc90b853786e7f0712 (patch) | |
| tree | fde603b80ce85e0ed198f7b6ddd2aa5b41582b23 /meta-oe/recipes-dbs/mysql/mariadb.inc | |
| parent | 8314be774a6545e3150d98091e707332b444fcc9 (diff) | |
| download | meta-openembedded-df8259cc49bbfef9c33e96bc90b853786e7f0712.tar.gz | |
Mariadb: update to 10.4.24
Source: Mariadb.org
MR: 115460, 115507, 1115549, 115549, 115488
Type: Security Fix
Disposition: Backport from mariadb.org
ChangeID: 722782cefa6805e907ee377a340f1b8bec174079
Description:
Bug fix only update, includes these CVES:
CVE-2021-46665
CVE-2021-46664
CVE-2021-46661
CVE-2021-46668
CVE-2021-46663
For more information see: https://mariadb.com/kb/en/mariadb-10424-release-notes/
drop mariadb/c11_atomics.patch as its include in the update.
drop mariadb/clang_version_header_conflict.patch different fix applied
Signed-off-by: Armin Kuster <akuster@mvista.com>
Diffstat (limited to 'meta-oe/recipes-dbs/mysql/mariadb.inc')
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 0fb0c95ec3..9aca7371af 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -15,12 +15,10 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://support-files-CMakeLists.txt-fix-do_populate_sysroot.patch \ file://sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ file://0001-disable-ucontext-on-musl.patch \ - file://c11_atomics.patch \ - file://clang_version_header_conflict.patch \ file://fix-arm-atomic.patch \ " -SRC_URI[md5sum] = "c3bc7a3eca3b0bbae5748f7b22a55c0c" -SRC_URI[sha256sum] = "87d5e29ee1f18de153266ec658138607703ed2a05b3ffb1f89091d33f4abf545" +SRC_URI[md5sum] = "af39316a6803d13f84fb586635598036" +SRC_URI[sha256sum] = "fe975551b37f095640ea5e380eb896a37e331caf113dbe5d05564714338df846" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" |