aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2016-07-26 17:23:12 +0800
committerArmin Kuster <akuster808@gmail.com>2016-08-16 10:29:42 -0700
commitae7f8f79c37de19bb2e17024cf2bf4f5e09bd12b (patch)
treecb116705148d8366900b0f2ddd279e1b493b78b2
parent4756aea459ce1ab895fd29a607557ec4fb77fa63 (diff)
downloadmeta-openembedded-contrib-ae7f8f79c37de19bb2e17024cf2bf4f5e09bd12b.tar.gz
meta-openembedded-contrib-ae7f8f79c37de19bb2e17024cf2bf4f5e09bd12b.tar.bz2
meta-openembedded-contrib-ae7f8f79c37de19bb2e17024cf2bf4f5e09bd12b.zip
mariadb: upgrade to 5.5.50
Upgrade mariadb from 5.5.46 to 5.5.50. * update runtime dependency of mariadb-setupdb which requires command install [AK] This update appears to be mostly bug fixes and is why is was merge from master. plus the following securiy fixes 5.5.49: CVE-2016-0647 CVE-2016-0648 CVE-2016-0666 CVE-2016-0643 CVE-2016-5444 CVE-2016-3452 5.5.48: CVE-2016-0640 CVE-2016-0644 CVE-2016-0646 CVE-2016-0649 CVE-2016-0650 CVE-2016-0641 5.5.47: CVE-2016-0546 CVE-2016-0505 CVE-2016-0596 CVE-2016-0597 CVE-2016-0616 CVE-2016-0598 CVE-2016-0600 CVE-2016-0606 CVE-2016-0608 CVE-2016-0609 CVE-2016-0642 CVE-2016-0651 CVE-2016-2047 Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> (cherry picked from commit 6255219b93d2af4cf56611fb5b1c3dc55ada2c6b) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/mysql/mariadb-native_5.5.50.bb (renamed from meta-oe/recipes-support/mysql/mariadb-native_5.5.46.bb)0
-rw-r--r--meta-oe/recipes-support/mysql/mariadb.inc5
-rw-r--r--meta-oe/recipes-support/mysql/mariadb_5.5.50.bb (renamed from meta-oe/recipes-support/mysql/mariadb_5.5.46.bb)0
3 files changed, 3 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.46.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.5.50.bb
index 4ce960d7da..4ce960d7da 100644
--- a/meta-oe/recipes-support/mysql/mariadb-native_5.5.46.bb
+++ b/meta-oe/recipes-support/mysql/mariadb-native_5.5.50.bb
diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc
index 4801ffe227..9c3d2340fd 100644
--- a/meta-oe/recipes-support/mysql/mariadb.inc
+++ b/meta-oe/recipes-support/mysql/mariadb.inc
@@ -17,8 +17,8 @@ SRC_URI = "http://archive.mariadb.org/mariadb-${PV}/source/mariadb-${PV}.tar.gz
file://fix-a-building-failure.patch \
"
-SRC_URI[md5sum] = "92f682b00eb137af01e59ea93f7e31f7"
-SRC_URI[sha256sum] = "45b66b7adc87cad32e553df1d5211e5b6426b78a3bc318a5ccde088bf93e6e10"
+SRC_URI[md5sum] = "5cfb169934170a429589e05f0f5aba9c"
+SRC_URI[sha256sum] = "030b60a787333bf20ec0ee02b02da52474772c069954dc914f894a7703989b76"
S = "${WORKDIR}/mariadb-${PV}"
@@ -176,6 +176,7 @@ RDEPENDS_${PN}-leftovers = "perl perl-module-cwd perl-module-benchmark perl-modu
perl-module-file-spec perl-module-file-find perl-module-file-basename perl-module-file-path \
perl-module-constant perl-module-lib perl-module-file-temp perl-module-file-spec-functions \
perl-module-io-socket-inet perl-module-io-select"
+RDEPENDS_${PN}-setupdb = "coreutils"
# Allow old code to link to the backward compatible library
RDEPENDS_libmysqlclient-dev = "libmysqlclient-r-dev"
diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.46.bb b/meta-oe/recipes-support/mysql/mariadb_5.5.50.bb
index 8f998a3a56..8f998a3a56 100644
--- a/meta-oe/recipes-support/mysql/mariadb_5.5.46.bb
+++ b/meta-oe/recipes-support/mysql/mariadb_5.5.50.bb