From patchwork Wed Aug 19 12:46:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 52544 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by patches.linaro.org (Postfix) with ESMTPS id 0831722DB1 for ; Wed, 19 Aug 2015 12:46:56 +0000 (UTC) Received: by lbbpd10 with SMTP id pd10sf1170418lbb.3 for ; Wed, 19 Aug 2015 05:46:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:reply-to :list-id:list-unsubscribe:list-archive:list-post:list-help :list-subscribe:mime-version:content-type:content-transfer-encoding :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=ZwWS3/BSiw8fueYQ/BxAWNEO8oIowO+TQEHeUnr0FFs=; b=Dhd6kALj7PjVI3uQCV2RLCf5+Abv9ZvheVfBzDnOjJiSXqUYkyA4dW2DBHO6lCMqHr oJqF1gyPY+kWGWq8EMgpiaaxnK+OkmOX7rD6h17cjf3XLB5orEn3m4yQLtlUYM9D3qkp 3yiim66HbqTvME9J2PBCuFaRp8zJp+nBt/p8fV8ZO92ja1volUNH40Kbi5qd4mKmZthg Yi9nYQrme6d2/+ykDyhlarioJ1ef+ZsYhT7D+8We2XVq5YWb6HBjn4GGJxqxcXnA1Iw8 tYJSeb9wcxyzkI9Yxyvv+N7p1tyEVoIX4UUI9bribO7SxukTbxXdZ3Am4o31eTgS7YPm +viA== X-Gm-Message-State: ALoCoQmOAkkL8vyGL5wLm9qqE6gWqIyxEmXyOLjnRauV+N+oX9BAVG1lPKxwS0/FNkoG73Dcs5Hq X-Received: by 10.194.184.6 with SMTP id eq6mr3199666wjc.4.1439988414991; Wed, 19 Aug 2015 05:46:54 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.133 with SMTP id v5ls23884lae.63.gmail; Wed, 19 Aug 2015 05:46:54 -0700 (PDT) X-Received: by 10.152.2.229 with SMTP id 5mr1609519lax.124.1439988414812; Wed, 19 Aug 2015 05:46:54 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id c5si433311lae.45.2015.08.19.05.46.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Aug 2015 05:46:54 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by lbbpu9 with SMTP id pu9so2363916lbb.3 for ; Wed, 19 Aug 2015 05:46:54 -0700 (PDT) X-Received: by 10.152.22.99 with SMTP id c3mr11394087laf.32.1439988414695; Wed, 19 Aug 2015 05:46:54 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.162.200 with SMTP id yc8csp349447lbb; Wed, 19 Aug 2015 05:46:52 -0700 (PDT) X-Received: by 10.70.38.35 with SMTP id d3mr14082425pdk.33.1439988412051; Wed, 19 Aug 2015 05:46:52 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id bh3si1016288pbc.227.2015.08.19.05.46.51; Wed, 19 Aug 2015 05:46:52 -0700 (PDT) Received-SPF: pass (google.com: domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 4545D767D6; Wed, 19 Aug 2015 12:46:48 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by mail.openembedded.org (Postfix) with ESMTP id 8A1BF76A0F for ; Wed, 19 Aug 2015 12:46:11 +0000 (UTC) Received: by wibhh20 with SMTP id hh20so7320813wib.0 for ; Wed, 19 Aug 2015 05:46:11 -0700 (PDT) X-Received: by 10.194.95.71 with SMTP id di7mr23428087wjb.125.1439988370961; Wed, 19 Aug 2015 05:46:10 -0700 (PDT) Received: from localhost ([2001:610:612:0:2ad2:44ff:fe4b:bc17]) by smtp.gmail.com with ESMTPSA id s16sm25845413wib.16.2015.08.19.05.46.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Aug 2015 05:46:10 -0700 (PDT) From: Koen Kooi To: openembedded-devel@lists.openembedded.org Date: Wed, 19 Aug 2015 14:46:05 +0200 Message-Id: <1439988365-22686-2-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1439988365-22686-1-git-send-email-koen.kooi@linaro.org> References: <1439988365-22686-1-git-send-email-koen.kooi@linaro.org> Cc: Koen Kooi Subject: [oe] [meta-oe][PATCHv2 2/2] mariadb: update to 5.5.45 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: koen.kooi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 This is the latest release in the 5.5.x stable series. The CVE patch has been applied upstream. Signed-off-by: Koen Kooi --- ...b-native_5.5.43.bb => mariadb-native_5.5.45.bb} | 0 meta-oe/recipes-support/mysql/mariadb.inc | 17 +++++---- .../mysql/mariadb/fix-CVE-2015-2305.patch | 43 ---------------------- .../mysql/{mariadb_5.5.43.bb => mariadb_5.5.45.bb} | 0 4 files changed, 9 insertions(+), 51 deletions(-) rename meta-oe/recipes-support/mysql/{mariadb-native_5.5.43.bb => mariadb-native_5.5.45.bb} (100%) delete mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch rename meta-oe/recipes-support/mysql/{mariadb_5.5.43.bb => mariadb_5.5.45.bb} (100%) diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.43.bb b/meta-oe/recipes-support/mysql/mariadb_5.5.45.bb similarity index 100% rename from meta-oe/recipes-support/mysql/mariadb_5.5.43.bb rename to meta-oe/recipes-support/mysql/mariadb_5.5.45.bb 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 similarity index 100% rename from meta-oe/recipes-support/mysql/mariadb-native_5.5.43.bb rename to 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 a11924a..b40c581 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc @@ -11,11 +11,10 @@ SRC_URI = "http://mirrors.supportex.net/mariadb/mariadb-${PV}/source/mariadb-${P 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}" @@ -87,11 +86,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 } 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 2d1b467..0000000 --- a/meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f5c1d00a9ceb61acfe038dcf2ec0236c2939328c Mon Sep 17 00:00:00 2001 -From: Roy Li -Date: Mon, 1 Jun 2015 15:31:48 +0800 -Subject: [PATCH] From 70bc2965604b6b8aaf260049e64c708dddf85334 Mon Sep 17 - 00:00:00 2001 From: Gary Houston Date: Wed, 25 Feb - 2015 13:29:03 +1100 Subject: [PATCH] Bug fix for integer overflow in regcomp - for excessively long pattern strings. CERT Vulnerability Note VU#695940. - Found by Guido Vranken. - -Upsteam-Status: Backport - -https://bugzilla.suse.com/attachment.cgi?id=627001 - -Signed-off-by: Roy Li ---- - regex/regcomp.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/regex/regcomp.c b/regex/regcomp.c -index abc1817..31e57c1 100644 ---- a/regex/regcomp.c -+++ b/regex/regcomp.c -@@ -138,7 +138,16 @@ struct cclass cclasses[CCLASS_LAST+1]= { - (NC-1)*sizeof(cat_t)); - if (g == NULL) - return(REG_ESPACE); -- p->ssize = (long) (len/(size_t)2*(size_t)3 + (size_t)1); /* ugh */ -+ { -+ /* Patched for CERT Vulnerability Note VU#695940, Feb 2015. */ -+ size_t new_ssize = len/(size_t)2*(size_t)3 + (size_t)1; /* ugh */ -+ if (new_ssize < len || new_ssize > LONG_MAX / sizeof(sop)) { -+ free((char *) g); -+ return REG_INVARG; -+ } -+ p->ssize = new_ssize; -+ } -+ - p->strip = (sop *)malloc(p->ssize * sizeof(sop)); - p->slen = 0; - if (p->strip == NULL) { --- -1.9.1 -