From patchwork Wed Dec 19 02:51:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 154223 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4441771ljp; Tue, 18 Dec 2018 18:51:33 -0800 (PST) X-Google-Smtp-Source: AFSGD/XOWykSjnve8vzfxYVeo/H/iuh7vix563fBpHrApel3vDJUuVV8S2sAedjWVRCLDnxcEl9h X-Received: by 2002:a62:4d81:: with SMTP id a123mr19560683pfb.122.1545187893444; Tue, 18 Dec 2018 18:51:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545187893; cv=none; d=google.com; s=arc-20160816; b=AlKf45ymZc9YraT2O5Yo8aILCp2ilo4YYIaPsOLCApx+cSKHsHMk09Yh7BqSJlSUyb O7TNc4CDlYydHAS1p0wDV/dnQC6/a8dKfq2122uEixWA2bA7xIsvNjVP7SljdH2ONzmG BjkeVPy4Q9nhVXiHZrJ69RjAG81TFwE2YSTowi0X7EuRixbivN55eEAcF9WVzI/Ah2Sx +oBG2Ke2vGHtX+X8V62WqtxAeTvn/9t8SCSlkLob6JvU6udrFtkD98PjV+v9p4zrYXmi M2KWHtAk7MxW0GJ2tT1r8oMtHlAip8uRhy6pHfY3FX1v2X7N0ht/ItpNpjwt0wclmQT6 H3Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=3ndqb3OMvgRxs2UsnpaejndAIAtu9UPlEQIYDQqPHgA=; b=SxHJfek0hd4QwZMkTyIdQRCzlYJzGmVhBYsjbxlIaw3s04Wla4dE7Y8/gfOV5yZJco 4kD68kOY8/cw4vwRLMWEgW+l6IrZLDVh6gLNpMXGHdp4sH8qmy92RfdbFLLMXpcwF0FL VykmZMXxzCnt5oadM/QslOs2fPQz1Q4Y8KjBXpnf068wCq52SByiLFrutHicSTUcAFqU uTS+vOxj8YyD4y9MCX6P+Io0eYyeWp0MIn650gPXd7Vyh7LXpEdAbDzLj2V8T4j6Frpk 9OFj81dyXNkT/u7lBoKsTLAo2SkBT+AL367Thi5QeCNaGZQ5xSP06dmVogJBGG2W9seh bf0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="Tevw/Tp2"; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y27si13356187pga.459.2018.12.18.18.51.32; Tue, 18 Dec 2018 18:51:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="Tevw/Tp2"; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E8C7779C9B; Wed, 19 Dec 2018 02:51:25 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mail.openembedded.org (Postfix) with ESMTP id 25DB279C9B for ; Wed, 19 Dec 2018 02:51:25 +0000 (UTC) Received: by mail-pf1-f180.google.com with SMTP id i12so9089028pfo.7 for ; Tue, 18 Dec 2018 18:51:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=33iRvqybn3fGL5LiRBcvbOJeQzq2oVuqB0cAGXy9ld0=; b=Tevw/Tp25anpdzUkdOvS4DGg/mF0WHNRY9L+vvGvhWRrKEnSmbLSYLRzQNuVi0BDZ2 5IeiFhza0T13OA21T1AKggSXx+b7BlVxvhCHp2JCQ0aMTuBRsHd86vhpGLM+LPtmDgdu k2Rh0NLq/fmw6nHHTz9c8MYiLyb971/ZlPX/3Fa5zULg6jD7v3fk+jACKo9XW0Te/U7n M0AxWybUQ0WPUl5wz4VknsmYvNSmaRsoDD6CGTM2GWzBKKgyvG08VBGfaItIoXV7krND HVgqsYnwZn84qNEGhO8ekAY3lySTRDiJnznGlIu+8YR6hThdg1sPyKL5vTkbg5CJSEdz Y9Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=33iRvqybn3fGL5LiRBcvbOJeQzq2oVuqB0cAGXy9ld0=; b=Qm1uObS3PFZfnocyLG/xYJkjieg0B4EdrgexALP7vIkicYKVcz4SJAD2TBix0Dvo9B qPT3kve8z0/huSh13c77qCoJc5XptO/jlsAeHUrkm9uxhd4H/Wz20W4Bh7SZPEDrqAlb xoNpMZhXyW6k6nAEjNJcJ9zQKBWeovaTED4KZFRJShYt1/wAzNWxdM0MRCuy/Tdkhwix V3E2exK9xt6NJnrLtuTTw8cybdatyUHbtHSJm7fVbJFIAL8FuJ0QeUCb268vtHtf4Knx 0Oa4kYZCKBBxfFh5wKWPdYU8sMpWabzOHX0r+xrmbeNyJ6g0rtB5XXb2ka17qZdO1lsL 62Pg== X-Gm-Message-State: AA+aEWYAFNUBBL3xy2MH8DrSzFgrK7arS9euGFs1/ZfSHJEZOyJuiZtN mHPwkqoDBqwXAaWnjaHNGV9jdVs+YWs= X-Received: by 2002:a63:a35c:: with SMTP id v28mr17782924pgn.205.1545187885652; Tue, 18 Dec 2018 18:51:25 -0800 (PST) Received: from localhost.localdomain ([2601:646:877f:9499::19ec]) by smtp.gmail.com with ESMTPSA id m3sm28000563pff.173.2018.12.18.18.51.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Dec 2018 18:51:25 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 18 Dec 2018 18:51:04 -0800 Message-Id: <20181219025109.19159-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 1/6] gnulib: Upgrade to 2018-03-07.03 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Call check_git_config to setup git to function correctly on some builders git might not be setup for user and email address Fixes: Your branch is behind 'origin/master' by 584 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Cloning into 'TOPDIR/build/tmp/work/mips32r2-yoe-linux-musl/gnulib/2017-08-20.18-r0/image//usr/share/gnulib'... done. *** Please tell me who you are. Run git config --global user.email "you@example.com" git config --global user.name "Your Name" to set your account's default identity. Omit --global to set the identity only in this repository. Signed-off-by: Khem Raj --- .../gnulib/gnulib/CVE-2018-17942.patch | 88 ------------------- ...17-08-20.18.bb => gnulib_2018-03-07.03.bb} | 8 +- 2 files changed, 5 insertions(+), 91 deletions(-) delete mode 100644 meta-oe/recipes-support/gnulib/gnulib/CVE-2018-17942.patch rename meta-oe/recipes-support/gnulib/{gnulib_2017-08-20.18.bb => gnulib_2018-03-07.03.bb} (87%) -- 2.20.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/gnulib/gnulib/CVE-2018-17942.patch b/meta-oe/recipes-support/gnulib/gnulib/CVE-2018-17942.patch deleted file mode 100644 index 77e82b1674..0000000000 --- a/meta-oe/recipes-support/gnulib/gnulib/CVE-2018-17942.patch +++ /dev/null @@ -1,88 +0,0 @@ -From e91600a7aae3bafbefbe13abf771e61badd16286 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Tue, 16 Oct 2018 14:26:11 +0800 -Subject: [PATCH] vasnprintf: Fix heap memory overrun bug. - -Reported by Ben Pfaff in -. - -* lib/vasnprintf.c (convert_to_decimal): Allocate one more byte of -memory. -* tests/test-vasnprintf.c (test_function): Add another test. - -Upstream-Status: Backport [http://git.savannah.gnu.org/gitweb/?p=gnulib.git; -a=commitdiff;h=278b4175c9d7dd47c1a3071554aac02add3b3c35] - -CVE: CVE-2018-17942 - -Signed-off-by: Changqing Li ---- - ChangeLog | 8 ++++++++ - lib/vasnprintf.c | 4 +++- - tests/test-vasnprintf.c | 19 ++++++++++++++++++- - 3 files changed, 29 insertions(+), 2 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 9864353..5ff76a3 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,11 @@ -+2018-09-23 Bruno Haible -+ vasnprintf: Fix heap memory overrun bug. -+ Reported by Ben Pfaff in -+ . -+ * lib/vasnprintf.c (convert_to_decimal): Allocate one more byte of -+ memory. -+ * tests/test-vasnprintf.c (test_function): Add another test. -+ - 2017-08-21 Paul Eggert - - vc-list-files: port to Solaris 10 -diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c -index 2e4eb19..45de49f 100644 ---- a/lib/vasnprintf.c -+++ b/lib/vasnprintf.c -@@ -860,7 +860,9 @@ convert_to_decimal (mpn_t a, size_t extra_zeroes) - size_t a_len = a.nlimbs; - /* 0.03345 is slightly larger than log(2)/(9*log(10)). */ - size_t c_len = 9 * ((size_t)(a_len * (GMP_LIMB_BITS * 0.03345f)) + 1); -- char *c_ptr = (char *) malloc (xsum (c_len, extra_zeroes)); -+ /* We need extra_zeroes bytes for zeroes, followed by c_len bytes for the -+ digits of a, followed by 1 byte for the terminating NUL. */ -+ char *c_ptr = (char *) malloc (xsum (xsum (extra_zeroes, c_len), 1)); - if (c_ptr != NULL) - { - char *d_ptr = c_ptr; -diff --git a/tests/test-vasnprintf.c b/tests/test-vasnprintf.c -index 2dd869f..ff68d5c 100644 ---- a/tests/test-vasnprintf.c -+++ b/tests/test-vasnprintf.c -@@ -53,7 +53,24 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...)) - ASSERT (result != NULL); - ASSERT (strcmp (result, "12345") == 0); - ASSERT (length == 5); -- if (size < 6) -+ if (size < 5 + 1) -+ ASSERT (result != buf); -+ ASSERT (memcmp (buf + size, &"DEADBEEF"[size], 8 - size) == 0); -+ if (result != buf) -+ free (result); -+ } -+ /* Note: This test assumes IEEE 754 representation of 'double' floats. */ -+ for (size = 0; size <= 8; size++) -+ { -+ size_t length; -+ char *result; -+ memcpy (buf, "DEADBEEF", 8); -+ length = size; -+ result = my_asnprintf (buf, &length, "%2.0f", 1.6314159265358979e+125); -+ ASSERT (result != NULL); -+ ASSERT (strcmp (result, "163141592653589790215729350939528493057529598899734151772468186268423257777068536614838678161083520756952076273094236944990208") == 0); -+ ASSERT (length == 126); -+ if (size < 126 + 1) - ASSERT (result != buf); - ASSERT (memcmp (buf + size, &"DEADBEEF"[size], 8 - size) == 0); - if (result != buf) --- -2.7.4 - diff --git a/meta-oe/recipes-support/gnulib/gnulib_2017-08-20.18.bb b/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb similarity index 87% rename from meta-oe/recipes-support/gnulib/gnulib_2017-08-20.18.bb rename to meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb index e048810554..be1aee5537 100644 --- a/meta-oe/recipes-support/gnulib/gnulib_2017-08-20.18.bb +++ b/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb @@ -11,16 +11,18 @@ SECTION = "devel" LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=56a22a6e5bcce45e2c8ac184f81412b5" -SRCREV = "b23000de1e47c7d580e0e220966dd1ee42a5e5bc" +SRCREV = "0d6e3307bbdb8df4d56043d5f373eeeffe4cbef3" -SRC_URI = "git://git.sv.gnu.org/gnulib;protocol=git \ - file://CVE-2018-17942.patch \ +SRC_URI = "git://git.sv.gnu.org/gnulib.git \ " S = "${WORKDIR}/git" +inherit utils + do_install () { cd ${S} + check_git_config git checkout master git clone ${S} ${D}/${datadir}/gnulib cd ${D}/${datadir}/gnulib From patchwork Wed Dec 19 02:51:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 154224 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4442126ljp; Tue, 18 Dec 2018 18:52:02 -0800 (PST) X-Google-Smtp-Source: AFSGD/Xub/fQr3LuGCuFhvty9vSnnOR0fqXNR41M5yZ5FYFkqfWq70rR1PYtzJr1LhjZ0qq0rmUy X-Received: by 2002:a63:2784:: with SMTP id n126mr18346160pgn.48.1545187922803; Tue, 18 Dec 2018 18:52:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545187922; cv=none; d=google.com; s=arc-20160816; b=ZpKAvxch6iH43jL0srYvIi30zgNngHHaPNs06vQLxUVrUqQigdkRsyWdemcl6r7uVf B2lTIF9btH51LHDtct9Rw1fryk1O7F1GbRhH2/1n69vCh4BIUEUBsAMnfaShKkTm9Xf2 kSHLkbRYZfQcij/sEKDD5BJAchDEx13YwGFjxAEEm+hE26nrFoWNUaZLVXiS+I9ddbjG 4SRD4EueGSXELoUE72Qk5bGfRnAs7rjVgczOveols4hzLHsfTI2ocL5ibA7M+8GJHNZA xbJl7f7TbaznUCQq4bHznLRZUNs2gC2q+OXKSYcJgOmvH4vBhfddVA7nwT2jSFGAzyRv Nuhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=imnRbASk4kVUHaNXe3KALub76n0EBci5nFePgpT3ejg=; b=E/WdYvhIXIkHD7tv8MCDLuNXCrxmBbDnXvlo1B9rwyGIbcFCkEpHUJ2tw8pnNf4Bu9 pcVdr6OkO4GV03+09b6EkM6X8AS1Z4SIPssf9haLDYiQLmBdHZ4QvYyOfam09xUDoPK0 OtTZsAWNnG2iRqT822EbEA6CESaPReca4Pfi25+iuac1kcHJPQe8oKy2Z0TVdeI9EBBj lqO0CSzJzAILTPK6b9OTBhPWt3m+Ty3x2o+K/d8I9BbosN0GIkPg9z6a4hpT3/Yhn3CX mPyfIRapj90WCcQx2Ztg2EFFqs7R9kGD6tUUZAkOaZFxximhIJVpFQLNWIbPKFG88T8n SIpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=n1eexalr; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id k62si15085994pfc.208.2018.12.18.18.52.02; Tue, 18 Dec 2018 18:52:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=n1eexalr; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id AC30F79E05; Wed, 19 Dec 2018 02:52:00 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by mail.openembedded.org (Postfix) with ESMTP id E16546B7CD for ; Wed, 19 Dec 2018 02:51:25 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id n2so8753758pgm.3 for ; Tue, 18 Dec 2018 18:51:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gr3vLW4ckZO1ydUSrWO/k0OcIzllSwpXYn+lzI4fs9w=; b=n1eexalr8Vj/VMvyaaj2SYxER+9oGlj2By1hm/s8RaIpd25khiN9X2k6NEvF3+Yqg1 8iGR6zJYIHmfSekZ8+wQcdItmTr2OSJLNvCTu7EKnYw0n2DKzDE/FUih0oijBs/hWAOu Ex+aIGSjugSblROqbvxYRNRQj5ZzHoFiEd5PDe6GJjBKEXiwywl78tfIPU4VCgRz0wNM TLQkO5nvyHvHtUbxK5MjYuQCPu2KHLmf+tVaVgIx+yafvH19348rpXACipgGaO5DE+b8 ZTxNuCfSskHM3mLPToew/uBPYZtRRMO4vFgmL1qbAcbCdMk9RYCFzzrobS9Gr8UER75v yWaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gr3vLW4ckZO1ydUSrWO/k0OcIzllSwpXYn+lzI4fs9w=; b=sivU0ONymVYNM4F+aJSI9LtWM7qvqZZ4guXQX1/6V8oLXumUr+wH2YQovdeS2VNPQO iVB2Poz11+3BmxtDvd0+Zrw/xpx2A8iVkVRL+yACpH8RBRFmkuK/ES8B5CJbEmfO0hPX 6z8Nk1K9cpTq1SD66qj7h8YpeMpZEGxC+SFQRomK1UKnzt3vN1QMns0RvdAuGgV5GICo U+OUsAaK9DEQJLP+lQH31msL6BwBnxVXDbSraAd1Qm2368spG/uVWBgFshdNk1IplCPG 5zcGypOTme7lnJUZRApDXF9TxOeG4SIABzAXAoIX+5ojGUt265PF0OmHUXdkb41ZOXoB twGA== X-Gm-Message-State: AA+aEWbWX47zF+h+GLCicZvaCrnk/aF4JcDVfsAcA/B35MYNWV3ZBktG jBS5IKJSIB+fSsPsJ/wNIARK4U1PH6o= X-Received: by 2002:a62:da5a:: with SMTP id w26mr18914430pfl.106.1545187886530; Tue, 18 Dec 2018 18:51:26 -0800 (PST) Received: from localhost.localdomain ([2601:646:877f:9499::19ec]) by smtp.gmail.com with ESMTPSA id m3sm28000563pff.173.2018.12.18.18.51.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Dec 2018 18:51:25 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 18 Dec 2018 18:51:05 -0800 Message-Id: <20181219025109.19159-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181219025109.19159-1-raj.khem@gmail.com> References: <20181219025109.19159-1-raj.khem@gmail.com> MIME-Version: 1.0 Cc: Ivan Maidanski Subject: [oe] [meta-oe][PATCH 2/6] bdwgc: upgrade 7.6.8 -> 7.6.10 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org From: Ivan Maidanski Highlights of this upgrade: * Fix races, deadlocks, bugs in disclaim finalization and find-leak mode See the following for detailed changes: * https://github.com/ivmai/bdwgc/releases/tag/v7.6.10 Signed-off-by: Ivan Maidanski Signed-off-by: Khem Raj --- .../recipes-support/bdwgc/{bdwgc_7.6.8.bb => bdwgc_7.6.10.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-support/bdwgc/{bdwgc_7.6.8.bb => bdwgc_7.6.10.bb} (96%) -- 2.20.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/bdwgc/bdwgc_7.6.8.bb b/meta-oe/recipes-support/bdwgc/bdwgc_7.6.10.bb similarity index 96% rename from meta-oe/recipes-support/bdwgc/bdwgc_7.6.8.bb rename to meta-oe/recipes-support/bdwgc/bdwgc_7.6.10.bb index bb78971381..fdf3d6c16d 100644 --- a/meta-oe/recipes-support/bdwgc/bdwgc_7.6.8.bb +++ b/meta-oe/recipes-support/bdwgc/bdwgc_7.6.10.bb @@ -21,7 +21,7 @@ SECTION = "devel" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://README.QUICK;md5=728501f233050290314d33fb07d883eb" -SRCREV = "8b2a98209a59c92e1be318e4acda507d83175f4d" +SRCREV = "cef9cbed83f2b5101d4e65ca0f158600d26cbd34" SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-7_6 \ " From patchwork Wed Dec 19 02:51:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 154225 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4442200ljp; Tue, 18 Dec 2018 18:52:09 -0800 (PST) X-Google-Smtp-Source: AFSGD/XTTFL+rVr12eQEmQRy1z++7ScmwL4RRN19ybHlpXOjF4JEe/SOguGrIg0rBnnB9ly7+qWJ X-Received: by 2002:a63:e545:: with SMTP id z5mr2786867pgj.195.1545187929377; Tue, 18 Dec 2018 18:52:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545187929; cv=none; d=google.com; s=arc-20160816; b=FYNYKBmJDcfW+AlGRoEc8S8AV/0IJIUdbrJKiXlmrwGYE4UnND+0ligsdfSnLUfEiZ lP972GC6qhZdsuIk/BMbi72+CQOMbBOQWStwC0Yj/RiQ3gFXtsHzDLpGZaL+go1TVNwM 73/BUZdUwJnc6GrapBTAG7FgLUk6Aa44pEanpUh1HgT3xIWsV6XnGhqopVxDn9PTzMPJ nJ+jxh9jQm/td7FeyQ+lDIiWmMM2amSLQNPvNqCzw0ZyvNEivJsDIaiGoAAM6jTghtp5 /eK9kwl8u815mDUlT3hIwPrhi35JYc5rNl0R4kNELBvgLuxF3JiqTY/hr592gisePIO/ n1qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=Iny1Mj8QOn/KJxSwws1453MnbPEg75vtGBQXKXGo8Lo=; b=R6yjI5pKJ3PsPHnkRgkQvApKbPx9VcM6u1Wf2PN72hWLJ4KnoGL2lAylPoipAOaXzt 2rxYFGUFsX4d9NijJ6SnGxJGoBfGXfmLJ69vNx3VzVakNPSwkM3JdSehudb2UdA9P82s ohRjGmHmiA7Sxxh41joP2N6ut65ogbl7Jqu41ix05jv+r5SWkXD3gCSouvOq2OQRHgqk EnM5OoHeWGpgCTdWczv+9eDcS5agyX02217RYU3ylM+qI9TTvnn8QqxMp/b9EOraICbS QbPs6zsaOPFvCUSduVJuwPdGKTSFzUhcIQymV7k+NeQQKE/GhdH+NfD5s4sYoA9bdXX9 HDxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nYxMdrTh; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b30si15531438pla.285.2018.12.18.18.52.09; Tue, 18 Dec 2018 18:52:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nYxMdrTh; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 4182D7BDB6; Wed, 19 Dec 2018 02:52:02 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by mail.openembedded.org (Postfix) with ESMTP id B9A276B7CD for ; Wed, 19 Dec 2018 02:51:26 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id d72so8742552pga.9 for ; Tue, 18 Dec 2018 18:51:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xPL8nBpvZPs5xN6xIOxdFH6lnhiUbi6jP7tW4FPYpIg=; b=nYxMdrThx4KV7abaEdGkdikMiBB5x04/bMpDcoerOXQ/rIngKu5oaOA1HiO5k6OQaw cCmL9V+zgrjPhcxmtKIW1xXNYLw7ZPngWQMaUJFSks09NfJkZX09RYz5gr5E6cluh32O /a64/Ppy1mYcj+HTOLPo5/etP5oak+Mdv3UjexfJUsTzXjvCHCzvsqvFuZeq5cLV5pO+ g2zmeNsDWhakwNJeUMMfMWdLmllLoIN7vpq3sutUbegwVbpMOdEeXniJniDsabySQptk 2zvHBhJ/8E9TzU/zCe9U1PzqXNS1UQcJoCUtqi6Ie0RQkyoip35PUgtezfXTNmIksOtX C7cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xPL8nBpvZPs5xN6xIOxdFH6lnhiUbi6jP7tW4FPYpIg=; b=k0k5qTdcrdaUzUzvaNDX7plsvs3+x3lG+hWmn05/A/y/du1cBszSLkdkZOf/hB77AO Qjda8IdgQn+QlhYCztD8pAcOpGFyRVNaecyqu2tncEec+L1YSO6GK5zAB7MuDU5uyT89 RLbmNPpsMmuP7QgWMNt4BnwCQzJOeRreC3tZqBd45jg/8wqhBQUgOFRPr6BLcr0BcKjI a1gC7EzLdhAMHznl+L00EeN03eQmGtb29r4ETY2M5Q+QiYG3bL7kD+Hp836ZoKl92FvD 8ZZ9bdoDRzPkyp3pkkfdXTPfVN8nRxbokXB6+/qcIkiobdSf2ItNLjDNZz5rrzf8bGBx baiw== X-Gm-Message-State: AA+aEWaJcdNn1PkPDCZAK3c8aH2NV+Q6ucVcA04PZ8vcySAzhdi1UgBq CgJa9aYLM5z4QSYjVROR23T8EFL/FeE= X-Received: by 2002:a63:c848:: with SMTP id l8mr17885834pgi.78.1545187887374; Tue, 18 Dec 2018 18:51:27 -0800 (PST) Received: from localhost.localdomain ([2601:646:877f:9499::19ec]) by smtp.gmail.com with ESMTPSA id m3sm28000563pff.173.2018.12.18.18.51.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Dec 2018 18:51:26 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 18 Dec 2018 18:51:06 -0800 Message-Id: <20181219025109.19159-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181219025109.19159-1-raj.khem@gmail.com> References: <20181219025109.19159-1-raj.khem@gmail.com> MIME-Version: 1.0 Cc: Bartosz Golaszewski , Miguel Gaio Subject: [oe] [meta-oe][PATCH 3/6] catch2: Upgrade to 2.5.0 release X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Drop upstreamed patch and add a patch to fix build seen with clang and gcc9 Signed-off-by: Khem Raj --- ...1-Fix-convert-from-char-on-ARM-build.patch | 46 ------------------- .../catch2/0001-Remove-redundant-move.patch | 36 +++++++++++++++ .../{catch2_2.4.1.bb => catch2_2.5.0.bb} | 16 ++++--- 3 files changed, 45 insertions(+), 53 deletions(-) delete mode 100644 meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch create mode 100644 meta-oe/recipes-test/catch2/catch2/0001-Remove-redundant-move.patch rename meta-oe/recipes-test/catch2/{catch2_2.4.1.bb => catch2_2.5.0.bb} (70%) -- 2.20.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch b/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch deleted file mode 100644 index 3073775630..0000000000 --- a/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5729874fa5059c39aa97cfa08fddf107b7a65c9e Mon Sep 17 00:00:00 2001 -From: Miguel Gaio -Date: Wed, 3 Oct 2018 10:22:16 +0200 -Subject: [PATCH] Fix convert from char on ARM build - -Some platforms set the signedness of char to unsigned (eg. ARM). -Convert from char should not assume the signedness of char. - -Fix build issue with -Werror,-Wtautological-unsigned-zero-compare flags. - -Signed-off-by: Miguel Gaio - -Upstream-Status: Accepted [Commit f1faaa9c107113692301ad8bb56084460ef1a2ff] - -Signed-off-by: Bartosz Golaszewski ---- - include/internal/catch_tostring.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/internal/catch_tostring.cpp b/include/internal/catch_tostring.cpp -index 4e0c027d..8cbabbf2 100644 ---- a/include/internal/catch_tostring.cpp -+++ b/include/internal/catch_tostring.cpp -@@ -205,7 +205,7 @@ std::string StringMaker::convert(bool b) { - return b ? "true" : "false"; - } - --std::string StringMaker::convert(char value) { -+std::string StringMaker::convert(signed char value) { - if (value == '\r') { - return "'\\r'"; - } else if (value == '\f') { -@@ -222,8 +222,8 @@ std::string StringMaker::convert(char value) { - return chstr; - } - } --std::string StringMaker::convert(signed char c) { -- return ::Catch::Detail::stringify(static_cast(c)); -+std::string StringMaker::convert(char c) { -+ return ::Catch::Detail::stringify(static_cast(c)); - } - std::string StringMaker::convert(unsigned char c) { - return ::Catch::Detail::stringify(static_cast(c)); --- -2.19.1 - diff --git a/meta-oe/recipes-test/catch2/catch2/0001-Remove-redundant-move.patch b/meta-oe/recipes-test/catch2/catch2/0001-Remove-redundant-move.patch new file mode 100644 index 0000000000..c3f5fc9ce7 --- /dev/null +++ b/meta-oe/recipes-test/catch2/catch2/0001-Remove-redundant-move.patch @@ -0,0 +1,36 @@ +From b2bd82a0c0d3d5dda588d12cc1672a03a9630784 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 17 Dec 2018 17:27:43 -0800 +Subject: [PATCH] Remove redundant move + +fixes errors like below + +/mnt/a/yoe/build/tmp/work/aarch64-yoe-linux-musl/catch2/2.5.0-r0/git/include/internal/catch_session.cpp:52:29: +error: redundant move in return statement [-Werror=redundant-move] + 52 | return std::move(multi); + | ~~~~~~~~~^~~~~~~ +/mnt/a/yoe/build/tmp/work/aarch64-yoe-linux-musl/catch2/2.5.0-r0/git/include/internal/catch_session.cpp:52:29: +note: remove 'std::move' call + +Upstream-Status: Submitted [https://github.com/catchorg/Catch2/pull/1474] +Signed-off-by: Khem Raj +--- + include/internal/catch_session.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/internal/catch_session.cpp b/include/internal/catch_session.cpp +index 0920521c..b66d57ac 100644 +--- a/include/internal/catch_session.cpp ++++ b/include/internal/catch_session.cpp +@@ -49,7 +49,7 @@ namespace Catch { + multi->addListener(listener->create(Catch::ReporterConfig(config))); + } + multi->addReporter(createReporter(config->getReporterName(), config)); +- return std::move(multi); ++ return multi; + } + + +-- +2.20.1 + diff --git a/meta-oe/recipes-test/catch2/catch2_2.4.1.bb b/meta-oe/recipes-test/catch2/catch2_2.5.0.bb similarity index 70% rename from meta-oe/recipes-test/catch2/catch2_2.4.1.bb rename to meta-oe/recipes-test/catch2/catch2_2.5.0.bb index 0183c2e41a..14a1ebe80d 100644 --- a/meta-oe/recipes-test/catch2/catch2_2.4.1.bb +++ b/meta-oe/recipes-test/catch2/catch2_2.5.0.bb @@ -6,19 +6,21 @@ LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SRC_URI = "git://github.com/catchorg/Catch2.git \ - file://0001-Fix-convert-from-char-on-ARM-build.patch" -SRCREV = "9e1bdca4667295fcb16265eae00efa8423f07007" + file://0001-Remove-redundant-move.patch \ + " +# v2.5.0 +SRCREV = "6ccd467094973824d89efb16cbc553e279f79823" S = "${WORKDIR}/git" inherit cmake python3native +do_install_append() { + rm ${D}${datadir}/Catch2/lldbinit + rm ${D}${datadir}/Catch2/gdbinit + rmdir ${D}${datadir}/Catch2/ +} # Header-only library RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" -do_install_append() { - rm ${D}/${datadir}/Catch2/lldbinit - rm ${D}/${datadir}/Catch2/gdbinit - rmdir ${D}/${datadir}/Catch2/ -} From patchwork Wed Dec 19 02:51:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 154226 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4442255ljp; Tue, 18 Dec 2018 18:52:16 -0800 (PST) X-Google-Smtp-Source: AFSGD/XQf6MQC9fiVEwQCk1Ocyu1KOXJQqn1FEH7b4+LdWf9pJhHwPIUBb0ho066X4kcF3p01eLh X-Received: by 2002:a62:13c3:: with SMTP id 64mr18825756pft.93.1545187936360; Tue, 18 Dec 2018 18:52:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545187936; cv=none; d=google.com; s=arc-20160816; b=RDUUjxett+M9vYnsF3cuKqqZF5JfLrE7yvomoXFoyoxIQF88MMHEjCwccmtdqpGR1P CjPSoC4bbj34GxDAxrZp3mvNskalEWYWbnoR+S7MHlPkmTvsbtyobd9d+1yfy8GmH5SS wt133ID/zMFf2HHNlKHtj8EJ8ycMjwDeUWwvxmT9FuKODKPWoyZf81ZbaQ/FsZqE+0WY JE/hRpwsKpK4owHE147SCXzYJN1rbTK8W5UxmHjKUmgyg/hXgN6nxpy7R/vI0pwdlLn+ jd6R25Qas2vBWDCtGPlD8E080rhMIuOCetnx6Oy6yqM1ZwLQE4+kMC/ZP2563O5nIdPJ +Hkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=pUsfR4Nre5mLAV16nBRbQKMIZ01q6URE9lHhD05DhfA=; b=NHddhYam5bl04FOa7ey6Infd5gLyzIA6jXKCvFkNFDar3Y/lvOvC3bR7gzCnoAIQ8r hlHFyyRu+9F86kdBVH3olatzTALbgltxzO+4iLdGFr3VIYxfNikB8Mx22gH5WPJuRCQO rX+kqHih/r8iOedg3RKRNPssbEpSP9r494G6GEpE7RhstC4mhF3/akQluHa+0nNryFPa +cJatFgugz+6E7uZ+5COhLCSnKO52p3jMXUtH+Mrj6RZPM9qt/mG87jOuIpFF/gXmtc9 c0pCxFKGwJShC7NSnEWiZy143iT6/oOofD4R0hC3h7xJWcMzWw41cIRDD/fuV5rbPoGI fefg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=X0HZGsKw; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b12si13851898pls.32.2018.12.18.18.52.16; Tue, 18 Dec 2018 18:52:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=X0HZGsKw; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 6FD737BF0A; Wed, 19 Dec 2018 02:52:03 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mail.openembedded.org (Postfix) with ESMTP id 98CD179E05 for ; Wed, 19 Dec 2018 02:51:27 +0000 (UTC) Received: by mail-pg1-f177.google.com with SMTP id z10so8747489pgp.7 for ; Tue, 18 Dec 2018 18:51:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F3XToJ4YYz8t8s+CFrIXHDUlQe71J3s3gn0ZjytFCVM=; b=X0HZGsKwr3YBQx2t+XE1Y0V0mHJjDvE92K0gSFMFFU1Aa4ulMahLvNhtim1MJakeoA dMpks6tnhPPFPnFu5qj2RY1rVVCS4sFPtLp0kFbDysdU0xSM1ndmPyY26Dcgi/IpSvFL m/NieT0gXUY77r7IvwuHPAHu+0PmktRExPF5OxHpPaClUqxg5NOAGyepvZoh9n2DU/M7 iTRKMSVi9Ur8RpIoCVx+rFpZFw+laaGGD9tyztFiJa1NvMijaAUtPfSCuN9DFWu5FEfx 3r3YwLBQkDALRrcOSbqOIxZZYfOJEfVqeSm3kHSo9D/Cf9OzTUcVJrdd39QJXUshF4bm EZoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=F3XToJ4YYz8t8s+CFrIXHDUlQe71J3s3gn0ZjytFCVM=; b=VRdbAjGdTzeKM2j7B9jtr1sJlW25Kfe/WJ3PmRLu3Xh43FZ+d1njfV65Ig0vQp8zxl hsDmlV1QC/erKmT3KLLwLnbW43lTok2ztNHtlGAu0ETuClFp32xcRsk/3Et/nLNYrkFb QZ9ip4Ki2XOCAJrcdzvKCSLG6vbwTjAcsWKmG8Vptq6k+5dsk5SnK3elfdhppplS8wZ2 fGVyvqoG22AVMBR0LsN6u8UNQRv/odT0mp8scsd9BpP0gYHMArEg+sx5CHTqPGCgRhU7 fP/Moixv6GJMfeNZxoWTqQjxP5sFazOqL9IHnP8G6dE9h0oP5B9acRuvSnHgKaMRN9Aw V+qQ== X-Gm-Message-State: AA+aEWaXbZo4J4OcTcJigVigxbOecIOX+yleNNr/6enkmrVJO8/8phLz x74R9kQej4HPOnaMjgRGJ3UZezcm1pU= X-Received: by 2002:a63:374e:: with SMTP id g14mr14989816pgn.59.1545187888201; Tue, 18 Dec 2018 18:51:28 -0800 (PST) Received: from localhost.localdomain ([2601:646:877f:9499::19ec]) by smtp.gmail.com with ESMTPSA id m3sm28000563pff.173.2018.12.18.18.51.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Dec 2018 18:51:27 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 18 Dec 2018 18:51:07 -0800 Message-Id: <20181219025109.19159-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181219025109.19159-1-raj.khem@gmail.com> References: <20181219025109.19159-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 4/6] collectd: Upgrade to 5.8.1 release X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Fix build with gcc9 Signed-off-by: Khem Raj --- .../0005-Disable-new-gcc8-warnings.patch | 18 +++++------ ...ctdclient-Fix-string-overflow-errors.patch | 31 +++++++++++++++++++ .../{collectd_5.8.0.bb => collectd_5.8.1.bb} | 5 +-- 3 files changed, 43 insertions(+), 11 deletions(-) create mode 100644 meta-oe/recipes-extended/collectd/collectd/0006-libcollectdclient-Fix-string-overflow-errors.patch rename meta-oe/recipes-extended/collectd/{collectd_5.8.0.bb => collectd_5.8.1.bb} (95%) -- 2.20.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/collectd/collectd/0005-Disable-new-gcc8-warnings.patch b/meta-oe/recipes-extended/collectd/collectd/0005-Disable-new-gcc8-warnings.patch index b12690b327..13510cdea0 100644 --- a/meta-oe/recipes-extended/collectd/collectd/0005-Disable-new-gcc8-warnings.patch +++ b/meta-oe/recipes-extended/collectd/collectd/0005-Disable-new-gcc8-warnings.patch @@ -1,4 +1,4 @@ -From d65e48b68076d5b304e6d865967003ae1fea0e6c Mon Sep 17 00:00:00 2001 +From f82f8faf9942f51e9c3c773b56574652695bef5a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 9 May 2018 21:45:38 -0700 Subject: [PATCH] Disable new gcc8 warnings @@ -7,17 +7,17 @@ GCC seems to be not able to detect the checks for size are already in place Signed-off-by: Khem Raj + --- -Upstream-Status: Submitted [https://github.com/collectd/collectd/pull/2768] src/libcollectdclient/network_parse.c | 7 +++++++ src/write_sensu.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/src/libcollectdclient/network_parse.c b/src/libcollectdclient/network_parse.c -index 2365ab0a..79e6ed96 100644 +index aa753ce..fef43a9 100644 --- a/src/libcollectdclient/network_parse.c +++ b/src/libcollectdclient/network_parse.c -@@ -163,6 +163,11 @@ static int parse_int(void *payload, size_t payload_size, uint64_t *out) { +@@ -148,6 +148,11 @@ static int parse_int(void *payload, size_t payload_size, uint64_t *out) { return 0; } @@ -29,7 +29,7 @@ index 2365ab0a..79e6ed96 100644 static int parse_string(void *payload, size_t payload_size, char *out, size_t out_size) { char *in = payload; -@@ -175,6 +180,8 @@ static int parse_string(void *payload, size_t payload_size, char *out, +@@ -160,6 +165,8 @@ static int parse_string(void *payload, size_t payload_size, char *out, return 0; } @@ -39,22 +39,22 @@ index 2365ab0a..79e6ed96 100644 lcc_value_list_t *state) { char buf[LCC_NAME_LEN]; diff --git a/src/write_sensu.c b/src/write_sensu.c -index ce23e654..63e1f599 100644 +index bd7a56d..6cb59d5 100644 --- a/src/write_sensu.c +++ b/src/write_sensu.c -@@ -569,6 +569,11 @@ static char *sensu_value_to_json(struct sensu_host const *host, /* {{{ */ +@@ -570,6 +570,11 @@ static char *sensu_value_to_json(struct sensu_host const *host, /* {{{ */ return ret_str; } /* }}} char *sensu_value_to_json */ +#pragma GCC diagnostic push -+#if __GNUC__ == 8 ++#if __GNUC__ > 7 +#pragma GCC diagnostic ignored "-Wstringop-overflow" +#pragma GCC diagnostic ignored "-Wstringop-truncation" +#endif /* * Uses replace_str2() implementation from * http://creativeandcritical.net/str-replace-c/ -@@ -631,6 +636,8 @@ static char *replace_str(const char *str, const char *old, /* {{{ */ +@@ -632,6 +637,8 @@ static char *replace_str(const char *str, const char *old, /* {{{ */ return ret; } /* }}} char *replace_str */ diff --git a/meta-oe/recipes-extended/collectd/collectd/0006-libcollectdclient-Fix-string-overflow-errors.patch b/meta-oe/recipes-extended/collectd/collectd/0006-libcollectdclient-Fix-string-overflow-errors.patch new file mode 100644 index 0000000000..3ed652f71f --- /dev/null +++ b/meta-oe/recipes-extended/collectd/collectd/0006-libcollectdclient-Fix-string-overflow-errors.patch @@ -0,0 +1,31 @@ +From 98719ea7f717750c790a1f9384ea8d0117e7f52d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 17 Dec 2018 18:15:05 -0800 +Subject: [PATCH] libcollectdclient: Fix string overflow errors + +Ensure that string has a space for ending null char + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + src/libcollectdclient/network_parse.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/libcollectdclient/network_parse.c b/src/libcollectdclient/network_parse.c +index fef43a9..6d65266 100644 +--- a/src/libcollectdclient/network_parse.c ++++ b/src/libcollectdclient/network_parse.c +@@ -169,9 +169,9 @@ static int parse_string(void *payload, size_t payload_size, char *out, + + static int parse_identifier(uint16_t type, void *payload, size_t payload_size, + lcc_value_list_t *state) { +- char buf[LCC_NAME_LEN]; +- +- if (parse_string(payload, payload_size, buf, sizeof(buf)) != 0) ++ char buf[LCC_NAME_LEN+1]; ++ buf[LCC_NAME_LEN] = '\0'; ++ if (parse_string(payload, payload_size, buf, LCC_NAME_LEN) != 0) + return EINVAL; + + switch (type) { diff --git a/meta-oe/recipes-extended/collectd/collectd_5.8.0.bb b/meta-oe/recipes-extended/collectd/collectd_5.8.1.bb similarity index 95% rename from meta-oe/recipes-extended/collectd/collectd_5.8.0.bb rename to meta-oe/recipes-extended/collectd/collectd_5.8.1.bb index df9fa233cd..6dff18c16b 100644 --- a/meta-oe/recipes-extended/collectd/collectd_5.8.0.bb +++ b/meta-oe/recipes-extended/collectd/collectd_5.8.1.bb @@ -13,9 +13,10 @@ SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \ file://0001-fix-to-build-with-glibc-2.25.patch \ file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ file://0005-Disable-new-gcc8-warnings.patch \ + file://0006-libcollectdclient-Fix-string-overflow-errors.patch \ " -SRC_URI[md5sum] = "a841159323624f18bf03198e9f5aa364" -SRC_URI[sha256sum] = "b06ff476bbf05533cb97ae6749262cc3c76c9969f032bd8496690084ddeb15c9" +SRC_URI[md5sum] = "bfce96c42cede5243028510bcc57c1e6" +SRC_URI[sha256sum] = "e796fda27ce06377f491ad91aa286962a68c2b54076aa77a29673d53204453da" inherit autotools pythonnative update-rc.d pkgconfig systemd From patchwork Wed Dec 19 02:51:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 154227 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4442372ljp; Tue, 18 Dec 2018 18:52:24 -0800 (PST) X-Google-Smtp-Source: AFSGD/VRXV8853L3KdVZIIX80oqf2ZAHYRMSxevf/AwrzlmdbMEOe2x1n3gOYslaKxLx/OH7dFkS X-Received: by 2002:a62:8d4f:: with SMTP id z76mr19572521pfd.2.1545187944405; Tue, 18 Dec 2018 18:52:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545187944; cv=none; d=google.com; s=arc-20160816; b=WxpPZbAxJyFses8C78i81qKCCq8+0w1exAuLlJK7nK3isyCxSVc54r/kKjpPF4Zu7f 2kQbA7sgEStkvueyobaaA3907duFAzhwD7agXurnegYG8dVmi09BPmN/QLEQaoSY5Azj qoYZFxr2l4qw0EGFzOYebxlLMnnIUXa2tKvwz5ympMWJuMtcJi5R9kGNglqTUs69yb68 /tkvYdJFw4VU0xyhGr8NOWr3d1HVgAgwBWJ3+4QX0VtUDTyXQP2v4yaaAlPWdN7acqUX 2hfw9LETpvhBfmjZtDmWzR//4SH68MHw1MKXnB798sJps2U3mkdEQKnr2ppkBiGdnLVn zeLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=f2rQmWr+RCk8cB0sMOXL507M7R5QiOxqNDSOoYif/To=; b=WzM+8Ussr0XXRT3rnmIHNsUUaQyjoJNe65d3W7/i8Dhd33GG1YRs6AhGq/61vxxSq7 Qh2JFVi95uta6e2e6IZF5Ep8wXW6bUBrvD8NuCghzSzpCb7Uf2NE2iTkfGvbeXrejz1D T3mAAATYAEUFxjLFrzEghTVLPa/YUwc8T19ZwsYPagVzAfKeRus9XQdQWe2MIGEm4mzq Msu/rXypO0DWDkjWuADLJH4CaNPdsSHeZB98hk4EasithEfLDXPOV02tt6MMd0leFoG8 msEy+VTTIiT6BChYl/U5M6JPweuaDLPUN2MAhlKJm5dMbPjw6WnGInYuLRhuSpstvOVc a+9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qSnYwY3M; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id g4si15603124pfm.85.2018.12.18.18.52.24; Tue, 18 Dec 2018 18:52:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qSnYwY3M; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9BFAB7BDEC; Wed, 19 Dec 2018 02:52:04 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by mail.openembedded.org (Postfix) with ESMTP id 7374D6B7CD for ; Wed, 19 Dec 2018 02:51:29 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id c25so7246941pgb.4 for ; Tue, 18 Dec 2018 18:51:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XTTu/MvuN2o+a/vSJRRj4E0dKQhaS7QxEhNhJzbyIoM=; b=qSnYwY3MBWHLT3x0VFqDWCOyscZfUVwXTwhXPEZ6Qn39ugO2SdCxxaAQ9go7wvZcAx iSR61ZfKdcMoEBYvKa5vNWTFDj1F9zx9ynWeFW+5ca0x6h1VXCHPI13wd1Z1yslkMkEU L2iEx2WDNPqmQdR63SB55IJA94IEN+uFXfNJ5uPWYfPUT/TsaGi+tCSY0ncSVsMHHk8z s0FO8Gt91+g8ByPLkA/UbrdAlqKfppxLjJa2z9KRhNJ4iKilS0Wlqzh3M+zGxYwoh3x2 HqYF1H+FUrkber70wn1Sc7qmTBC8lHSCoVwb5GB9+YF1xm21tC5p5oMM6cAITZsQO6Ee bsdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XTTu/MvuN2o+a/vSJRRj4E0dKQhaS7QxEhNhJzbyIoM=; b=CZRn54LZ5lKYGQBLBl7DYPJEspVkJRmpD8gtJSZO28Qx4N7O6iK9hT7m+Qd8t/dDwv NXKpvm5iP2YnpK9NZyyI31+PAd3BMpX//rj9EY+/0K3Amn8OmVHaR6pKqkWeefa2CsBp EqnQNo88HwFJCXPchGSZ0sIBMIxrQLwMbEod95GhziQ0IVFlq1nfRFRyRxP10ZVWFeMP TtMSFwjj4b313viUu+8h822ZeT4SBNc58XoQYUz1vg+sk6pEKAeeJSUT4yA7zNofuPIC Gw/GWTQwfaDF36+Ctzkg2H4Ry+rxwh71BNU8XxocJKguHPIAu7vw26+y+6dDA2oHvvtr X05g== X-Gm-Message-State: AA+aEWZT2b/tRmg+ih11VfyBdz0n89Tx/NKJIGUVZ8KtxBomM5gKGg2W DB74z0ySFdRPQY/50VOMlXYL6++W/s8= X-Received: by 2002:a63:24c2:: with SMTP id k185mr17240861pgk.406.1545187890093; Tue, 18 Dec 2018 18:51:30 -0800 (PST) Received: from localhost.localdomain ([2601:646:877f:9499::19ec]) by smtp.gmail.com with ESMTPSA id m3sm28000563pff.173.2018.12.18.18.51.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Dec 2018 18:51:28 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 18 Dec 2018 18:51:08 -0800 Message-Id: <20181219025109.19159-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181219025109.19159-1-raj.khem@gmail.com> References: <20181219025109.19159-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 5/6] opensc: Upgrade to 0.19.0 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Switch fetcher to use github Add patch to build with gcc9 Remove upstreamed patch Inherit bash-completion Signed-off-by: Khem Raj --- ...-Fixed-gcc-8-compilation-errors-1353.patch | 73 ------------------- .../0001-Remove-redundant-logging.patch | 34 +++++++++ .../{opensc_0.18.0.bb => opensc_0.19.0.bb} | 19 ++--- 3 files changed, 42 insertions(+), 84 deletions(-) delete mode 100644 meta-oe/recipes-support/opensc/opensc/0001-Fixed-gcc-8-compilation-errors-1353.patch create mode 100644 meta-oe/recipes-support/opensc/opensc/0001-Remove-redundant-logging.patch rename meta-oe/recipes-support/opensc/{opensc_0.18.0.bb => opensc_0.19.0.bb} (74%) diff --git a/meta-oe/recipes-support/opensc/opensc/0001-Fixed-gcc-8-compilation-errors-1353.patch b/meta-oe/recipes-support/opensc/opensc/0001-Fixed-gcc-8-compilation-errors-1353.patch deleted file mode 100644 index 48d8327546..0000000000 --- a/meta-oe/recipes-support/opensc/opensc/0001-Fixed-gcc-8-compilation-errors-1353.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 87857d5cae7db94fdd776904886392b1e86053bd Mon Sep 17 00:00:00 2001 -From: Florian Bezdeka <1119693+fbezdeka@users.noreply.github.com> -Date: Fri, 18 May 2018 18:54:56 +0200 -Subject: [PATCH] Fixed gcc 8 compilation errors (#1353) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The following errors occured during a compilation using gcc 8: - -In function »gids_create_file.constprop«, - inserted by »gids_save_certificate.isra.8« beicard-gids.c:1548:7: -card-gids.c:465:2: Error: »strncpy« output may be truncated copying 8 bytes from a string of length 8 [-Werror=stringop-truncation] - strncpy(record->filename, filename, 8); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -pkcs15-oberthur.c: In function »sc_pkcs15emu_oberthur_add_prvkey«: -pkcs15-oberthur.c:741:5: Error: »strncpy« output may be truncated copying 254 bytes from a string of length 254 [-Werror=stringop-truncation] - strncpy(kobj.label, objs[ii]->label, sizeof(kobj.label) - 1); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Backport [https://github.com/OpenSC/OpenSC/pull/1353] -Signed-off-by Khem Raj ---- - src/libopensc/card-gids.c | 3 ++- - src/libopensc/pkcs15-oberthur.c | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/libopensc/card-gids.c b/src/libopensc/card-gids.c -index fc5d2a7..ac3e579 100644 ---- a/src/libopensc/card-gids.c -+++ b/src/libopensc/card-gids.c -@@ -33,6 +33,7 @@ Some features are undocumented like the format used to store certificates. They - - #include - #include -+#include "../common/compat_strlcpy.h" - - #ifdef ENABLE_OPENSSL - /* openssl only needed for card administration */ -@@ -462,7 +463,7 @@ static int gids_create_file(sc_card_t *card, char* directory, char* filename) { - memset(masterfilebuffer + offset, 0, sizeof(gids_mf_record_t)); - record = (gids_mf_record_t*) (masterfilebuffer + offset); - strncpy(record->directory, directory, 8); -- strncpy(record->filename, filename, 8); -+ strlcpy(record->filename, filename, sizeof(record->filename)); - record->fileIdentifier = fileIdentifier; - record->dataObjectIdentifier = dataObjectIdentifier; - -diff --git a/src/libopensc/pkcs15-oberthur.c b/src/libopensc/pkcs15-oberthur.c -index 4f841ed..3415be7 100644 ---- a/src/libopensc/pkcs15-oberthur.c -+++ b/src/libopensc/pkcs15-oberthur.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include "../common/compat_strlcpy.h" - - #include "pkcs15.h" - #include "log.h" -@@ -738,7 +739,7 @@ sc_pkcs15emu_oberthur_add_prvkey(struct sc_pkcs15_card *p15card, - unsigned int id = path.value[path.len - 2] * 0x100 + path.value[path.len - 1]; - - if (id == ccont.id_cert) { -- strncpy(kobj.label, objs[ii]->label, sizeof(kobj.label) - 1); -+ strlcpy(kobj.label, objs[ii]->label, sizeof(kobj.label)); - break; - } - } --- -2.18.0 - diff --git a/meta-oe/recipes-support/opensc/opensc/0001-Remove-redundant-logging.patch b/meta-oe/recipes-support/opensc/opensc/0001-Remove-redundant-logging.patch new file mode 100644 index 0000000000..291f1a239a --- /dev/null +++ b/meta-oe/recipes-support/opensc/opensc/0001-Remove-redundant-logging.patch @@ -0,0 +1,34 @@ +From c012f46965b3fe24e31367796e52c2d0b14ca5d9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 17 Dec 2018 18:44:23 -0800 +Subject: [PATCH] Remove redundant logging + +Same information is printed a few line below in same function, the only +difference is that there it takes care of case when label is NULL pointer +unlike this line + +secondly, every function call to cosm_write_tokeninfo() in this file +passes label=NULL, and then it tries to print a null pointer + +Fixes errors like +src/libopensc/log.h:48:47: error: '%s' directive argument is null +[-Werror=format-overflow=] + +Upstream-Status: Submitted [https://github.com/OpenSC/OpenSC/pull/1557] +Signed-off-by: Khem Raj +--- + src/pkcs15init/pkcs15-oberthur.c | 1 - + 1 file changed, 1 deletion(-) + +Index: git/src/pkcs15init/pkcs15-oberthur.c +=================================================================== +--- git.orig/src/pkcs15init/pkcs15-oberthur.c ++++ git/src/pkcs15init/pkcs15-oberthur.c +@@ -70,7 +70,6 @@ cosm_write_tokeninfo (struct sc_pkcs15_c + ctx = p15card->card->ctx; + + SC_FUNC_CALLED(ctx, SC_LOG_DEBUG_VERBOSE); +- sc_debug(ctx, SC_LOG_DEBUG_NORMAL, "cosm_write_tokeninfo() label '%s'; flags 0x%X", label, flags); + if (sc_profile_get_file(profile, COSM_TITLE"-token-info", &file)) { + rv = SC_ERROR_INCONSISTENT_PROFILE; + SC_TEST_GOTO_ERR(ctx, SC_LOG_DEBUG_NORMAL, rv, "Cannot find "COSM_TITLE"-token-info"); diff --git a/meta-oe/recipes-support/opensc/opensc_0.18.0.bb b/meta-oe/recipes-support/opensc/opensc_0.19.0.bb similarity index 74% rename from meta-oe/recipes-support/opensc/opensc_0.18.0.bb rename to meta-oe/recipes-support/opensc/opensc_0.19.0.bb index 45c931e7bd..bc1722e394 100644 --- a/meta-oe/recipes-support/opensc/opensc_0.18.0.bb +++ b/meta-oe/recipes-support/opensc/opensc_0.19.0.bb @@ -8,22 +8,19 @@ eID cards have also been confirmed to work." HOMEPAGE = "http://www.opensc-project.org/opensc/" SECTION = "System Environment/Libraries" +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" -SRC_URI = "https://snapshot.debian.org/archive/debian/20180521T101428Z/pool/main/o/opensc/opensc_0.18.0.orig.tar.gz \ - file://0001-Fixed-gcc-8-compilation-errors-1353.patch \ +#v0.19.0 +SRCREV = "f1691fc91fc113191c3a8aaf5facd6983334ec47" +SRC_URI = "git://github.com/OpenSC/OpenSC \ + file://0001-Remove-redundant-logging.patch \ " - -SRC_URI[md5sum] = "bce516f752e0db5327aa06cc0136fe27" -SRC_URI[sha256sum] = "6ef62b00e8fdbe3e386c3ee25c2cadb56c1931ea42f1a11dce8c947f51b45033" - DEPENDS = "openct pcsc-lite virtual/libiconv openssl" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" - -inherit autotools pkgconfig +S = "${WORKDIR}/git" +inherit autotools pkgconfig bash-completion -S = "${WORKDIR}/OpenSC-${PV}" EXTRA_OECONF = " \ --disable-static \ --enable-openct \ From patchwork Wed Dec 19 02:51:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 154228 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4442473ljp; Tue, 18 Dec 2018 18:52:34 -0800 (PST) X-Google-Smtp-Source: AFSGD/UAM9FbX5Kx/AwaCOOnJpgbIn7/CfvaHcSTStg2gtom3rdYOjpKSdt9zkOcvxzJYWR7dZ4r X-Received: by 2002:a62:5793:: with SMTP id i19mr19122086pfj.49.1545187953890; Tue, 18 Dec 2018 18:52:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545187953; cv=none; d=google.com; s=arc-20160816; b=KwSeVRAgudKPzGRNcQz1Ik7SR9spNpj5ltQ+Yje453l22mWCLcJ6l9oe0y5MBIGN4j 1I5KMzl62KetHarvOE1mbuscCAdPiVo/r8gLcUZ4g6lcSJgjJV6C7T9m9H+CW0UqGFVZ 3LyFrMcjTJmP9eo9RZQuv3bSMBjDxnJgh6/BgxLdsIV4A/BxUxqrB/+jlC3Dl9tWhS6+ oiMiQEkgdMcbLTiNdXkHqUvrTGR0yOnaP8gRMk0xZvF2XGc0pxDGvxohH4vVYpDlKfP0 wbOLP5QB6rzmVZNHMU1TL7JIGqerOWzLKJd102u+G7Aq4XNaEg3urSmmB/wTYB+M63Hb 2rzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=SyDfj7vY+HhEmNGulUWRH/ADHCZNxQNJaWnI1zE6k88=; b=SjI35pqea7Y/LsBu/H6EctIFWRskoL0vTRXidlDfpmyhIDyLtxQNOrre1IVpvvWqau htTsK++1+gOmx0lPGeAnUwPvUCZG32SCXgIc/ODgrK1e6SnzItzPbOPzsIMyJy/pNLuK cZLvGhee4mvDrQK9Sls0S/3z9gW9Gn1BwF3lMdzzYUTVTEFWTMhE4OIt64v9Lq61TJBi 6f3WmCkICX+BAjgvIMdBtiwskEI6YCanmNxwa8AHySjdQsd7L3yffYGIOPmB715YmNtw jRPnNmfny65818REQ2QD+A+idvc7w/W8pCC+HyvAOcvV+fyE5Od+g7pGqYDk7jEkdU24 dkyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=KKY8v2Kk; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id e125si15209284pfe.14.2018.12.18.18.52.33; Tue, 18 Dec 2018 18:52:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=KKY8v2Kk; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 05C057BF39; Wed, 19 Dec 2018 02:52:06 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mail.openembedded.org (Postfix) with ESMTP id 5C03C6B7CD for ; Wed, 19 Dec 2018 02:51:30 +0000 (UTC) Received: by mail-pg1-f181.google.com with SMTP id w7so8731262pgp.13 for ; Tue, 18 Dec 2018 18:51:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hKBiJbefj9R0URzWzp13SUCgAp3KzUdvWyTWObp9UNk=; b=KKY8v2KkVu3MW8k9VGguPDReJxBMTUTUSs+RluHiM0BUNeIUej9Z1mEpnJCavADJIN 4IsAAZw/UAP3bblbhO+9JY4gWBYYJLi5URRoVQml+niRtj4URuMlKepqBbvR4QP/SwNQ ECZb5+UXSSM6jh8Du5UHS7VSS9YdZkdmOML7lQaWlxmjihmb8vRb+xZrAWtqGe3Jph1J zF77khZM7SQdh6mZhpNYpcO37edv7b5R30fQOUexiFaFomnwk0g4GEhqULsomgOEvnFk MKu882mchXDwcTkbzmeYYyhRE8f/eu1LmnxKpJdL36JAlHUh66DFz0BFupT9BFaX95bk 4tIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hKBiJbefj9R0URzWzp13SUCgAp3KzUdvWyTWObp9UNk=; b=AJ50Z31tx+omXc3VtwFsQEp+BDLo0h+b0Af7NcrnlKYHze1A4YeVpERTK32gN39JSF ZBouyHRte4OYc8PR6ObahGLbG44RI3r4oo1PLeUsts6OxB4U1aXgy9n4ThEBI6gNndYy ovitnuUALl/Y3cVWYVjmL0ehtiyiNTbuzOwKgnpXZSp0zz8XPjacj149lvzXtv6XJ5sR QThNXTPqGcIr64fBnkzpQj8pLxa/4x5Tx/DB9dxd0bc3zm8sDk5DbciTmuS0DKoTEPYm +vVIRPNR98+5oWK3D8BLbdFkz4PQAY1XYonavauyC+evCnpgmY5RhVX6DeRtymFPgIVk vkjw== X-Gm-Message-State: AA+aEWatWVHSST3eoKHUVr/VEXG8GpSmzBoBFnpnbx0X+evenB3Z7s5W zfW5BwxLLFcUmV7C4T7jgA9z+39KsGU= X-Received: by 2002:a63:a401:: with SMTP id c1mr17983243pgf.403.1545187890937; Tue, 18 Dec 2018 18:51:30 -0800 (PST) Received: from localhost.localdomain ([2601:646:877f:9499::19ec]) by smtp.gmail.com with ESMTPSA id m3sm28000563pff.173.2018.12.18.18.51.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Dec 2018 18:51:30 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 18 Dec 2018 18:51:09 -0800 Message-Id: <20181219025109.19159-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181219025109.19159-1-raj.khem@gmail.com> References: <20181219025109.19159-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 6/6] rocksdb: Upgrade to 5.17.2 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...Fix-GitHub-issue-3716-gcc-8-warnings.patch | 194 ------------------ meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb | 7 +- 2 files changed, 3 insertions(+), 198 deletions(-) delete mode 100644 meta-oe/recipes-dbs/rocksdb/rocksdb/0001-Fix-GitHub-issue-3716-gcc-8-warnings.patch -- 2.20.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb/0001-Fix-GitHub-issue-3716-gcc-8-warnings.patch b/meta-oe/recipes-dbs/rocksdb/rocksdb/0001-Fix-GitHub-issue-3716-gcc-8-warnings.patch deleted file mode 100644 index be498974af..0000000000 --- a/meta-oe/recipes-dbs/rocksdb/rocksdb/0001-Fix-GitHub-issue-3716-gcc-8-warnings.patch +++ /dev/null @@ -1,194 +0,0 @@ -From 8d65d70b54d1d306a0a0b00e036bc8ddd39d8ec1 Mon Sep 17 00:00:00 2001 -From: "przemyslaw.skibinski@percona.com" -Date: Fri, 20 Apr 2018 13:28:05 -0700 -Subject: [PATCH] Fix GitHub issue #3716: gcc-8 warnings - -Summary: -Fix the following gcc-8 warnings: -- conflicting C language linkage declaration [-Werror] -- writing to an object with no trivial copy-assignment [-Werror=class-memaccess] -- array subscript -1 is below array bounds [-Werror=array-bounds] - -Solves https://github.com/facebook/rocksdb/issues/3716 -Closes https://github.com/facebook/rocksdb/pull/3736 - -Differential Revision: D7684161 - -Pulled By: yiwu-arbug - -fbshipit-source-id: 47c0423d26b74add251f1d3595211eee1e41e54a ---- -Signed-off-by: Khem Raj -Upstream-Status: Backport [https://github.com/facebook/rocksdb/commit/dee95a1afc6c63515e7d94dec33acdb79638b6d7.patch] - - db/c.cc | 77 ++++++++++++++------------------------- - memtable/inlineskiplist.h | 12 +++--- - 2 files changed, 33 insertions(+), 56 deletions(-) - -diff --git a/db/c.cc b/db/c.cc -index 064103ed4..0d485d096 100644 ---- a/db/c.cc -+++ b/db/c.cc -@@ -1388,23 +1388,24 @@ void rocksdb_writebatch_put_log_data( - b->rep.PutLogData(Slice(blob, len)); - } - -+class H : public WriteBatch::Handler { -+ public: -+ void* state_; -+ void (*put_)(void*, const char* k, size_t klen, const char* v, size_t vlen); -+ void (*deleted_)(void*, const char* k, size_t klen); -+ virtual void Put(const Slice& key, const Slice& value) override { -+ (*put_)(state_, key.data(), key.size(), value.data(), value.size()); -+ } -+ virtual void Delete(const Slice& key) override { -+ (*deleted_)(state_, key.data(), key.size()); -+ } -+}; -+ - void rocksdb_writebatch_iterate( - rocksdb_writebatch_t* b, - void* state, - void (*put)(void*, const char* k, size_t klen, const char* v, size_t vlen), - void (*deleted)(void*, const char* k, size_t klen)) { -- class H : public WriteBatch::Handler { -- public: -- void* state_; -- void (*put_)(void*, const char* k, size_t klen, const char* v, size_t vlen); -- void (*deleted_)(void*, const char* k, size_t klen); -- virtual void Put(const Slice& key, const Slice& value) override { -- (*put_)(state_, key.data(), key.size(), value.data(), value.size()); -- } -- virtual void Delete(const Slice& key) override { -- (*deleted_)(state_, key.data(), key.size()); -- } -- }; - H handler; - handler.state_ = state; - handler.put_ = put; -@@ -1649,18 +1650,6 @@ void rocksdb_writebatch_wi_iterate( - void* state, - void (*put)(void*, const char* k, size_t klen, const char* v, size_t vlen), - void (*deleted)(void*, const char* k, size_t klen)) { -- class H : public WriteBatch::Handler { -- public: -- void* state_; -- void (*put_)(void*, const char* k, size_t klen, const char* v, size_t vlen); -- void (*deleted_)(void*, const char* k, size_t klen); -- virtual void Put(const Slice& key, const Slice& value) override { -- (*put_)(state_, key.data(), key.size(), value.data(), value.size()); -- } -- virtual void Delete(const Slice& key) override { -- (*deleted_)(state_, key.data(), key.size()); -- } -- }; - H handler; - handler.state_ = state; - handler.put_ = put; -@@ -3109,20 +3098,21 @@ void rocksdb_slicetransform_destroy(rocksdb_slicetransform_t* st) { - delete st; - } - -+struct Wrapper : public rocksdb_slicetransform_t { -+ const SliceTransform* rep_; -+ ~Wrapper() { delete rep_; } -+ const char* Name() const override { return rep_->Name(); } -+ Slice Transform(const Slice& src) const override { -+ return rep_->Transform(src); -+ } -+ bool InDomain(const Slice& src) const override { -+ return rep_->InDomain(src); -+ } -+ bool InRange(const Slice& src) const override { return rep_->InRange(src); } -+ static void DoNothing(void*) { } -+}; -+ - rocksdb_slicetransform_t* rocksdb_slicetransform_create_fixed_prefix(size_t prefixLen) { -- struct Wrapper : public rocksdb_slicetransform_t { -- const SliceTransform* rep_; -- ~Wrapper() { delete rep_; } -- const char* Name() const override { return rep_->Name(); } -- Slice Transform(const Slice& src) const override { -- return rep_->Transform(src); -- } -- bool InDomain(const Slice& src) const override { -- return rep_->InDomain(src); -- } -- bool InRange(const Slice& src) const override { return rep_->InRange(src); } -- static void DoNothing(void*) { } -- }; - Wrapper* wrapper = new Wrapper; - wrapper->rep_ = rocksdb::NewFixedPrefixTransform(prefixLen); - wrapper->state_ = nullptr; -@@ -3131,19 +3121,6 @@ rocksdb_slicetransform_t* rocksdb_slicetransform_create_fixed_prefix(size_t pref - } - - rocksdb_slicetransform_t* rocksdb_slicetransform_create_noop() { -- struct Wrapper : public rocksdb_slicetransform_t { -- const SliceTransform* rep_; -- ~Wrapper() { delete rep_; } -- const char* Name() const override { return rep_->Name(); } -- Slice Transform(const Slice& src) const override { -- return rep_->Transform(src); -- } -- bool InDomain(const Slice& src) const override { -- return rep_->InDomain(src); -- } -- bool InRange(const Slice& src) const override { return rep_->InRange(src); } -- static void DoNothing(void*) { } -- }; - Wrapper* wrapper = new Wrapper; - wrapper->rep_ = rocksdb::NewNoopTransform(); - wrapper->state_ = nullptr; -diff --git a/memtable/inlineskiplist.h b/memtable/inlineskiplist.h -index 702a7336d..eadda1dc1 100644 ---- a/memtable/inlineskiplist.h -+++ b/memtable/inlineskiplist.h -@@ -280,7 +280,7 @@ struct InlineSkipList::Node { - // next_[0]. This is used for passing data from AllocateKey to Insert. - void StashHeight(const int height) { - assert(sizeof(int) <= sizeof(next_[0])); -- memcpy(&next_[0], &height, sizeof(int)); -+ memcpy(static_cast(&next_[0]), &height, sizeof(int)); - } - - // Retrieves the value passed to StashHeight. Undefined after a call -@@ -300,30 +300,30 @@ struct InlineSkipList::Node { - assert(n >= 0); - // Use an 'acquire load' so that we observe a fully initialized - // version of the returned Node. -- return (next_[-n].load(std::memory_order_acquire)); -+ return ((&next_[0] - n)->load(std::memory_order_acquire)); - } - - void SetNext(int n, Node* x) { - assert(n >= 0); - // Use a 'release store' so that anybody who reads through this - // pointer observes a fully initialized version of the inserted node. -- next_[-n].store(x, std::memory_order_release); -+ (&next_[0] - n)->store(x, std::memory_order_release); - } - - bool CASNext(int n, Node* expected, Node* x) { - assert(n >= 0); -- return next_[-n].compare_exchange_strong(expected, x); -+ return (&next_[0] - n)->compare_exchange_strong(expected, x); - } - - // No-barrier variants that can be safely used in a few locations. - Node* NoBarrier_Next(int n) { - assert(n >= 0); -- return next_[-n].load(std::memory_order_relaxed); -+ return (&next_[0] - n)->load(std::memory_order_relaxed); - } - - void NoBarrier_SetNext(int n, Node* x) { - assert(n >= 0); -- next_[-n].store(x, std::memory_order_relaxed); -+ (&next_[0] - n)->store(x, std::memory_order_relaxed); - } - - // Insert node after prev on specific level. --- -2.17.0 - diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb index 594d1a9c77..67822477ee 100644 --- a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb +++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb @@ -6,12 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" -SRCREV = "c60df9d9e7629fe208a9b848293a5599f83d5e77" -SRCBRANCH = "5.13.fb" -PV = "5.13.1" +SRCREV = "f438b98e552010613cff8684a7d84191ed785148" +SRCBRANCH = "5.17.fb" +PV = "5.17.2" SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \ - file://0001-Fix-GitHub-issue-3716-gcc-8-warnings.patch \ " S = "${WORKDIR}/git"