From f604ee6826654ae2f12a375f8a6a96c9433a20cb Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sun, 2 Oct 2016 07:48:57 -0700 Subject: mariadb: update to version 5.5.52 Update to latest from 5.5.50 to 5.5.52, maintenance updates. includes CVE-2016-6662 affects < 5.5.51 Signed-off-by: Armin Kuster --- .../recipes-support/mysql/mariadb-native_5.5.50.bb | 19 --------------- .../recipes-support/mysql/mariadb-native_5.5.52.bb | 19 +++++++++++++++ meta-oe/recipes-support/mysql/mariadb.inc | 5 ++-- meta-oe/recipes-support/mysql/mariadb_5.5.50.bb | 27 ---------------------- meta-oe/recipes-support/mysql/mariadb_5.5.52.bb | 27 ++++++++++++++++++++++ 5 files changed, 48 insertions(+), 49 deletions(-) delete mode 100644 meta-oe/recipes-support/mysql/mariadb-native_5.5.50.bb create mode 100644 meta-oe/recipes-support/mysql/mariadb-native_5.5.52.bb delete mode 100644 meta-oe/recipes-support/mysql/mariadb_5.5.50.bb create mode 100644 meta-oe/recipes-support/mysql/mariadb_5.5.52.bb diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.50.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.5.50.bb deleted file mode 100644 index 4ce960d7da..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb-native_5.5.50.bb +++ /dev/null @@ -1,19 +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 extra/comp_err ${D}${bindir}/ - install -m 0755 scripts/comp_sql ${D}${bindir}/ -} - diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.52.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.5.52.bb new file mode 100644 index 0000000000..4ce960d7da --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb-native_5.5.52.bb @@ -0,0 +1,19 @@ +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 extra/comp_err ${D}${bindir}/ + install -m 0755 scripts/comp_sql ${D}${bindir}/ +} + diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc index 2428269109..edef40b95f 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc @@ -17,9 +17,8 @@ SRC_URI = "http://archive.mariadb.org/mariadb-${PV}/source/mariadb-${PV}.tar.gz file://fix-a-building-failure.patch \ file://change-cc-to-cc-version.patch \ " - -SRC_URI[md5sum] = "5cfb169934170a429589e05f0f5aba9c" -SRC_URI[sha256sum] = "030b60a787333bf20ec0ee02b02da52474772c069954dc914f894a7703989b76" +SRC_URI[md5sum] = "fca86f1eaed2163b4bdce4f98f472324" +SRC_URI[sha256sum] = "e142f9459507b97c5848042863b313ce70750118446bb4e35e5c07fe66007293" S = "${WORKDIR}/mariadb-${PV}" diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.50.bb b/meta-oe/recipes-support/mysql/mariadb_5.5.50.bb deleted file mode 100644 index d7895732a6..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb_5.5.50.bb +++ /dev/null @@ -1,27 +0,0 @@ -require mariadb.inc - -EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" - -DEPENDS += "mariadb-native ncurses zlib readline libaio libevent" - -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-support/mysql/mariadb_5.5.52.bb b/meta-oe/recipes-support/mysql/mariadb_5.5.52.bb new file mode 100644 index 0000000000..d7895732a6 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb_5.5.52.bb @@ -0,0 +1,27 @@ +require mariadb.inc + +EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" + +DEPENDS += "mariadb-native ncurses zlib readline libaio libevent" + +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 1.2.3-korg