From 4fc4326a0c7510d293b8108696beda4b395e0e2d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 19 Aug 2015 14:46:05 +0200 Subject: 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 Signed-off-by: Martin Jansa --- meta-oe/recipes-support/mysql/mariadb.inc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'meta-oe/recipes-support/mysql/mariadb.inc') 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 file://mysqld.service \ file://configure.cmake-fix-valgrind.patch \ file://fix-a-building-failure.patch \ - file://fix-CVE-2015-2305.patch \ " -SRC_URI[md5sum] = "c8760d6b5890fc1de76c07af48092c88" -SRC_URI[sha256sum] = "a0709997140549154edb87c9dfab564cd4755b238251acbf42369118f9bb4d01" +SRC_URI[md5sum] = "6ec397f717f6e2e4e9154e76de9ec9fc" +SRC_URI[sha256sum] = "4dc3aff6941ef1068412002915d795bcf67db0eaa38a5c6f3af57474c4226fb0" S = "${WORKDIR}/mariadb-${PV}" @@ -88,11 +87,13 @@ do_compile_prepend_class-target () { cp ${STAGING_BINDIR_NATIVE}/comp_sql ${S}/scripts if [ "${@bb.utils.contains('PACKAGECONFIG', 'krb5', 'yes', 'no', d)}" = "no" ]; then - mkdir ${B}/include/openssl - echo "#ifndef KSSL_H" >${B}/include/openssl/kssl.h - echo "#define KSSL_H" >>${B}/include/openssl/kssl.h - echo "#include ">>${B}/include/openssl/kssl.h - echo "#endif" >>${B}/include/openssl/kssl.h + if ! [ -e ${B}/include/openssl/kssl.h ] ; then + mkdir -p ${B}/include/openssl + echo "#ifndef KSSL_H" >${B}/include/openssl/kssl.h + echo "#define KSSL_H" >>${B}/include/openssl/kssl.h + echo "#include ">>${B}/include/openssl/kssl.h + echo "#endif" >>${B}/include/openssl/kssl.h + fi fi } -- cgit v1.2.3-54-g00ecf