From aa137e3344daea3643e446204bffc461c41f9708 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 15 Sep 2021 13:43:56 +0800 Subject: mariadb: Upgrade to 10.5.12 Fixes for the following security vulnerabilities: CVE-2021-2372 CVE-2021-2389 Signed-off-by: Mingli Yu Signed-off-by: Armin Kuster --- .../recipes-dbs/mysql/mariadb-native_10.5.11.bb | 20 ---------------- .../recipes-dbs/mysql/mariadb-native_10.5.12.bb | 20 ++++++++++++++++ meta-oe/recipes-dbs/mysql/mariadb.inc | 2 +- .../mariadb/clang_version_header_conflict.patch | 4 ++-- meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb | 27 ---------------------- meta-oe/recipes-dbs/mysql/mariadb_10.5.12.bb | 27 ++++++++++++++++++++++ 6 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb-native_10.5.11.bb create mode 100644 meta-oe/recipes-dbs/mysql/mariadb-native_10.5.12.bb delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb create mode 100644 meta-oe/recipes-dbs/mysql/mariadb_10.5.12.bb diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.11.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.11.bb deleted file mode 100644 index 73b2a0980d..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.11.bb +++ /dev/null @@ -1,20 +0,0 @@ -require mariadb.inc -inherit native - -PROVIDES += "mysql5-native" -DEPENDS = "ncurses-native zlib-native bison-native libpcre2-native" - -RDEPENDS_${PN} = "" -PACKAGES = "" -EXTRA_OEMAKE = "" - -do_install() { - oe_runmake 'DESTDIR=${D}' install - - install -d ${D}${bindir} - install -m 0755 sql/gen_lex_hash ${D}${bindir}/ - install -m 0755 sql/gen_lex_token ${D}${bindir}/ - install -m 0755 extra/comp_err ${D}${bindir}/ - install -m 0755 scripts/comp_sql ${D}${bindir}/ -} - diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.12.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.12.bb new file mode 100644 index 0000000000..73b2a0980d --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.12.bb @@ -0,0 +1,20 @@ +require mariadb.inc +inherit native + +PROVIDES += "mysql5-native" +DEPENDS = "ncurses-native zlib-native bison-native libpcre2-native" + +RDEPENDS_${PN} = "" +PACKAGES = "" +EXTRA_OEMAKE = "" + +do_install() { + oe_runmake 'DESTDIR=${D}' install + + install -d ${D}${bindir} + install -m 0755 sql/gen_lex_hash ${D}${bindir}/ + install -m 0755 sql/gen_lex_token ${D}${bindir}/ + install -m 0755 extra/comp_err ${D}${bindir}/ + install -m 0755 scripts/comp_sql ${D}${bindir}/ +} + 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 \ " SRC_URI_append_libc-musl = " file://ppc-remove-glibc-dep.patch" -SRC_URI[sha256sum] = "761053605fe30ce393f324852117990350840a93b3e6305ef4d2f8c8305cc47a" +SRC_URI[sha256sum] = "ab4f1ca69a30c5372e191a68e8b543a74168327680fb1f4067e8cc0a5582e4bd" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" 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 set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR}) endif() --file(READ ${MRN_SOURCE_DIR}/version MRN_VERSION) +-file(READ ${MRN_SOURCE_DIR}/version_full MRN_VERSION) +file(READ ${MRN_SOURCE_DIR}/ver MRN_VERSION) file(READ ${MRN_SOURCE_DIR}/version_major MRN_VERSION_MAJOR) file(READ ${MRN_SOURCE_DIR}/version_minor MRN_VERSION_MINOR) @@ -25,7 +25,7 @@ Signed-off-by: Khem Raj @@ -0,0 +1 @@ +7.07 \ No newline at end of file ---- a/storage/mroonga/version +--- a/storage/mroonga/version_full +++ /dev/null @@ -1 +0,0 @@ -7.07 diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb deleted file mode 100644 index 57d7736ea3..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb +++ /dev/null @@ -1,27 +0,0 @@ -require mariadb.inc - -inherit qemu - -DEPENDS += "qemu-native bison-native boost libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2" - -PROVIDES += "mysql5 libmysqlclient" - -RPROVIDES_${PN} += "mysql5" -RREPLACES_${PN} += "mysql5" -RCONFLICTS_${PN} += "mysql5" - -RPROVIDES_${PN}-dbg += "mysql5-dbg" -RREPLACES_${PN}-dbg += "mysql5-dbg" -RCONFLICTS_${PN}-dbg += "mysql5-dbg" - -RPROVIDES_${PN}-leftovers += "mysql5-leftovers" -RREPLACES_${PN}-leftovers += "mysql5-leftovers" -RCONFLICTS_${PN}-leftovers += "mysql5-leftovers" - -RPROVIDES_${PN}-client += "mysql5-client" -RREPLACES_${PN}-client += "mysql5-client" -RCONFLICTS_${PN}-client += "mysql5-client" - -RPROVIDES_${PN}-server += "mysql5-server" -RREPLACES_${PN}-server += "mysql5-server" -RCONFLICTS_${PN}-server += "mysql5-server" diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.5.12.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.5.12.bb new file mode 100644 index 0000000000..57d7736ea3 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb_10.5.12.bb @@ -0,0 +1,27 @@ +require mariadb.inc + +inherit qemu + +DEPENDS += "qemu-native bison-native boost libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2" + +PROVIDES += "mysql5 libmysqlclient" + +RPROVIDES_${PN} += "mysql5" +RREPLACES_${PN} += "mysql5" +RCONFLICTS_${PN} += "mysql5" + +RPROVIDES_${PN}-dbg += "mysql5-dbg" +RREPLACES_${PN}-dbg += "mysql5-dbg" +RCONFLICTS_${PN}-dbg += "mysql5-dbg" + +RPROVIDES_${PN}-leftovers += "mysql5-leftovers" +RREPLACES_${PN}-leftovers += "mysql5-leftovers" +RCONFLICTS_${PN}-leftovers += "mysql5-leftovers" + +RPROVIDES_${PN}-client += "mysql5-client" +RREPLACES_${PN}-client += "mysql5-client" +RCONFLICTS_${PN}-client += "mysql5-client" + +RPROVIDES_${PN}-server += "mysql5-server" +RREPLACES_${PN}-server += "mysql5-server" +RCONFLICTS_${PN}-server += "mysql5-server" -- cgit v1.2.3-54-g00ecf