From patchwork Mon Feb 20 14:18:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19808 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 8AFABC05027 for ; Mon, 20 Feb 2023 14:18:40 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web11.14045.1676902719910757701 for ; Mon, 20 Feb 2023 06:18:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=S3VQBX17; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id u10so1471029pjc.5 for ; Mon, 20 Feb 2023 06:18: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=4LzYi2SzAV+hQcYeSTSNbrhtogzYbWe8uRslCp8SS68=; b=S3VQBX177FffthP3WfEUmIfUTc2fHULsZmNqcnOxDgp5+n2EmVEKRb+6lkadMX/OOh 3xeQaEdMylf4o7LgxAI2WsORWPUyF2S2j6K6kEYzIlefKmBD82ne0OIVNQ7RYv4IyNLJ hrM5e9WbAV6Dy2CqMsfGV8/B2rqh6qgE/OOwEIHKXR1LC56LCYCJyF/vYDi0rzqtXFv+ rCufJ+Z3QIA3jSMlr1E/N7nzKTgH4DoQ3Jbs8/cbpY4G7ltR+LXcb7ELmJrb5uN5k9TD jn2j+gcxQXwddV3f7z68e3LfZHWCjlgtOfId2N2XjRdENmqNDGNJEurB+k+pRGzA9gAX kyjw== 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=NJj5oFZoH7w28OJgEeknWbZHxq8Pcs47hMVNHmCmWiEoynFWISBRfUUITzkuQXjhs7 ugYAYC0aNUsCUg2EEllWMIl3qRwgI6rlDLI3Fz8ZXfIq/5RO5FPdkys1V14FPa6eCBSS 5njYVQO4X2fyvINWIAkCx7oMIadYFka63E7Nkx/2cl36oNrh8FVtGLxR3WcxGoxa8e2G t4/NIIdaSFPum1+LwYp+jd8Vz8ovqN9qizz/4tww/N43kOAZEeiCoMG/716tttfSYslc X51A3kpsoiR7SatNmcuZ2TLnAB/ydCrn2cs6sFO2P3iAZc0tDbKFioNY9Qgs16VjMThj tNEA== X-Gm-Message-State: AO0yUKVuXMa8K2hxBAp8hSvJNBzB1D0cKk867DhYXJRTclDRVKsu2drU gylxK0nZORkU30nn59+I7ehMRfTV86WN2QSakVs= X-Google-Smtp-Source: AK7set/X5CWum9xaavx420MJEXDA3GzAS4ucmltzUqQmb0Gf0sa0gGlxfNW9D62auabTUVtjJeA3Bg== X-Received: by 2002:a05:6a20:698c:b0:c7:346b:71a9 with SMTP id t12-20020a056a20698c00b000c7346b71a9mr1736727pzk.27.1676902718608; Mon, 20 Feb 2023 06:18: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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.18.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:18:38 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 01/22] tar: CVE-2022-48303 Date: Mon, 20 Feb 2023 04:18:08 -1000 Message-Id: <5223319b43811228d83c2bdac3e542b9a8852dfd.1676902605.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 ; Mon, 20 Feb 2023 14:18:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177407 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 Mon Feb 20 14:18:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19812 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 7E135C64ED8 for ; Mon, 20 Feb 2023 14:18:50 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.web11.14047.1676902721487967580 for ; Mon, 20 Feb 2023 06:18:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=SLw3IsWB; spf=softfail (domain: sakoman.com, ip: 209.85.215.173, mailfrom: steve@sakoman.com) Received: by mail-pg1-f173.google.com with SMTP id 132so637465pgh.13 for ; Mon, 20 Feb 2023 06:18: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=GMyJ6lzQfiEJxvuKNw81U8ehoc+uVeZnAxCN47Zrcmg=; b=SLw3IsWBkiBj2mx87y3ZvAm2wxGWFL5WjDqBxwcoDZMLkqTc0CCteQzGENnJPPSnlf 5nGZyQD99pdRM47zSlKotVHil/dgKVMwmLBja6W+AP7P8/eE1hMSMLS0vSYcYtfLgwxW Tl8YpbN1fcivdGDoqgtmZhzdxQURpuwGy0jLme7ve6YU+uKiXZdf5WMqM9Mzwqz5H1xO PkAFFbWNVXaNRxZJKwdK5VP3g3dKY8rDrbXZeJAxiFf4DY5cXt/ftfn61/MfSW2a/JBa I9kNkVWyzUpB7IUYmHTmDeHk5QVF3Lgb446ubxqHOhtHzcpF63QCOjjpStxDZ4A+3Q1s VQog== 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=GMyJ6lzQfiEJxvuKNw81U8ehoc+uVeZnAxCN47Zrcmg=; b=4ig+iC1g2FAEhFfF3JxPOxUMplqQbBSb68HRTxJoRcUL7/mqk5s6TTCnOhJDgYvsaR /vcWS7Zyv4Wpn256L2ytTyLDHAZ0kJhpjO678qJ9gkhPWZ299xVDRCDUzBxKVDK2ZqoA BF4UnPHxqNv70+ATgRbt+VKLMrIyAN8QAFIaLh12TtzrqhMiTgf0gEzYg5tRLVGOo4sp rawrUe9N32nFnANd8Pi9GHrYs8ObkHOMV6s4y5H9BHCyigctbfJNJKhhNTutUMipK8IR trajP+Y+VbNOEIajhK+5tyHb7BcSShHT9fe6ZaEUEXsP2TLTzVUo7cYybc+CiS++2/Ty LCjA== X-Gm-Message-State: AO0yUKUt0F7AMADrWXxUVINFcdcmr8bubfIrIIVODosL7cTCSILO+r/D AwojVr3V134Zy4FGLBaAQ7xApAWJEd0+RzZ962s= X-Google-Smtp-Source: AK7set/bxFNWRhnTFRZrMNM+p+/CYH7oQh8noXrruC5RO8k83ZrWzbnCiLFJtIc8adwy1riZzJRGmA== X-Received: by 2002:aa7:9474:0:b0:593:f191:966 with SMTP id t20-20020aa79474000000b00593f1910966mr2912022pfq.1.1676902720450; Mon, 20 Feb 2023 06:18: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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.18.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:18:40 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 02/22] diffutils: update 3.8 -> 3.9 Date: Mon, 20 Feb 2023 04:18:09 -1000 Message-Id: <7059580cac6798dd42c4fe0f6dd5c4db035585c0.1676902605.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 ; Mon, 20 Feb 2023 14:18:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177408 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 --- ...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 Mon Feb 20 14:18:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19813 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 7C523C64EC4 for ; Mon, 20 Feb 2023 14:18:50 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web10.13839.1676902723499454599 for ; Mon, 20 Feb 2023 06:18:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=S76kle9M; spf=softfail (domain: sakoman.com, ip: 209.85.216.47, mailfrom: steve@sakoman.com) Received: by mail-pj1-f47.google.com with SMTP id pt11so2113302pjb.1 for ; Mon, 20 Feb 2023 06:18: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=V0P6MzCrE+i5VwrW6I1TbKenQlJHZn930SzFPasCCEM=; b=S76kle9MHBFavLQpm2gbBDZVBDHx38Taf3opfJIiewlVj5tqO6tlIV3ODJhlC1SHyM bkVqXmY5avp4GpEuop4DRy/OxXD4KOchAa2OFnkqyyRZ6H+CZ1a9ZxZb3mIumDc+B16B wy+zhp7TEWnCumBd2xYMv7sJR1RknafQ5SnGDpJmDWw0J4XKGhHUDoALSm3S+AymRl5e ejx2pzqmilCHKh7etK+h4tF3JS69D0z9CqcFo6L9IQkkLp4nhPpcpJ4TYh3di1Dra6Bs zmhcZfB1Mqe6ZOKKuNe7gB0uqZrqSywovvYV5+VRYxPF0+UGhaYrw3dYjmkQ1al26Ljo Ht+Q== 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=V0P6MzCrE+i5VwrW6I1TbKenQlJHZn930SzFPasCCEM=; b=fSVrAIffGWMWvldlHx4q8eEy4mMIWZNK/iOnLhij6qsIqkWzMCm31voX6CAGdnuvXg j1QfZrYS/M9wVZZb7HeTh1s3D7geY+tZvtdcCqvG4PfxRLr+tur1HFj9lnFEF7LFkUmt klqxD3dyTNIKearEwNiAhTwXmm3O0W+P4qPuKp9PwJXFR3vjsbDQ4LuTqm17b6+hWCuK Tz9iNgI/ieusoq6INgziEQ/6yaaGXLNGOaD5i+Vjm+22AO5xG98JPcDZc1GB7R+tWz1v VvIEqGiw06OkITsMOcyTpFkUByEQvwVduRpVJPjzT51f3qapGOF54O5XSOCeqkKZo3sb HQ/w== X-Gm-Message-State: AO0yUKVSpKVvXkHPB6QLosr1ErWKBiP3SJdw/iNoDi6AXrIn7lUjwvh+ VLTt1XDvLQsvAiVaZgO49KaZQYgoZQL0nhSRC3g= X-Google-Smtp-Source: AK7set9tNEDBjfuFz/w4Tjb1/xI9GLwX7pwywlMKdAf48LIsGi+NNxZ0XUjRJs7TSLllfOi+xWf/3Q== X-Received: by 2002:a05:6a20:6999:b0:be:e0c3:5003 with SMTP id t25-20020a056a20699900b000bee0c35003mr1858848pzk.5.1676902722376; Mon, 20 Feb 2023 06:18: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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.18.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:18:41 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 03/22] lttng-tools: update 2.13.8 -> 2.13.9 Date: Mon, 20 Feb 2023 04:18:10 -1000 Message-Id: <73eee649fcdb653c8fc9ba71673e3bbdea35959f.1676902605.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 ; Mon, 20 Feb 2023 14:18:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177409 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 --- .../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 Mon Feb 20 14:18:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19814 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 7D935C64ED9 for ; Mon, 20 Feb 2023 14:18:50 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web10.13840.1676902725953694070 for ; Mon, 20 Feb 2023 06:18:46 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=WTrT27jR; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id z2so1669281plf.12 for ; Mon, 20 Feb 2023 06:18: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=Kh9KE99OuxK6kuewwCb+zTHUzpTL/UoxeAgf/o2r+fk=; b=WTrT27jRstGWUU7VX/bcme5mI6/SuvXOIAP3SxdTurC1GyEWtMHuCJXaGHLAi6jTYi UgIEHli8pnC55v95DcOAzc05pYxAqalrqZ4XOeQlJpSr8f54EJ4iXYfb7/k2CBp+3uss 1GLBP3HDJsAaBxqN6ZLB7+eaqZTvkSOCgY/EZ+xMOoUe1TEGvqitUtthIySd+7xZBPjV b8novz3BbPf0lcsrCf5xZI0JqjV2MGzxh5ypZcqGwGHrAdH3582Txx3ou8ZxJu/oeNUV XBKdoqU0haNLSvpAkzomzRayozNU+x6NEYzS8NUvZ7zy9unNWGJpA8mR6XyAXNWv5g66 YaVg== 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=Kh9KE99OuxK6kuewwCb+zTHUzpTL/UoxeAgf/o2r+fk=; b=svB9c7P5pGrBPypRc/tOLOViKgXaNhRo5+GvzDyVQfLFVq/PxssZcs2I9RxpKToNMr Vh46gWV5xIGNEndmhUuvxtpspk6PPcad8EytlgS3+FLPXYCb2MNq6+XwV/s+4qFwy0iS TfRLW3p817AYpG2htYckXdX8Fsc4b9i+DsXCb4ookvvu1g7HK5rwmYGxY1unlUEpCWOE NIAtLteAV8kgXtKN1HKKUlPGvzq7D1KxApeinp4ZEI3bj2cCLkSAMZ0dqx49erL0e0zK bjBvV9+ov9oaTPDEHx77XdLxd3eKWtVNWdHMqvNG4k9+CJtA6o1FHVAJL3+ThRBzNEku wDcA== X-Gm-Message-State: AO0yUKUyHUTq1oWt2XLPJ7yE7QoAdmAEH0hDNyZTbgH0E5+K7L5nEu8K TRcAF1l19QrA0Jd4zf+VDsRxpMF+OUcYjgpQqLk= X-Google-Smtp-Source: AK7set/THkU4luYGnBhuOemSoYGeyXabEZCGMN143pe8HDvHHe2xqe9+FtR9nQL7fe9eca4nmFbSWw== X-Received: by 2002:a05:6a20:3d08:b0:c7:1bac:6ef9 with SMTP id y8-20020a056a203d0800b000c71bac6ef9mr20176835pzi.46.1676902724497; Mon, 20 Feb 2023 06:18: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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.18.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:18:44 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 04/22] apr: update 1.7.0 -> 1.7.2 Date: Mon, 20 Feb 2023 04:18:11 -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 ; Mon, 20 Feb 2023 14:18:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177410 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 --- ...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 Mon Feb 20 14:18:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19810 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 66C65C636CC for ; Mon, 20 Feb 2023 14:18:50 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web11.14053.1676902727494271717 for ; Mon, 20 Feb 2023 06:18:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Ce/YbAuc; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id y19so791779pgk.5 for ; Mon, 20 Feb 2023 06:18:47 -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=VXJQyzp2MJXLWlDGBfQ02CD4O58CAWJPyHaLVH5o8ns=; b=Ce/YbAucaDxMPgDgg2bSErDtHL4L7BQj4ChNxv44+Qz0kJWlGcYuD31kG06XZmdzBU INp1M0IliKnJkQWyvktvkTj0m6HV6R73rmp0PaIJD4iGZ1qcaRkalCrrWMEit/YTs862 njh38eRqbY9+49jw+OJDZS6HmLY24aWpa+GjCC5bB9JX0yZc95hKQiIOJEDY46ui3GAb nhWycQMox2gwQrsAIzAcckN0WqWC+V0iRPyJpwhbf0266F9cyKergmoEF+NRcM+oVcTm 58s4LB/JDHOkN6nLlCOPcPIYvBHrRGCyPevEByPrzInJf7da31tdT5vlAZ7wWeoFsQHy zTHQ== 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=VXJQyzp2MJXLWlDGBfQ02CD4O58CAWJPyHaLVH5o8ns=; b=Q3pwZe9IotLV3KKR6iRy6l9Akc2KKL4qzCfGUuEsiCX7a6gUT8z215SLF+8hcdmOVq Rpqswozi0XCSpPeEpIK9EqWmYOvUSCmONXx6fAwoz5WzIdw1iLR11QZHm0q79osqJ8K7 NU97/OeN4Pe0X9owmFcdw/zpQWKKEeu8oMGsx+nAAjnHzxUFNz7FYfJvnNRp4OVnSRP/ c+Toe2ocY0nQcc1Gwgk+kag0/GkPrvdZ3M5dSbSpRFzkuB5KUQLDYSVfxhrfFPHJ5Axd fPZiNBMDYrUvhAR096UlQ5LQWY7UeKQs0t4QqpDj9Ww4EcuPZyhoYQy6YL7/derodX5L dgwQ== X-Gm-Message-State: AO0yUKW/bLc+u7QvQA3WfjlQpdIytWYJkvwzUWHmBpE/EZd+J9zAtYHF wstQ2hzJEhomhwbz1FhtyoDJ8ZdwkdAx/XSOefI= X-Google-Smtp-Source: AK7set8FocjjzR9ew/RK2hKRxWz9mlD42N3B8Nt/rTNx5lIboFWm4WN/RlZb2+Cj89dzjJSjbwY4bA== X-Received: by 2002:aa7:9eda:0:b0:5a8:5e6d:28d7 with SMTP id r26-20020aa79eda000000b005a85e6d28d7mr893821pfq.0.1676902726482; Mon, 20 Feb 2023 06:18:46 -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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.18.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:18:46 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 05/22] apr-util: update 1.6.1 -> 1.6.3 Date: Mon, 20 Feb 2023 04:18:12 -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 ; Mon, 20 Feb 2023 14:18:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177411 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 --- .../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 Mon Feb 20 14:18:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19811 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 66CAFC64EC7 for ; Mon, 20 Feb 2023 14:18:50 +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.14058.1676902729285837393 for ; Mon, 20 Feb 2023 06:18:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=JW9T8G1U; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id dw16so420310pfb.1 for ; Mon, 20 Feb 2023 06:18:49 -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=lo+puxxMyKevbHJ3baeIrZnG2uNrKsSXDeAxwa3Mm78=; b=JW9T8G1UeZLNP4pTt16TsB91EilYcthhftWSOI6ZC88XGp7AV3b6IOfrqSwaSLkzsH sHQRAelYZBGp+1Ko4EYx1PzsM5Fy/HG3SqKr5I1JGqtEALMcEacjBUUdcrQ+muQvsLNq Vy+3efzwUbr9HrPFHoxmxjb/uogubulCQQP7HonQF1aLpeAnXpQArQkKG1BFdvMmqwGl JhkMhImUxDq6tKkXF/EQ28PEMupuN4pREiGi+P4ymRR6l1SG3lNceKpklqIT551Ao7Ro M/LU7YAdgXO5beDeRJLOl08JgeMH+FMkpuq3gEYze41Auvg7QsvdKOmKXFxYIoH3stbj Ftow== 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=lo+puxxMyKevbHJ3baeIrZnG2uNrKsSXDeAxwa3Mm78=; b=RIQ6HtC2guwkyrzgZe0xRijLKsAsk+6Lk2SP3gzEY3djSDD5f8zupBu1V+zfkdnleg thv8rVqp5niStym8uycuf3upcZQSRu8xJn9vQnxzF0CtGq3qOi/Xfu838iJFJG9zd0BO lLsdtgE5d3q2ZbiFK7h41rYs46jyooOKoh+0gv9NXFZo0fmqiLisgZBRSyJ7KOoiDI6O efW9Pc9ieMBOppE84VS3+UyIBe081646m9ByqVLGrtp7YhM3YxPsm1GhuDksFvNx3zIP fTIsG69zy07xBQdMq4+Cpv9jQy+vOf8w6X08KOcKLffxR8n0E6cOZBdJUf7eqQn+OxNb ShCQ== X-Gm-Message-State: AO0yUKWEHtsXBzbdR9ozcrQvtDyC1/pbb1gty4mbfZsk1b+YRyBgyfcr lGT1H8n3ThpWpx7DJfGYhdixkDsGhmXGa6DYA1U= X-Google-Smtp-Source: AK7set/Xi8S0M1IgU6y8xei3pX/YjxZcIaELR3EeOtaly3Rnequa/kO2ZpUffTPWlVXOx2R0ckWzgg== X-Received: by 2002:a62:1513:0:b0:5a9:9263:76ec with SMTP id 19-20020a621513000000b005a9926376ecmr2070026pfv.9.1676902728241; Mon, 20 Feb 2023 06:18:48 -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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.18.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:18:47 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 06/22] bind: upgrade 9.18.10 -> 9.18.11 Date: Mon, 20 Feb 2023 04:18:13 -1000 Message-Id: <3aea7767cc0c3eceb748699ecead324fab4284a3.1676902605.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 ; Mon, 20 Feb 2023 14:18:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177412 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 --- .../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 cb0e251d51..55a06eae5f 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 Mon Feb 20 14:18:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19818 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 648D9C636CC for ; Mon, 20 Feb 2023 14:19:00 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.14061.1676902731098171116 for ; Mon, 20 Feb 2023 06:18:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=KdSdg8e4; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id q5so1525957plh.9 for ; Mon, 20 Feb 2023 06:18:51 -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=QIwnW9JaPCVAyPqAal3aEQDJH90RnAWtvYlrl4HwRmM=; b=KdSdg8e4fzEKxxhLZZI5gUqD7KP5gecVcO58wxDptn3Q7235AmmzYUOdOua2cgLDtn GRy7D24Igf5RHoF4fRavAAS4yQlPZWNVyOce7VL02hkJJgliYCUJsSqrn52NqdwrRslP cnPfTLGXX15Mx/BbnAjASqgT0951/jQN8pgz0ypQUfuIXsS0CJhqa/0mI8BawxT9uipi P+ZOX6HIKZWMgglz8b8D/i2xnNd9BC1n3zLQBO0kpIsgAofDregtAIBFwYtvV5bx+xG1 9gqJPkSBJ1Ya+tiJhTrHf0SIg2i3o+Nic1AjGjQpofcDdn2C+oYdZvFF792pXuA8y9Uz WV4w== 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=QIwnW9JaPCVAyPqAal3aEQDJH90RnAWtvYlrl4HwRmM=; b=HVAkYIutZPzj+ydCxej7z1PaMT4q9QxR3+6yf2KZ1/ozQ+0Vb4pLa6FrmXypM8d3bS ORi9fsZWBI3p03oTqx+CVj10F/g4+SK7uq6ZD1dP7WuiP65kbcpL7fy2QYj3+HeP+PnC sFxfbPBPfw7xG6vbnBXKdoIEjeREP+yEKMEoo94ZTxraf/p2dd8o8Kr+Ld0vfNbqlbEH MsVuXEOPuOStNBMrlXbRm9DaRyEl78Ry00vmDI2D4h1Vr6G3RZCEeopkl1MESx/+Eli2 l4HIxjEHrktDcvQfrMTAYW3TSftKsxV5+OyRd/L/T3Dokiu4iIBH4tUzgjddFNN4AvTN 8pJQ== X-Gm-Message-State: AO0yUKVgOciSzXkLgFtWXOVAGWqnUP2ZD6Kelsc2aAiHjOV1lTc826LI DdDKaFOWVbaqUcCZ7xPAq2ZYN2gdvJ+mq40vLpk= X-Google-Smtp-Source: AK7set8eTl4iVU1sERoFMzbg7Rlz4A/vmQbxyGzm11cJ0viged2Bh1LSmqeZukdndqLI8CIcZ4RnTA== X-Received: by 2002:a05:6a20:a692:b0:bf:8ee2:2009 with SMTP id ba18-20020a056a20a69200b000bf8ee22009mr867499pzb.26.1676902730057; Mon, 20 Feb 2023 06:18:50 -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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.18.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:18:49 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 07/22] libjpeg-turbo: upgrade 2.1.4 -> 2.1.5 Date: Mon, 20 Feb 2023 04:18:14 -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 ; Mon, 20 Feb 2023 14:19:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177413 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 --- .../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 Mon Feb 20 14:18:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19816 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 777E1C64ED8 for ; Mon, 20 Feb 2023 14:19:00 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web11.14063.1676902732898912906 for ; Mon, 20 Feb 2023 06:18:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=vS1yTBcV; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id p6so751257pga.0 for ; Mon, 20 Feb 2023 06:18: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=3PXFfLKUTRkAo017Z7Qn6oLQQ3ethLL6HGgeYyHNdng=; b=vS1yTBcVOPIgUsz4cZ6O6+DHyMgQutEjl1dC2GCIkNEXwJQF5X92wIpGTMKqjtGtuz fiQ8cPYUZuvbOxFS1pEo6J7LBhApdF8j24dvZUGKOMTj1RcoznDpA9Kw0pFmP8p42RJw ovnqZHQ7HrNEUhQwn7hPLJmP+212pCawZslDN72dsBVW+jMk9Gahp/Sx6B/lEi4N57ww pvoc0spkYqwaUAE7CdJsGzcI24hZcCsYx7RRp1gbruyhkNOFJoe7RWNP/hgTmlqPlw50 ETi+j8xPpRR2/lCz5re4yK1R1Gb3qReagNsk1zOr9LrXFvRd0baVO4Fx87eVxVMYW7v+ iVyw== 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=3PXFfLKUTRkAo017Z7Qn6oLQQ3ethLL6HGgeYyHNdng=; b=s07PuiK+va4a3xxP8LooLDOvY3KzCfBNcnTTyMFUMnXXmmuIjKrAsrl71JukI+UODr +qUOyOoWtUCqAYYvoTldqdvG7xSx6DuKbFb1porJ+tZOM/3wuJ1plZixZa1yZjGycsNg 2l2oD/otpWE95IoX9h9DyuP7pMN8LD2B5YZmVe9UIs6Gosm4yNQDXJR9xPTVCkOtvYFs ewJJIktzdmKnmQdcO7BW43kTfAiCkV9aU6rC8ozX4PEbo8PuTwQstvf/Bae9CHEmfmsf xVuGMsjlnhDK51RAFwUnauCAAul22ejqCc6+ufMvgdG0D9tOO7S9BN2H+QdjwKIpWcGy Dxlw== X-Gm-Message-State: AO0yUKXpbY0g6GfXrkq9tyDLAkZJTZugC9VY1h6EUg3YInxX9gDRziZ2 4ZI1mr6wUkiyDFz1hWwNwvp8HZhtGuEe1wdZmDQ= X-Google-Smtp-Source: AK7set8UcVA+Mdq24K1ay7o0qNbWCyCJmDjXGW+5U3BtFVk50t/7ureXn+jVqYbNz6zgnZ+L0GgtEA== X-Received: by 2002:a62:6185:0:b0:59c:3fd7:45de with SMTP id v127-20020a626185000000b0059c3fd745demr2961173pfb.30.1676902731939; Mon, 20 Feb 2023 06:18: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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.18.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:18:51 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 08/22] pkgconf: upgrade 1.9.3 -> 1.9.4 Date: Mon, 20 Feb 2023 04:18:15 -1000 Message-Id: <7b7cdf017d10c1c387f5ae4a35c763b437ef2673.1676902605.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 ; Mon, 20 Feb 2023 14:19:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177414 From: Alexander Kanavin Changes from 1.9.3 to 1.9.4: ---------------------------- * Fix a buffer overflow vulnerability involving very large variable expansions. CVE-2023-24056 * Fix a bunch of minor regressions with the solver. * Create separate solutions for `--cflags` and `--libs` when `--static` is not used. * Remove final trailing whitespace in pkgconf_fragment_render_buf(). * Revert broken pkg.m4 change involving querying module versions in PKG_CHECK_MODULES. * Fix handling of tildes in version strings. * Various C99 formatting string fixes involving SIZE_FMT_SPECIFIER. Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit ea19dd90b367eda92aa01bc5131d126ed6d22280) Signed-off-by: Steve Sakoman --- .../pkgconf/{pkgconf_1.9.3.bb => pkgconf_1.9.4.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/pkgconf/{pkgconf_1.9.3.bb => pkgconf_1.9.4.bb} (96%) diff --git a/meta/recipes-devtools/pkgconf/pkgconf_1.9.3.bb b/meta/recipes-devtools/pkgconf/pkgconf_1.9.4.bb similarity index 96% rename from meta/recipes-devtools/pkgconf/pkgconf_1.9.3.bb rename to meta/recipes-devtools/pkgconf/pkgconf_1.9.4.bb index 453da89c3d..ab0f371093 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_1.9.3.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_1.9.4.bb @@ -20,7 +20,7 @@ SRC_URI = "\ file://pkg-config-native.in \ file://pkg-config-esdk.in \ " -SRC_URI[sha256sum] = "5fb355b487d54fb6d341e4f18d4e2f7e813a6622cf03a9e87affa6a40565699d" +SRC_URI[sha256sum] = "daccf1bbe5a30d149b556c7d2ffffeafd76d7b514e249271abdd501533c1d8ae" inherit autotools From patchwork Mon Feb 20 14:18:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19819 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 77831C64ED9 for ; Mon, 20 Feb 2023 14:19:00 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mx.groups.io with SMTP id smtpd.web10.13849.1676902734753355872 for ; Mon, 20 Feb 2023 06:18:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=0MH9H6rw; spf=softfail (domain: sakoman.com, ip: 209.85.210.177, mailfrom: steve@sakoman.com) Received: by mail-pf1-f177.google.com with SMTP id x24so723179pfn.7 for ; Mon, 20 Feb 2023 06:18: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=FyzG0llGH+zsOOxhM3PxyB0xaKoybihe9/v6KgjJMbU=; b=0MH9H6rwiDif+J6X2ky9f+oLP1w24K8uOKccFs0v50NyJNuoMro7GCic1p2sfOQuok a0r0y6tQc5XFU3JRhatyk71jPnHCFX6s0SIVS95hIpzOghBRoImJ0MmETe8BAX3Qyfsj Ty1UYUVeV5AFn2IZOtLXXdoM0NokXfF4bacz6B9vQHn2Z6X3E2vbFOEHNMXNt2P/JlPj ccMZYnMvaj0sUE6s+63bYIRJBn/7r4lpmvYxy62vEg8Sy2oJWkuSG/EvKJYGn8ni8dsj QVfv+K7vNiSQGJruIuz8d9djgXi579FBVRzxP0ZrwNPZVv/GlIb2r1e/PYVoc/gwwKJk Q7lQ== 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=zyvkPpE0nCXED7kT3fY0EwmMMJlMIG0tYf2VAkcawjuNi2POgojSmda2VNGiX59ScE 2+nZ04k7PKx9DxGzEvjzhkPj6JSTMvsKVjhrBUql2iMDESu4wAhs1IZcgi3zjLYYv/Jr UK+nyF2hQCySTv2pW8NmX+BFrgZXnVur22Hm+OFJ73+6y11w1GwOwWQsojtWUKqJ6g6X m45OD/Q4JwJqqSrHt4IVCCQ/cP/gqMH+YfR7PmCCMMq1pBjMp+SitEOTRKAGn1zfHsZt zo2GqKFeIqz5YPPy+7P6UXVAxMeSaU0FAbBE2ptjGwSPs0oPWxKeI3ZEK1QLOoj9bH4/ oQqA== X-Gm-Message-State: AO0yUKUd8VfLnyy5JfOqk41fJTBqS/u7HgoeZJYEyMEovGqIrR575m/m 6GhTOZ/RIepC0/HzZGX9wUP0vgWqWFh8Qa+jWs0= X-Google-Smtp-Source: AK7set8freOEj6etVDs5z8HFd671L2QzoPLk/aFPVobR6rnwzb+pG4wVK+tbAEpErri21fUS7dQujg== X-Received: by 2002:aa7:9eca:0:b0:5a8:ac19:8f42 with SMTP id r10-20020aa79eca000000b005a8ac198f42mr741235pfq.14.1676902733833; Mon, 20 Feb 2023 06:18: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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.18.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:18:53 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 09/22] linux-firmware: upgrade 20221214 -> 20230117 Date: Mon, 20 Feb 2023 04:18:16 -1000 Message-Id: <3291c8ecf3ecf48f88175466425f2f0b0be69cdf.1676902605.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 ; Mon, 20 Feb 2023 14:19:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177415 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 Mon Feb 20 14:18:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19815 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 65DBCC05027 for ; Mon, 20 Feb 2023 14:19:00 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web11.14066.1676902736696849155 for ; Mon, 20 Feb 2023 06:18:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=7tEfW7mX; spf=softfail (domain: sakoman.com, ip: 209.85.216.47, mailfrom: steve@sakoman.com) Received: by mail-pj1-f47.google.com with SMTP id ei9-20020a17090ae54900b002349a303ca5so1544290pjb.4 for ; Mon, 20 Feb 2023 06:18:56 -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=dGGEugTG2RtGEFg7DB4Vh0ivgyC8ewQXm4szrxoXNrU=; b=7tEfW7mX2yqeXYuu7MHYJoPrloDO5QLRHVkzXiojuEKO7RDAI5FvPIe0k5qM2yCFoA WXgB1N2hc0DMeQo8wLJb8dNmXj/2JoSwvqv8cFRPPRQmCc+OAw3MgivgPCqxTD1uzvOc ffI073kVsBCaVWpo/ENpoibM4Fc448JVPsnK9JkbmGjlXTB4JJIArCSS+psWSso8TEJ0 81TqJr3CORJ0VNiPDoLiccH8+GksWoBofgkLDjAFWWrDRQr1J710tztE+mD+ujhIVU9P WULj0hr1wjqWBJtfLF7xQekzmcg5e5BEAEdfvAl39VgX3pazvrsh8h+zcuISd+USg+Hg jlcg== 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=dGGEugTG2RtGEFg7DB4Vh0ivgyC8ewQXm4szrxoXNrU=; b=SKCcA5aiwTXnzQu/ffF54RWHwnGvlS/MXASov8GNI0qOakqlHWRG1KkVYIIVNl6/Yg c3xLo+EYpCo2EoospD2+RD6Ah8hD+EiyO8p0vG/ySldv1+1r7eJhrhFK+MMejMJj3ZGx uY75sbafaGFx2/spm7KpWiaonhhKV8xIxV8FHnfuTDauSqHBaAZLXJQJb+0Ltj87C5w8 ZtjBHlkcAbfW3G6ot5tIUq0XuYmmj4wcpq7aHjTrxD6LeRcBzz1Np63eiEh8CWinF/sQ 2ejfZUeitkDJ7BVUcyleDNYDOeYHz/u97w6UZ6JsKOMPsx+T116MhLp9aLz9rcjWRr/l YgSA== X-Gm-Message-State: AO0yUKWqC6flkF9Eo1TxiaVQT1NJExUt+BXJPdrTK4U3SraeE/lMJ5Kz eWkgPjYsd2wstfaJtR4u6L7gw49Xs9mkUIkHeHM= X-Google-Smtp-Source: AK7set+fNBTfKMzHxTfuP4FLRX3yr35xZpX5sjHqQFGlhZlffb9SvjUWGa4nXD5m5EbTQHDHRiZuYg== X-Received: by 2002:a05:6a20:6990:b0:be:d368:5c63 with SMTP id t16-20020a056a20699000b000bed3685c63mr1178887pzk.38.1676902735752; Mon, 20 Feb 2023 06:18:55 -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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.18.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:18:55 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 10/22] git: upgrade 2.37.5 -> 2.37.6 Date: Mon, 20 Feb 2023 04:18:17 -1000 Message-Id: <936354cade974b59b964ea55aca22a04fa44a2a5.1676902605.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 ; Mon, 20 Feb 2023 14:19:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177416 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.37.5.bb => git_2.37.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/git/{git_2.37.5.bb => git_2.37.6.bb} (98%) diff --git a/meta/recipes-devtools/git/git_2.37.5.bb b/meta/recipes-devtools/git/git_2.37.6.bb similarity index 98% rename from meta/recipes-devtools/git/git_2.37.5.bb rename to meta/recipes-devtools/git/git_2.37.6.bb index ea53cc41e4..e6165ca37b 100644 --- a/meta/recipes-devtools/git/git_2.37.5.bb +++ b/meta/recipes-devtools/git/git_2.37.6.bb @@ -167,4 +167,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "5c11f90652afee6c77ef7ddfc672facd4bc6f2596d9627df2f1780664b058b9a" +SRC_URI[tarball.sha256sum] = "626e4c338f72b170e2b3afb1cb2161f6fbe4fb1d0749154f1ebfb5f0a57ec25f" From patchwork Mon Feb 20 14:18:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19817 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 6490DC64EC4 for ; Mon, 20 Feb 2023 14:19:00 +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.14068.1676902738729478045 for ; Mon, 20 Feb 2023 06:18:58 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=MyW/soBC; spf=softfail (domain: sakoman.com, ip: 209.85.215.180, mailfrom: steve@sakoman.com) Received: by mail-pg1-f180.google.com with SMTP id bm5so719142pgb.12 for ; Mon, 20 Feb 2023 06:18:58 -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=mWd54Io8a4Hh3wXNPZR/OK7TBdW1lV7YzckWJv9rlOc=; b=MyW/soBC75UTV6P0+z/q92oJxGFL0h2d2iWcVpS5ffLiys7nRfywk4RBuEi7wsOa1j Cc/YZ8w9ABu6LB8i5/HmudsL12x/CULdOMsz0EIW500A0QJ8qVj41yOgzR4kTKvzIJlG GqA3xZOy+eWjNPZY6mPKp3WLfN2i2OtxEB6yWksHlYqAwPXuTwFeabz2TqpB3w0ONBvo XTJ5huHI0pf2Jc9YMCzum1qFhy/9NgWKutSR2xO7vcoAAWW6pnANIqX9Mwhi1lkG2uC6 k0VJLGTWwHKfoRwxFwQCek1yxEV+1c9ZfNcViZO+7gU4hc63oFmxfAucl+WlH6OVz7/a vTTg== 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=mWd54Io8a4Hh3wXNPZR/OK7TBdW1lV7YzckWJv9rlOc=; b=6YI4crSzdTYPtgi8oPrEc0OhzoJl0yWsr0iAZ5QtrFEmY3llE2tgAPqf3fGWgLV4x9 l+ghPicbgZhXOw7bblk8ms00dJfs/z9bzKEd4CwryFpfRTc4GPbzOjirVz9HAQ3lWp6c Ga0mRRhvNXKwSyN72tNgsilnnwMr9DvQxlnSuIiFtRfgjKj7WILVDU7nKCXanPs4e9tU Vnnw5t7b787M5iGx78xohrDMgkdJvNtGWTFsUxkoesObThBPbqJm34uCbjoq7ByjFxyx JN4LHCKncK8/UEesrsx+E3AcNjl7earYbrCRDMno6xecbolcKmFn3o/7n04W/GG/oh5H B+EA== X-Gm-Message-State: AO0yUKXj/gTD2p0xiW+lf1ozVEaEbl3M++MvFnaxcuBUrS/8MIFOJ4ko 1GE7O529S8tCVfHqGxrB1y90hXezV/Ccb/uZAdA= X-Google-Smtp-Source: AK7set/2PeKvcj9UHFIKVFlvB+fkozQkWgRCbUQb36pe6mKxtyaYuStlmICNcS14zmFPC2F/H4N5fg== X-Received: by 2002:a62:2f41:0:b0:5a8:808a:d3ce with SMTP id v62-20020a622f41000000b005a8808ad3cemr1702476pfv.8.1676902737780; Mon, 20 Feb 2023 06:18:57 -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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.18.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:18:57 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 11/22] sudo: upgrade 1.9.12p1 -> 1.9.12p2 Date: Mon, 20 Feb 2023 04:18:18 -1000 Message-Id: <9f01e75b2d249a5885b313bcb4ba76df750b0d56.1676902605.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 ; Mon, 20 Feb 2023 14:19:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177417 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 --- .../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 Mon Feb 20 14:18:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19824 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 68F02C64EC7 for ; Mon, 20 Feb 2023 14:19:10 +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.web11.14070.1676902740565416587 for ; Mon, 20 Feb 2023 06:19:00 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=c4PAcmjo; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id 16so601748pfl.8 for ; Mon, 20 Feb 2023 06:19:00 -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=/GbpV/WkgmscLg5aTSZqmWmY58gYR6HVorkrMMpgIMQ=; b=c4PAcmjotnCT9AzGZ3sNnv5dPfEYq6DvcGBs9M/QdYb/dwglu8f6c4xVYHRml8lp6l l+MYm2j/Tykysyswp6Pfmlzh0iwnnr7fPkID4BHRN0BcU/aSB/6LyrHag00I0otti6fg pOWKLom2QkKRmjmuKNwnj6CHfVRhZoxewq+iH/VFfopoJRnsM2iUtvfsxBv7GhRme02G ZNcTmWvqIXyMrNiBtX703N73SyzQBE/zHMBEakVMaH3de99lzto8T7gejL/wx4na1N6P DLFejnHwSlh9+BNGTcMvnnxDUIDaSSOnHt1u+sLwpu4W8pRxrbpPcL4TOHd1DEpT2aWo gHnw== 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=/GbpV/WkgmscLg5aTSZqmWmY58gYR6HVorkrMMpgIMQ=; b=NW3ZPWSG3DRxU8fHsOQ5IyvTlwEuDUKmcjDwbP2mkgQfVZZixMu5rrZdA/d77J2hz6 4OLDJK3CZ40l/XLRbCE5JODvgiahZoyUr5FPqA1Cz31C8549BWsd4EBx7ZU/RerZEwvp oCeT7sPCMaA+LrL9EeJaWFLduD24eVYPF5AcfMD8nYzXlin3LikjO5c7B3de5VDmiqVs AnfmmM8GGK08xaBx1lOa5UhM64gTNCCtK/6R0CEJ9cU7u7JRGqb4MfbYit2qFw2msZck sFtv4FhCGO+Nuf37IN/c2+Ij5iPwzDf5Qaza4D0QSH7nz/MFbtoHV6bSmI83ZjGM1igG 4WIQ== X-Gm-Message-State: AO0yUKV32AaQFEeWuHBD1Q6RSizIBr9VLqoKo/I6EQvwPDc1wwrYMc3O ehLQdoKkdtL2h372jvYrFI6faWoopepZ7NRWuLM= X-Google-Smtp-Source: AK7set9N3H45kTTVzo/vnPDmwqKb5mC8BTu0STMtIqjitohYAAA+ANw5kfjhdZki1OG3FehpjKJYFQ== X-Received: by 2002:aa7:95a4:0:b0:5a8:c6c1:c9ae with SMTP id a4-20020aa795a4000000b005a8c6c1c9aemr1283125pfk.30.1676902739592; Mon, 20 Feb 2023 06:18:59 -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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.18.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:18:59 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 12/22] libgit2: upgrade 1.5.0 -> 1.5.1 Date: Mon, 20 Feb 2023 04:18:19 -1000 Message-Id: <63cb8eb147088ae171ffa2b6005410742e50e4e6.1676902605.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 ; Mon, 20 Feb 2023 14:19:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177418 From: Alexander Kanavin 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: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit f59486310cf33c586671a16cf52862c19c3c4c31) Signed-off-by: Steve Sakoman --- .../libgit2/{libgit2_1.5.0.bb => libgit2_1.5.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/libgit2/{libgit2_1.5.0.bb => libgit2_1.5.1.bb} (78%) diff --git a/meta/recipes-support/libgit2/libgit2_1.5.0.bb b/meta/recipes-support/libgit2/libgit2_1.5.1.bb similarity index 78% rename from meta/recipes-support/libgit2/libgit2_1.5.0.bb rename to meta/recipes-support/libgit2/libgit2_1.5.1.bb index ee4d79b11a..59866ce385 100644 --- a/meta/recipes-support/libgit2/libgit2_1.5.0.bb +++ b/meta/recipes-support/libgit2/libgit2_1.5.1.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=112e6bb421dea73cd41de09e777f2d2c" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=main;protocol=https" -SRCREV = "fbea439d4b6fc91c6b619d01b85ab3b7746e4c19" +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.5;protocol=https" +SRCREV = "42e5db98b963ae503229c63e44e06e439df50e56" S = "${WORKDIR}/git" From patchwork Mon Feb 20 14:18:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19820 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 78851C64EC4 for ; Mon, 20 Feb 2023 14:19:10 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web10.13840.1676902725953694070 for ; Mon, 20 Feb 2023 06:19:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=PB1zH6IR; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id z2so1670248plf.12 for ; Mon, 20 Feb 2023 06:19:02 -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=/JPJdxV/rXrayU1ZqofgHzDslP1Y4mlt6Ml00TiScQA=; b=PB1zH6IRAG5vfFl0pAbPXSoLRqfamCxlVciAcEPf1n7OS8kuJVlABt3cje+pNIWxHd wMXkk/Cb318smJ/llLWFFGYa9D3YkXIR7TU5kq4QBKzum6DXENface1sQ/omwKcoQTKm AFVTRGZPsBSJQjBTyh6+qj7ZRMTAafbPDi/q2eFBR7/PwBrcev3Ff2NvKnENI7X8cMxE utN7SMEtwWLRRHrBshQ8bERkjvMW140M78g9hfSw742kymy1ArkGTXzMcRhodk/ol7eg 1i1Ip/3KUaWx5mVSk5F3eXtq6gXMhxKHtIWuCASvLbRPofouWsTOh4Y4FGL1Y+mFFAg5 yIJA== 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=/JPJdxV/rXrayU1ZqofgHzDslP1Y4mlt6Ml00TiScQA=; b=F0QY2LahblADDM/F2KacwhrJd2TWiHjIUGnXnMi/bYr0XmCIvgi1LjASXUJ9OE0hl9 HeGGvyfOtFgIGQl4E+GG9ImyaLD7WchiLquXck0mVPAQDqDjl9uAIcPaq7Fzm6GW9aK7 zQKdyp74JaTlE0cWMWqdlJzYaLFaRI+9Uu2+IiUCpfYNUuNPnn8KeZUYmnpXV+RIzIzb GP7XAo9piDPWh4OfRULVzZ+Ws/RqJsDZ2c805o89z7OvFSfijjVkmqhGwlUZx5jdl99v g2SOcI5c9n0MXag2hqCVHgMRpOeuD6vgJBsQ9WZvLMna31EjMPL9S0QwFMVJr15kOv1k UWfw== X-Gm-Message-State: AO0yUKU6GVRWxVHPDKldbWz/q0sFfWvkXeiBBiGwUhktgK3D1TMGjfMc 01utHvgh7CmjfbKN2DPjJl8VCWrtjQT2TquSzko= X-Google-Smtp-Source: AK7set/M1Q1VcaRHLxvITfYE6phDXBQAAI2wwPtmAHElekBl1FYLCjlLol3YKZYbKbLujtZSqAAr3g== X-Received: by 2002:a05:6a20:a10b:b0:bd:17a4:c339 with SMTP id q11-20020a056a20a10b00b000bd17a4c339mr298831pzk.13.1676902741416; Mon, 20 Feb 2023 06:19:01 -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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.19.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:19:01 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 13/22] image.bbclass: print all QA functions exceptions Date: Mon, 20 Feb 2023 04:18:20 -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 ; Mon, 20 Feb 2023 14:19:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177419 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-recipe/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass index e5e5274924..14528e664c 100644 --- a/meta/classes-recipe/image.bbclass +++ b/meta/classes-recipe/image.bbclass @@ -318,7 +318,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 Mon Feb 20 14:18:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19825 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 79B0CC677F1 for ; Mon, 20 Feb 2023 14:19:10 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web11.14063.1676902732898912906 for ; Mon, 20 Feb 2023 06:19:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=M01vBdEV; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id p6so751561pga.0 for ; Mon, 20 Feb 2023 06:19:04 -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=Km/73tJXPA8epIq594QhkLBC3np/vTjulAZyu3LDhe8=; b=M01vBdEVONMxmVNoZ6BL5j7/WiBIo/VzaC0Tk2LYKncYbpr1J/EG97NOwE7+cXQwP6 kgaWaMVwsNaFI81R3ic2DCh9G9G8p1lW/MQfNTgaJKh4Y0qtmv7zKStwVdd17eUm43Jg qCc552yl2hnklfLEE2ZXRd0AFqnurhc83w+w39iV5oIX982LdCVnOYdV3k5uIAnBtLDw z+reaBJBOb3W7y53pHKzxZf3LefjPu28E+/SSWeT8Wey5WxRRq+ebKBU2bWNlK8RreHE BruTkXMPE8AuskthmKZsT/CuSSQWGh+Pa+Egtgt61ltuq6Vf8A2znOJlqdKmoevb99sK BZAw== 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=Km/73tJXPA8epIq594QhkLBC3np/vTjulAZyu3LDhe8=; b=Q7H1zQ/pXpCguOyt+B4RN3cLxD+go4+E0HELEUFEEInd3LgwIxD1CbaUYsZ4U2Q6sE wyrFRMYeGXf0Yo359/fWkuN89TudvTmZA79DeaNp5pcpoqXfjH6itMrkSkaXjPHXGreF FpBkaT0Bh3T+VFffC+/CGIaF5PUFzfMroogNLpj1FcKcC1WiLwqRabUXhoi8BN/YYWS/ gw5z8IZw6wjPOqZGycjBHSANZ1LBHXkJwpByib0YVdfFVO9JDwFuC0jNpS7Ir8q353vJ MO5GVhYQ2nmGikTsw4mmdpexyNLCLb2PQusgmNqjl0mvV3OPdWqrLCLNnaFUe/Er3kww 38/w== X-Gm-Message-State: AO0yUKXhJp+ZSA7/A9bTGmMAo9Uci2uU3wUdXjT9b7Etj9ueSPrKuWhJ 7bih9qX1DMhDHjEB1RQu7PPjKQWoiWBNKQZ6pCk= X-Google-Smtp-Source: AK7set/YVN6sc++RjTHjCyROAvvnIPIZDsQ4dG5YrSvkqtkuYF9UVSBIyAOc4HlvvsBdVNppRcY24Q== X-Received: by 2002:aa7:989c:0:b0:5a8:d360:de72 with SMTP id r28-20020aa7989c000000b005a8d360de72mr84893pfl.29.1676902743236; Mon, 20 Feb 2023 06:19:03 -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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.19.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:19:02 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 14/22] update-alternatives: fix typos Date: Mon, 20 Feb 2023 04:18:21 -1000 Message-Id: <5dab1edf6df6eaba59c3c6a996ca19213e0a4743.1676902605.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 ; Mon, 20 Feb 2023 14:19:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177420 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-recipe/update-alternatives.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes-recipe/update-alternatives.bbclass b/meta/classes-recipe/update-alternatives.bbclass index 970d9bcd45..f34cc6bc19 100644 --- a/meta/classes-recipe/update-alternatives.bbclass +++ b/meta/classes-recipe/update-alternatives.bbclass @@ -5,7 +5,7 @@ # # 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. # @@ -35,7 +35,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 @@ -68,7 +68,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 Mon Feb 20 14:18:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19821 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 5EE51C636CC for ; Mon, 20 Feb 2023 14:19:10 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web11.14078.1676902746004035602 for ; Mon, 20 Feb 2023 06:19:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=pdD+UBR9; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id c1so1774943plg.4 for ; Mon, 20 Feb 2023 06:19:05 -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=SdSN7uB37MkPocVUgy6jpvLHgk3aJ3QnYXYPFZ1EjBA=; b=pdD+UBR97tr8AY0SkWd2vT9qxEXDQRmFJ4m3wu6LXoOgniJZYJ+oFVHWozIp+7uk+u DjXahmJu5amwfYwm25eTOjQlVRO2nQbIZlBhQ8/2S42vTewh+RKOSwQLqCj/4WMJjp8b QVWfPeIa/07/ag6mzFT/Lnf6odFgfXw5ks+6qYJsMGAtoKCQh1z00sSpn333sOo81Ncb EXGtUvUNtM+rGXplSI6dbP7AYgwSuVZiKmus75qJqNTL+DjXmKc0wQhGy+vWy1Kdigp9 sFmd5KqsykeAz74j3eaigOnf21hm5vOHGMVKo846kRtC9pt9VfHbpFaILcW0HV4rYoPA C80Q== 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=SdSN7uB37MkPocVUgy6jpvLHgk3aJ3QnYXYPFZ1EjBA=; b=dTscuQ603kVpNSFbhrjVLIoXra+ASTPRwbBfoWrkJ1rwk3fyRFXY0YL2gjXPdDtSKk sNHngpsczaMOL4n32Wg5pj/abR6k89Ngs/f+89jqvezF0gCgErs0YGRChtUVE60Syd8y jtD7Dazce01tMJs+tueIa3VmwXDwNTFJbKCwxqLzIU294eX+w5GxIB//EmoD6MZ7BAS/ EqXrxi311wwZ+TX6GJVuufeqOfIkVvK4eohEURe1qQ5yWckKGZBMIep8SUR84pb1MAqr PVwgb3Jqy1oVsgxE3d2wYQYofLpxwzLezNQVAs7SvgQwWSs8uiusBl3VK75G0cD8Yvod dGIg== X-Gm-Message-State: AO0yUKUCPrdZZMwlmoVlA8fRM5VC74EXI/Jeiay6b3e5VfZALqHI7BAh For/JwEnrEp8HJf2bPCBv7PSxGy76HfkMYClNjs= X-Google-Smtp-Source: AK7set8bJxBOP1qU3ym7jkICVyfZzJNLCUfMYvjkXP7duR+pRdAWLmKJRPHU2DKah134spDko0ijjA== X-Received: by 2002:a05:6a20:430e:b0:ae:47a6:e6d9 with SMTP id h14-20020a056a20430e00b000ae47a6e6d9mr677436pzk.6.1676902745113; Mon, 20 Feb 2023 06:19:05 -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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.19.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:19:04 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 15/22] ffmpeg: fix configure failure on noexec /tmp host Date: Mon, 20 Feb 2023 04:18:22 -1000 Message-Id: <20231fece4b7f15bae574d89a362506f39cfd967.1676902605.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 ; Mon, 20 Feb 2023 14:19:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177421 From: Chen Qi The configure scripts uses /tmp to execute some generated files. If /tmp is noexec, then we meet the following error. | Unable to create and execute files in /tmp. Set the TMPDIR environment | variable to another directory and make sure that it is not mounted noexec. | Sanity test failed. Signed-off-by: Chen Qi Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 6099b88c4decb285fd3519d5565909c15d935030) Signed-off-by: Steve Sakoman --- meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb index 06eca4fefe..7970740254 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb @@ -141,6 +141,8 @@ LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -f EXTRA_OEMAKE = "V=1" do_configure() { + export TMPDIR="${B}/tmp" + mkdir -p ${B}/tmp ${S}/configure ${EXTRA_OECONF} } From patchwork Mon Feb 20 14:18:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19822 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 68A68C05027 for ; Mon, 20 Feb 2023 14:19:10 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.web11.14047.1676902721487967580 for ; Mon, 20 Feb 2023 06:19:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Qx27OLrL; spf=softfail (domain: sakoman.com, ip: 209.85.215.173, mailfrom: steve@sakoman.com) Received: by mail-pg1-f173.google.com with SMTP id 132so638167pgh.13 for ; Mon, 20 Feb 2023 06:19:07 -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=o4+LzvaBUyQ/MsWlx0Esk4hYgorGZ1Z+O1ByXrEAzV8=; b=Qx27OLrLbU9Zcq3CmBf0utRSiJErnR1r2DKNhGeY/JxN14DbaZWl4fakvlNBCwyGYp 9Q9p+dw9PF8pO/XkSy7bAHzH2DxLicfgZi+xDQwd7RLccYPYLROJRZsSlwG0oiIy+5X/ qNjOCK/5d6FheDyBFdELVVcgPsymrmM8xdMIeuU1x9unPS6R9UQMXDe9i3UxPasHha7a m/y67j1sh9ruIZvZ7ffXtBQQxMwjfAy0giE/oFemp6F00MqAaH2n1FroS+/A3ztyHioy qnXFvzwb3dTx3l9dzPcDAdwBtulRG/4vhpP+axsXoSyJiILpBJISjW6OKyzR7BXJ3qwS JYJA== 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=o4+LzvaBUyQ/MsWlx0Esk4hYgorGZ1Z+O1ByXrEAzV8=; b=UQ9f2cuMtxMn97zwlgIlG5hPQ5Jcv1mN9MQYTRotdmcG7UEbkium7EevX2jeosIcua rG+fell+qtMCXIxTI8FhoRST6o3X9pTIs5RXcUzoAYlqG2JNmzNY8Gqkfs9qUmmvqNEK Q0nbhm0u0bU3swnmlehNRE7TPBSgvr96UIR8rYlUsBu3Auff228rVTYVyZx0clza62Oc yiM9sTZkmGKJo0c875ojblnB5//jA7EKlmT67YCmjQFl54bbxIgP41AZGVZ6rii2YIrB JkjgXHjZwaZgxQVJKpbVUzsJoYiVNJJHf5z6C45tFJU/YIRyFWeOamkkIszW8BjuUUgB 0I2Q== X-Gm-Message-State: AO0yUKUGiQQnzcRghTDN/kO7oWV2MUGGzpSxrSmGnYlD2rYyjaoIU9zb HHjnsStNyMhYQyL6dikZyrViMzMOjG0GshbyYYc= X-Google-Smtp-Source: AK7set8m9CvcTAYg+4IOT8g7MZ1v0YzDT3hQr+r11+XnteiGVYEbAqOQP5zJuFL5ssjCkdVSr8qmiw== X-Received: by 2002:aa7:952d:0:b0:5a8:a0df:a624 with SMTP id c13-20020aa7952d000000b005a8a0dfa624mr985807pfp.22.1676902746934; Mon, 20 Feb 2023 06:19:06 -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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.19.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:19:06 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 16/22] devshell: Do not add scripts/git-intercept to PATH Date: Mon, 20 Feb 2023 04:18:23 -1000 Message-Id: <54dfb8bf6836013ac7fc6112fce9daaf6e719515.1676902605.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 ; Mon, 20 Feb 2023 14:19:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177422 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-global/devshell.bbclass | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/classes-global/devshell.bbclass b/meta/classes-global/devshell.bbclass index 03af56b7a2..4c23049cf0 100644 --- a/meta/classes-global/devshell.bbclass +++ b/meta/classes-global/devshell.bbclass @@ -8,8 +8,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 Mon Feb 20 14:18:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19823 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 78D82C64ED9 for ; Mon, 20 Feb 2023 14:19:10 +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.14058.1676902729285837393 for ; Mon, 20 Feb 2023 06:19:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=poDbwJHt; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id dw16so420872pfb.1 for ; Mon, 20 Feb 2023 06:19:09 -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=poDbwJHtskIZsBnd2IBDVMQJXZKh1hjun2qOgvDRVOfbj8xwjlIkq7Si1AMmDsjvuT EVs8h2/iP/5YhqyXcluPfa37WxesK8jZZx6pmn3FAg9YKLULLStHjk8QgPkXQCZCMayu H0RAWHWHYkawdfrWnZ2jQEkxY34by0rYIwQMMkoFBqkJ2tp/Dm9azRX+++3atsDVYiCB mpZk29IlMWjzhNeaRVnpWKtXps3MSl/SIuq+CVII/WzbKRbQh2lGQAHzwqz3G62s5BsW guhAPmfFCgBdK3I4yuyBGfPRtdvU/vbaeTkGsAQnDi+Eka6a0jqemEdSrOsJhTQZzXz/ 0JHQ== 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=Wpz0E7Xs2lva+/svhFBZjZSS5WqMfhf3O1XlT39a1RGPdI5v0eV2Zr1InmUHSXh2ZJ lMXp31IoR5rnPGzqpOARWQlnFFYuF9cQWRjJwBMT9M+c3otm/V6BiXYyEwkrHHjT3BDd NE3k6jji9yTW73VtKBq9YT83qrwGY8V8TABjEK+hnAiaQPFFvx9SqvmrnZXf1JwA+uvb FC2Adcr26ZZ0GaILK7Svtx9ijjO7FeF3Xkk2O2M+mIAkS88grnd3E5bilqIj5EAHuUuX fL5kpb/0eXhwQN7I04EJX5oe2bk+ooS5Egms2vB/1yWL5fvse/aY60ZYQ4+Q7GGjcqYp a0vA== X-Gm-Message-State: AO0yUKUqidOBPL0hdIfcGBirSJH9015UURfAHD60XyjhIOiEVv75aLhQ 796dF7G+0ByNC5CaLR94e2dQPAlrfY5whCa48Ww= X-Google-Smtp-Source: AK7set/ROOb9jVyruX0wY5C6WSwHcb8Goj3Y3guwaxYbLqwHwglhZNp2aiIEP17zyqjuXruRuE1dIg== X-Received: by 2002:aa7:96c9:0:b0:5a8:bed9:3509 with SMTP id h9-20020aa796c9000000b005a8bed93509mr1174128pfq.3.1676902748818; Mon, 20 Feb 2023 06:19:08 -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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.19.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:19:08 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 17/22] oeqa ssh.py: move output prints to new line Date: Mon, 20 Feb 2023 04:18:24 -1000 Message-Id: <5346b927a9fba57b2bb41406fcac09cd6369f26c.1676902605.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 ; Mon, 20 Feb 2023 14:19:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177423 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 Mon Feb 20 14:18:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19828 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 65F39C05027 for ; Mon, 20 Feb 2023 14:19:20 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web11.14082.1676902751636741256 for ; Mon, 20 Feb 2023 06:19:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=X1BvQilU; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id t14so1832911plo.2 for ; Mon, 20 Feb 2023 06:19:11 -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=X1BvQilU2DPT78RGrT1g+Ux36EOYuwna1xcxu7EDWwjtXdlM7F84k7WUfv2JYdYjrZ zasy7j163n06gGHGt8htSZOzqUnCsfRkTsTr/avfq3fPMfHFOzIUjH4/6d/gdiRQ+UnT BTP8Nz0y//D8tVfTukFflHhWa9c+jSlm/kcJbmTnM49SM8KJLhBfXay2GKvKlgSD8TNq OaOtc1+JgwPoRLuzEj2KuhqaEvmq8Bio0a5XuMZ2v9SSVSXv1/uor4pDCHS7iShw83XY v51yKdufmAw5f65HZs6EgsXDZhDMj2iDO45aio93HHCdG4HQjYoqDYwgqThYZZyI9KSB 0rJg== 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=0lsErIf0CcRsUvFS1EtBP88aC+yaU7eWoUCvIUWjIxREwaU2tl/5nstdPAoJk7c93r Nw/L+JF4Bxdh7agpo8kzxKGLFV7ErbByuHuxoVB4e/pmHIwwsUVU8Sx1oKkcIx1hdcpJ //yNyM5Xrrpcmdv94aafJ30EY1RJX7TzTw4RxJOSZBCmTgpb0vMvifDFdmqiVJDz/qPT ktbmMPWyFB+pESjKQF7QNCHvQEy9RIW/nPTOMpIPraVzKp9j87Nr2N8ZWUKWYJ2L+9mw +4OdtKlOk9Sz1kIEyPYc6SOPj71W9WShUIKfJMjsyPo8soIZdkRFh4sNawi+rn5opgpc 4PBg== X-Gm-Message-State: AO0yUKUcDPCx2U1Dhd/Bj4QReslZBNVrQdU23Q9GS6RYok0AlfVIGSuE 5eZsCwcwFXrtpJajmaMh/ixAs+aFdcggI4szbFA= X-Google-Smtp-Source: AK7set/XXYpLydSsLCEC8ryeNQF43eGmSoMia6taeQy6VFCWlSv1dQfdk0KTSvRgF/Xz0QO6vurmkw== X-Received: by 2002:a05:6a20:8402:b0:bd:ce7:22d2 with SMTP id c2-20020a056a20840200b000bd0ce722d2mr2450600pzd.25.1676902750661; Mon, 20 Feb 2023 06:19:10 -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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.19.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:19:10 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 18/22] oeqa ssh.py: add connection keep alive options to ssh client Date: Mon, 20 Feb 2023 04:18:25 -1000 Message-Id: <07db4a45918eb82503b0bbc7003258c0a03bd5fe.1676902605.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 ; Mon, 20 Feb 2023 14:19:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177424 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 Mon Feb 20 14:18:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19826 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 76052C64ED9 for ; Mon, 20 Feb 2023 14:19:20 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web10.13862.1676902753483632844 for ; Mon, 20 Feb 2023 06:19:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Zmlt1eMY; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id d1-20020a17090a3b0100b00229ca6a4636so1801102pjc.0 for ; Mon, 20 Feb 2023 06:19:13 -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=rvMjPCTVxpwZfmmRwbkjpHLYLKc4R2eKSFLm7EibgVo=; b=Zmlt1eMYOly7G3ECoM3v2/FWL1lNr3/qx2I68SoYXdHDN3RQSFE+ZEycG38bq+q6dN pVhhGZyOcyy12UwRZ0Exbfn5fMpdudSWdwibCA5ruoTTVNTnpimolTf+12YMwFUkcwQz 9S+arxubR6XAz141orsnmqqXqdcSRk3EMdi6mhkYfFv7rHNmYRRc3Jvew68bCvLIt/LY l8i8qwP0FgSx5wTRcvAJAIAbZSWdzk82kWPzlOf9alnWt+1Yrhp/Ae5exr5WFiKp+oq0 361FHtfFKLJCCRODqDVB6LG+LgWVzdIJ1zvtcb2Pj2L3BB0RHIsbw7tvxivAVPdze1Hc FReQ== 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=rvMjPCTVxpwZfmmRwbkjpHLYLKc4R2eKSFLm7EibgVo=; b=WIxS+/tt9ZQT7zZTevfaH5OfUkj38nyRq9RDxPnOxhsi1BlrPPnQLN1ZJElcGEQ95C uqzoZBuBAz69yHZhfFfR45wabOeJY3zArMuZGbSZPaY95p1p9/mLklAp6HJUs5eW1xrY 1ChWpcsGI+LiDyxKCbOSVFqXfLiYW8mUvTwsBp9l3eSDEpHcmiSC3E0G+Lfbj+qsoBfQ jSw7B0i2fA9Ut245izIZp6axjh9LexA+o6yEItFdpq99DyA+R1CBiK7E6BRgacDQCNJk icbkotBn84+nHU8I86EyzqcCEUa9eDkIQNEAi9ls2PW5WV3IP+l4LroZ6+DxJreM2yA+ Xn1Q== X-Gm-Message-State: AO0yUKXp95/tSmL/2lf2WmAuC51Rc7Rg32kNAl+94q2/4EPWKbDdlfPK gD2qoFgd9aQsZSUHU7BW8ttwm32b6krYXT9MX1U= X-Google-Smtp-Source: AK7set+7Kzd/ECKrn/htJOK9E2+wlcFea30JpHdCxH0QFaLp42aG6kd7oRT8n0yPqLrXqbq9OHVM3A== X-Received: by 2002:a05:6a20:914c:b0:bd:2d4:ae12 with SMTP id x12-20020a056a20914c00b000bd02d4ae12mr12400386pzc.12.1676902752459; Mon, 20 Feb 2023 06:19:12 -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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.19.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:19:12 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 19/22] oeqa dump.py: add error counter and stop after 5 failures Date: Mon, 20 Feb 2023 04:18:26 -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 ; Mon, 20 Feb 2023 14:19:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177425 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 bcee03b576..d420b497f9 100644 --- a/meta/lib/oeqa/utils/dump.py +++ b/meta/lib/oeqa/utils/dump.py @@ -93,37 +93,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: @@ -137,4 +155,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 Mon Feb 20 14:18:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19829 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 7428AC64EC4 for ; Mon, 20 Feb 2023 14:19:20 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web11.14086.1676902755396186562 for ; Mon, 20 Feb 2023 06:19:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=1bHA7FnP; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id u10so1472526pjc.5 for ; Mon, 20 Feb 2023 06:19:15 -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=qdo5/QtSzW+PTDveKsD9vVBBlf+wSZS4OAiPhbvMEAY=; b=1bHA7FnP35KOSSaBts1mqaPkUpoR3f5S9cmIDKbZn+58KP5dTMjOOWJj61w96nr/Du 08pUwO2i0x2mvsH6sxx1Q8kQnswCdXKqI7hnfIKJAvLw9320du1YdKrSPAKdHNG+9Yz3 3a7568S7hTtDsCwTlMczmF6l6Z2XYQukBx4xWou7NQyQPVhp+S13aGe7nbb5Q6+AHpmI Dv5mSJWE26muhdmlOS1zRQU/uxNvyC5Tw3wa6uTrpvVOf/0gRGmyxcXfsFoKvJB+Smdr c9/visCSCriQZNz22T86dRZ9MGWfg1u7qNaeWfcnhBYy5xsKJl9CXwzjDwuPhL5RyV4i 6mMQ== 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=qdo5/QtSzW+PTDveKsD9vVBBlf+wSZS4OAiPhbvMEAY=; b=Tmx6E7/X6rfT3f64/JufarOmYb/SUGXCda2AcVMhHfr3+8Uo6ZxUE6hzzOBTYrl0TM 83xlPlHKhAQOBAaGlvkvJLKj4lMxkP022IwFA1kGwuzumOQkQgsmrTUJq5PCeSWx6bfC Zv82wI/lxdzl0fJE6Hw66+o1e/vMeKwyZTbQ4iv8x+kFxDycKYUyvArYc3PIWr0oxuPG eFmiDMIOTGYPWLsrE03wgW5J9FRQPS6JcylGXvSSHcSwG5E/rbK5uGVZytYbe0ePWNvh C2i0qWLh2CO3MjzWPDTIKjnMlnLO+JE+MQbgbe7jpHevkXQ8D/qEcoci4cCc+xqf2iyQ X62w== X-Gm-Message-State: AO0yUKWez5h2oU1P1A8alQ2+kEphypbJ9wkTNqUcW6qAdiqIPzPcTt7D kY/KSZhJWgWIJEf9mJYk3GHsFRy2gGfLvL80oQA= X-Google-Smtp-Source: AK7set+n4ggGWmJxDU4K6xvfKwF/5k2kz3r8H0Lfbsl1Xy0WNZvdFtXX0iu6GUAZBu07fIJqYc7Csw== X-Received: by 2002:a05:6a20:69aa:b0:c2:addd:b508 with SMTP id t42-20020a056a2069aa00b000c2adddb508mr1984014pzk.2.1676902754300; Mon, 20 Feb 2023 06:19:14 -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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.19.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:19:13 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 20/22] oeqa qemurunner: read more data at a time from serial Date: Mon, 20 Feb 2023 04:18:27 -1000 Message-Id: <62df87d3544b7fc3717743b131a62c6092359ec5.1676902605.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 ; Mon, 20 Feb 2023 14:19:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177426 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 c68974f25c..3aeef19434 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -198,7 +198,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) @@ -463,6 +463,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 Mon Feb 20 14:18:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19827 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 68F86C64EC7 for ; Mon, 20 Feb 2023 14:19:20 +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.14068.1676902738729478045 for ; Mon, 20 Feb 2023 06:19:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=GGMoIEqc; spf=softfail (domain: sakoman.com, ip: 209.85.215.180, mailfrom: steve@sakoman.com) Received: by mail-pg1-f180.google.com with SMTP id bm5so719630pgb.12 for ; Mon, 20 Feb 2023 06:19: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=VvV+fL1cUxzOvVEvWvWxCJlWye+sNpK/COiOL5YRgdU=; b=GGMoIEqc9fWTplQ+xc4Mqp5ySPoNwjhckUa6D0IUfKSxfg+mdFjMOCdcOYLzzuOlGo XxPiwp/Wb6XshBi7H9F9YYwpTbXTiDMtE+R+WRvOcKoJwKzJsu6dxJ8eqIbvekARC3f+ jc8n8Q42HeK4PIQObd4OywFc0+LRuWbE8lPRLYSA2sPAzynWmUuHE4y5eQwINXgbRGo7 fWek+qY7tjolbf/N1kUQLrCPULKvoAWcvHP5Oj0lURQJWiE/NzVq6OCkBfrg/2TvlASt JT0RgylX8QyZCHt41Lzci8bzKtthlt8bTpyqApBSZIr/FhOnR061sr7WB8eEiOhzfR3o DtLw== 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=VvV+fL1cUxzOvVEvWvWxCJlWye+sNpK/COiOL5YRgdU=; b=LKrYNSzpuaq9JqU6QL0cp5WQlzFbBAOO/UBeDirtqkagjRxaMX31tWKMmogY1mrY4k tkRrfRW2F2mSGL1r60L6QfbWX/8OZfJIn7QjfF8Th84diSiNLcDeakNB48JR8difFiLQ p/qRyXDoZQdst2ylCRHFjU0UF250ZRtLPF3FUrcZxHmmlapB0DJMcPspRr2kKFRhebyJ NlDgGcux6/rWag9Z1Lf9vRIgi5kiJpTbOeHHeeENVYpX5+i81I2tRZpKjmnVPBp5xDP+ nghX9Yi/pmuUn5Wi4mB3PRvQ1fbk6F2G5S9qK0yIn1aDDS3AiKhzAF3PMdceL2CzeOVC m6lA== X-Gm-Message-State: AO0yUKVaFLC88V6QAq3W2btfCgQwL7YbTCHs4pXIGsz2rxu3SbQZ3YN5 Fq4z3WLDXGlwwfg3pRCwvqIj0bjG9PX6DSAae4I= X-Google-Smtp-Source: AK7set8LJBd3rtqwdmHjNQ3r04ROpToXDff+Q28JIqMTEj/169BeiT9gU0ivuCxhQ381CE1/+32zcQ== X-Received: by 2002:aa7:9505:0:b0:593:ed9c:9f07 with SMTP id b5-20020aa79505000000b00593ed9c9f07mr977074pfp.27.1676902756067; Mon, 20 Feb 2023 06:19:16 -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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.19.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:19:15 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 21/22] oeqa qemurunner.py: add timeout to QMP calls Date: Mon, 20 Feb 2023 04:18:28 -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 ; Mon, 20 Feb 2023 14:19:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177427 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 3aeef19434..d21b0a275f 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -346,6 +346,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" % @@ -623,6 +625,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 Mon Feb 20 14:18:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19830 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 63355C636CC for ; Mon, 20 Feb 2023 14:19:20 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web10.13865.1676902758807710705 for ; Mon, 20 Feb 2023 06:19:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=xTWe4Fcb; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id g12so648966pfi.0 for ; Mon, 20 Feb 2023 06:19: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=PyqWoa3xzLASBdv0OFKUSWEn2FogIu3JhAgLX68lQos=; b=xTWe4FcbWFLE+Cg3tso+mKev+/9esdY38VAlkcqQPYdxnZCbn9PR8Eg4E5xuduP8Wa Bhv1p8DgHiHuV5+ecUa5b17iuaT5kjzSlAzw3XFDmRqFrTbau9UyGC/Ngsyy8NoZJfDU 5KsdEYaiD4LxwIkgje5fZQOuo4IaErqWRM6KT3jSJF9y0e0SyT3Ou/QLToxtQiteR/Px IL++oIC9CzEXf12EWhRu6274/o6DWnkB4/c7VeHG1qFg34a9NI9/Jyemcz3021/f6gxV b6XL8Bowwsvm5Lji6u2Ok2bb1RjEvrfjb98lq5RQMHA9xq/+JNoWczFufoT+fvLouasg SBRA== 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=PyqWoa3xzLASBdv0OFKUSWEn2FogIu3JhAgLX68lQos=; b=VcEFVr5bVPeSebJkcZgp60uImskWAxxA/z+GhY6eqq8cCbbgYv8rrOULq9hFzlPoTe 4gUnn3RuIR4j6WxD0tguZ/bDDvLIUfYbrg1CNlei4y3gEbS8ngzG1DbUPlS3EEkNETe5 yWe3xHFOWp1yFh0gV35LfRf67zxmXskGPgtvoDbn5auxx+daIcMkvChy/EhekGBFDkrK D0wKatbilqHYucKlYhh1UY42CUPn9DzLfVW7ZSngfbhnPoiY9XYSS/3t7/4sr3xnzs6Z BQY27GfGc9ezOGLZz77voK1B2p6QgoSCwSglMyxgLE2m8JjxT7gn93cn6bJzcp94RIDQ /9sw== X-Gm-Message-State: AO0yUKV0nYyTuBR37vcevAFukr3W3FStNNMEm7lk+vVOnt1yhP/lgfwq D1lUkrg6Ni9D5BrP1RYntbWdZq5jONvKaok0IQ4= X-Google-Smtp-Source: AK7set+RkU8fBAkUKFv7j8dgTSu++M1u1X6HvNFMeYIlxVECOHWmBwn+b5OrpyKoPxMuToSbLHUvtg== X-Received: by 2002:a62:1d4e:0:b0:5a9:c75f:bcbf with SMTP id d75-20020a621d4e000000b005a9c75fbcbfmr955594pfd.34.1676902757851; Mon, 20 Feb 2023 06:19: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 q19-20020a62e113000000b0058baf8694e1sm7789297pfh.71.2023.02.20.06.19.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:19:17 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 22/22] oeqa qemurunner.py: try to avoid reading one character at a time Date: Mon, 20 Feb 2023 04:18:29 -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 ; Mon, 20 Feb 2023 14:19:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177428 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 d21b0a275f..1aaba02bd8 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -653,6 +653,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')