From patchwork Tue Feb 21 14:40:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19911 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E6BDC6379F for ; Tue, 21 Feb 2023 14:41:17 +0000 (UTC) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web10.43525.1676990474552571898 for ; Tue, 21 Feb 2023 06:41:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=qWLBLAtb; spf=softfail (domain: sakoman.com, ip: 209.85.210.175, mailfrom: steve@sakoman.com) Received: by mail-pf1-f175.google.com with SMTP id x24so2709852pfn.7 for ; Tue, 21 Feb 2023 06:41:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4LzYi2SzAV+hQcYeSTSNbrhtogzYbWe8uRslCp8SS68=; b=qWLBLAtbRfnQuhLTqq8McwYOJ0MMknSAldn3rKg9GsfRLknNE7xNTax2kJQKbuNLjT Sk50zKs9aWnX8JxwpzWztU8cPCjJx5U70sqnCRVe2y0I+kFLR9neqnBuxRTYZyJmt9JN FEbaXWgX8rSDbY+CBSOSkm96o+15MpB3YL7rBfFspFVgf4hm9xK4KtXJSe5pXKfyG2xQ KJvCKzHKJVFcJndHJ9wjZTKONDovzF0DWadK0gLLsWNnbKR3zBANPgN/69zbsyBBJfJ7 jgO5px/v8imm5bh7zj0zJStZhxGYQigN0JsCLuHbaZ0725yT9ny9wAXYyYDPQhdauwYr kXqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4LzYi2SzAV+hQcYeSTSNbrhtogzYbWe8uRslCp8SS68=; b=XYxqEtJxrENDVQfUMu/duLkkSDG1iHWPBfTdyfpeRL2ip55BdHlVjmnCBXCqModgns cYGv0CInLYNt9ImOWeGQuCsWMCUTzKahuRX/8+KPZz8mUqO2ALM7JkeqSSxCcXrJ/2GS KLn93bcowQ6/K/bp/XCQfVeD8EeEJwJKYOA33CjCQteionZbod59D4oircJXwGdG+4+8 wKs1o/5ffYRDRSCpWWvn42l7Vv/pjf5rkoV4K+NH29LxLrfj86/8sahpDMMxOKZt1FD/ G5Pm4cQGBDnxm6QZIXIzCy23vyzixLYQ7/HneTNc3Cj3syeA6cLrWv/sihmjewEu6NJr L9CA== X-Gm-Message-State: AO0yUKVy/gWvsVNzb370njdK8/IM0gxi/FSlaaECp1UdWaAXgrAhUEnA R+oChJH9sEiNqs4Vr9LAsFU+S//zO4QcaqmseAw= X-Google-Smtp-Source: AK7set+s5zULjt2GhyB9zomqZGJzD0OxOmC0czgK5v5dJfWCGi1bN9meeQLIQ7BQoWY+wt2XPakfRA== X-Received: by 2002:a05:6a00:4ac4:b0:5a9:cad5:b283 with SMTP id ds4-20020a056a004ac400b005a9cad5b283mr4339552pfb.14.1676990473443; Tue, 21 Feb 2023 06:41:13 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:13 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 01/23] tar: CVE-2022-48303 Date: Tue, 21 Feb 2023 04:40:44 -1000 Message-Id: <231360a55bf1b96d6bb1cf94820b08788677c58b.1676990336.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177501 From: Rodolfo Quesada Zumbado Fixes CVE-2022-48303 by checking Base-256 encoding is at least 2 bytes long. GNU Tar through 1.34 has a one-byte out-of-bounds read that results in use of uninitialized memory for a conditional jump. Exploitation to change the flow of control has not been demonstrated. The issue occurs in from_header in list.c via a V7 archive in which mtime has approximately 11 whitespace characters. Reference: https://nvd.nist.gov/vuln/detail/CVE-2022-48303 Upstream patch: https://savannah.gnu.org/bugs/?62387 https://git.savannah.gnu.org/cgit/tar.git/patch/src/list.c?id=3da78400eafcccb97e2f2fd4b227ea40d794ede8 Signed-off-by: Rodolfo Quesada Zumbado Signed-off-by: Joe Slater Signed-off-by: Steve Sakoman --- .../tar/tar/CVE-2022-48303.patch | 43 +++++++++++++++++++ meta/recipes-extended/tar/tar_1.34.bb | 4 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/tar/tar/CVE-2022-48303.patch diff --git a/meta/recipes-extended/tar/tar/CVE-2022-48303.patch b/meta/recipes-extended/tar/tar/CVE-2022-48303.patch new file mode 100644 index 0000000000..b2f40f3e64 --- /dev/null +++ b/meta/recipes-extended/tar/tar/CVE-2022-48303.patch @@ -0,0 +1,43 @@ +From 3da78400eafcccb97e2f2fd4b227ea40d794ede8 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Sat, 11 Feb 2023 11:57:39 +0200 +Subject: Fix boundary checking in base-256 decoder + +* src/list.c (from_header): Base-256 encoding is at least 2 bytes +long. + +Upstream-Status: Backport [see reference below] +CVE: CVE-2022-48303 + +Reference to upstream patch: +https://savannah.gnu.org/bugs/?62387 +https://git.savannah.gnu.org/cgit/tar.git/patch/src/list.c?id=3da78400eafcccb97e2f2fd4b227ea40d794ede8 + +Signed-off-by: Rodolfo Quesada Zumbado +Signed-off-by: Joe Slater +--- + src/list.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-)Signed-off-by: Rodolfo Quesada Zumbado + + +(limited to 'src/list.c') + +diff --git a/src/list.c b/src/list.c +index 9fafc42..86bcfdd 100644 +--- a/src/list.c ++++ b/src/list.c +@@ -881,8 +881,9 @@ from_header (char const *where0, size_t digs, char const *type, + where++; + } + } +- else if (*where == '\200' /* positive base-256 */ +- || *where == '\377' /* negative base-256 */) ++ else if (where <= lim - 2 ++ && (*where == '\200' /* positive base-256 */ ++ || *where == '\377' /* negative base-256 */)) + { + /* Parse base-256 output. A nonnegative number N is + represented as (256**DIGS)/2 + N; a negative number -N is +-- +cgit v1.1 + diff --git a/meta/recipes-extended/tar/tar_1.34.bb b/meta/recipes-extended/tar/tar_1.34.bb index 7307cd57a2..1ef5fe221e 100644 --- a/meta/recipes-extended/tar/tar_1.34.bb +++ b/meta/recipes-extended/tar/tar_1.34.bb @@ -6,7 +6,9 @@ SECTION = "base" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2" +SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \ + file://CVE-2022-48303.patch \ +" SRC_URI[sha256sum] = "b44cc67f8a1f6b0250b7c860e952b37e8ed932a90bd9b1862a511079255646ff" From patchwork Tue Feb 21 14:40:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19913 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B71F1C61DA3 for ; Tue, 21 Feb 2023 14:41:17 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web11.44230.1676990476541129870 for ; Tue, 21 Feb 2023 06:41:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=USIGKfFx; spf=softfail (domain: sakoman.com, ip: 209.85.215.180, mailfrom: steve@sakoman.com) Received: by mail-pg1-f180.google.com with SMTP id t1so2192122pgi.2 for ; Tue, 21 Feb 2023 06:41:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=JdAU0ifAf5yNi9xcT28n1yztvh+x9zb+d0mH5frbkDg=; b=USIGKfFxZZgiFSyabR15r4EYWQ3bdXBVt3nE6s99sBnTHkm/RAl+56Ge3dm2kkrXHL O8cQF6jRVE4qhpc338un7rZZLzg32MAOTkwLvkyUo8IniDWxogwhDsvQC9pu6sw7GKte ajYJdD398VeEBVmC7zFD1niKl/tfKJ3W1v7U4aqfe9MJUY1bNGJWzZO8ABOrM+046u/c x1XHup8NFl6AKHzJqY6NosYKAfVjPWXU2mUjP76ZTnzgi3KLPPrG430CSCESBTbZUXdl wzlMbiIpFgFEDjeSxFrbSVgQGookDWR9rKD9HuZ5IWd1TDftUkLRkyQLc69ZAoDU1wSi DSug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JdAU0ifAf5yNi9xcT28n1yztvh+x9zb+d0mH5frbkDg=; b=F5w5EYUEEDXbfmPTbjdsLh9TFMNuRPhsZ/Sv+uuYLLVRfv+FfgO0o+I9VBDmX2u1YU byqaLnvMhM9yKroU68hQhEevgrVRY6If0vjWQ+qWynxXBoRCney62zzMBtLmt1Qixcc5 kOQPeeQqruKZ8zeZGNchLv51m+MLibTniQfcUqj670Hh2p3gDAtmzCOrsQrVdntoFRyM OG/iO5fHkKNa7K3xiRnaFTodYkB756geMFG3mAV8pWgUicF+zgvB+Y6whAUPyH8tko4p rnZp3gPNplWC6jQ+5Csr6FAzyFuiME8/ULg9dS2u10tzLN7s7hekvI/KRQRgdhLYumOH /XjQ== X-Gm-Message-State: AO0yUKX6ITJqzxLPb8kxm1X8ZJAkZXX28FKat3OKs96jtfKUypfLTYPc S9WwhwgO7RdDsJ56Vuc2F7GlpcGthzLZlsX7PKA= X-Google-Smtp-Source: AK7set9HpTHA9/rXYE8GuhEJTrXOKxSKdQiIksqF4Ns/S6zFxZl204lbgrf7oYJ7n1DBG5Ypj0laWw== X-Received: by 2002:aa7:842a:0:b0:5aa:39a8:41ab with SMTP id q10-20020aa7842a000000b005aa39a841abmr6322379pfn.21.1676990475406; Tue, 21 Feb 2023 06:41:15 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:15 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 02/23] diffutils: update 3.8 -> 3.9 Date: Tue, 21 Feb 2023 04:40:45 -1000 Message-Id: <686bb89d7553f48c029b6f6d79c88304f2dc0c55.1676990336.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177502 From: Alexander Kanavin NEWS * Noteworthy changes in release 3.9 (2023-01-15) [stable] ** Bug fixes diff -c and -u no longer output incorrect timezones in headers on platforms like Solaris where struct tm lacks tm_gmtoff. [bug#51228 introduced in 3.4] Drop patch as issue fixed upstream. Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit e5ec5de7217de28bccf3243496df6b41ca8a1d0b) Signed-off-by: Steve Sakoman (cherry picked from commit 6bf52987a82370a1353399a480271a76237e7619) Signed-off-by: Steve Sakoman --- ...001-Skip-strip-trailing-cr-test-case.patch | 11 +++---- ...a-standard-layout-so-glibc-and-musl-.patch | 33 ------------------- .../{diffutils_3.8.bb => diffutils_3.9.bb} | 3 +- 3 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch rename meta/recipes-extended/diffutils/{diffutils_3.8.bb => diffutils_3.9.bb} (88%) diff --git a/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch b/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch index aac1c43465..8b88c308f2 100644 --- a/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch +++ b/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch @@ -1,4 +1,4 @@ -From bd7fb8be2ae2d75347cf7733302d5093046ffa85 Mon Sep 17 00:00:00 2001 +From 027229d25392b22d7280c0abbc3efde4f467d167 Mon Sep 17 00:00:00 2001 From: Peiran Hong Date: Thu, 5 Sep 2019 15:42:22 -0400 Subject: [PATCH] Skip strip-trailing-cr test case @@ -10,19 +10,21 @@ package. Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Peiran Hong + --- tests/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 83a7c9d..04d51b5 100644 +index d98df82..757ea52 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -21,8 +21,10 @@ TESTS = \ +@@ -21,9 +21,11 @@ TESTS = \ stdin \ strcoll-0-names \ filename-quoting \ - strip-trailing-cr \ + timezone \ colors +# Skipping this test since it requires valgrind +# and thus is too heavy for diffutils package @@ -30,6 +32,3 @@ index 83a7c9d..04d51b5 100644 XFAIL_TESTS = large-subopt --- -2.21.0 - diff --git a/meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch b/meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch deleted file mode 100644 index 4928e1eaff..0000000000 --- a/meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f385ad6639380eb6dfa8b8eb4a5ba65dd12db744 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 25 Mar 2022 13:43:19 -0700 -Subject: [PATCH] mcontext is not a standard layout so glibc and musl differ - -This is already applied to libsigsegv upstream, hopefully next version -of grep will update its internal copy and we can drop this patch - -Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=libsigsegv.git;a=commitdiff;h=a6ff69873110c0a8ba6f7fd90532dbc11224828c] - -Signed-off-by: Khem Raj ---- - lib/sigsegv.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/sigsegv.c b/lib/sigsegv.c -index 998c827..b6f4841 100644 ---- a/lib/sigsegv.c -+++ b/lib/sigsegv.c -@@ -219,8 +219,8 @@ int libsigsegv_version = LIBSIGSEGV_VERSION; - # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1] - # else /* 32-bit */ - /* both should be equivalent */ --# if 0 --# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] -+# if ! defined __GLIBC__ -+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_regs->gregs[1] - # else - # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] - # endif --- -2.35.1 - diff --git a/meta/recipes-extended/diffutils/diffutils_3.8.bb b/meta/recipes-extended/diffutils/diffutils_3.9.bb similarity index 88% rename from meta/recipes-extended/diffutils/diffutils_3.8.bb rename to meta/recipes-extended/diffutils/diffutils_3.9.bb index 8889c83ee2..2bb9e6f32d 100644 --- a/meta/recipes-extended/diffutils/diffutils_3.8.bb +++ b/meta/recipes-extended/diffutils/diffutils_3.9.bb @@ -6,10 +6,9 @@ require diffutils.inc SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ file://run-ptest \ file://0001-Skip-strip-trailing-cr-test-case.patch \ - file://0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch \ " -SRC_URI[sha256sum] = "a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec" +SRC_URI[sha256sum] = "d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1" EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix" From patchwork Tue Feb 21 14:40:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19915 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8618FC6379F for ; Tue, 21 Feb 2023 14:41:27 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web10.43528.1676990478424193122 for ; Tue, 21 Feb 2023 06:41:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=oIGAmF6N; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id n20so2627165pfu.12 for ; Tue, 21 Feb 2023 06:41:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3jkrrzOkMgERGFGGVPGs53jHkNboN4WtDk9CTx2lWmo=; b=oIGAmF6NTa6xNnWoi+phlag2lvwLmxFb+kmbvjYwX2JH8LTv/XiJCsbpUB9tPxoxQa 1dUUMRSMHghIcBnlPDD4hxQM2Ey2ZvtRKdOmgIbnMrMl68uyavjzQtZeKHhuIHVOFp9x FHtAYEgBzGvXBMoeuqgsskyXjpzW7PPOn/bS140A1ZKKGL+b2AiE3W648H+PNoq3uD+Q PaU//hNPSNxc+GUY4l5Q0Do4uZFEJirAakVQFngvmJ8Jynts5YknARfnk+4XGaskYP/o KXDCQBT3wGrgTjpF1xmJ8SjIlSKSa6urVRaPmBIBr3dqwNk+Ky0vS/zrA9rxwnYb/38R Gt2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3jkrrzOkMgERGFGGVPGs53jHkNboN4WtDk9CTx2lWmo=; b=BQAQ5KyYXtGJs+WMTFXdb2pfNKJNQbsuuoEULjhXFgvv4e3jpKCOYnrlcvCgOGrsc/ 4BbwiHYR/aWTpohXvm/YswNRiJukDDB5oO+zdfQ5f2J65rrV1Bexi6VyvcXRXgXLBODJ 9Doai6VMk8Fd7aJANKwQoJmhi1urdtQAlG+XsdzosnvOMIJo/4ofvrXC4PztNAZ7Fcci YFFWnPJsSatzceYf63YCU2jUNI6sKKiWBRc9UR3CJ1hcXO8T06iOpJufOM3rDIf1/xU4 J5Rr4fR8LGtYYH9bD+LVR97kSwbhzWcPHsxgAfN8RwsmxsfnJ7eOER/79xPNDoqYceUe Gz8w== X-Gm-Message-State: AO0yUKUSyQsn00PYIyQacF7AzjvqFC/WjFZwxeWyoiVjq3J1vQjyd/b7 m3kjZff9gDeFwy6ytKmYmRTSXWwdwaJ7bLa1FGg= X-Google-Smtp-Source: AK7set8rr1+jI4rQsLvOMtmUKCGu3VW8sgHqeWQqqAYc5KIde2Nb9bkyMIg8gr6Q/3B3a7CmAHFq6g== X-Received: by 2002:aa7:96b4:0:b0:5d2:248d:7ec3 with SMTP id g20-20020aa796b4000000b005d2248d7ec3mr575087pfk.8.1676990477358; Tue, 21 Feb 2023 06:41:17 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:16 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 03/23] lttng-tools: update 2.13.8 -> 2.13.9 Date: Tue, 21 Feb 2023 04:40:46 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177503 From: Alexander Kanavin 2023-01-13 (National Sticker Day) LTTng modules 2.13.8 * fix: jbd2: use the correct print format * Fix: in_x32_syscall was introduced in v4.7.0 * Explicitly skip tracing x32 system calls * fix: kallsyms wrapper on ppc64el * fix: Adjust ranges for RHEL 8.6 kernels * fix: kvm-x86 requires CONFIG_KALLSYMS_ALL * fix: mm/slab_common: drop kmem_alloc & avoid dereferencing fields when not using (v6.1) Drop determinism.patch as issue resolved upstream via linked ticket. Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit cd9e72a390efb778a6278e2e6c9604ab29d6feb9) Signed-off-by: Steve Sakoman (cherry picked from commit 812fb8f02b25bfd30f6d9640cf3b50131d68e0b1) Signed-off-by: Steve Sakoman --- .../lttng/lttng-tools/determinism.patch | 64 ------------------- ...-tools_2.13.8.bb => lttng-tools_2.13.9.bb} | 3 +- 2 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/determinism.patch rename meta/recipes-kernel/lttng/{lttng-tools_2.13.8.bb => lttng-tools_2.13.9.bb} (98%) diff --git a/meta/recipes-kernel/lttng/lttng-tools/determinism.patch b/meta/recipes-kernel/lttng/lttng-tools/determinism.patch deleted file mode 100644 index 0a897a8e13..0000000000 --- a/meta/recipes-kernel/lttng/lttng-tools/determinism.patch +++ /dev/null @@ -1,64 +0,0 @@ -This is a bit ugly. Specifing abs_builddir as an RPATH is plain wrong when -cross compiling. Sadly, removing the rpath makes libtool/automake do -weird things and breaks the build as shared libs are no longer generated. - -We already try and delete the RPATH at do_install with chrpath however -that does leave the path in the string table so it doesn't help us -with reproducibility. - -Instead, hack in a bogus but harmless path, then delete it later in -our do_install. Ultimately we may want to pass a specific path to use -to configure if we really do need to set an RPATH at all. It is unclear -to me whether the tests need that or not. - -Fixes reproducibility issues for lttng-tools. - -Upstream-Status: Submitted [https://bugs.lttng.org/issues/1361 - needs discussion with upstream about the correct solution] -RP 2021/3/1 - -Index: lttng-tools-2.12.2/tests/regression/ust/ust-dl/Makefile.am -=================================================================== ---- lttng-tools-2.12.2.orig/tests/regression/ust/ust-dl/Makefile.am -+++ lttng-tools-2.12.2/tests/regression/ust/ust-dl/Makefile.am -@@ -27,16 +27,16 @@ noinst_LTLIBRARIES = libzzz.la libbar.la - - libzzz_la_SOURCES = libzzz.c libzzz.h - libzzz_la_LDFLAGS = -module -shared -avoid-version \ -- -rpath $(abs_builddir) -+ -rpath /usr/lib - - libbar_la_SOURCES = libbar.c libbar.h - libbar_la_LDFLAGS = -module -shared -avoid-version \ -- -rpath $(abs_builddir) -+ -rpath /usr/lib - libbar_la_LIBADD = libzzz.la - - libfoo_la_SOURCES = libfoo.c libfoo.h - libfoo_la_LDFLAGS = -module -shared -avoid-version \ -- -rpath $(abs_builddir) -+ -rpath /usr/lib - libfoo_la_LIBADD = libbar.la - - CLEANFILES = libfoo.so libfoo.so.debug libbar.so libbar.so.debug \ -@@ -44,7 +44,7 @@ CLEANFILES = libfoo.so libfoo.so.debug l - - libtp_la_SOURCES = libbar-tp.h libbar-tp.c libfoo-tp.h libfoo-tp.c \ - libzzz-tp.h libzzz-tp.c --libtp_la_LDFLAGS = -module -shared -rpath $(abs_builddir) -+libtp_la_LDFLAGS = -module -shared -rpath /usr/lib - - # Extract debug symbols - libfoo.so.debug: libfoo.la -Index: lttng-tools-2.12.2/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am -=================================================================== ---- lttng-tools-2.12.2.orig/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am -+++ lttng-tools-2.12.2/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am -@@ -5,7 +5,7 @@ AM_CFLAGS += -O0 - noinst_LTLIBRARIES = libfoo.la - - libfoo_la_SOURCES = foo.c foo.h --libfoo_la_LDFLAGS = -shared -module -avoid-version -rpath $(abs_builddir)/.libs/ -+libfoo_la_LDFLAGS = -shared -module -avoid-version -rpath /usr/lib - - noinst_PROGRAMS = userspace-probe-elf-binary - userspace_probe_elf_binary_SOURCES = userspace-probe-elf-binary.c diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.9.bb similarity index 98% rename from meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb rename to meta/recipes-kernel/lttng/lttng-tools_2.13.9.bb index a814eb79f9..1f6929e307 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.9.bb @@ -35,11 +35,10 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ file://0001-tests-do-not-strip-a-helper-library.patch \ file://run-ptest \ file://lttng-sessiond.service \ - file://determinism.patch \ file://disable-tests.patch \ " -SRC_URI[sha256sum] = "b1e959579b260790930b20f3c7aa7cefb8a40e0de80d4a777c2bf78c6b353dc1" +SRC_URI[sha256sum] = "8d94dc95b608cf70216b01203a3f8242b97a232db2e23421a2f43708da08f337" inherit autotools ptest pkgconfig useradd python3-dir manpages systemd From patchwork Tue Feb 21 14:40:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19917 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8CBD5C61DA3 for ; Tue, 21 Feb 2023 14:41:27 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web10.43531.1676990480737757678 for ; Tue, 21 Feb 2023 06:41:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=KpkU3WL4; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id y19so2498070pgk.5 for ; Tue, 21 Feb 2023 06:41:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=n7qdVUbJhS5wHcY22Trm4tZpDFrc/MnQhBYA5ZRE2No=; b=KpkU3WL4Al+aqdIiRemCIW/Bhi/QGJPmKJJ2c8jryZYGvgHplBucxLAXf7A1qOJmtk X0LRs5/FS4TKvWRhu7vCPxYd5Qg29RRUU5uPBFJ7uD9WNk4wzdqIvQxJdLX8kqH21PQz lUP6rJEJY+Ox7lWHy1Ez2PsjcJLoeLWxLdN1+hyliibkH82+N91UnePF0rOO8gUAbLd4 Aernv/ZZxJAhqKimkHCIW5gPy0sHkiheMMsTL2UgVhhm+XqJBIkxfIOJ2pR0sA5jv6Lu bWiGMxAIc9IIWH4OpUthgzLnII+yLUcaKYusHmx112+DqPb4bbYwbjTc0a/nwtHL6OhT 3Wcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n7qdVUbJhS5wHcY22Trm4tZpDFrc/MnQhBYA5ZRE2No=; b=ApicLSBLLV+JyB2oqvSfFgsSUHMa7PHKx9kkQpK8Bha57Pz+h2oyquomcPiC8sdU0G 8i6KJyZh430B1l0/9pM4PjJNZ3U54ti5IaTkjh4feYBhLwX2Rim2vNg5iM50i2dcFVuE 6urb1ibS10QPevyP1bOHbtzKIAZDo+hLvOTsWNXndvKAp3PpJEU6lwwAk2Vw4eWBNJMb 2EJV6t9vd8313abalSNiSjT12/cmWwvjYiCcftLyC3Qsr5kDrNeZDEdA3OizwWU8aNan ksU8T50KEMn3YMACypC4F2AKDKYeZxxRElmQjTgFobbQ8KhwSz0r8h3X0dS418TpZqQL H4+Q== X-Gm-Message-State: AO0yUKXBpOeUiqTSGg7DBGA17nYGSTe7GYDDQojAPLLlHbBrBuWXc6h0 tgl8aUlAaYOjcl64tDQwbD2QNLzphkK/wfsf0oU= X-Google-Smtp-Source: AK7set/hLQBZyCuNZh7CdNWor7RcU8s7XkavSI3oFAPtpzpvaHQ5IEvWaHx6I99j/dVDuIbF60Ov7Q== X-Received: by 2002:aa7:96c9:0:b0:5a9:c682:831d with SMTP id h9-20020aa796c9000000b005a9c682831dmr4440122pfq.13.1676990479444; Tue, 21 Feb 2023 06:41:19 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:19 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 04/23] apr: update 1.7.0 -> 1.7.2 Date: Tue, 21 Feb 2023 04:40:47 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177504 From: Alexander Kanavin Changes for APR 1.7.2 *) Correct a packaging issue in 1.7.1. The contents of the release were correct, but the top level directory was misnamed. Changes for APR 1.7.1 *) SECURITY: CVE-2022-24963 (cve.mitre.org) Integer Overflow or Wraparound vulnerability in apr_encode functions of Apache Portable Runtime (APR) allows an attacker to write beyond bounds of a buffer. *) SECURITY: CVE-2022-28331 (cve.mitre.org) On Windows, Apache Portable Runtime 1.7.0 and earlier may write beyond the end of a stack based buffer in apr_socket_sendv(). This is a result of integer overflow. *) SECURITY: CVE-2021-35940 (cve.mitre.org) Restore fix for out-of-bounds array dereference in apr_time_exp*() functions. (This issue was addressed as CVE-2017-12613 in APR 1.6.3 and later 1.6.x releases, but was missing in 1.7.0.) [Stefan Sperling] *) configure: Fix various build issues for compilers enforcing strict C99 compliance. PR 66396, 66408, 66426. [Florian Weimer , Sam James ] *) apr_atomic_read64(): Fix non-atomic read on 32-bit Windows [Ivan Zhakov] *) configure: Prefer posix name-based shared memory over SysV IPC. [Jim Jagielski] *) configure: Add --disable-sctp argument to forcibly disable SCTP support, or --enable-sctp which fails if SCTP support is not detected. [Lubos Uhliarik , Joe Orton] *) Fix handle leak in the Win32 apr_uid_current implementation. PR 61165. [Ivan Zhakov] *) Add error handling for lseek() failures in apr_file_write() and apr_file_writev(). [Joe Orton] *) Don't silently set APR_FOPEN_NOCLEANUP for apr_file_mktemp() created file to avoid a fd and inode leak when/if later passed to apr_file_setaside(). [Yann Ylavic] *) APR's configure script uses AC_TRY_RUN to detect whether the return type of strerror_r is int. When cross-compiling this defaults to no. This commit adds an AC_CACHE_CHECK so users who cross-compile APR may influence the outcome with a configure variable. [Sebastian Kemper ] *) Add a cache check with which users who cross-compile APR can influence the outcome of the /dev/zero test by setting the variable ac_cv_mmap__dev_zero=yes [Sebastian Kemper ] *) Trick autoconf into printing the correct default prefix in the help. [Stefan Fritsch] *) Don't try to use PROC_PTHREAD by default when cross compiling. [Yann Ylavic] *) Add the ability to cross compile APR. [Graham Leggett] *) While cross-compiling, the tools/gen_test_char could not be executed at build time, use AX_PROG_CC_FOR_BUILD to build native tools/gen_test_char Support explicit libtool by variable assigning before buildcheck.sh, it is helpful for cross-compiling (such as libtool=aarch64-linux-libtool) [Hongxu Jia ] *) Avoid an overflow on 32 bit platforms. [René Hjortskov Nielsen ] *) Use AC_CHECK_SIZEOF, so as to support cross compiling. PR 56053. [Mike Frysinger ] *) Add --tag=CC to libtool invocations. PR 62640. [Michael Osipov] *) apr_pools: Fix pool debugging output so that creation events are always emitted before allocation events and subpool destruction events are emitted on pool clear/destroy for proper accounting. [Brane Čibej] *) apr_socket_listen: Allow larger listen backlog values on Windows 8+. [Evgeny Kotkov ] *) Fixed: apr_get_oslevel() was returning APR_WIN_XP on Windows 10 *) Fix attempt to free invalid memory on exit when apr_app is used on Windows. [Ivan Zhakov] *) Fix double free on exit when apr_app is used on Windows. [Ivan Zhakov] *) Fix a regression in apr_stat() for root path on Windows. [Ivan Zhakov] Dropped patches have all been merged, addressed separately or are backports. Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 3ffae93f24bb1e3954b232099153fd059cfd7daf) Signed-off-by: Steve Sakoman (cherry picked from commit e5326ea0ac7e55b2d671a27c1e035c43b8bbc70d) Signed-off-by: Steve Sakoman --- ...ion-to-disable-timed-dependant-tests.patch | 20 ++--- ...CHE_CHECK-for-strerror_r-return-type.patch | 52 ------------- ...-runtime-test-for-mmap-that-can-map-.patch | 26 +++---- ...ir-path-references-from-installed-ap.patch | 25 +++--- ...configure.in-support-cross-compiling.patch | 63 --------------- ...ze-doesn-t-match-in-glibc-when-cross.patch | 76 ------------------- .../apr/apr/CVE-2021-35940.patch | 58 -------------- .../recipes-support/apr/apr/autoconf270.patch | 22 ------ .../apr/apr/libtoolize_check.patch | 21 +++-- .../apr/{apr_1.7.0.bb => apr_1.7.2.bb} | 8 +- 10 files changed, 51 insertions(+), 320 deletions(-) delete mode 100644 meta/recipes-support/apr/apr/0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch delete mode 100644 meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch delete mode 100644 meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch delete mode 100644 meta/recipes-support/apr/apr/CVE-2021-35940.patch delete mode 100644 meta/recipes-support/apr/apr/autoconf270.patch rename meta/recipes-support/apr/{apr_1.7.0.bb => apr_1.7.2.bb} (91%) diff --git a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch index abff4e9331..a274f3a16e 100644 --- a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch +++ b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch @@ -1,14 +1,15 @@ -From 2bbe20b4f69e84e7a18bc79d382486953f479328 Mon Sep 17 00:00:00 2001 +From 225abf37cd0b49960664b59f08e515a4c4ea5ad0 Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman Date: Thu, 26 Mar 2020 18:30:36 +0000 Subject: [PATCH] Add option to disable timed dependant tests -The disabled tests rely on timing to pass correctly. On a virtualized +The disabled tests rely on timing to pass correctly. On a virtualized system under heavy load, these tests randomly fail because they miss a timer or other timing related issues. Upstream-Status: Pending Signed-off-by: Jeremy Puhlman + --- configure.in | 6 ++++++ include/apr.h.in | 1 + @@ -16,10 +17,10 @@ Signed-off-by: Jeremy Puhlman 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in -index d9f32d6..f0c5661 100644 +index bfd488b..3663220 100644 --- a/configure.in +++ b/configure.in -@@ -2886,6 +2886,12 @@ AC_ARG_ENABLE(timedlocks, +@@ -3023,6 +3023,12 @@ AC_ARG_ENABLE(timedlocks, ) AC_SUBST(apr_has_timedlocks) @@ -45,10 +46,10 @@ index ee99def..c46a5f4 100644 #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD @apr_procattr_user_set_requires_password@ diff --git a/test/testlock.c b/test/testlock.c -index a43f477..6233d0b 100644 +index e3437c1..04e01b9 100644 --- a/test/testlock.c +++ b/test/testlock.c -@@ -396,13 +396,13 @@ abts_suite *testlock(abts_suite *suite) +@@ -535,7 +535,7 @@ abts_suite *testlock(abts_suite *suite) abts_run_test(suite, threads_not_impl, NULL); #else abts_run_test(suite, test_thread_mutex, NULL); @@ -56,6 +57,8 @@ index a43f477..6233d0b 100644 +#if APR_HAS_TIMEDLOCKS && APR_HAVE_TIME_DEPENDANT_TESTS abts_run_test(suite, test_thread_timedmutex, NULL); #endif + abts_run_test(suite, test_thread_nestedmutex, NULL); +@@ -543,7 +543,7 @@ abts_suite *testlock(abts_suite *suite) abts_run_test(suite, test_thread_rwlock, NULL); abts_run_test(suite, test_cond, NULL); abts_run_test(suite, test_timeoutcond, NULL); @@ -63,7 +66,4 @@ index a43f477..6233d0b 100644 +#if APR_HAS_TIMEDLOCKS && APR_HAVE_TIME_DEPENDANT_TESTS abts_run_test(suite, test_timeoutmutex, NULL); #endif - #endif --- -2.23.0 - + #ifdef WIN32 diff --git a/meta/recipes-support/apr/apr/0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch b/meta/recipes-support/apr/apr/0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch deleted file mode 100644 index d0a9bd9129..0000000000 --- a/meta/recipes-support/apr/apr/0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 8ca3c3306f1a149e51a3be6a4b1e47e9aee88262 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 23 Aug 2022 22:42:03 -0700 -Subject: [PATCH] add AC_CACHE_CHECK for strerror_r return type - -APR's configure script uses AC_TRY_RUN to detect whether the return type -of strerror_r is int. When cross-compiling this defaults to no. - -This commit adds an AC_CACHE_CHECK so users who cross-compile APR may -influence the outcome with a configure variable. - -Upstream-Status: Backport [https://svn.apache.org/viewvc?view=revision&revision=1875065] -Signed-off-by: Khem Raj ---- - build/apr_common.m4 | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/build/apr_common.m4 b/build/apr_common.m4 -index cbf2a4c..42e75cf 100644 ---- a/build/apr_common.m4 -+++ b/build/apr_common.m4 -@@ -525,8 +525,9 @@ dnl string. - dnl - dnl - AC_DEFUN([APR_CHECK_STRERROR_R_RC], [ --AC_MSG_CHECKING(for type of return code from strerror_r) --AC_TRY_RUN([ -+AC_CACHE_CHECK([whether return code from strerror_r has type int], -+[ac_cv_strerror_r_rc_int], -+[AC_TRY_RUN([ - #include - #include - #include -@@ -542,14 +543,10 @@ main() - }], [ - ac_cv_strerror_r_rc_int=yes ], [ - ac_cv_strerror_r_rc_int=no ], [ -- ac_cv_strerror_r_rc_int=no ] ) -+ ac_cv_strerror_r_rc_int=no ] ) ] ) - if test "x$ac_cv_strerror_r_rc_int" = xyes; then - AC_DEFINE(STRERROR_R_RC_INT, 1, [Define if strerror returns int]) -- msg="int" --else -- msg="pointer" - fi --AC_MSG_RESULT([$msg]) - ] ) - - dnl --- -2.37.2 - diff --git a/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch b/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch index fa6202da79..a78b16284f 100644 --- a/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch +++ b/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch @@ -1,4 +1,4 @@ -From ee728971fd9d2da39356f1574d58d5daa3b24520 Mon Sep 17 00:00:00 2001 +From 316b81c462f065927d7fec56aadd5c8cb94d1cf0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 26 Aug 2022 00:28:08 -0700 Subject: [PATCH] configure: Remove runtime test for mmap that can map @@ -10,24 +10,25 @@ mutexes Upstream-Status: Inappropriate [Cross-compile specific] Signed-off-by: Khem Raj + --- - configure.in | 32 -------------------------------- - 1 file changed, 32 deletions(-) + configure.in | 30 ------------------------------ + 1 file changed, 30 deletions(-) diff --git a/configure.in b/configure.in -index a99049d..f1f55c7 100644 +index 3663220..dce9789 100644 --- a/configure.in +++ b/configure.in -@@ -1182,38 +1182,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \ +@@ -1303,36 +1303,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \ APR_CHECK_DEFINE(MAP_ANON, sys/mman.h) AC_CHECK_FILE(/dev/zero) -# Not all systems can mmap /dev/zero (such as HP-UX). Check for that. -if test "$ac_cv_func_mmap" = "yes" && -- test "$ac_cv_file__dev_zero" = "yes"; then -- AC_MSG_CHECKING(for mmap that can map /dev/zero) -- AC_TRY_RUN([ --#include +- test "$ac_cv_file__dev_zero" = "yes"; then +- AC_CACHE_CHECK([for mmap that can map /dev/zero], +- [ac_cv_mmap__dev_zero], +- [AC_TRY_RUN([#include -#include -#include -#ifdef HAVE_SYS_MMAN_H @@ -49,14 +50,9 @@ index a99049d..f1f55c7 100644 - return 3; - } - return 0; -- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no]) -- -- AC_MSG_RESULT($ac_cv_file__dev_zero) +- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])]) -fi - # Now we determine which one is our anonymous shmem preference. haveshmgetanon="0" havemmapzero="0" --- -2.37.2 - diff --git a/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch b/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch index 72e706f966..d63423f3a1 100644 --- a/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch +++ b/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch @@ -1,8 +1,7 @@ -From 5925b20da8bbc34d9bf5a5dca123ef38864d43c6 Mon Sep 17 00:00:00 2001 +From 689a8db96a6d1e1cae9cbfb35d05ac82140a6555 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 30 Jan 2018 09:39:06 +0800 -Subject: [PATCH 2/7] apr: Remove workdir path references from installed apr - files +Subject: [PATCH] apr: Remove workdir path references from installed apr files Upstream-Status: Inappropriate [configuration] @@ -14,20 +13,23 @@ packages at target run time, the workdir path caused confusion. Rebase to 1.6.3 Signed-off-by: Hongxu Jia + --- - apr-config.in | 26 ++------------------------ - 1 file changed, 2 insertions(+), 24 deletions(-) + apr-config.in | 32 ++------------------------------ + 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/apr-config.in b/apr-config.in -index 84b4073..bbbf651 100644 +index bed47ca..47874e5 100644 --- a/apr-config.in +++ b/apr-config.in -@@ -152,14 +152,7 @@ while test $# -gt 0; do +@@ -164,16 +164,7 @@ while test $# -gt 0; do flags="$flags $LDFLAGS" ;; --includes) - if test "$location" = "installed"; then flags="$flags -I$includedir $EXTRA_INCLUDES" +- elif test "$location" = "crosscompile"; then +- flags="$flags -I$APR_TARGET_DIR/$includedir $EXTRA_INCLUDES" - elif test "$location" = "source"; then - flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" - else @@ -37,13 +39,15 @@ index 84b4073..bbbf651 100644 ;; --srcdir) echo $APR_SOURCE_DIR -@@ -181,29 +174,14 @@ while test $# -gt 0; do +@@ -197,33 +188,14 @@ while test $# -gt 0; do exit 0 ;; --link-ld) - if test "$location" = "installed"; then - ### avoid using -L if libdir is a "standard" location like /usr/lib - flags="$flags -L$libdir -l${APR_LIBNAME}" +- elif test "$location" = "crosscompile"; then +- flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}" - else - ### this surely can't work since the library is in .libs? - flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}" @@ -62,6 +66,8 @@ index 84b4073..bbbf651 100644 - # Since the user is specifying they are linking with libtool, we - # *know* that -R will be recognized by libtool. - flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}" +- elif test "$location" = "crosscompile"; then +- flags="$flags -L${APR_TARGET_DIR}/$libdir -l${APR_LIBNAME}" - else - flags="$flags $LA_FILE" - fi @@ -69,6 +75,3 @@ index 84b4073..bbbf651 100644 ;; --shlib-path-var) echo "$SHLIBPATH_VAR" --- -1.8.3.1 - diff --git a/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch b/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch deleted file mode 100644 index 4dd53bd8eb..0000000000 --- a/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch +++ /dev/null @@ -1,63 +0,0 @@ -From d5028c10f156c224475b340cfb1ba025d6797243 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Fri, 2 Feb 2018 15:51:42 +0800 -Subject: [PATCH 3/7] Makefile.in/configure.in: support cross compiling - -While cross compiling, the tools/gen_test_char could not -be executed at build time, use AX_PROG_CC_FOR_BUILD to -build native tools/gen_test_char - -Upstream-Status: Submitted [https://github.com/apache/apr/pull/8] - -Signed-off-by: Hongxu Jia ---- - Makefile.in | 10 +++------- - configure.in | 3 +++ - 2 files changed, 6 insertions(+), 7 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 5fb760e..8675f90 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -46,7 +46,7 @@ LT_VERSION = @LT_VERSION@ - - CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \ - build/apr_rules.out tools/gen_test_char@EXEEXT@ \ -- tools/gen_test_char.o tools/gen_test_char.lo \ -+ tools/gen_test_char.o \ - include/private/apr_escape_test_char.h - DISTCLEAN_TARGETS = config.cache config.log config.status \ - include/apr.h include/arch/unix/apr_private.h \ -@@ -131,13 +131,9 @@ check: $(TARGET_LIB) - etags: - etags `find . -name '*.[ch]'` - --OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) --tools/gen_test_char.lo: tools/gen_test_char.c -+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c - $(APR_MKDIR) tools -- $(LT_COMPILE) -- --tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) -- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@ - - include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ - $(APR_MKDIR) include/private -diff --git a/configure.in b/configure.in -index 719f331..361120f 100644 ---- a/configure.in -+++ b/configure.in -@@ -183,6 +183,9 @@ dnl can only be used once within a configure script, so this prevents a - dnl preload section from invoking the macro to get compiler info. - AC_PROG_CC - -+dnl Check build CC for gen_test_char compiling which is executed at build time. -+AX_PROG_CC_FOR_BUILD -+ - dnl AC_PROG_SED is only avaliable in recent autoconf versions. - dnl Use AC_CHECK_PROG instead if AC_PROG_SED is not present. - ifdef([AC_PROG_SED], --- -1.8.3.1 - diff --git a/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch b/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch deleted file mode 100644 index d1a2ebe881..0000000000 --- a/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 49661ea3858cf8494926cccf57d3e8c6dcb47117 Mon Sep 17 00:00:00 2001 -From: Dengke Du -Date: Wed, 14 Dec 2016 18:13:08 +0800 -Subject: [PATCH] apr: fix off_t size doesn't match in glibc when cross - compiling - -In configure.in, it contains the following: - - APR_CHECK_SIZEOF_EXTENDED([#include ], off_t, 8) - -the macro "APR_CHECK_SIZEOF_EXTENDED" was defined in build/apr_common.m4, -it use the "AC_TRY_RUN" macro, this macro let the off_t to 8, when cross -compiling enable. - -So it was hardcoded for cross compiling, we should detect it dynamic based on -the sysroot's glibc. We change it to the following: - - AC_CHECK_SIZEOF(off_t) - -The same for the following hardcoded types for cross compiling: - - pid_t 8 - ssize_t 8 - size_t 8 - off_t 8 - -Change the above correspondingly. - -Signed-off-by: Dengke Du - -Upstream-Status: Pending - ---- - configure.in | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.in b/configure.in -index 27b8539..fb408d1 100644 ---- a/configure.in -+++ b/configure.in -@@ -1801,7 +1801,7 @@ else - socklen_t_value="int" - fi - --APR_CHECK_SIZEOF_EXTENDED([#include ], pid_t, 8) -+AC_CHECK_SIZEOF(pid_t) - - if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then - pid_t_fmt='#define APR_PID_T_FMT "hd"' -@@ -1873,7 +1873,7 @@ APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned long, lu, [size_t_fmt="lu"], [ - APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned int, u, [size_t_fmt="u"]) - ]) - --APR_CHECK_SIZEOF_EXTENDED([#include ], ssize_t, 8) -+AC_CHECK_SIZEOF(ssize_t) - - dnl the else cases below should no longer occur; - AC_MSG_CHECKING([which format to use for apr_ssize_t]) -@@ -1891,7 +1891,7 @@ fi - - ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\"" - --APR_CHECK_SIZEOF_EXTENDED([#include ], size_t, 8) -+AC_CHECK_SIZEOF(size_t) - - # else cases below should no longer occur; - AC_MSG_CHECKING([which format to use for apr_size_t]) -@@ -1909,7 +1909,7 @@ fi - - size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\"" - --APR_CHECK_SIZEOF_EXTENDED([#include ], off_t, 8) -+AC_CHECK_SIZEOF(off_t) - - if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then - # Enable LFS diff --git a/meta/recipes-support/apr/apr/CVE-2021-35940.patch b/meta/recipes-support/apr/apr/CVE-2021-35940.patch deleted file mode 100644 index 00befdacee..0000000000 --- a/meta/recipes-support/apr/apr/CVE-2021-35940.patch +++ /dev/null @@ -1,58 +0,0 @@ - -SECURITY: CVE-2021-35940 (cve.mitre.org) - -Restore fix for CVE-2017-12613 which was missing in 1.7.x branch, though -was addressed in 1.6.x in 1.6.3 and later via r1807976. - -The fix was merged back to 1.7.x in r1891198. - -Since this was a regression in 1.7.0, a new CVE name has been assigned -to track this, CVE-2021-35940. - -Thanks to Iveta Cesalova for reporting this issue. - -https://svn.apache.org/viewvc?view=revision&revision=1891198 - -Upstream-Status: Backport -CVE: CVE-2021-35940 -Signed-off-by: Armin Kuster - - -Index: time/unix/time.c -=================================================================== ---- a/time/unix/time.c (revision 1891197) -+++ b/time/unix/time.c (revision 1891198) -@@ -142,6 +142,9 @@ - static const int dayoffset[12] = - {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; - -+ if (xt->tm_mon < 0 || xt->tm_mon >= 12) -+ return APR_EBADDATE; -+ - /* shift new year to 1st March in order to make leap year calc easy */ - - if (xt->tm_mon < 2) -Index: time/win32/time.c -=================================================================== ---- a/time/win32/time.c (revision 1891197) -+++ b/time/win32/time.c (revision 1891198) -@@ -54,6 +54,9 @@ - static const int dayoffset[12] = - {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; - -+ if (tm->wMonth < 1 || tm->wMonth > 12) -+ return APR_EBADDATE; -+ - /* Note; the caller is responsible for filling in detailed tm_usec, - * tm_gmtoff and tm_isdst data when applicable. - */ -@@ -228,6 +231,9 @@ - static const int dayoffset[12] = - {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; - -+ if (xt->tm_mon < 0 || xt->tm_mon >= 12) -+ return APR_EBADDATE; -+ - /* shift new year to 1st March in order to make leap year calc easy */ - - if (xt->tm_mon < 2) diff --git a/meta/recipes-support/apr/apr/autoconf270.patch b/meta/recipes-support/apr/apr/autoconf270.patch deleted file mode 100644 index 9f7b5c624c..0000000000 --- a/meta/recipes-support/apr/apr/autoconf270.patch +++ /dev/null @@ -1,22 +0,0 @@ -With autoconf 2.70 confdefs.h is already included. Including it twice generates -compiler warnings and since this macros is to error on warnings, it breaks. - -Fix by not including the file. - -Upstream-Status: Pending -RP - 2021/1/28 - -Index: apr-1.7.0/build/apr_common.m4 -=================================================================== ---- apr-1.7.0.orig/build/apr_common.m4 -+++ apr-1.7.0/build/apr_common.m4 -@@ -505,8 +505,7 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], - fi - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( -- [#include "confdefs.h" -- ] -+ [] - [[$1]] - [int main(int argc, const char *const *argv) {] - [[$2]] diff --git a/meta/recipes-support/apr/apr/libtoolize_check.patch b/meta/recipes-support/apr/apr/libtoolize_check.patch index 740792e6b0..80ce43caa4 100644 --- a/meta/recipes-support/apr/apr/libtoolize_check.patch +++ b/meta/recipes-support/apr/apr/libtoolize_check.patch @@ -1,6 +1,7 @@ +From 17835709bc55657b7af1f7c99b3f572b819cf97e Mon Sep 17 00:00:00 2001 From: Helmut Grohne -Subject: check for libtoolize rather than libtool -Last-Update: 2014-09-19 +Date: Tue, 7 Feb 2023 07:04:00 +0000 +Subject: [PATCH] check for libtoolize rather than libtool libtool is now in package libtool-bin, but apr only needs libtoolize. @@ -8,14 +9,22 @@ Upstream-Status: Pending [ from debian: https://sources.debian.org/data/main/a/a Signed-off-by: Robert Yang ---- apr.orig/build/buildcheck.sh -+++ apr/build/buildcheck.sh -@@ -39,11 +39,11 @@ fi +--- + build/buildcheck.sh | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/build/buildcheck.sh b/build/buildcheck.sh +index 44921b5..08bc8a8 100755 +--- a/build/buildcheck.sh ++++ b/build/buildcheck.sh +@@ -39,13 +39,11 @@ fi # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a # output is multiline from 1.5 onwards -# Require libtool 1.4 or newer --libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` +-if test -z "$libtool"; then +- libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` +-fi -lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` +# Require libtoolize 1.4 or newer +libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14` diff --git a/meta/recipes-support/apr/apr_1.7.0.bb b/meta/recipes-support/apr/apr_1.7.2.bb similarity index 91% rename from meta/recipes-support/apr/apr_1.7.0.bb rename to meta/recipes-support/apr/apr_1.7.2.bb index cb4bb936d7..c9059c9921 100644 --- a/meta/recipes-support/apr/apr_1.7.0.bb +++ b/meta/recipes-support/apr/apr_1.7.2.bb @@ -16,21 +16,15 @@ BBCLASSEXTEND = "native nativesdk" SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://run-ptest \ file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \ - file://0003-Makefile.in-configure.in-support-cross-compiling.patch \ file://0004-Fix-packet-discards-HTTP-redirect.patch \ file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ - file://0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \ file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ file://libtoolize_check.patch \ file://0001-Add-option-to-disable-timed-dependant-tests.patch \ - file://autoconf270.patch \ - file://0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch \ file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \ - file://CVE-2021-35940.patch \ " -SRC_URI[md5sum] = "7a14a83d664e87599ea25ff4432e48a7" -SRC_URI[sha256sum] = "e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea" +SRC_URI[sha256sum] = "75e77cc86776c030c0a5c408dfbd0bf2a0b75eed5351e52d5439fa1e5509a43e" inherit autotools-brokensep lib_package binconfig multilib_header ptest multilib_script From patchwork Tue Feb 21 14:40:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19916 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93291C64ED6 for ; Tue, 21 Feb 2023 14:41:27 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web10.43531.1676990480737757678 for ; Tue, 21 Feb 2023 06:41:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=JChylybf; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id y19so2498132pgk.5 for ; Tue, 21 Feb 2023 06:41:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PqQlpP3mmspwqbKh5AbERGwm8jGIaC4lcte5La2rNBU=; b=JChylybfql0TsoxivQV1zZ03yJE/5Q97iG4Qr+7ozfRDTLATUfMq25jWlq2mx4WUFI wtJejSMQbWPx3LPk1Ng5QqNK4O4fQcDO/AgSc67bLFG6mhuuelnSD+dxl0BBiEWz6Gv6 XI12HLjoTjdP7uq/eoK1M3VbhwwEcdXBcqTgaXee7zxWUOVdJQBOxxC4wxVnywd4uttv ZfpVyRmMSLQ9Rqp/A313OCWtbgbU/d8tq4gTgb8VGaQZIIcerjY2lTPk1pSJReu1C/o2 f2RW09MpoHxvLrnuNQIyzKlRo9PYIhsRA0oWX37zbWc3oOGJOGb/marRRxh3uqAKF/yB jDeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PqQlpP3mmspwqbKh5AbERGwm8jGIaC4lcte5La2rNBU=; b=29xqVZz3MBxKIpeQNmsNdH3ePUhtL5uz1arcdsIVgBe7XzWGELBgJPfXAqtL7WVVX7 p4TsTOx0YVEjkgEHCvAj8i0GcvYzJtNdWPkhxd7QWyWzgigPSBdexdQYNGvReI297y/b uPkNEOd2OVBDj/+tIrVPDi6WwvcvVbgY4INWF55oXvPWklnuiob2EZ6Nc13Tr8zrJWqi hvhCuqWOoDhG+iVE2NdvwtMtbznM+0XiQqJ8JVAOzweNwrfbypvD5793lvFRxnNP1fu0 2ZdegV7CvPCSBRcG83BblNCe1FRmMiNiVKoyiNVkcozACoaVRKvl0qNR2oMknAWq3P8W lyDA== X-Gm-Message-State: AO0yUKUPiAsg8qcO+1ebgNrFmhkZ34OAuaA0x6pxzbzqdG7RgkYk9j2k oM7j7flmR/0TC4yL+7738ZUpfeF3bZzqnYPyD6o= X-Google-Smtp-Source: AK7set8u7td8JG5/wu2/Ftibi6yIgmWGODsW8NUlyD53BZMC+X/ZlihExB4AVZMx0cdfxyVqxXe62A== X-Received: by 2002:a62:52d0:0:b0:5a8:68c0:5607 with SMTP id g199-20020a6252d0000000b005a868c05607mr2870378pfb.21.1676990482259; Tue, 21 Feb 2023 06:41:22 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:21 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 05/23] apr-util: update 1.6.1 -> 1.6.3 Date: Tue, 21 Feb 2023 04:40:48 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177505 From: Alexander Kanavin Changes with APR-util 1.6.3 *) Correct a packaging issue in 1.6.2. The contents of the release were correct, but the top level directory was misnamed. Changes with APR-util 1.6.2 *) SECURITY: CVE-2022-25147 (cve.mitre.org) Integer Overflow or Wraparound vulnerability in apr_base64 functions of Apache Portable Runtime Utility (APR-util) allows an attacker to write beyond bounds of a buffer. *) Teach configure how to find and build against MariaDB 10.2. PR 61517 [Kris Karas ] *) apr_crypto_commoncrypto: Remove stray reference to -lcrypto that prevented commoncrypto being enabled. [Graham Leggett] *) Add --tag=CC to libtool invocations. PR 62640. [Michael Osipov] *) apr_dbm_gdbm: Fix handling of error codes. This makes gdbm 1.14 work. apr_dbm_gdbm will now also return error codes starting with APR_OS_START_USEERR, as apr_dbm_berkleydb does, instead of always returning APR_EGENERAL. [Stefan Fritsch] Drop backport. Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit dca707f9fecc805503e17f6db3e4c88069ac0125) Signed-off-by: Steve Sakoman (cherry picked from commit 43cd36b178ebb602edd5919c26f8b8642736a3a8) Signed-off-by: Steve Sakoman --- .../0001-Fix-error-handling-in-gdbm.patch | 134 ------------------ .../{apr-util_1.6.1.bb => apr-util_1.6.3.bb} | 6 +- 2 files changed, 2 insertions(+), 138 deletions(-) delete mode 100644 meta/recipes-support/apr/apr-util/0001-Fix-error-handling-in-gdbm.patch rename meta/recipes-support/apr/{apr-util_1.6.1.bb => apr-util_1.6.3.bb} (94%) diff --git a/meta/recipes-support/apr/apr-util/0001-Fix-error-handling-in-gdbm.patch b/meta/recipes-support/apr/apr-util/0001-Fix-error-handling-in-gdbm.patch deleted file mode 100644 index 6f27876a7f..0000000000 --- a/meta/recipes-support/apr/apr-util/0001-Fix-error-handling-in-gdbm.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 6b638fa9afbeb54dfa19378e391465a5284ce1ad Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Wed, 12 Sep 2018 17:16:36 +0800 -Subject: [PATCH] Fix error handling in gdbm - -Only check for gdbm_errno if the return value of the called gdbm_* -function says so. This fixes apr-util with gdbm 1.14, which does not -seem to always reset gdbm_errno. - -Also make the gdbm driver return error codes starting with -APR_OS_START_USEERR instead of always returning APR_EGENERAL. This is -what the berkleydb driver already does. - -Also ensure that dsize is 0 if dptr == NULL. - -Upstream-Status: Backport [https://svn.apache.org/viewvc?view=revision&revision=1825311] - -Signed-off-by: Changqing Li ---- - dbm/apr_dbm_gdbm.c | 47 +++++++++++++++++++++++++++++------------------ - 1 file changed, 29 insertions(+), 18 deletions(-) - -diff --git a/dbm/apr_dbm_gdbm.c b/dbm/apr_dbm_gdbm.c -index 749447a..1c86327 100644 ---- a/dbm/apr_dbm_gdbm.c -+++ b/dbm/apr_dbm_gdbm.c -@@ -36,13 +36,25 @@ - static apr_status_t g2s(int gerr) - { - if (gerr == -1) { -- /* ### need to fix this */ -- return APR_EGENERAL; -+ if (gdbm_errno == GDBM_NO_ERROR) -+ return APR_SUCCESS; -+ return APR_OS_START_USEERR + gdbm_errno; - } - - return APR_SUCCESS; - } - -+static apr_status_t gdat2s(datum d) -+{ -+ if (d.dptr == NULL) { -+ if (gdbm_errno == GDBM_NO_ERROR || gdbm_errno == GDBM_ITEM_NOT_FOUND) -+ return APR_SUCCESS; -+ return APR_OS_START_USEERR + gdbm_errno; -+ } -+ -+ return APR_SUCCESS; -+} -+ - static apr_status_t datum_cleanup(void *dptr) - { - if (dptr) -@@ -53,22 +65,15 @@ static apr_status_t datum_cleanup(void *dptr) - - static apr_status_t set_error(apr_dbm_t *dbm, apr_status_t dbm_said) - { -- apr_status_t rv = APR_SUCCESS; - -- /* ### ignore whatever the DBM said (dbm_said); ask it explicitly */ -+ dbm->errcode = dbm_said; - -- if ((dbm->errcode = gdbm_errno) == GDBM_NO_ERROR) { -+ if (dbm_said == APR_SUCCESS) - dbm->errmsg = NULL; -- } -- else { -- dbm->errmsg = gdbm_strerror(gdbm_errno); -- rv = APR_EGENERAL; /* ### need something better */ -- } -- -- /* captured it. clear it now. */ -- gdbm_errno = GDBM_NO_ERROR; -+ else -+ dbm->errmsg = gdbm_strerror(dbm_said - APR_OS_START_USEERR); - -- return rv; -+ return dbm_said; - } - - /* -------------------------------------------------------------------------- -@@ -107,7 +112,7 @@ static apr_status_t vt_gdbm_open(apr_dbm_t **pdb, const char *pathname, - NULL); - - if (file == NULL) -- return APR_EGENERAL; /* ### need a better error */ -+ return APR_OS_START_USEERR + gdbm_errno; /* ### need a better error */ - - /* we have an open database... return it */ - *pdb = apr_pcalloc(pool, sizeof(**pdb)); -@@ -141,10 +146,12 @@ static apr_status_t vt_gdbm_fetch(apr_dbm_t *dbm, apr_datum_t key, - if (pvalue->dptr) - apr_pool_cleanup_register(dbm->pool, pvalue->dptr, datum_cleanup, - apr_pool_cleanup_null); -+ else -+ pvalue->dsize = 0; - - /* store the error info into DBM, and return a status code. Also, note - that *pvalue should have been cleared on error. */ -- return set_error(dbm, APR_SUCCESS); -+ return set_error(dbm, gdat2s(rd)); - } - - static apr_status_t vt_gdbm_store(apr_dbm_t *dbm, apr_datum_t key, -@@ -201,9 +208,11 @@ static apr_status_t vt_gdbm_firstkey(apr_dbm_t *dbm, apr_datum_t *pkey) - if (pkey->dptr) - apr_pool_cleanup_register(dbm->pool, pkey->dptr, datum_cleanup, - apr_pool_cleanup_null); -+ else -+ pkey->dsize = 0; - - /* store any error info into DBM, and return a status code. */ -- return set_error(dbm, APR_SUCCESS); -+ return set_error(dbm, gdat2s(rd)); - } - - static apr_status_t vt_gdbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey) -@@ -221,9 +230,11 @@ static apr_status_t vt_gdbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey) - if (pkey->dptr) - apr_pool_cleanup_register(dbm->pool, pkey->dptr, datum_cleanup, - apr_pool_cleanup_null); -+ else -+ pkey->dsize = 0; - - /* store any error info into DBM, and return a status code. */ -- return set_error(dbm, APR_SUCCESS); -+ return set_error(dbm, gdat2s(rd)); - } - - static void vt_gdbm_freedatum(apr_dbm_t *dbm, apr_datum_t data) --- -2.7.4 - diff --git a/meta/recipes-support/apr/apr-util_1.6.1.bb b/meta/recipes-support/apr/apr-util_1.6.3.bb similarity index 94% rename from meta/recipes-support/apr/apr-util_1.6.1.bb rename to meta/recipes-support/apr/apr-util_1.6.3.bb index b851d46351..7c6fcc699b 100644 --- a/meta/recipes-support/apr/apr-util_1.6.1.bb +++ b/meta/recipes-support/apr/apr-util_1.6.3.bb @@ -13,11 +13,9 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ file://configfix.patch \ file://configure_fixes.patch \ file://run-ptest \ - file://0001-Fix-error-handling-in-gdbm.patch \ -" + " -SRC_URI[md5sum] = "bd502b9a8670a8012c4d90c31a84955f" -SRC_URI[sha256sum] = "b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459" +SRC_URI[sha256sum] = "2b74d8932703826862ca305b094eef2983c27b39d5c9414442e9976a9acf1983" EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \ From patchwork Tue Feb 21 14:40:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19914 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86151C636D7 for ; Tue, 21 Feb 2023 14:41:27 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web10.43537.1676990486146524330 for ; Tue, 21 Feb 2023 06:41:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Ccq3FfdX; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id a7so2794474pfx.10 for ; Tue, 21 Feb 2023 06:41:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Mtz/EKJy95JhMPhWHBabz8DeuLc/3AgIbS/4NY6KcMc=; b=Ccq3FfdXLyqc/Tiw73zYx6n1y4OtrLEPw+cB+nf42o4xmfbdjPYY9jRhR6X4tPqsS0 eEdF2cAhFqNYHXb/f0XNu4tpCiPxQOmw1dooP1SmIZq56zN7cO7r/HmdyB0XY6ZqgAs0 Ty8BCLif3no6ZDIn5398o8Qo77HX0RyRv4y7R6+bxXj6uAQBtuihjfQw/T+lJH5/MPmA T2Ew1C1HAJhIlHxpLlAJPGlkUZ8cgQ+gX19Nme9CocnWXH9ioA9qx2jgs7W5XNVtEAid pleaaOerCCjrF/+qgzyPBn6JcV6xvNkTyr3FtavpGZMZGIzpfhTD5g9021R8BfaLmFxR sWCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Mtz/EKJy95JhMPhWHBabz8DeuLc/3AgIbS/4NY6KcMc=; b=AE2ECDcsIQVQNrLQxNIVow064dPqdEOfe5WYG7+uetHup78pGGFb1OUVK/8lAl2cRc 9+efK+tYIit0ScCx9kaW7/xWDoOCGf01hHollXyqIJuZ59GXZEbbKRdngEmHaohv+NWw tsQQNFnLbW8YPPFt4/JOCUmRgGLaA1bpukOLDkjxM3H8wz5FzatIqfFMCq1CZkVtktf8 6Cg1rZGAKMj4XhQMeXkUc1J0+sSwETnAgCOuEUHc40oBeTtCrhYlVCOOySiMiTXufWbp 1pVDP+iIhsV9Dpc4/MMOgd8j5KdOsDXx3VB8spjvAqUsgfvftFDj3OrjbCHf9jyBsYLv DZnw== X-Gm-Message-State: AO0yUKWa9XUJq6OIk21jwfGAklQjXb83knDlNZRgI+NBJB2B8Qbnb9Xy 5p2tr0EOQKGaKCD0EXlDaNmvhRrUn9yvplwZn40= X-Google-Smtp-Source: AK7set9HTx8wIrfdXnYkhZjE2RMyXVAUlJ0ZseIosNL8Apg4AtuUvUjThUQpkyg/QcagRi9fAHtzQg== X-Received: by 2002:a62:1946:0:b0:5a8:bd6e:90fb with SMTP id 67-20020a621946000000b005a8bd6e90fbmr4388436pfz.19.1676990485063; Tue, 21 Feb 2023 06:41:25 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:24 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 06/23] bind: upgrade 9.18.10 -> 9.18.11 Date: Tue, 21 Feb 2023 04:40:49 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177506 From: Alexander Kanavin Stable branch update License-update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 63e8a8952c3d1b3b5c481be6bba52a3f4d65648e) Signed-off-by: Steve Sakoman (cherry picked from commit 54e2de8a589766c9a305c9bd0782afb5353fd109) Signed-off-by: Steve Sakoman --- .../0001-avoid-start-failure-with-bind-user.patch | 0 ...0001-named-lwresd-V-and-start-log-hide-build-options.patch | 0 ...bind-ensure-searching-for-json-headers-searches-sysr.patch | 0 .../bind/{bind-9.18.10 => bind-9.18.11}/bind9 | 0 .../bind/{bind-9.18.10 => bind-9.18.11}/conf.patch | 0 .../bind/{bind-9.18.10 => bind-9.18.11}/generate-rndc-key.sh | 0 .../init.d-add-support-for-read-only-rootfs.patch | 0 .../make-etc-initd-bind-stop-work.patch | 0 .../bind/{bind-9.18.10 => bind-9.18.11}/named.service | 0 .../bind/{bind_9.18.10.bb => bind_9.18.11.bb} | 4 ++-- 10 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/0001-avoid-start-failure-with-bind-user.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/0001-named-lwresd-V-and-start-log-hide-build-options.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/bind9 (100%) rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/conf.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/generate-rndc-key.sh (100%) rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/init.d-add-support-for-read-only-rootfs.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/make-etc-initd-bind-stop-work.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/named.service (100%) rename meta/recipes-connectivity/bind/{bind_9.18.10.bb => bind_9.18.11.bb} (96%) diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/0001-avoid-start-failure-with-bind-user.patch b/meta/recipes-connectivity/bind/bind-9.18.11/0001-avoid-start-failure-with-bind-user.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.10/0001-avoid-start-failure-with-bind-user.patch rename to meta/recipes-connectivity/bind/bind-9.18.11/0001-avoid-start-failure-with-bind-user.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind-9.18.11/0001-named-lwresd-V-and-start-log-hide-build-options.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.10/0001-named-lwresd-V-and-start-log-hide-build-options.patch rename to meta/recipes-connectivity/bind/bind-9.18.11/0001-named-lwresd-V-and-start-log-hide-build-options.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/bind-ensure-searching-for-json-headers-searches-sysr.patch b/meta/recipes-connectivity/bind/bind-9.18.11/bind-ensure-searching-for-json-headers-searches-sysr.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.10/bind-ensure-searching-for-json-headers-searches-sysr.patch rename to meta/recipes-connectivity/bind/bind-9.18.11/bind-ensure-searching-for-json-headers-searches-sysr.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/bind9 b/meta/recipes-connectivity/bind/bind-9.18.11/bind9 similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.10/bind9 rename to meta/recipes-connectivity/bind/bind-9.18.11/bind9 diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/conf.patch b/meta/recipes-connectivity/bind/bind-9.18.11/conf.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.10/conf.patch rename to meta/recipes-connectivity/bind/bind-9.18.11/conf.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/generate-rndc-key.sh b/meta/recipes-connectivity/bind/bind-9.18.11/generate-rndc-key.sh similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.10/generate-rndc-key.sh rename to meta/recipes-connectivity/bind/bind-9.18.11/generate-rndc-key.sh diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/init.d-add-support-for-read-only-rootfs.patch b/meta/recipes-connectivity/bind/bind-9.18.11/init.d-add-support-for-read-only-rootfs.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.10/init.d-add-support-for-read-only-rootfs.patch rename to meta/recipes-connectivity/bind/bind-9.18.11/init.d-add-support-for-read-only-rootfs.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/make-etc-initd-bind-stop-work.patch b/meta/recipes-connectivity/bind/bind-9.18.11/make-etc-initd-bind-stop-work.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.10/make-etc-initd-bind-stop-work.patch rename to meta/recipes-connectivity/bind/bind-9.18.11/make-etc-initd-bind-stop-work.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/named.service b/meta/recipes-connectivity/bind/bind-9.18.11/named.service similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.10/named.service rename to meta/recipes-connectivity/bind/bind-9.18.11/named.service diff --git a/meta/recipes-connectivity/bind/bind_9.18.10.bb b/meta/recipes-connectivity/bind/bind_9.18.11.bb similarity index 96% rename from meta/recipes-connectivity/bind/bind_9.18.10.bb rename to meta/recipes-connectivity/bind/bind_9.18.11.bb index 2432131f5c..0618129318 100644 --- a/meta/recipes-connectivity/bind/bind_9.18.10.bb +++ b/meta/recipes-connectivity/bind/bind_9.18.11.bb @@ -4,7 +4,7 @@ DESCRIPTION = "BIND 9 provides a full-featured Domain Name Server system" SECTION = "console/network" LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9a4a897f202c0710e07f2f2836bc2b62" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d8cf7bd9c4fd5471a588e7e66e672408" DEPENDS = "openssl libcap zlib libuv" @@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "f415a92feb62568b50854a063cb231e257351f8672186d0ab031a49b3de2cac6" +SRC_URI[sha256sum] = "8ff3352812230cbcbda42df87cad961f94163d3da457c5e4bef8057fd5df2158" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # follow the ESV versions divisible by 2 From patchwork Tue Feb 21 14:40:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19919 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 865F4C61DA3 for ; Tue, 21 Feb 2023 14:41:37 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.44235.1676990487990921412 for ; Tue, 21 Feb 2023 06:41:28 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=25fJF6wM; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id q5so5249915plh.9 for ; Tue, 21 Feb 2023 06:41:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=d7F5AnSWtXRB+cBMOBEpQue3hh5IEVcuOCI1wTRrcAQ=; b=25fJF6wMPzgMit9lBL713i6FgonAFgChjDaZKh33iL//4aXL9iEyFplRV1nbNj6hZL tcvwlaOpzTSTc72gNKRWyv4Jd0Z6d8EyeL9CtUzmwacSxHTKjwgc6JLNlWaTZZOtgdCO Q6e0hEyu850A49NLKfFfLcNvoWiWCoMaDiCW6GT1Wmngu9iT3vr7OEH80wR0XypYTYJZ RxJVT4ruuBPY2ILbQg8xir8sQ+i56gmNaXNrf8S5Y4Lnq+qtAis4sHkazusLGoPFuEjZ PQ27OfKN/cWlp7Bn+XBoQWieKuiMzQGrGxwCFeYk0bvvSiCHGBIUIHGXa8UBLYQF3o+w Oetw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d7F5AnSWtXRB+cBMOBEpQue3hh5IEVcuOCI1wTRrcAQ=; b=YV0PBNP6NczHPekgq7J1SP+pEFuu5JTI+ZgwON52C37uPrmPdtGmzDJ6dGyM95dTOw 66gb+35iFJsKXY9y00BOLAuAOqssdXUKyUY/v69Zhg6FgtU+r0bwY5MhUtqbj0JxYeV4 E6vp/mipO1RlGOVxr/t+MNpuz/n5t0RLxwDaEHPoKZqkgEU017GC6yMset3PvBXSAJyX IMNCqr4wqb3yq5otVCpK5ipHjo9TPT4p++PEMYYdVXyBobFdQWgmk/gRVO0PGbbCUDSs 9S5SJEn0eKW8ygyCwCh6JgoNvGxPupO1HKB0rKj1QY1bohCAPUaIod8vKnS4Z7sjDTtk CR9Q== X-Gm-Message-State: AO0yUKUCD2HUruHKtNs7+yYpZTgVskL1877jm8gAbSlUe4KsZdT4mWHz /hzUVNU5mW14JOdlBu6LxG53G26+xJk5PpXIFbE= X-Google-Smtp-Source: AK7set8PUwr3mDLyQqqSh96UiK+TMUVRT+kGyCliDL4WMBGz7Z64nbVF/H2EhhnTATbhy9jXgnmWGw== X-Received: by 2002:a05:6a20:728f:b0:bb:c422:809f with SMTP id o15-20020a056a20728f00b000bbc422809fmr4372739pzk.4.1676990486960; Tue, 21 Feb 2023 06:41:26 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:26 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 07/23] libjpeg-turbo: upgrade 2.1.4 -> 2.1.5 Date: Tue, 21 Feb 2023 04:40:50 -1000 Message-Id: <1ca7a15d7dece08e18cdb41f897ec37d1349ab70.1676990336.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177507 From: Alexander Kanavin Significant changes relative to 2.1.4 Fixed issues in the build system whereby, when using the Ninja Multi-Config CMake generator, a static build of libjpeg-turbo (a build in which ENABLE_SHARED is 0) could not be installed, a Windows installer could not be built, and the Java regression tests failed. Fixed a regression introduced by 2.0 beta1[15] that caused a buffer overrun in the progressive Huffman encoder when attempting to transform a specially-crafted malformed 12-bit-per-component JPEG image into a progressive 12-bit-per-component JPEG image using a 12-bit-per-component build of libjpeg-turbo (-DWITH_12BIT=1.) Given that the buffer overrun was fully contained within the progressive Huffman encoder structure and did not cause a segfault or other user-visible errant behavior, given that the lossless transformer (unlike the decompressor) is not generally exposed to arbitrary data exploits, and given that 12-bit-per-component builds of libjpeg-turbo are uncommon, this issue did not likely pose a security risk. Fixed an issue whereby, when using a 12-bit-per-component build of libjpeg-turbo (-DWITH_12BIT=1), passing samples with values greater than 4095 or less than 0 to jpeg_write_scanlines() caused a buffer overrun or underrun in the RGB-to-YCbCr color converter. Fixed a floating point exception that occurred when attempting to use the jpegtran -drop and -trim options to losslessly transform a specially-crafted malformed JPEG image. Fixed an issue in tjBufSizeYUV2() whereby it returned a bogus result, rather than throwing an error, if the align parameter was not a power of 2. Fixed a similar issue in tjCompressFromYUV() whereby it generated a corrupt JPEG image in certain cases, rather than throwing an error, if the align parameter was not a power of 2. Fixed an issue whereby tjDecompressToYUV2(), which is a wrapper for tjDecompressToYUVPlanes(), used the desired YUV image dimensions rather than the actual scaled image dimensions when computing the plane pointers and strides to pass to tjDecompressToYUVPlanes(). This caused a buffer overrun and subsequent segfault if the desired image dimensions exceeded the scaled image dimensions. Fixed an issue whereby, when decompressing a 12-bit-per-component JPEG image (-DWITH_12BIT=1) using an alpha-enabled output color space such as JCS_EXT_RGBA, the alpha channel was set to 255 rather than 4095. Fixed an issue whereby the Java version of TJBench did not accept a range of quality values. Fixed an issue whereby, when -progressive was passed to TJBench, the JPEG input image was not transformed into a progressive JPEG image prior to decompression. Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit f779689c2c766b609be31222d71110c1a15145a8) Signed-off-by: Steve Sakoman (cherry picked from commit a5d15ae9f4671790d3c5fb3606ec0861c17ed6dd) Signed-off-by: Steve Sakoman --- .../jpeg/{libjpeg-turbo_2.1.4.bb => libjpeg-turbo_2.1.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/jpeg/{libjpeg-turbo_2.1.4.bb => libjpeg-turbo_2.1.5.bb} (97%) diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.4.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.bb similarity index 97% rename from meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.4.bb rename to meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.bb index 1708fa97f0..4d21ca1e1d 100644 --- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.4.bb +++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.bb @@ -14,7 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://0001-libjpeg-turbo-fix-package_qa-error.patch \ " -SRC_URI[sha256sum] = "d3ed26a1131a13686dfca4935e520eb7c90ae76fbc45d98bb50a8dc86230342b" +SRC_URI[sha256sum] = "bc12bc9dce55300c6bf4342bc233bcc26bd38bf289eedf147360d731c668ddaf" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P(\d+[\.\-_]*)+)/" From patchwork Tue Feb 21 14:40:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19920 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 941F8C678D5 for ; Tue, 21 Feb 2023 14:41:37 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web10.43540.1676990489758014750 for ; Tue, 21 Feb 2023 06:41:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=aVLLqjyu; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id ko13so5879346plb.13 for ; Tue, 21 Feb 2023 06:41:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=FyzG0llGH+zsOOxhM3PxyB0xaKoybihe9/v6KgjJMbU=; b=aVLLqjyuXEr5SAbJi7lOzxHCd3UzU4B5H3oMGaUOCe09kW1f9cThzPvF3SCWz7UYyp nURWbUiqVGMpO/o/hPFKvQajNMzErvOdHlr4/QoBe1CpYLbDuX39AafznMfoGBGH+2EN W2jyM6CYzFNwZbSBXEpvnaTul7lIzQU+zOCAkD5L0KlrOiWqXEV6dZhTOf3RxLDuXSCy amf0VmSG48vnTYdqNWu6ly346dwXNmB/9avu3t6WZYLb/LUEYA/OCInRK5141CmgRs61 D2kE2Fsrn0WG0SPrV6e/4ZZie0b7cUHUC7nGlCkMHbc7oody24BivIxuy+BEbZIyMcps nn8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FyzG0llGH+zsOOxhM3PxyB0xaKoybihe9/v6KgjJMbU=; b=m2hzRsVsKhbLYpKC1xcdmiBPUBPCscQw8rarpfmXORVk6MVYiVJkHfU6KXuZhjOfrG zCs2s0vxVAluGqfMd9XRWX0RXZH2CBN+fPiF+Fy8FTJU1/6sJW6KYgmEmcUXoHsfMZG0 vBhGvjMZrfEpTPzvQLptVULsmr+joA4NyTkCvpjwHTv86wFN5qij/yXYp8yPXlmqwaru SzKIkOsfy1KWpHQHUSOaRetYMeaP4F5Y03QjtDfEgT1uWacuvuYXIXDPOUsNwI6RvjJX jIEaPw02JtZDzys0aykJTMB2q5KvsAA66i1oNqwqLLjGDYLtn+S4exkMRyQY0yzTK7Mt LQ8w== X-Gm-Message-State: AO0yUKX2xFY1qUkNZZbFX9GT90qHwCHzCU7AgXBdwfWI8JLnd1zvH8Jv TwyAZXduZJitt2lyA+Vu4zqKVfPtkpayGvXRhGs= X-Google-Smtp-Source: AK7set/XaOWejajXp1ArL5UOMdByMd1EV1o80cU7N8d7y/cREECZjhvjMt5hiw8maHERZtsaA739Sg== X-Received: by 2002:a05:6a20:b547:b0:cb:7244:1cd7 with SMTP id ev7-20020a056a20b54700b000cb72441cd7mr2781060pzb.12.1676990488782; Tue, 21 Feb 2023 06:41:28 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:28 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 08/23] linux-firmware: upgrade 20221214 -> 20230117 Date: Tue, 21 Feb 2023 04:40:51 -1000 Message-Id: <42246eb699bf9c96517bfc4e8788606cd4ba72fb.1676990336.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177508 From: Alexander Kanavin License-Update: additional firmwares, copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit fdb8c12fc71b4a985372f5d02ce59a1402c14c4a) Signed-off-by: Steve Sakoman --- ...inux-firmware_20221214.bb => linux-firmware_20230117.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20221214.bb => linux-firmware_20230117.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20221214.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20221214.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb index c2354e627f..1dce06c8f5 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20221214.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb @@ -70,7 +70,7 @@ LICENSE = "\ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ - file://LICENSE.amdgpu;md5=44c1166d052226cb2d6c8d7400090203 \ + file://LICENSE.amdgpu;md5=a2589a05ea5b6bd2b7f4f623c7e7a649 \ file://LICENSE.amd-ucode;md5=6ca90c57f7b248de1e25c7f68ffc4698 \ file://LICENSE.amlogic_vdec;md5=dc44f59bf64a81643e500ad3f39a468a \ file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \ @@ -132,7 +132,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ " # WHENCE checksum is defined separately to ease overriding it if # class-devupstream is selected. -WHENCE_CHKSUM = "bf7c716d16e48fe118c6209f99b13253" +WHENCE_CHKSUM = "05f1d941972cedadbf667c05f6010378" # These are not common licenses, set NO_GENERIC_LICENSE for them # so that the license files will be copied from fetched source @@ -209,7 +209,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw # Pin this to the 20220509 release, override this in local.conf SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae" -SRC_URI[sha256sum] = "e793783e92acbde549965521462d1d1327827360664cf242dbda08f075654331" +SRC_URI[sha256sum] = "df11e25ba2fb4d5343473757e17a3b4cef599250a26b1f7e0f038850f0cb3d64" inherit allarch From patchwork Tue Feb 21 14:40:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19922 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1F7CC678DB for ; Tue, 21 Feb 2023 14:41:37 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web10.43544.1676990491517608605 for ; Tue, 21 Feb 2023 06:41:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=uSzRh7Jq; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id b14-20020a17090a8c8e00b002349579949aso4889899pjo.5 for ; Tue, 21 Feb 2023 06:41:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=doEyWAQuS2AH0ZhTmt3Xkkp28VxvfRP0mJmcRGiegY8=; b=uSzRh7Jqdrvrsjmg+TLfJEQNuDyPMXYzqUlDhazRkbtV30u3WFkzoSlTG2Fixyhwu2 cPzZtdV/zEkW2zaRbA2cWr8cllDZ7Rsj680X0j/H/LXGBxYInZUSnpTtAsNl8RtVJoy9 uwoXHaZFwRQAOQ/iprSEnOT9ykmNrQw1TACOnqgk3lL47D8vQtAEB1BnHCAquy7V4xGh GHj1kDnlvjrVhHThrjKnPoGTyQMEjKxGmJ/jIcsWpt4SFEG9jwrq6q/RS2ER0BIBMB/f EU5aXo1XyRRywKRxJAY/WT37RQarZmSkwdKUtzh/JcDNjOs/eLJOWwsX5JKJQugWBDnc s9OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=doEyWAQuS2AH0ZhTmt3Xkkp28VxvfRP0mJmcRGiegY8=; b=ipce3myxiL26VPKsl333KDZpLMyXZDYuN7grIZoVENiejE5dQhNU/cYZfE7hEaCpIk k1u3ZNeIGXLhCi4DUE5v/e68c04vLj8etARKO9xKWO/JzZ51AvHxy+OziyxRIGWyS4xM Ulss3j0UFlzBvvoNiMPrHhvZ1njy8ZEuoGmrEPJ+8X/HtwEKLy9qNIGfNUBV4rrVo1hA a4QzFbZhy7ZeCROQ2npGSuD6NZeeEP0e8jE16mbDv8TwCjq9sOXFlffvmxh/+y0DUAOn GlivIINT9ai1dPMsDW+21+J50osI/hRVw3DKph+b4DGcoTNnzLGjbtT1HMYXg3UR32Yq Ba+w== X-Gm-Message-State: AO0yUKW7hlga2L32kmdbthULgWS2WHJyHDb4ZmCE3u4tWHCW7LKEliDV snzLEt630NrUAY04EyQHmf7voLQa03lgYBOvP1Y= X-Google-Smtp-Source: AK7set8bkGVUTer8rEYms2klqJXFXKb13g7Z0uYT75Y9wnmGl61mZORm5H2gBlAS/JVHkwn2XFUArg== X-Received: by 2002:a05:6a21:339b:b0:ad:67fa:8e50 with SMTP id yy27-20020a056a21339b00b000ad67fa8e50mr6136862pzb.57.1676990490570; Tue, 21 Feb 2023 06:41:30 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:30 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 09/23] git: upgrade 2.35.6 -> 2.35.7 Date: Tue, 21 Feb 2023 04:40:52 -1000 Message-Id: <0e7de5066491bc9b860ad4d65965d6f848898aff.1676990336.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177509 From: Sakib Sajal Upgrade git to latest 2.37.x release to address security issues CVE-2022-23521 and CVE-2022-41903. Signed-off-by: Sakib Sajal Signed-off-by: Steve Sakoman --- meta/recipes-devtools/git/{git_2.35.6.bb => git_2.35.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/git/{git_2.35.6.bb => git_2.35.7.bb} (98%) diff --git a/meta/recipes-devtools/git/git_2.35.6.bb b/meta/recipes-devtools/git/git_2.35.7.bb similarity index 98% rename from meta/recipes-devtools/git/git_2.35.6.bb rename to meta/recipes-devtools/git/git_2.35.7.bb index 0bb4a6a021..7cc8e5722b 100644 --- a/meta/recipes-devtools/git/git_2.35.6.bb +++ b/meta/recipes-devtools/git/git_2.35.7.bb @@ -167,4 +167,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "6bd51e0487028543ba40fe3d5b33bd124526a7f7109824aa7f022e79edf93bd1" +SRC_URI[tarball.sha256sum] = "fc849272a95cc7457091221a645fcd753b3b1984767ee3323fb6a0aa944bbcb4" From patchwork Tue Feb 21 14:40:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19921 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B047C636D7 for ; Tue, 21 Feb 2023 14:41:37 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web10.43537.1676990486146524330 for ; Tue, 21 Feb 2023 06:41:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=mURaCdvN; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id a7so2794730pfx.10 for ; Tue, 21 Feb 2023 06:41:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=0+eID7JVngK/NvNvETz2cvN9ZSI5cqHEeYxMtX4O0xI=; b=mURaCdvNOpDo3J6j8yXyAzjOh7ek1dTcPkwOj7f5s0uJnY/WlXsJ2OA765K9ZqHaZ6 4IAHjPhVkVcG3Q+nWVDertcNuhkgYTJeaxFSvgmSmRhC4dDrdxTpGNLeZ+Jlj5I5qX6V JRuUL0XsI0B+CS9xXjp6/bOjH3iFcKhEz4np5iRxXSNo9Tq2DL1A5n8+2sjE06Go3bp7 VycdgCmPitShDyEJbs1btDFVzATL9V5hI4s5IotSwn9BKZpiK3ehbPPt1qfw4D2k4OMn LjatZDhVUXyI5DqRaqKVoTKBBkMCDnmamsEywUca1CaegIQhPB9es1ss+2m+R6PhasMC FAgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0+eID7JVngK/NvNvETz2cvN9ZSI5cqHEeYxMtX4O0xI=; b=VGFRGQORgb4ySuA1BGUWgHlguFmdtiVDsQ8LUPa9tklHvHyAhlYc45vIEC38iWfgPb EL4QZroUCryBC4vGtSJvlIrfD/UWm+zdUUUXW3VKuhaoAIGr+ckA/wDGeWA3qXBv+rEj kkGgbnRGJyab6F5lKVs7fCuR0VsIkKZucKfvO4DDjaflCdXLEAYnKrntofkr0Gcl4I0c xoDKqvf9xrzoIJMGB2ZzWmO26Liuwz6DKLhlMhqE7tVxeHP6VFyk0/ceC1qflP2+klU7 BYiFZptu2Z3lvZ+5d0hK5FENN8nJj8lZAtoeMOi19btsWNyDX+jf2kesrwp73f1WYtNN b03Q== X-Gm-Message-State: AO0yUKUKH95J6cxCzBUSqKAB8hWbpOP35r3Kdpb0Gqo3XJmXzVnzhlbh G/ddhith8UJRf6jh2Y3dc/YLx9wSzkeySd+OGl8= X-Google-Smtp-Source: AK7set/lhQLo29HQsXkweu4sQrAh24MAjqwDVvAT/SYCV77JRODGjvdAWdDlkuGGOKbrdWaw310wrg== X-Received: by 2002:aa7:9985:0:b0:5a8:c3ec:e24e with SMTP id k5-20020aa79985000000b005a8c3ece24emr4351585pfh.4.1676990492553; Tue, 21 Feb 2023 06:41:32 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:32 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 10/23] sudo: upgrade 1.9.12p1 -> 1.9.12p2 Date: Tue, 21 Feb 2023 04:40:53 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177510 From: Alexander Kanavin Changes: Fixed a compilation error on Linux/aarch64. GitHub issue #197. Fixed a potential crash introduced in the fix GitHub issue #134. If a user’s sudoers entry did not have any RunAs user’s set, running sudo -U otheruser -l would dereference a NULL pointer. Fixed a bug introduced in sudo 1.9.12 that could prevent sudo from creating a I/O files when the iolog_file sudoers setting contains six or more Xs. Fixed a compilation issue on AIX with the native compiler. GitHub issue #231. Fixed CVE-2023-22809, a flaw in sudo’s -e option (aka sudoedit) that could allow a malicious user with sudoedit privileges to edit arbitrary files Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 5a3f5f4f607f5e06af772287109b68579154fb2f) Signed-off-by: Steve Sakoman (cherry picked from commit cd1b6167242003c79b39d8761ea0f36db41f0671) Signed-off-by: Steve Sakoman --- .../sudo/{sudo_1.9.12p1.bb => sudo_1.9.12p2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/sudo/{sudo_1.9.12p1.bb => sudo_1.9.12p2.bb} (96%) diff --git a/meta/recipes-extended/sudo/sudo_1.9.12p1.bb b/meta/recipes-extended/sudo/sudo_1.9.12p2.bb similarity index 96% rename from meta/recipes-extended/sudo/sudo_1.9.12p1.bb rename to meta/recipes-extended/sudo/sudo_1.9.12p2.bb index 1495b67b8b..ae7207c081 100644 --- a/meta/recipes-extended/sudo/sudo_1.9.12p1.bb +++ b/meta/recipes-extended/sudo/sudo_1.9.12p2.bb @@ -8,7 +8,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[sha256sum] = "475a18a8eb3da8b2917ceab063a6baf51ea09128c3c47e3e0e33ab7497bab7d8" +SRC_URI[sha256sum] = "b9a0b1ae0f1ddd9be7f3eafe70be05ee81f572f6f536632c44cd4101bb2a8539" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" From patchwork Tue Feb 21 14:40:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19918 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8666AC6379F for ; Tue, 21 Feb 2023 14:41:37 +0000 (UTC) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mx.groups.io with SMTP id smtpd.web11.44241.1676990495346702006 for ; Tue, 21 Feb 2023 06:41:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=pV7Ly7PW; spf=softfail (domain: sakoman.com, ip: 209.85.215.176, mailfrom: steve@sakoman.com) Received: by mail-pg1-f176.google.com with SMTP id h31so2491464pgl.6 for ; Tue, 21 Feb 2023 06:41:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=pmJ3SrPMIh5aoUp6COSk2CBEg/OLuZs4Kvq5bVp1Aak=; b=pV7Ly7PWMupgs2s3YGUyUWVh3hmwYflncfArw728AoYJTxT4yStRpbK0oe/FsnEaVF mUdK0ivXCQTNC01T/sSwgAv7dYwGcbKe0RCV6pAWvqLiR4wR1r2BtT6W+MxHjVwnISnX IuhOUlpwbRDgH7IUGc9d8x+LrkZwg9+6wCT1oYon3oR1P64RRkuSpCpMAjjpjz4YX8j5 9L7y+fI/H52TI5+jfcmu9QsaEH4mcXE1ArF8dZ0LZqHhpFdjjbdvg0mWCXkT44SoUhRo ZMJ7/HukOAl0KFYctlnp1yFcfh1ejVA7Ot3ILmA3wDNL4rz1xMGg2Zwa0mW/aFDKzleD Tl2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pmJ3SrPMIh5aoUp6COSk2CBEg/OLuZs4Kvq5bVp1Aak=; b=c8qQ44640NSmX27jI4ARetnHH7NEEq7VePWJgUAyWT1k7qYHwPH1O8k7ve6YgLrGal AViNELLxYFyf03P3ARsGdgDDlJjheyeFlu3g7wlvgzdePV4s4KRZzCfb4FHHZdGrPQce M31/9e5GecIAPqkWwZrYTN7V9kTjvr3dz8Fp00DNU4dzRabP3jrCM2Jff8oufuwSA8ab 95zl98r8UYXkXupzxvMbWeIMSdLTfLZupi5V57tqo3i6SGW5r4hXLLi2pgRAXnuIU7XE DB2jnU9tqu6wTkMiG01t6AMUSMWK+oaCfRUg3WxbgwBuAmq7q5evhtAb1gSen2F58l7x +K4Q== X-Gm-Message-State: AO0yUKX0Dlgyx0JXYclBhOixL6SKNxFD2l3w4GGqsmiN2XaOUyKW+kGN EMpGrKGWz5MVBbgWVp1zXIsrBPoq+wCfrAyYEJY= X-Google-Smtp-Source: AK7set8AlAGwqUtDIB1ZPLPxxxmvcvreEnA3hYjaQfHM8tOHDnxCdu+1l5Q202xS9sz2jjC3wkndXQ== X-Received: by 2002:a05:6a00:86:b0:5a8:c044:663e with SMTP id c6-20020a056a00008600b005a8c044663emr5028425pfj.21.1676990494375; Tue, 21 Feb 2023 06:41:34 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:33 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 11/23] libgit2: uprade 1.4.3 -> 1.4.4 Date: Tue, 21 Feb 2023 04:40:54 -1000 Message-Id: <4bc31ac89eb0562bae37e2246e8001b4286f61da.1676990336.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177511 This is a security release with multiple changes. This provides compatibility with git's changes to address CVE 2022-29187. As a follow up to CVE 2022-24765, now not only is the working directory of a non-bare repository examined for its ownership, but the .git directory and the .git file (if present) are also examined for their ownership. A fix for compatibility with git's (new) behavior for CVE 2022-24765 allows users on POSIX systems to access a git repository that is owned by them when they are running in sudo. A fix for further compatibility with git's (existing) behavior for CVE 2022-24765 allows users on Windows to access a git repository that is owned by the Administrator when running with escalated privileges (using runas Administrator). The bundled zlib is updated to v1.2.12, as prior versions had memory corruption bugs. It is not known that there is a security vulnerability in libgit2 based on these bugs, but we are updating to be cautious. Signed-off-by: Steve Sakoman --- .../libgit2/{libgit2_1.4.3.bb => libgit2_1.4.4.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/libgit2/{libgit2_1.4.3.bb => libgit2_1.4.4.bb} (91%) diff --git a/meta/recipes-support/libgit2/libgit2_1.4.3.bb b/meta/recipes-support/libgit2/libgit2_1.4.4.bb similarity index 91% rename from meta/recipes-support/libgit2/libgit2_1.4.3.bb rename to meta/recipes-support/libgit2/libgit2_1.4.4.bb index 7e27b5b018..a6f4d8d7f2 100644 --- a/meta/recipes-support/libgit2/libgit2_1.4.3.bb +++ b/meta/recipes-support/libgit2/libgit2_1.4.4.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e5a9227de4cb6afb5d35ed7b0fdf480d" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.4;protocol=https" -SRCREV = "465bbf88ea939a965fbcbade72870c61f815e457" +SRCREV = "3b7d756ccfaf9ec2922d2db22e6cc98f8ab6580c" S = "${WORKDIR}/git" From patchwork Tue Feb 21 14:40:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19923 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93D3AC64ED6 for ; Tue, 21 Feb 2023 14:41:37 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web10.43528.1676990478424193122 for ; Tue, 21 Feb 2023 06:41:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=iHrrKiaB; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id n20so2627814pfu.12 for ; Tue, 21 Feb 2023 06:41:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=1D6WMDL76xjUGrBNfm2GE5eel+TO5iAF0XenY83OKR0=; b=iHrrKiaBQRUdshse0TLhOj2dYgoEs01FFihmRi0KglMyRGRmQQN6U90cfp3fiAiowS T59CxL/0U8TchPxc9cAV/8ExasZ0ZGS0JT0u/twJcYLQFFvwH0rb5ILvsI+zil5RSNVc 8gGBPujKN3iyfjKghH9K/uJrX1w0jMYHFCAeTuSGDmZ3QE39Aku6CRZqhIRbZKFtzzhK RkE2UfmUaVoah6KyIFn6ZlE9rnTIpCkGPfEAbG/p/etAYEwLQvWELr2oNghcKT55puuh NQdqFGW6/JtVe81B3x0E7CTMKkGag02+VjQJSfxJylFlbvDTDcoe/UQD8zGIGdRfqpJH f13A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1D6WMDL76xjUGrBNfm2GE5eel+TO5iAF0XenY83OKR0=; b=vCdrS79DbS2z0LL6jjv39/bZhpHEctiavlscaYRLmgy8AxjUtvZmnFJbR9PwMfIc8S isG3LQVKDQXsFAhRhakfAMB5Lk1bFC1LdkK9xU965th3+dzHWNqpG9EyHABQNY0IZ2wN gSDOeEvmQ3ToDaDxxwBKNkbMq7q6pp9SlEofzJa2IPlZjtKxSQer7NXV5UBphSU0w1r1 tpNHD84sFuUsr2pRr6ldy7Z3ziqOl5MBxOGjTxxaVC1hLzA68LxXZMJjfg/bWUY3C5vr UfXaVzPnVoi/4hRvgmkPgKJeAaWpkBeEL0WeRrjgJ0/QZSPf2W93MbG2mrWnjyb4Sngy tgcw== X-Gm-Message-State: AO0yUKWTePXkwSLnJX+y1Ra3tv5mdMeWEdDlKfDIDw362BUqPTqVQHKY j6G30K0dGeUgehgjD7k2rKc8mIJIve8p1aSe3nw= X-Google-Smtp-Source: AK7set/LsniMiqOXloEelQjwVgMZgtWkXiF0jJjObrps3Ocj2xZsE/YUAOmPTe+5cX2Fv7TvHqpNmQ== X-Received: by 2002:a62:1c97:0:b0:5aa:39a8:41a2 with SMTP id c145-20020a621c97000000b005aa39a841a2mr3167543pfc.24.1676990496143; Tue, 21 Feb 2023 06:41:36 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:35 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 12/23] libgit2: upgrade 1.4.4 -> 1.4.5 Date: Tue, 21 Feb 2023 04:40:55 -1000 Message-Id: <6c64dc88b5dac910f3760e9cd1003cc83df3ffad.1676990336.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177512 Fixes: libgit2, when compiled using the optional, included libssh2 backend, fails to verify SSH keys by default. Description When using an SSH remote with the optional, included libssh2 backend, libgit2 does not perform certificate checking by default. Prior versions of libgit2 require the caller to set the certificate_check field of libgit2's git_remote_callbacks structure - if a certificate check callback is not set, libgit2 does not perform any certificate checking. This means that by default - without configuring a certificate check callback, clients will not perform validation on the server SSH keys and may be subject to a man-in-the-middle attack. Beginning in libgit2 v1.4.5 and v1.5.1, libgit2 will now perform host key checking by default. Users can still override the default behavior using the certificate_check function. The libgit2 security team would like to thank the Julia and Rust security teams for responsibly disclosing this vulnerability and assisting with fixing the vulnerability. Signed-off-by: Steve Sakoman --- .../libgit2/{libgit2_1.4.4.bb => libgit2_1.4.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/libgit2/{libgit2_1.4.4.bb => libgit2_1.4.5.bb} (91%) diff --git a/meta/recipes-support/libgit2/libgit2_1.4.4.bb b/meta/recipes-support/libgit2/libgit2_1.4.5.bb similarity index 91% rename from meta/recipes-support/libgit2/libgit2_1.4.4.bb rename to meta/recipes-support/libgit2/libgit2_1.4.5.bb index a6f4d8d7f2..aadfe4ad02 100644 --- a/meta/recipes-support/libgit2/libgit2_1.4.4.bb +++ b/meta/recipes-support/libgit2/libgit2_1.4.5.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e5a9227de4cb6afb5d35ed7b0fdf480d" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.4;protocol=https" -SRCREV = "3b7d756ccfaf9ec2922d2db22e6cc98f8ab6580c" +SRCREV = "cd6f679af401eda1f172402006ef8265f8bd58ea" S = "${WORKDIR}/git" From patchwork Tue Feb 21 14:40:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19925 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 940A2C6379F for ; Tue, 21 Feb 2023 14:41:47 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web10.43552.1676990499308222312 for ; Tue, 21 Feb 2023 06:41:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=XZQ0AAIz; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id n5so2801167pfv.11 for ; Tue, 21 Feb 2023 06:41:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=GzOTgWpscrqwSvLTIKg5fluqrbi5fP2D6zkqJ15zwGg=; b=XZQ0AAIzZ9bZbI12g7hI0LBXxeDzebKPCP+6GQbRxvVWTfDWCX7hFaMezfMzLGmRVQ A8JPfoaBVXXZAwZWi+0G0CLDUj7075jU9PqBnR7wINI207Jgq0X3regH2e/tJPIWlZbJ iUsUTcPZ2SRHVhZE913+HAg+A9CJeY2PM85HoR6p7f0rtrGzNKGvZHZ232BZW1NxBE8f Jm37gSTE0y3UCdDDJzGG0ORcIvOcBwaZr5lzN2jilURigT2GV66ekfZDPNgjSFb0xa+/ LmRgx/EY7D0BSwRfoM8edOB6RnBOezNq/leXjMtip3Napkd7Qzvq1WaFQrFNfdUAkmnP CH0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GzOTgWpscrqwSvLTIKg5fluqrbi5fP2D6zkqJ15zwGg=; b=ZgaoIurUKdxhnYkeF2qDl9DKWddM8EKGEO0lZ0aLMYptk6xpiYyOa/6Sa+0FIfRiCA 8UwcJqhAkjixLfv7gjQBdSnAMeTY9EfSv51TJo4oBTLj4QidqyDzU7yoN4mlOTb5Rc6E ho9cGtkegrvwjinbofcY0SYESHq/7pN+qvS2CUqPn64W1OmUgaxxwxhIYVZypWdArc/C R0dENxgma3pTwK9XHqhgFUOMsT0kx4vUILJQSzjPHCB1e02vhJj5VFSHi5z1rNtyPv+U vJjeL5Cit2EdT7Hk4x01Dd2DZ9C+S3pmA4cWDkv3nmihOFw7Gox63JmHCZvcjEixkzAI 7bMw== X-Gm-Message-State: AO0yUKXBLtERZZXwkm9T6849+o4DwFUseZclETxNzO2nfh0hzuDLgXIp +RWC5ocHj20estrh/SsVvqbNwZ/CpU7oCT/GM8U= X-Google-Smtp-Source: AK7set/l34zirt3mFeS1A+Cdl5xpL4JGl+33WK49vfGMuK9TYo0xzsQQFTuuw52YU8/4Al9/IHwZfg== X-Received: by 2002:a62:7b07:0:b0:577:272f:fdb with SMTP id w7-20020a627b07000000b00577272f0fdbmr3279566pfc.29.1676990498138; Tue, 21 Feb 2023 06:41:38 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:37 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 13/23] qemu: fix compile error Date: Tue, 21 Feb 2023 04:40:56 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177513 From: Kai Kang Backport 2 patches and rebase 0001-hw-display-qxl-Pass-requested-buffer-size-to-qxl_phy.patch to fix compile error: ../qemu-6.2.0/hw/display/qxl.c: In function 'qxl_phys2virt': ../qemu-6.2.0/hw/display/qxl.c:1477:67: error: 'size' undeclared (first use in this function); did you mean 'gsize'? 1477 | if (!qxl_get_check_slot_offset(qxl, pqxl, &slot, &offset, size)) { | ^~~~ | gsize ../qemu-6.2.0/hw/display/qxl.c:1477:67: note: each undeclared identifier is reported only once for each function it appears in Signed-off-by: Kai Kang Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 2 + ...ave-qxl_log_command-Return-early-if-.patch | 57 +++++ ...ass-requested-buffer-size-to-qxl_phy.patch | 217 ++++++++++++++++++ 3 files changed, 276 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/0001-hw-display-qxl-Have-qxl_log_command-Return-early-if-.patch create mode 100644 meta/recipes-devtools/qemu/qemu/0001-hw-display-qxl-Pass-requested-buffer-size-to-qxl_phy.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index b68be447f1..5430718f75 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -93,6 +93,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0021-target-ppc-implement-xs-n-maddqp-o-xs-n-msubqp-o.patch \ file://CVE-2022-3165.patch \ file://CVE-2022-4144.patch \ + file://0001-hw-display-qxl-Have-qxl_log_command-Return-early-if-.patch \ + file://0001-hw-display-qxl-Pass-requested-buffer-size-to-qxl_phy.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/0001-hw-display-qxl-Have-qxl_log_command-Return-early-if-.patch b/meta/recipes-devtools/qemu/qemu/0001-hw-display-qxl-Have-qxl_log_command-Return-early-if-.patch new file mode 100644 index 0000000000..cd846222c9 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0001-hw-display-qxl-Have-qxl_log_command-Return-early-if-.patch @@ -0,0 +1,57 @@ +Upstream-Status: Backport [https://github.com/qemu/qemu/commit/61c34fc] + +Signed-off-by: Kai Kang + +From 61c34fc194b776ecadc39fb26b061331107e5599 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= +Date: Mon, 28 Nov 2022 21:27:37 +0100 +Subject: [PATCH] hw/display/qxl: Have qxl_log_command Return early if no + log_cmd handler +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Only 3 command types are logged: no need to call qxl_phys2virt() +for the other types. Using different cases will help to pass +different structure sizes to qxl_phys2virt() in a pair of commits. + +Reviewed-by: Marc-André Lureau +Signed-off-by: Philippe Mathieu-Daudé +Signed-off-by: Stefan Hajnoczi +Message-Id: <20221128202741.4945-2-philmd@linaro.org> +--- + hw/display/qxl-logger.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/hw/display/qxl-logger.c b/hw/display/qxl-logger.c +index 68bfa47568..1bcf803db6 100644 +--- a/hw/display/qxl-logger.c ++++ b/hw/display/qxl-logger.c +@@ -247,6 +247,16 @@ int qxl_log_command(PCIQXLDevice *qxl, const char *ring, QXLCommandExt *ext) + qxl_name(qxl_type, ext->cmd.type), + compat ? "(compat)" : ""); + ++ switch (ext->cmd.type) { ++ case QXL_CMD_DRAW: ++ break; ++ case QXL_CMD_SURFACE: ++ break; ++ case QXL_CMD_CURSOR: ++ break; ++ default: ++ goto out; ++ } + data = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id); + if (!data) { + return 1; +@@ -269,6 +279,7 @@ int qxl_log_command(PCIQXLDevice *qxl, const char *ring, QXLCommandExt *ext) + qxl_log_cmd_cursor(qxl, data, ext->group_id); + break; + } ++out: + fprintf(stderr, "\n"); + return 0; + } +-- +2.34.1 + diff --git a/meta/recipes-devtools/qemu/qemu/0001-hw-display-qxl-Pass-requested-buffer-size-to-qxl_phy.patch b/meta/recipes-devtools/qemu/qemu/0001-hw-display-qxl-Pass-requested-buffer-size-to-qxl_phy.patch new file mode 100644 index 0000000000..ac51cf567a --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0001-hw-display-qxl-Pass-requested-buffer-size-to-qxl_phy.patch @@ -0,0 +1,217 @@ +Upstream-Status: Backport [https://github.com/qemu/qemu/commit/8efec0e] + +Backport and rebase patch to fix compile error which imported by CVE-2022-4144.patch: + +../qemu-6.2.0/hw/display/qxl.c: In function 'qxl_phys2virt': +../qemu-6.2.0/hw/display/qxl.c:1477:67: error: 'size' undeclared (first use in this function); did you mean 'gsize'? + 1477 | if (!qxl_get_check_slot_offset(qxl, pqxl, &slot, &offset, size)) { + | ^~~~ + | gsize +../qemu-6.2.0/hw/display/qxl.c:1477:67: note: each undeclared identifier is reported only once for each function it appears in + +Signed-off-by: Kai Kang + +From 8efec0ef8bbc1e75a7ebf6e325a35806ece9b39f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= +Date: Mon, 28 Nov 2022 21:27:39 +0100 +Subject: [PATCH] hw/display/qxl: Pass requested buffer size to qxl_phys2virt() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Currently qxl_phys2virt() doesn't check for buffer overrun. +In order to do so in the next commit, pass the buffer size +as argument. + +For QXLCursor in qxl_render_cursor() -> qxl_cursor() we +verify the size of the chunked data ahead, checking we can +access 'sizeof(QXLCursor) + chunk->data_size' bytes. +Since in the SPICE_CURSOR_TYPE_MONO case the cursor is +assumed to fit in one chunk, no change are required. +In SPICE_CURSOR_TYPE_ALPHA the ahead read is handled in +qxl_unpack_chunks(). + +Signed-off-by: Philippe Mathieu-Daudé +Acked-by: Gerd Hoffmann +Signed-off-by: Stefan Hajnoczi +Message-Id: <20221128202741.4945-4-philmd@linaro.org> +--- + hw/display/qxl-logger.c | 11 ++++++++--- + hw/display/qxl-render.c | 20 ++++++++++++++++---- + hw/display/qxl.c | 14 +++++++++----- + hw/display/qxl.h | 3 ++- + 4 files changed, 35 insertions(+), 13 deletions(-) + +diff --git a/hw/display/qxl-logger.c b/hw/display/qxl-logger.c +index 1bcf803..35c38f6 100644 +--- a/hw/display/qxl-logger.c ++++ b/hw/display/qxl-logger.c +@@ -106,7 +106,7 @@ static int qxl_log_image(PCIQXLDevice *qxl, QXLPHYSICAL addr, int group_id) + QXLImage *image; + QXLImageDescriptor *desc; + +- image = qxl_phys2virt(qxl, addr, group_id); ++ image = qxl_phys2virt(qxl, addr, group_id, sizeof(QXLImage)); + if (!image) { + return 1; + } +@@ -214,7 +214,8 @@ int qxl_log_cmd_cursor(PCIQXLDevice *qxl, QXLCursorCmd *cmd, int group_id) + cmd->u.set.position.y, + cmd->u.set.visible ? "yes" : "no", + cmd->u.set.shape); +- cursor = qxl_phys2virt(qxl, cmd->u.set.shape, group_id); ++ cursor = qxl_phys2virt(qxl, cmd->u.set.shape, group_id, ++ sizeof(QXLCursor)); + if (!cursor) { + return 1; + } +@@ -236,6 +237,7 @@ int qxl_log_command(PCIQXLDevice *qxl, const char *ring, QXLCommandExt *ext) + { + bool compat = ext->flags & QXL_COMMAND_FLAG_COMPAT; + void *data; ++ size_t datasz; + int ret; + + if (!qxl->cmdlog) { +@@ -249,15 +251,18 @@ int qxl_log_command(PCIQXLDevice *qxl, const char *ring, QXLCommandExt *ext) + + switch (ext->cmd.type) { + case QXL_CMD_DRAW: ++ datasz = compat ? sizeof(QXLCompatDrawable) : sizeof(QXLDrawable); + break; + case QXL_CMD_SURFACE: ++ datasz = sizeof(QXLSurfaceCmd); + break; + case QXL_CMD_CURSOR: ++ datasz = sizeof(QXLCursorCmd); + break; + default: + goto out; + } +- data = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id); ++ data = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id, datasz); + if (!data) { + return 1; + } +diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c +index ca21700..fcfd40c 100644 +--- a/hw/display/qxl-render.c ++++ b/hw/display/qxl-render.c +@@ -107,7 +107,9 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl) + qxl->guest_primary.resized = 0; + qxl->guest_primary.data = qxl_phys2virt(qxl, + qxl->guest_primary.surface.mem, +- MEMSLOT_GROUP_GUEST); ++ MEMSLOT_GROUP_GUEST, ++ qxl->guest_primary.abs_stride ++ * height); + if (!qxl->guest_primary.data) { + goto end; + } +@@ -228,7 +230,8 @@ static void qxl_unpack_chunks(void *dest, size_t size, PCIQXLDevice *qxl, + if (offset == size) { + return; + } +- chunk = qxl_phys2virt(qxl, chunk->next_chunk, group_id); ++ chunk = qxl_phys2virt(qxl, chunk->next_chunk, group_id, ++ sizeof(QXLDataChunk) + chunk->data_size); + if (!chunk) { + return; + } +@@ -295,7 +298,8 @@ fail: + /* called from spice server thread context only */ + int qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt *ext) + { +- QXLCursorCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id); ++ QXLCursorCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id, ++ sizeof(QXLCursorCmd)); + QXLCursor *cursor; + QEMUCursor *c; + +@@ -314,7 +318,15 @@ int qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt *ext) + } + switch (cmd->type) { + case QXL_CURSOR_SET: +- cursor = qxl_phys2virt(qxl, cmd->u.set.shape, ext->group_id); ++ /* First read the QXLCursor to get QXLDataChunk::data_size ... */ ++ cursor = qxl_phys2virt(qxl, cmd->u.set.shape, ext->group_id, ++ sizeof(QXLCursor)); ++ if (!cursor) { ++ return 1; ++ } ++ /* Then read including the chunked data following QXLCursor. */ ++ cursor = qxl_phys2virt(qxl, cmd->u.set.shape, ext->group_id, ++ sizeof(QXLCursor) + cursor->chunk.data_size); + if (!cursor) { + return 1; + } +diff --git a/hw/display/qxl.c b/hw/display/qxl.c +index ae8aa07..2a4b2d4 100644 +--- a/hw/display/qxl.c ++++ b/hw/display/qxl.c +@@ -274,7 +274,8 @@ static void qxl_spice_monitors_config_async(PCIQXLDevice *qxl, int replay) + QXL_IO_MONITORS_CONFIG_ASYNC)); + } + +- cfg = qxl_phys2virt(qxl, qxl->guest_monitors_config, MEMSLOT_GROUP_GUEST); ++ cfg = qxl_phys2virt(qxl, qxl->guest_monitors_config, MEMSLOT_GROUP_GUEST, ++ sizeof(QXLMonitorsConfig)); + if (cfg != NULL && cfg->count == 1) { + qxl->guest_primary.resized = 1; + qxl->guest_head0_width = cfg->heads[0].width; +@@ -459,7 +460,8 @@ static int qxl_track_command(PCIQXLDevice *qxl, struct QXLCommandExt *ext) + switch (le32_to_cpu(ext->cmd.type)) { + case QXL_CMD_SURFACE: + { +- QXLSurfaceCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id); ++ QXLSurfaceCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id, ++ sizeof(QXLSurfaceCmd)); + + if (!cmd) { + return 1; +@@ -494,7 +496,8 @@ static int qxl_track_command(PCIQXLDevice *qxl, struct QXLCommandExt *ext) + } + case QXL_CMD_CURSOR: + { +- QXLCursorCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id); ++ QXLCursorCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id, ++ sizeof(QXLCursorCmd)); + + if (!cmd) { + return 1; +@@ -1463,7 +1466,8 @@ static bool qxl_get_check_slot_offset(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, + } + + /* can be also called from spice server thread context */ +-void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, int group_id) ++void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, int group_id, ++ size_t size) + { + uint64_t offset; + uint32_t slot; +@@ -1971,7 +1975,7 @@ static void qxl_dirty_surfaces(PCIQXLDevice *qxl) + } + + cmd = qxl_phys2virt(qxl, qxl->guest_surfaces.cmds[i], +- MEMSLOT_GROUP_GUEST); ++ MEMSLOT_GROUP_GUEST, sizeof(QXLSurfaceCmd)); + assert(cmd); + assert(cmd->type == QXL_SURFACE_CMD_CREATE); + qxl_dirty_one_surface(qxl, cmd->u.surface_create.data, +diff --git a/hw/display/qxl.h b/hw/display/qxl.h +index 30d21f4..4551c23 100644 +--- a/hw/display/qxl.h ++++ b/hw/display/qxl.h +@@ -147,7 +147,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(PCIQXLDevice, PCI_QXL) + #define QXL_DEFAULT_REVISION (QXL_REVISION_STABLE_V12 + 1) + + /* qxl.c */ +-void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id); ++void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id, ++ size_t size); + void qxl_set_guest_bug(PCIQXLDevice *qxl, const char *msg, ...) + GCC_FMT_ATTR(2, 3); + +-- +2.34.1 + From patchwork Tue Feb 21 14:40:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19924 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 902FCC64ED6 for ; Tue, 21 Feb 2023 14:41:47 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mx.groups.io with SMTP id smtpd.web11.44243.1676990501292688729 for ; Tue, 21 Feb 2023 06:41:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=STiHgAx8; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id s15so1103569pfg.3 for ; Tue, 21 Feb 2023 06:41:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ALHGg2o4TlmtEmzNzXVL30yOXxTXSO7/vcqj8Kroxt4=; b=STiHgAx8yHle/gx08GplqzRvJHqdDoPrWsSfzp40RjZBgRs25gIsLbsx09rR4yOA+m 73JqxXl42hDbXZh/WBOtK38mch+QY1vR/fF39MLJSFPuaMvHcZNpZFlKesPSle/9UnA5 ifxbUDMobN2d3r/heJq3jOO7fR5CKV6T24hEAUL8EwumEHK49fQxGSzDNQzFxdk5TXw1 l3EjgcSnep2d9srFJHDObhNQgLNwCTWXmIjoVDmmvtmWgkg5jwK8DhkL1giMp3g48V2R 69yBVYl307mXRI3MjjcqNBANcyrV1VaQqkcqabY1gDbw0qgLMsuzIJJSM0pyQkM2w7+K oOSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ALHGg2o4TlmtEmzNzXVL30yOXxTXSO7/vcqj8Kroxt4=; b=iqY1rral/isJnNH3UMf921yTOIVblB8E2hGtuSL4EIhk5JCZ5ukoIlaeshocNjoLes 2FHfWDN6vSrNMRPP5xSKc28S9E+/sDg/gY3mkyXe2IxjMsixHVcJ+yKRAKnEfGYg4QOo MePIVzQCGenIFqRu0SHM82IeK//HheO8/kpUl7khtYLocmf6Kfn9xPXoEC7f/hym/7Zn DbTbjmjNH4uYYA293YpDEu2KX4fJa7wANGcrth+PYQW4zdfN/5J1qjiR/cIUFfpsDdCr 4+bYsvSJQnzoIF0FEytdLnJV8PD/mKi9P3PdasJaCyGaBa/SYM+UMSWnWb7seQ3JRxRx YLGQ== X-Gm-Message-State: AO0yUKXaZAdD6h4DxOaIpfIdTobs/DxZltaZFJbOxAbvrbHjfKu3wFjd CJYB8YhK5PiBk8hyqUGC5+ZLKn+2PBEiD+5KyPI= X-Google-Smtp-Source: AK7set/sFyJGSUWjdDumRx5Dc7D6Fx/NHbaKoDyMtWKgfhCVRQRHsY0aABdvWqpZUawbehPcLFFAaA== X-Received: by 2002:a62:840e:0:b0:5a8:a467:f975 with SMTP id k14-20020a62840e000000b005a8a467f975mr4482725pfd.17.1676990500261; Tue, 21 Feb 2023 06:41:40 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:39 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 14/23] update-alternatives: fix typos Date: Tue, 21 Feb 2023 04:40:57 -1000 Message-Id: <6b6f3cfe8995663b31482e70285863266dfd9d80.1676990336.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177514 From: Ulrich Ölmann Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit d3ca05b072c152b76a86edaaddebabdef312ea95) Signed-off-by: Steve Sakoman --- meta/classes/update-alternatives.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index fc1ffd828c..7581a70439 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -1,5 +1,5 @@ # This class is used to help the alternatives system which is useful when -# multiple sources provide same command. You can use update-alternatives +# multiple sources provide the same command. You can use update-alternatives # command directly in your recipe, but in most cases this class simplifies # that job. # @@ -29,7 +29,7 @@ # A non-default link to create for a target # ALTERNATIVE_TARGET[name] = "target" # -# This is the name of the binary as it's been install by do_install +# This is the name of the binary as it's been installed by do_install # i.e. ALTERNATIVE_TARGET[sh] = "/bin/bash" # # A package specific link for a target @@ -62,7 +62,7 @@ ALTERNATIVE_PRIORITY = "10" # We need special processing for vardeps because it can not work on # modified flag values. So we aggregate the flags into a new variable -# and include that vairable in the set. +# and include that variable in the set. UPDALTVARS = "ALTERNATIVE ALTERNATIVE_LINK_NAME ALTERNATIVE_TARGET ALTERNATIVE_PRIORITY" PACKAGE_WRITE_DEPS += "virtual/update-alternatives-native" From patchwork Tue Feb 21 14:40:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19926 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8578BC636D7 for ; Tue, 21 Feb 2023 14:41:47 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web11.44244.1676990503172685682 for ; Tue, 21 Feb 2023 06:41:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Wl34nTsp; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id c32so2530027pgc.7 for ; Tue, 21 Feb 2023 06:41:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=/0Un6lUx0ZcotAQixy1TT+GjXgIoNemwkGdskbH6Jcs=; b=Wl34nTspBxbYvkkphM0UJ83+/Ic4qa09mv8nMiOJHmimh7ykpAkNEmAHhuoHZ4eekN eRrh7PI76FRPAaZjePqE36zqN4uectUtU5L5+8YbJaYh3dB3N9txQK8c2gILS2Vz3XWO MspVXk9FdT+hEdGjxnZ7pQQkCzAca/JqBcq6QAepQs7vcO7z8yQt2EtyrENe8GUfNQ+t MOmpXw/xFT0dAEDOdbqVkqDjrrBFbYd3wgwhhpIAVLBS4j1wRTvBKaTnZg6KEqyU6IHH S95RjhsxxIENPHa5nO1ynQ2KyLUoBjW6TTIHo5/keoyQM5H2OfCP7xXOHKN4QtYfP4CF Ynpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/0Un6lUx0ZcotAQixy1TT+GjXgIoNemwkGdskbH6Jcs=; b=tneM5COEEY6f7GpIXr6QkpoEmClDUzKTBfR0vAMRj+vaP+qfRRFt0pXRAtFE23U2+4 6c6jVVmgmjwFV1DHVWxLMrjyPcbPTLpSRdm1zT32CgEKIn47sHFiM+OkP09YgLELBRcJ HM4/VL23jAVar1eSYYy/fCHAi+vD9U8EX2q1tI49svDstWzuIxntOiIKcENWmt306s2H +TAISPPQP7LJDnyMlm1AG1D5SGHqHKn7XpS0eGB8d6I6hgBSgkUQrdUYUA7D4A4/WXuv aHQEfzeUOQDGqZlLUhkeOEdmJ00u7++TeqKp4jB5CCTK8Z3onK4HjYJ6nRoFmp2aNm1S Ro6Q== X-Gm-Message-State: AO0yUKUQNGP7D4R0lp+4cjzA5w+75JpBYmwo4b5qlZcJp/SlZ6PNOArT nMpUKKfoX8iatyEpAA5elSnIpVkdF+HTXIV+OcE= X-Google-Smtp-Source: AK7set+f8u/SkRYHHq3mRTgYmtRTxQK/INAiTyMGfnkerHx84pHpSYAVGK5LjvrwtuxrqUsC0a5rFQ== X-Received: by 2002:a05:6a00:18a9:b0:594:1f1c:3d3b with SMTP id x41-20020a056a0018a900b005941f1c3d3bmr7354540pfh.16.1676990502148; Tue, 21 Feb 2023 06:41:42 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:41 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 15/23] image.bbclass: print all QA functions exceptions Date: Tue, 21 Feb 2023 04:40:58 -1000 Message-Id: <6c53d8d8c88fb06b19fbf5bdd754960b21531074.1676990336.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177515 From: Mauro Queiros For the QA checks in `image.bbclass`, all exceptions other than `oe.utils.ImageQAFailed` always print the following generic message: "Image QA function func_name failed" This can be very misleading, as it may hide python syntax errors and other kind of issues that are hard to detect without more explicit error messages. This change makes sure that the error message of all exceptions are displayed. Before this change: "Image QA function func_name failed" After this change: "Image QA function func_name failed: f-string: empty expression not allowed (, line 13)" Signed-off-by: Mauro Queiros Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 3d85b30d8704d38b86f5b006748cebc74bd2a4fa) Signed-off-by: Steve Sakoman --- meta/classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index aa14ea2316..00413d56d1 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -313,7 +313,7 @@ fakeroot python do_image_qa () { except oe.utils.ImageQAFailed as e: qamsg = qamsg + '\tImage QA function %s failed: %s\n' % (e.name, e.description) except Exception as e: - qamsg = qamsg + '\tImage QA function %s failed\n' % cmd + qamsg = qamsg + '\tImage QA function %s failed: %s\n' % (cmd, e) if qamsg: imgname = d.getVar('IMAGE_NAME') From patchwork Tue Feb 21 14:40:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19927 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F565C61DA3 for ; Tue, 21 Feb 2023 14:41:47 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web11.44244.1676990503172685682 for ; Tue, 21 Feb 2023 06:41:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=fkR2jU7K; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id c32so2530083pgc.7 for ; Tue, 21 Feb 2023 06:41:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=M73S2YPKFCP8XO4ifSY8dBTdu+FQ76yeWPOAZzFKyNo=; b=fkR2jU7KtLNrh3UMlTysXa9aIc85/Z05ILSEh3PErAn40/bsnv19ql6Ux88hV5zx8Q EHv37AALnFmtrjo9zovcRC4KEYzG7TXgEERRMJXxs6PB09BC84d1ullqmkUsTLcaImUz dlrvyJ16UEqDhQ13J3kEHoctza2M2T+9arIsf+xzoJruyJRmtOdlLle1FI4C85Ukd+vE xO1JUm9qCQ7kl1ByOPbxo2l83K3KYaYprVIeTcLXKe8hUpuCq4JKvyRw7KJkeKvYzS4/ fWq8TykKO0H8ivxy6uKxC3NljDzYgPA2OObFuZElY2W+G6m8i1P7A7Q98EUwZTJssGYU iHcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=M73S2YPKFCP8XO4ifSY8dBTdu+FQ76yeWPOAZzFKyNo=; b=GqzHt+vPHNVW1622tgkQORR/cxJXuLDnIFPnCi0n785ZxPtrcdKTvcH9xnmEUw5Klz avlFw6BOl/IVqyq0ncdV3+PmNQCStbbvsGDqvdidtv14c/nzKWY76MrmaFLTcLZRPgBG RKB54lcuXlgi/3dPFCGI3h9mkGXxE/l0ugONyHV+rCw+/FnXhI58xC3qtyFDT3hp08pI wZMNNQ/SCvpwxmFIcdv8dTDvvvCq9vGyPrmEPWrJXSlON4s5aP+lApsiEiXHnQfaubFZ U/mBWH0IuhbztekmOSBDJHANMTFzAg2E2xV4SBxA+/BZpi8HMRb3hEh5aKfhxuMQwKTL fBWA== X-Gm-Message-State: AO0yUKUAdcSWi4TJuWEA3314ePn1McV6x9YZvQYI08eJ8fxRryn1KE2g 2q1w4fL4FR2U8BloBMWuNWWDJPlSrvX0CNjG+Ys= X-Google-Smtp-Source: AK7set/STMFVypzSnM2TbxFLvawiznQNxDnO+GdBpqVvyY9GbjLqIgQBLrDqc7wJZGTGQW9z20LaBQ== X-Received: by 2002:a62:17c1:0:b0:593:c9b6:dc5d with SMTP id 184-20020a6217c1000000b00593c9b6dc5dmr5724163pfx.0.1676990504259; Tue, 21 Feb 2023 06:41:44 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:43 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 16/23] devshell: Do not add scripts/git-intercept to PATH Date: Tue, 21 Feb 2023 04:40:59 -1000 Message-Id: <70ee5f9d50bec6e708cd2006c11ef3d0bd7cab42.1676990336.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177516 From: Peter Kjellerstedt The use of scripts/git-intercept was introduced in commit 3266c327df (install/devshell: Introduce git intercept script due to fakeroot issues) and later reverted in commit af27c81eaf (scripts: Make git intercept global). Signed-off-by: Peter Kjellerstedt Signed-off-by: Luca Ceresoli (cherry picked from commit f6c260c8e2a33e282a35afc99de4ef8cc1791b08) Signed-off-by: Steve Sakoman --- meta/classes/devshell.bbclass | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass index 247d04478c..26c01c080a 100644 --- a/meta/classes/devshell.bbclass +++ b/meta/classes/devshell.bbclass @@ -2,8 +2,6 @@ inherit terminal DEVSHELL = "${SHELL}" -PATH:prepend:task-devshell = "${COREBASE}/scripts/git-intercept:" - python do_devshell () { if d.getVarFlag("do_devshell", "manualfakeroot"): d.prependVar("DEVSHELL", "pseudo ") From patchwork Tue Feb 21 14:41:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19930 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86C23C6379F for ; Tue, 21 Feb 2023 14:41:57 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web10.43560.1676990510422522404 for ; Tue, 21 Feb 2023 06:41:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=01zVYtu7; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id d7so2714547pfu.4 for ; Tue, 21 Feb 2023 06:41:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=zdJK4UfanqJxNXfyGFrXDR6RoMDH3dic4Yd1NpqSz5w=; b=01zVYtu7pMTGrqu+ymixA11VEH9H/2skIGSTwtkI/JQ2ZcF+FptpD0VeXlDQWvxnjd y6qfj4+3kXpwq0KuSFBiYA1w6PK5J98l95GEUtKetRTtUd0i7mnClmBffvjPz3XCvLtg 0qzlBnE48xQAXqULJgLo/dbhbT6npj8YGCWsPI9XeL07qisgbh02BpVBZ73Jp9wH1t7o jdQTN72UXZWLpN2hYOzgwOCetnDSh+xhGrWQ/Ly+Wq58wYsi0HLatMbY1qxiUbSEA91O 6HVIR7wClrHdkG2pw+h4yUfGS8PyWypxNOyIE9pL6N+DTjsT8Em0+BVqxFLrnZTSqVBc yciw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zdJK4UfanqJxNXfyGFrXDR6RoMDH3dic4Yd1NpqSz5w=; b=DL60mt2+JU1gyeupw2zOHsckPmW8Ds4Keqt5cVjGmC6VE6uOZFOsUxp69ht8ZtmJ8p UGXD9TfYooDocrpWzOrHotKCOZA7hinHl8dYNYITLGTghwJc3pDEwgggO/zXZ/QPlUmI xpAc5fiRbrcJwcznvk70qXa5kzWJxS9ImV27oXoIe2cyQhM2JSNA6ULvf/fvO7rdCsKU 69yd7Fxd7nq+73cTjp/qYUGseTfg2ZMopnh19OKZHDc7Fr0krfk1AbJgLwyisO/cBrUa dCyvFSQrwFDOKl/Tw4Mf6WyxTCU6RMosf4NLI2FFMa4TIJjUSM1JT2zgoHF9lrWLDgIc S3hQ== X-Gm-Message-State: AO0yUKXbhcazJUTNEcbxXFItrp8udVTvbqvXxHy8NE+/s68DC8jgMYVK t8CSSHVPUCb4NP1xBfNMz1s9rt3kEkU7B/NLiQU= X-Google-Smtp-Source: AK7set/tKUqP2+dEjGcTB/9mOTfwiDKJJM5MOmJ0GvtlPD4SuR8H+mNXttkhKoEXHK6wylzogrxNNg== X-Received: by 2002:aa7:955c:0:b0:5a8:be36:65a8 with SMTP id w28-20020aa7955c000000b005a8be3665a8mr4789406pfq.27.1676990509504; Tue, 21 Feb 2023 06:41:49 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:49 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 17/23] oeqa ssh.py: move output prints to new line Date: Tue, 21 Feb 2023 04:41:00 -1000 Message-Id: <36b572fbc5c88b9aaf4e146ecdb00c8d4ea6ff70.1676990336.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177517 From: Mikko Rapeli The output from is garbled otherwise and it's not easy to remove debug output form real command output on target. Signed-off-by: Mikko Rapeli Signed-off-by: Luca Ceresoli (cherry picked from commit 917a70cbc43ac1c70c477b220c4115735457ef04) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/core/target/ssh.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py index f956a7744f..f1b9090bbf 100644 --- a/meta/lib/oeqa/core/target/ssh.py +++ b/meta/lib/oeqa/core/target/ssh.py @@ -240,7 +240,7 @@ def SSHCall(command, logger, timeout=None, **opts): eof = True else: output += data - logger.debug('Partial data from SSH call: %s' % data) + logger.debug('Partial data from SSH call:\n%s' % data) endtime = time.time() + timeout except InterruptedError: continue @@ -256,12 +256,12 @@ def SSHCall(command, logger, timeout=None, **opts): endtime = time.time() - starttime lastline = ("\nProcess killed - no output for %d seconds. Total" " running time: %d seconds." % (timeout, endtime)) - logger.debug('Received data from SSH call %s ' % lastline) + logger.debug('Received data from SSH call:\n%s ' % lastline) output += lastline else: output = process.communicate()[0].decode('utf-8', errors='ignore') - logger.debug('Data from SSH call: %s' % output.rstrip()) + logger.debug('Data from SSH call:\n%s' % output.rstrip()) options = { "stdout": subprocess.PIPE, From patchwork Tue Feb 21 14:41:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19929 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86BEAC636D7 for ; Tue, 21 Feb 2023 14:41:57 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web10.43561.1676990512338266078 for ; Tue, 21 Feb 2023 06:41:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=TK4nROCq; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id 16so2583482pfl.8 for ; Tue, 21 Feb 2023 06:41:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=TfTysN8juc1iVPA+1gh7rh6T8Zka+y/T7OPdYTuUUyQ=; b=TK4nROCqD87/WrQrwaHWpRNthDFAP2ALWsGbcYSbXw5mJG1NTTSCnOmV4sbABQWWtJ vgwqsse3If02EuqDbh1uejOTuK29Cx7xRpbMYTK672ebQXdwrip+pocdJTTvnhXrdCAI mSntxP7fdDEIBGl6akqk2Ju69ma78+vsziC2eDhdTozfOI42lgd3403Ur8jWXSd8obCm ESWMKcDg1MjlG25C82j+zIsCVaKUtoHcx4CIdCCQWliTBQL1/OjaHrrsLDMMsQ9HR8MP LV/BqprZ1BCfJMOX6DzTXwobt0ibOOdzZgn4L3KhkcbcXWntIZrTlJi3aYUxMJvPhgoj uBXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TfTysN8juc1iVPA+1gh7rh6T8Zka+y/T7OPdYTuUUyQ=; b=JkuDMBApRNukBylel1/Ptq1Qm1JQ/VAAsnveOUZasMPCzJiiF/bkjCDG/RHWyJx32s WBWBjidTG9IFsEXfHQaZpmyIpdqUCS6JiIRQxFB90Nu1AuDl702CUPgx1AH9ALiF3skc fx/0nb3U0pdhGDDKGNeFVZKXJ6ZUJ042Hil/K4k0EA3Q/Sd3X3onvKRAzVUycY3nKYfg l56op/1AVcAuyHzaQIsfnkLL/nCvl2+UvuEh7HbxElNd/Jbll2TuCiXUbKGILBTcWl8b 3+UVaXyWrCwGnHRwNSxTpaU9SIErA2s8AJROFgQaNGRvmbRW/ECti6FSR3XohYfNN73G POVQ== X-Gm-Message-State: AO0yUKWE/uEaai0YkAlCaHa55OKHNOyIHf3YKleIQxkoj/HPgDKs6Y7d 8G+FPwkHDxEz6cQ0yz/ctcPro9AZ69N567RTKYQ= X-Google-Smtp-Source: AK7set/Gm51kI07+PFEhRumuMJYtCMiWbUTOR7KSbT5nG2sUDuzavUR7DO84LDB8vyok1O67AQY7xg== X-Received: by 2002:a62:1dd0:0:b0:5aa:6125:dbf4 with SMTP id d199-20020a621dd0000000b005aa6125dbf4mr3750723pfd.11.1676990511421; Tue, 21 Feb 2023 06:41:51 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:51 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 18/23] oeqa ssh.py: add connection keep alive options to ssh client Date: Tue, 21 Feb 2023 04:41:01 -1000 Message-Id: <94021c8571242dd491ee3c7c40144c5a12ca8e42.1676990336.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177518 From: Mikko Rapeli Configure ssh client to test that connection with server is up. If the server does not respond within a minute then the connection, target machine or sshd daemon are stuck and it's better to exit the command execution with errors. Some tests can execute a long time without returning stdout/stderror data and it's difficult to adjust timers for those cases if connection to target machine or the target machine itself hangs and output is not expected in minutes or even hours. Signed-off-by: Mikko Rapeli Signed-off-by: Luca Ceresoli (cherry picked from commit ba68ff04c5786eca7cd8dd44056705867dea8ac4) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/core/target/ssh.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py index f1b9090bbf..48a463861d 100644 --- a/meta/lib/oeqa/core/target/ssh.py +++ b/meta/lib/oeqa/core/target/ssh.py @@ -34,6 +34,8 @@ class OESSHTarget(OETarget): self.timeout = timeout self.user = user ssh_options = [ + '-o', 'ServerAliveCountMax=2', + '-o', 'ServerAliveInterval=30', '-o', 'UserKnownHostsFile=/dev/null', '-o', 'StrictHostKeyChecking=no', '-o', 'LogLevel=ERROR' From patchwork Tue Feb 21 14:41:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19931 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94B6CC64ED6 for ; Tue, 21 Feb 2023 14:41:57 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web10.43563.1676990514185703333 for ; Tue, 21 Feb 2023 06:41:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=nNlSZOWG; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id u10so5146953pjc.5 for ; Tue, 21 Feb 2023 06:41:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Zj3RYMkmEvIaQO9kNUKRbDfEtKWHlrIbCW7SdO4tFdw=; b=nNlSZOWGrWxnTtM+AKVd5xo4Pq6h9Br0PuMTeWuv8jFnMnn36hqeN4xW6owai7akAi luJW+OoBcFJW0FVibRojPBl2Vu+A3URUBxosclXYrsbETRd/pF4UmjEp5MBtUTmV75YB dB3LiDsMxH8eB9TL2SNuzLczhPU7+kPSTU027gjvABFWClmW05nxwlxgofllyguw9PGe +sLxQiptB0idn6bH7myvFFltkTA1uhq3Rg2tzlQTSLITNQWPnnWjubR5bm1hjC6AZE0a n1hQuXSqVCigGiGIKWI0WnMOUBSdOz4OfgWRUCY9q+cvINQXv8G6cE46gKXt2vHVMnrH DiFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Zj3RYMkmEvIaQO9kNUKRbDfEtKWHlrIbCW7SdO4tFdw=; b=6ri5zraeeM0NYCf4SX2D9Plr90B0wxsk2z1kMZlRje/B/2oLo03S9LHyOWb9lmPh4Q xKPAyAPTZitRpjl+NzKPxXMUl+yWkQxkHGqbIdHPJq9iCldl9E9F4dceM3OVwgwDHCfa 62s+K5vMymY8Ap7amUKS0lYikHIBXiHxB6WCTJeQGs7em+e2jmiWUGI4BvSEEpBr3agt RVRStisSSZ3/+7l6+uyhd+3qum+w9I8B/8Vqu3cx4L0OARe38QRex8CHz4HFMZgMBDHc mB195tuqDwVw5vpg5tczfvUyCKq3UWEmMOh3R7yhpywus0t1A05N0sfwif/HPwyNJGMl JZYA== X-Gm-Message-State: AO0yUKUzcKENRdZ91Q8uOd2Ej9phjLCpjr2mtjqHRNqchK0GADXzJRkX G3RydSkfHNz/xIn/ZpMlJZnKOa3ylDyWsurMP0k= X-Google-Smtp-Source: AK7set9m6LWTfit3zEctE7BDTJ4CK3HP7tVK6sHERViNJ8AcNqVN6QW+CI4oJpiEMenAsxqbeVf74A== X-Received: by 2002:a05:6a21:99a5:b0:cb:9fcc:3f37 with SMTP id ve37-20020a056a2199a500b000cb9fcc3f37mr1125193pzb.35.1676990513199; Tue, 21 Feb 2023 06:41:53 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:52 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 19/23] oeqa dump.py: add error counter and stop after 5 failures Date: Tue, 21 Feb 2023 04:41:02 -1000 Message-Id: <91bc1e03bc990c527d8aadbdcd7bf97217db124e.1676990336.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177519 From: Mikko Rapeli If test target qemu machine hangs completely, dump_target() calls over serial console are taking a long time to time out, possibly for every failing ssh command execution and a lot of test cases, and same with dump_monitor(). Instead of trying for ever, count errors and after 5 stop trying to dump_target() and dump_monitor() completely. These help to end testing earlier when a test target is completely deadlocked and all ssh, serial and QMP communication with it are failing. Signed-off-by: Mikko Rapeli Signed-off-by: Luca Ceresoli (cherry picked from commit d9ad0a055abba983c6cee1dca4d2f0a8a3c48782) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/utils/dump.py | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/utils/dump.py b/meta/lib/oeqa/utils/dump.py index 95a79a571c..6fd5832051 100644 --- a/meta/lib/oeqa/utils/dump.py +++ b/meta/lib/oeqa/utils/dump.py @@ -91,37 +91,55 @@ class HostDumper(BaseDumper): self._write_dump(cmd.split()[0], result.output) class TargetDumper(BaseDumper): - """ Class to get dumps from target, it only works with QemuRunner """ + """ Class to get dumps from target, it only works with QemuRunner. + Will give up permanently after 5 errors from running commands over + serial console. This helps to end testing when target is really dead, hanging + or unresponsive. + """ def __init__(self, cmds, parent_dir, runner): super(TargetDumper, self).__init__(cmds, parent_dir) self.runner = runner + self.errors = 0 def dump_target(self, dump_dir=""): + if self.errors >= 5: + print("Too many errors when dumping data from target, assuming it is dead! Will not dump data anymore!") + return if dump_dir: self.dump_dir = dump_dir for cmd in self.cmds: # We can continue with the testing if serial commands fail try: (status, output) = self.runner.run_serial(cmd) + if status == 0: + self.errors = self.errors + 1 self._write_dump(cmd.split()[0], output) except: + self.errors = self.errors + 1 print("Tried to dump info from target but " "serial console failed") print("Failed CMD: %s" % (cmd)) class MonitorDumper(BaseDumper): - """ Class to get dumps via the Qemu Monitor, it only works with QemuRunner """ + """ Class to get dumps via the Qemu Monitor, it only works with QemuRunner + Will stop completely if there are more than 5 errors when dumping monitor data. + This helps to end testing when target is really dead, hanging or unresponsive. + """ def __init__(self, cmds, parent_dir, runner): super(MonitorDumper, self).__init__(cmds, parent_dir) self.runner = runner + self.errors = 0 def dump_monitor(self, dump_dir=""): if self.runner is None: return if dump_dir: self.dump_dir = dump_dir + if self.errors >= 5: + print("Too many errors when dumping data from qemu monitor, assuming it is dead! Will not dump data anymore!") + return for cmd in self.cmds: cmd_name = cmd.split()[0] try: @@ -135,4 +153,5 @@ class MonitorDumper(BaseDumper): output = self.runner.run_monitor(cmd_name) self._write_dump(cmd_name, output) except Exception as e: + self.errors = self.errors + 1 print("Failed to dump QMP CMD: %s with\nException: %s" % (cmd_name, e)) From patchwork Tue Feb 21 14:41:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19928 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88373C61DA3 for ; Tue, 21 Feb 2023 14:41:57 +0000 (UTC) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web11.44248.1676990515987886081 for ; Tue, 21 Feb 2023 06:41:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=MTttBKrK; spf=softfail (domain: sakoman.com, ip: 209.85.210.175, mailfrom: steve@sakoman.com) Received: by mail-pf1-f175.google.com with SMTP id fd25so1828545pfb.1 for ; Tue, 21 Feb 2023 06:41:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=d4/bx/Y+O/mJZYivl8D12tN4Cvb1RymFN4r2mhSHrwQ=; b=MTttBKrKtLPtqlKJUZTgbvk7HaMHhx/FVHg53P07QoGVHQcYT9nA7XHlnvrRNCwoGl PHYIhfrtNHp5c5iI5Q+qDuNnTMUDISWVmWmpFMo6XZUGDXzdXr0xmbkI5I68zw69CsIX G0m2Bc/cjJPH84R6eZfEKBLl1jDNMy/JWNzw/5+75DKzoPxfPoVqQ0oCs4//VR1jQ/hS c2RrALUBG/dfjAN5J1bvWOUCB6EWetHIvc3VguVoNJgAvSVzrYuSrY2Dj4rZDvMne8Xq NArvfHElLPv2Vgp2HWKYVkwhwgKJFvgChsxohJKYTuGXol6vlj9oF+n2+lX4kgpVw0gY DkYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d4/bx/Y+O/mJZYivl8D12tN4Cvb1RymFN4r2mhSHrwQ=; b=z3/GLyp5AsZilUHn4pQVSUfSb4UqgljNUgN4VdS1gwpTsRyH1AwvH5OOk4CwoxoJ98 ykNsB7pgqfo8Wgj2IzVuprbpIMkYBup7OWvtH4HSS6RnIu6YicNutMa+DosIDWTJBmgN EFht87vAhpAsAEhgTmb2CAE6cJcxrXokQIaoXXjeXMlc2ZH2Rx3MCVGA+QjH8W5RPcPL 21/rlStnbqLE20pbQWToCXtP+z9QIB5R+6HsMzrmJ0puzmhGzTqzgpG2tj/XliGrcVY+ o7TDFchKqkNmt/KrbQwcclPLE8lMX8y4mqf5Hq3tpyla5pYPF8Ryz7iUhXhQ9dFkWIZX d/rg== X-Gm-Message-State: AO0yUKVtIAqpIqvTUnzKIG/olZXk+pWK2Ex/F+P55CMeXjPcc71h3aun U3ld71uAy/22bc/WHQxfAVgcheANwYwy7gPA2p4= X-Google-Smtp-Source: AK7set8zhF9bWIGkqJ3S8Hx00tgf8zlus69VjzACpTYjMVOhT7tYEjXKtcuqsLjvL9twsc/57oJOag== X-Received: by 2002:a62:790f:0:b0:593:befd:848c with SMTP id u15-20020a62790f000000b00593befd848cmr4107738pfc.16.1676990514968; Tue, 21 Feb 2023 06:41:54 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:54 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 20/23] oeqa qemurunner: read more data at a time from serial Date: Tue, 21 Feb 2023 04:41:03 -1000 Message-Id: <3699e5bf2f9259266c49aaf69127183988b9d052.1676990336.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:41:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177520 From: Mikko Rapeli Use a short sleep to bundle serial console reads so that we are not reading one character at a time which reduces busy looping. Signed-off-by: Mikko Rapeli Signed-off-by: Luca Ceresoli (cherry picked from commit cafe65d8cf7544edbd387f7f5f6d77c64c6b18fa) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/utils/qemurunner.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 9a99859388..fedabb189a 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -195,7 +195,7 @@ class QemuRunner: qmp_file = "." + next(tempfile._get_candidate_names()) qmp_param = ' -S -qmp unix:./%s,server,wait' % (qmp_file) qmp_port = self.tmpdir + "/" + qmp_file - # Create a second socket connection for debugging use, + # Create a second socket connection for debugging use, # note this will NOT cause qemu to block waiting for the connection qmp_file2 = "." + next(tempfile._get_candidate_names()) qmp_param += ' -qmp unix:./%s,server,nowait' % (qmp_file2) @@ -459,6 +459,8 @@ class QemuRunner: socklist.remove(self.server_socket) self.logger.debug("Connection from %s:%s" % addr) else: + # try to avoid reading only a single character at a time + time.sleep(0.1) data = data + sock.recv(1024) if data: bootlog += data From patchwork Tue Feb 21 14:41:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19932 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F2AEC636D7 for ; Tue, 21 Feb 2023 14:42:07 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web10.43528.1676990478424193122 for ; Tue, 21 Feb 2023 06:41:57 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=UBlU/YLD; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id n20so2628544pfu.12 for ; Tue, 21 Feb 2023 06:41:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=QTreeO5EUmjdAHKN/iMtvW9W3cu/NjLVEjsf/hnOXI4=; b=UBlU/YLDEqKfzQg9YO/otCEMm0qaGOcvaMhwI8z1rCv5abwrGu0JZCd75vpwdKF8Yd AasaaZv3IGdyVjPOdaRfZv9gBez6pdNNyXLdJV4BEzxC3XnMM2gSTpAtbZVcI8KJtydo wvYih+Ud5SXLuUJQI/bnqlDfA9MdQK86zxHzT5cYvzzl2wpNjAYrUfolMNlSMz3Zc97A /pGVYzg95rI5y9oAfILvGX3tO4uAYSTI3DDcML1M0HIgCBMB+05lGhFzEe3gdYxSSSdz PkGiZrkQ03fEYEQ/9uXp7HlP+IyLTriPLH6OkO9dBtF5WGHh2hk3KEUxMkKh2yIgy08r hr6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QTreeO5EUmjdAHKN/iMtvW9W3cu/NjLVEjsf/hnOXI4=; b=qQFB1i/tV1794dQiPLhuoY1a6uX2gjRWnawkVRcQrgQZj8pcJ7Jt8M61T6U0zR2p7c Y3Wtitw//0LeSGjI0R1fHC8w5/ny5+krFiNX768VRChBZcQSL0xYOsQ3si2xEdntMWxB T0517QgBC/1HiAujeqJxjECSInvAwl13H9RPImn0sfbR/DVT0xOVwbRK/VdN62hMdBNV k1t2tRK1O4WwTe+NhSskYMEANQ32mhNkJCH6RdjjDdMseI0ZzTeNhCmLy7TZSeKhiF+2 lAddqWblBVeNMtPHcESZI8q6W+aPmn6acYX94/vMUXVfql3sp51voOv/z4cKfOZoIb4f +ZbA== X-Gm-Message-State: AO0yUKVzAPqBDIJZaToV98MWAWkljWQHD/nueTS/5f/iuK2VUKKDzKGW GA5O5dTciK1qXduG3mBuMR36l81VKIaC2cLKbhM= X-Google-Smtp-Source: AK7set9Exz16GPQ56g+73V8n0tfsPF9GNoQpHpy4mkYIJVBLXagbuRKQTZRXFkFlxCOlZSvic9+snw== X-Received: by 2002:a62:4ec9:0:b0:5a9:b7e3:2ee4 with SMTP id c192-20020a624ec9000000b005a9b7e32ee4mr4758966pfb.12.1676990516826; Tue, 21 Feb 2023 06:41:56 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:56 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 21/23] oeqa qemurunner.py: add timeout to QMP calls Date: Tue, 21 Feb 2023 04:41:04 -1000 Message-Id: <3b99d0ce6445084038f89dfa98605a7aec49107b.1676990336.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:42:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177521 From: Mikko Rapeli When a qemu machine hangs, the QMP calls can hang for ever too, and when this happens any failing test commands from ssh runner may be followed by dump_monitor() calls which then also hang. Hangs followed by hangs. Use runqemutime at setup and run_monitor() specific timeout for later calls. Signed-off-by: Mikko Rapeli Signed-off-by: Luca Ceresoli (cherry picked from commit 3a07bdf77dc6ecbf4c620b051dd032abaaf1e4ff) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/utils/qemurunner.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index fedabb189a..aa9e530f1b 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -342,6 +342,8 @@ class QemuRunner: return False try: + # set timeout value for all QMP calls + self.qmp.settimeout(self.runqemutime) self.qmp.connect() connect_time = time.time() self.logger.info("QMP connected to QEMU at %s and took %s seconds" % @@ -617,6 +619,7 @@ class QemuRunner: def run_monitor(self, command, args=None, timeout=60): if hasattr(self, 'qmp') and self.qmp: + self.qmp.settimeout(timeout) if args is not None: return self.qmp.cmd(command, args) else: From patchwork Tue Feb 21 14:41:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19933 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8831DC64ED6 for ; Tue, 21 Feb 2023 14:42:07 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web11.44252.1676990519697908885 for ; Tue, 21 Feb 2023 06:41:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=lOfGGYE3; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id cb13so2587599pfb.5 for ; Tue, 21 Feb 2023 06:41:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ZfyXsSgZ29yWeiNFmUUKhco0Tq+gvqz8Q0lXism6amM=; b=lOfGGYE3wOw3kaubLIndOIPMS5DzWVq/iAqDEwbdb2id4JHr4b2KCi6IzaS8VO0sBm coRVpz/CNIvBeNdOPN1jVYZiQQrvoa9OmzEfD2+KUTjlOYhScwxHIQp++PIN8w/+oHwU LeB2Z99dCwoJS6nS3DQ2up2t6m0/Kb0ebTgTBaFNGC1SwSCT0rHar3/NTKLpi8mG/jAF 3HFSIAhsh10q4Gs+8Qxg5wZb2/PlswiDXCcs+d+X+SaActx50dM5QlOtkVMvU/4Cmbb3 XDGRoiNcpB9z57amJpNWuojKEv/urxMNjTGVZxIbH2k9E8ySvsRslesGEPMK72sQFuSH zb2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZfyXsSgZ29yWeiNFmUUKhco0Tq+gvqz8Q0lXism6amM=; b=VrxtsF86UqAmF0pPrLXB6TmPQUEGCrbbYgyoZSWvA+2tR8aeuWSJ6FhjVd+i2opUEG dAxJrpNHQsG/TZ97z+713gHnhnxmM1bK4JQ+JkoeKcgXO3GPDAgRpyk6ifqIbRCVzWYv /ZyeKc1oeedPjmyjI/0wlS9OhB1vyx4yDoqLuawFanWDAiTHmJ1Vfoc/KEJnAZpoyjsc tDoYvrf8tas9B24Igf29uqBiNF2eeZmkWKY8qWt/VnNgcewjvmQmrri9mcFRm8PEDzzq uEa/uc3q6v3UQZ0nXSJOm7dKDCcEG6bXx0rPnXX8oU8Knvl2t+THbB4JR/09v8jtej3Z wv2w== X-Gm-Message-State: AO0yUKWkw9pZoIE2HRXKwYMkA90h28wDF2Cv3rgGKJaSDZkRuiHm6Z4m iCpzQzaxghTahFkMCQqmnLRff0ZVG2wQ9GtV/eQ= X-Google-Smtp-Source: AK7set8QuoRwRftRjnQjC/2tLaGEFJ/aT/Csl1c/SlYC8+rAd2TpO0O+V4S+WurFAIqY3vYZ1BfkLg== X-Received: by 2002:a62:38d3:0:b0:5a8:d987:d012 with SMTP id f202-20020a6238d3000000b005a8d987d012mr4248844pfa.11.1676990518722; Tue, 21 Feb 2023 06:41:58 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:41:58 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 22/23] oeqa qemurunner.py: try to avoid reading one character at a time Date: Tue, 21 Feb 2023 04:41:05 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:42:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177522 From: Mikko Rapeli Read from serial console with a small delay to bundle data to e.g. full lines. Reading one character at a time is not needed and causes busy looping. Signed-off-by: Mikko Rapeli Signed-off-by: Luca Ceresoli (cherry picked from commit 0049f6757f6f956fb4cc77b3df6a672c20b53cf4) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/utils/qemurunner.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index aa9e530f1b..925d05a339 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -647,6 +647,8 @@ class QemuRunner: except InterruptedError: continue if sread: + # try to avoid reading single character at a time + time.sleep(0.1) answer = self.server_socket.recv(1024) if answer: data += answer.decode('utf-8') From patchwork Tue Feb 21 14:41:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19934 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 882D6C61DA3 for ; Tue, 21 Feb 2023 14:42:07 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mx.groups.io with SMTP id smtpd.web11.44254.1676990521544338934 for ; Tue, 21 Feb 2023 06:42:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=RekSQt23; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id f11so2674796pfe.2 for ; Tue, 21 Feb 2023 06:42:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cxTZRwZIuS0BJgo+EoYKHb90T0klFAF7USleuLJ2eQs=; b=RekSQt23TbC0P4A0G+JYNjUVk1HLhtLEdLbbLjoOEOQFwBm23ZVJcxeub8lg02/B8p JApBPP2F7JO/SAty05z2CLfR2pVIQhmhKRy3NdwIiPnndQuoIc4BYkI/aFdgVjlEkNEg g9Hdsfveze5IYfyKFhUqgnn4lYMeeeUmOpfe7J5k6P+HzBuqzaLKrRq8Gse/ojqP/NZC Qzmx15k91mSezgS7Sb7lXbaZcxYHD49ZFEYgHScM9CKRCLdkYyxZvAxie9VdkDwseRrS j97rqZ4lq/jC0oqAKqzIJ8A6OGAZtkndXG0oBIN04magwYgmOBqXvWJuaoQ+gdfaK3cx MoOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cxTZRwZIuS0BJgo+EoYKHb90T0klFAF7USleuLJ2eQs=; b=1dAN577glLUcvBfR2sYgD2a9pPdpCDRVOAPKljL11cMW40oR2+i+kH6gnWgap93GnR 35LZlo1hWr13Ug5x2EDfidsvU9f7liCiolHg1ABalJ1vMXlNWk6KRhb5W2aAW4i67Rkb csckb6digOkbKsvcj8tZ1FiKfDVCnjkuVCqJTH6wCEOmwyGQSfH3xHyWysFDFR1tSrnP s1IlbZa792IRwyzDk1rpitvx+VdOcs9AA7ksvdteCDr5bLv/D1vGe4UnB9JZPNzPZw0d c0Bk6+JZi5n0fOrhPBfBcNCcY76SgCflNDknI2etljeDUwqCQ0GH5GaF4VDQsqs8imhZ O/Bg== X-Gm-Message-State: AO0yUKUTSpsDavqyGEhng0K7XKVMUKPh0JHc4TL/2wMIv2EXbUM26hSU RL8iGgTUvRjZGd7wl6E37Lv6+YgrBt0ml4T9Q1g= X-Google-Smtp-Source: AK7set8fA7Ynby6vL1FtDVTOI5GkA/yorsuxn6+WYliuGUlnYwOQ3S0UzqUalENK5rwPWt7YYhMltg== X-Received: by 2002:a05:6a00:4194:b0:5a8:cc39:fc58 with SMTP id ca20-20020a056a00419400b005a8cc39fc58mr5251087pfb.6.1676990520538; Tue, 21 Feb 2023 06:42:00 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id h5-20020a62b405000000b005ae8e94b0d5sm6151140pfn.107.2023.02.21.06.41.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:42:00 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 23/23] oeqa/selftest/bbtests: Update message lookup for test_git_unpack_nonetwork_fail Date: Tue, 21 Feb 2023 04:41:06 -1000 Message-Id: <6b50713cd51002584915f46eb366b8667db210ea.1676990336.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Feb 2023 14:42:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177523 From: Alexandre Belloni bitbake's output changed, update the test Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 7e64b63f96dd1d71e263e7bbbe6591e51e98395a) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/bbtests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py index cfac7afcf4..b42bbb651d 100644 --- a/meta/lib/oeqa/selftest/cases/bbtests.py +++ b/meta/lib/oeqa/selftest/cases/bbtests.py @@ -350,4 +350,4 @@ INHERIT:remove = \"report-error\" self.write_config("DISTROOVERRIDES .= \":gitunpack-enable-recipe\"") result = bitbake('gitunpackoffline-fail -c fetch', ignore_status=True) - self.assertTrue("Recipe uses a floating tag/branch without a fixed SRCREV" in result.output, msg = "Recipe without PV set to SRCPV should have failed: %s" % result.output) + self.assertTrue(re.search("Recipe uses a floating tag/branch .* for repo .* without a fixed SRCREV yet doesn't call bb.fetch2.get_srcrev()", result.output), msg = "Recipe without PV set to SRCPV should have failed: %s" % result.output)