diff options
author | Koen Kooi <koen.kooi@linaro.org> | 2015-08-19 14:46:05 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-31 19:11:12 +0200 |
commit | 4fc4326a0c7510d293b8108696beda4b395e0e2d (patch) | |
tree | 82f737ea424ae8fdafd3a1c156cf52bf7de018cc | |
parent | 3551575f9b69ca3d5f06321e444c9f8105c0a1b2 (diff) | |
download | meta-openembedded-4fc4326a0c7510d293b8108696beda4b395e0e2d.tar.gz |
mariadb: update to 5.5.45
This is the latest release in the 5.5.x stable series. The CVE patch has been applied upstream.
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb-native_5.5.45.bb (renamed from meta-oe/recipes-support/mysql/mariadb-native_5.5.43.bb) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb.inc | 17 | ||||
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch | 43 | ||||
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb_5.5.45.bb (renamed from meta-oe/recipes-support/mysql/mariadb_5.5.43.bb) | 0 |
4 files changed, 9 insertions, 51 deletions
diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.43.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.5.45.bb index 4ce960d7d..4ce960d7d 100644 --- a/meta-oe/recipes-support/mysql/mariadb-native_5.5.43.bb +++ b/meta-oe/recipes-support/mysql/mariadb-native_5.5.45.bb | |||
diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc index 4e2a64c89..cf004ad3a 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc | |||
@@ -12,11 +12,10 @@ SRC_URI = "http://archive.mariadb.org/mariadb-${PV}/source/mariadb-${PV}.tar.gz | |||
12 | file://mysqld.service \ | 12 | file://mysqld.service \ |
13 | file://configure.cmake-fix-valgrind.patch \ | 13 | file://configure.cmake-fix-valgrind.patch \ |
14 | file://fix-a-building-failure.patch \ | 14 | file://fix-a-building-failure.patch \ |
15 | file://fix-CVE-2015-2305.patch \ | ||
16 | " | 15 | " |
17 | 16 | ||
18 | SRC_URI[md5sum] = "c8760d6b5890fc1de76c07af48092c88" | 17 | SRC_URI[md5sum] = "6ec397f717f6e2e4e9154e76de9ec9fc" |
19 | SRC_URI[sha256sum] = "a0709997140549154edb87c9dfab564cd4755b238251acbf42369118f9bb4d01" | 18 | SRC_URI[sha256sum] = "4dc3aff6941ef1068412002915d795bcf67db0eaa38a5c6f3af57474c4226fb0" |
20 | 19 | ||
21 | S = "${WORKDIR}/mariadb-${PV}" | 20 | S = "${WORKDIR}/mariadb-${PV}" |
22 | 21 | ||
@@ -88,11 +87,13 @@ do_compile_prepend_class-target () { | |||
88 | cp ${STAGING_BINDIR_NATIVE}/comp_sql ${S}/scripts | 87 | cp ${STAGING_BINDIR_NATIVE}/comp_sql ${S}/scripts |
89 | 88 | ||
90 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'krb5', 'yes', 'no', d)}" = "no" ]; then | 89 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'krb5', 'yes', 'no', d)}" = "no" ]; then |
91 | mkdir ${B}/include/openssl | 90 | if ! [ -e ${B}/include/openssl/kssl.h ] ; then |
92 | echo "#ifndef KSSL_H" >${B}/include/openssl/kssl.h | 91 | mkdir -p ${B}/include/openssl |
93 | echo "#define KSSL_H" >>${B}/include/openssl/kssl.h | 92 | echo "#ifndef KSSL_H" >${B}/include/openssl/kssl.h |
94 | echo "#include <openssl/opensslconf.h>">>${B}/include/openssl/kssl.h | 93 | echo "#define KSSL_H" >>${B}/include/openssl/kssl.h |
95 | echo "#endif" >>${B}/include/openssl/kssl.h | 94 | echo "#include <openssl/opensslconf.h>">>${B}/include/openssl/kssl.h |
95 | echo "#endif" >>${B}/include/openssl/kssl.h | ||
96 | fi | ||
96 | fi | 97 | fi |
97 | } | 98 | } |
98 | 99 | ||
diff --git a/meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch b/meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch deleted file mode 100644 index 2d1b46734..000000000 --- a/meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From f5c1d00a9ceb61acfe038dcf2ec0236c2939328c Mon Sep 17 00:00:00 2001 | ||
2 | From: Roy Li <rongqing.li@windriver.com> | ||
3 | Date: Mon, 1 Jun 2015 15:31:48 +0800 | ||
4 | Subject: [PATCH] From 70bc2965604b6b8aaf260049e64c708dddf85334 Mon Sep 17 | ||
5 | 00:00:00 2001 From: Gary Houston <ghouston@arglist.com> Date: Wed, 25 Feb | ||
6 | 2015 13:29:03 +1100 Subject: [PATCH] Bug fix for integer overflow in regcomp | ||
7 | for excessively long pattern strings. CERT Vulnerability Note VU#695940. | ||
8 | Found by Guido Vranken. | ||
9 | |||
10 | Upsteam-Status: Backport | ||
11 | |||
12 | https://bugzilla.suse.com/attachment.cgi?id=627001 | ||
13 | |||
14 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
15 | --- | ||
16 | regex/regcomp.c | 11 ++++++++++- | ||
17 | 1 file changed, 10 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/regex/regcomp.c b/regex/regcomp.c | ||
20 | index abc1817..31e57c1 100644 | ||
21 | --- a/regex/regcomp.c | ||
22 | +++ b/regex/regcomp.c | ||
23 | @@ -138,7 +138,16 @@ struct cclass cclasses[CCLASS_LAST+1]= { | ||
24 | (NC-1)*sizeof(cat_t)); | ||
25 | if (g == NULL) | ||
26 | return(REG_ESPACE); | ||
27 | - p->ssize = (long) (len/(size_t)2*(size_t)3 + (size_t)1); /* ugh */ | ||
28 | + { | ||
29 | + /* Patched for CERT Vulnerability Note VU#695940, Feb 2015. */ | ||
30 | + size_t new_ssize = len/(size_t)2*(size_t)3 + (size_t)1; /* ugh */ | ||
31 | + if (new_ssize < len || new_ssize > LONG_MAX / sizeof(sop)) { | ||
32 | + free((char *) g); | ||
33 | + return REG_INVARG; | ||
34 | + } | ||
35 | + p->ssize = new_ssize; | ||
36 | + } | ||
37 | + | ||
38 | p->strip = (sop *)malloc(p->ssize * sizeof(sop)); | ||
39 | p->slen = 0; | ||
40 | if (p->strip == NULL) { | ||
41 | -- | ||
42 | 1.9.1 | ||
43 | |||
diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.43.bb b/meta-oe/recipes-support/mysql/mariadb_5.5.45.bb index 8f998a3a5..8f998a3a5 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.5.43.bb +++ b/meta-oe/recipes-support/mysql/mariadb_5.5.45.bb | |||