From 7007d14c2558f86a49c2e2acb6154432c2ba4092 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Tue, 4 Apr 2023 10:02:57 -0400 Subject: mariadb: Update to latest lts 10.4.28 Source: Mariadb.org MR: 119595, 119604, 119613, 119622, 119631, 119640, 119649, 119658, 119573 Type: Security Fix Disposition: Backport from mariadb.org ChangeID: 2aacce87739247d98ee5b61d1b714930da961a30 Description: This is a bug fix only update. Includes these CVES: CVE-2022-32081 CVE-2022-32083 CVE-2022-32084 CVE-2022-32085 CVE-2022-32086 CVE-2022-32087 CVE-2022-32088 CVE-2022-32089 CVE-2022-32091 Signed-off-by: Armin Kuster Signed-off-by: Armin Kuster -- V2] Missed on CVE reference. --- .../recipes-dbs/mysql/mariadb-native_10.4.25.bb | 20 ---------------- .../recipes-dbs/mysql/mariadb-native_10.4.28.bb | 20 ++++++++++++++++ meta-oe/recipes-dbs/mysql/mariadb.inc | 2 +- meta-oe/recipes-dbs/mysql/mariadb_10.4.25.bb | 27 ---------------------- meta-oe/recipes-dbs/mysql/mariadb_10.4.28.bb | 27 ++++++++++++++++++++++ 5 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb-native_10.4.25.bb create mode 100644 meta-oe/recipes-dbs/mysql/mariadb-native_10.4.28.bb delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb_10.4.25.bb create mode 100644 meta-oe/recipes-dbs/mysql/mariadb_10.4.28.bb diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.4.25.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.4.25.bb deleted file mode 100644 index e1a038dfa3..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb-native_10.4.25.bb +++ /dev/null @@ -1,20 +0,0 @@ -require mariadb.inc -inherit native - -PROVIDES += "mysql5-native" -DEPENDS = "ncurses-native zlib-native bison-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.4.28.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.4.28.bb new file mode 100644 index 0000000000..e1a038dfa3 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb-native_10.4.28.bb @@ -0,0 +1,20 @@ +require mariadb.inc +inherit native + +PROVIDES += "mysql5-native" +DEPENDS = "ncurses-native zlib-native bison-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 e052c7691e..e4eb48492a 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -19,7 +19,7 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://CVE-2022-47015.patch \ " -SRC_URI[sha256sum] = "ff963c4e11bc06b775f66f2b1ddef184996208fb4b23cfdb50d95fb02eaa7ef8" +SRC_URI[sha256sum] = "003fd23f3c6ee516176e1b62b0b43cdb6cdd3dcd4e30f855c1c5ab2baaf5a86c" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.4.25.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.4.25.bb deleted file mode 100644 index c0b53379d9..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb_10.4.25.bb +++ /dev/null @@ -1,27 +0,0 @@ -require mariadb.inc - -EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" - -DEPENDS += "mariadb-native bison-native 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.4.28.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.4.28.bb new file mode 100644 index 0000000000..c0b53379d9 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb_10.4.28.bb @@ -0,0 +1,27 @@ +require mariadb.inc + +EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" + +DEPENDS += "mariadb-native bison-native 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