From patchwork Thu Feb 1 19:37:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 38681 X-Patchwork-Delegate: steve@sakoman.com 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 CD335C4828D for ; Thu, 1 Feb 2024 19:37:52 +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.4993.1706816268826206498 for ; Thu, 01 Feb 2024 11:37:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Ixjtu6NG; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6da6b0eb2d4so1036170b3a.1 for ; Thu, 01 Feb 2024 11:37:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1706816268; x=1707421068; darn=lists.openembedded.org; 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=wT52is2XaklXDYp+mMofBi8B17TnCkzhVodRK1f5OaM=; b=Ixjtu6NGhKsnUp5k1QNCW74uG7x1FwIl4CcMd5H82M0bLnaQpVhQJcRTthh+kGS5i9 tSjXsqHymD68hykWnCiROL2pAnN1N2+QH0GVxoqInlGod+ofmOMPdYtHtuadSqqyQ5Ee YuPS89rd9ulIagkgN61Af3MWCdZ4ZQARYdS3THb1FnpQejMDycCWH6g4LbZ0ULTx9YR7 ZOZRvy/8woui57Scqz3N0Qb9dV5VLFHU8vTb9kJ9/WILhNEc1hQS2zjezLv9PkE7n9hy k7CzMJom2tegHdspMrT5yoi06lULNT3R2t9WC/vq25jkj4fUFF2XOUGo0uoQXmlcXcPt 4qzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706816268; x=1707421068; 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=wT52is2XaklXDYp+mMofBi8B17TnCkzhVodRK1f5OaM=; b=bwbHfC86kva23jtw1SJMOOvqfSSvaXDofds69PXblbxF0itDcN0VxjHL9KU0su85aL aYvIKfUOvOrwc3U10RAdxTBzvehTsZfFqlUOIgL+ODSRwi7dcUp5TqiasZggIYfrEnc7 polbw7NO+tlOo2ytwv6XKUidilUQLh57rpZ7or3cNq7GEvKnWe7zIRKmzp2mCe7TRcm5 tY/7XBxDzadHMlGT8+SAnDkPOT4+Vz8z4KJmR4F3si0qpaVT9jHfYU3+tTsjWSX7782n NQEXodWHjcSUpaBd/DTOV1Y6emRRe4zadEHAgO8+8UWNuw99eTnGZ4vOGNi+7TAJGmkU up5w== X-Gm-Message-State: AOJu0Yw/TcCeteIsQsWRIG53Z+ULCyeAxl81/oTfKmmck/Gg9v96AwrZ I415wchApRQbZ7BkY1rAIjOeJRt+0H7aDWwJGjSHKyuEdh4/Zky6rXirbB2qOMProO8K+ro+smA 4Ao4= X-Google-Smtp-Source: AGHT+IEvVYE2qsfv0fO61qsWlR7wXZy3W1hJrlw4diTH7Gy29KrSrC2PFePFKM7cpAw5Kc+bW4G3YQ== X-Received: by 2002:a05:6a00:6a04:b0:6de:3521:f046 with SMTP id hy4-20020a056a006a0400b006de3521f046mr5654947pfb.32.1706816267804; Thu, 01 Feb 2024 11:37:47 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id e10-20020a056a001a8a00b006dbdbe7f71csm109717pfv.98.2024.02.01.11.37.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 11:37:47 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 1/4] xwayland: Fix CVE-2023-6377 CVE-2023-6478 Date: Thu, 1 Feb 2024 09:37:39 -1000 Message-Id: <89974b7fa33f3e9d3e3a4df7ad219898fe400d3a.1706815725.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 ; Thu, 01 Feb 2024 19:37:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/194735 From: Lee Chee Yang Signed-off-by: Lee Chee Yang Signed-off-by: Steve Sakoman --- .../xwayland/xwayland/CVE-2023-6377.patch | 82 +++++++++++++++++++ .../xwayland/xwayland/CVE-2023-6478.patch | 66 +++++++++++++++ .../xwayland/xwayland_22.1.8.bb | 2 + 3 files changed, 150 insertions(+) create mode 100644 meta/recipes-graphics/xwayland/xwayland/CVE-2023-6377.patch create mode 100644 meta/recipes-graphics/xwayland/xwayland/CVE-2023-6478.patch diff --git a/meta/recipes-graphics/xwayland/xwayland/CVE-2023-6377.patch b/meta/recipes-graphics/xwayland/xwayland/CVE-2023-6377.patch new file mode 100644 index 0000000000..f650f495a3 --- /dev/null +++ b/meta/recipes-graphics/xwayland/xwayland/CVE-2023-6377.patch @@ -0,0 +1,82 @@ +CVE: CVE-2023-6377 +Upstream-Status: Backport [ https://gitlab.freedesktop.org/xorg/xserver/-/commit/19e9f199950aaa4b9b7696936d1b067475da999c ] +Signed-off-by: Lee Chee Yang + + +From 19e9f199950aaa4b9b7696936d1b067475da999c Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 28 Nov 2023 15:19:04 +1000 +Subject: [PATCH] Xi: allocate enough XkbActions for our buttons + +button->xkb_acts is supposed to be an array sufficiently large for all +our buttons, not just a single XkbActions struct. Allocating +insufficient memory here means when we memcpy() later in +XkbSetDeviceInfo we write into memory that wasn't ours to begin with, +leading to the usual security ooopsiedaisies. + +CVE-2023-6377, ZDI-CAN-22412, ZDI-CAN-22413 + +This vulnerability was discovered by: +Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + +(cherry picked from commit 0c1a93d319558fe3ab2d94f51d174b4f93810afd) +--- + Xi/exevents.c | 12 ++++++------ + dix/devices.c | 10 ++++++++++ + 2 files changed, 16 insertions(+), 6 deletions(-) + +diff --git a/Xi/exevents.c b/Xi/exevents.c +index dcd4efb3bc..54ea11a938 100644 +--- a/Xi/exevents.c ++++ b/Xi/exevents.c +@@ -611,13 +611,13 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to) + } + + if (from->button->xkb_acts) { +- if (!to->button->xkb_acts) { +- to->button->xkb_acts = calloc(1, sizeof(XkbAction)); +- if (!to->button->xkb_acts) +- FatalError("[Xi] not enough memory for xkb_acts.\n"); +- } ++ size_t maxbuttons = max(to->button->numButtons, from->button->numButtons); ++ to->button->xkb_acts = xnfreallocarray(to->button->xkb_acts, ++ maxbuttons, ++ sizeof(XkbAction)); ++ memset(to->button->xkb_acts, 0, maxbuttons * sizeof(XkbAction)); + memcpy(to->button->xkb_acts, from->button->xkb_acts, +- sizeof(XkbAction)); ++ from->button->numButtons * sizeof(XkbAction)); + } + else { + free(to->button->xkb_acts); +diff --git a/dix/devices.c b/dix/devices.c +index 7150734a58..20fef16923 100644 +--- a/dix/devices.c ++++ b/dix/devices.c +@@ -2530,6 +2530,8 @@ RecalculateMasterButtons(DeviceIntPtr slave) + + if (master->button && master->button->numButtons != maxbuttons) { + int i; ++ int last_num_buttons = master->button->numButtons; ++ + DeviceChangedEvent event = { + .header = ET_Internal, + .type = ET_DeviceChanged, +@@ -2540,6 +2542,14 @@ RecalculateMasterButtons(DeviceIntPtr slave) + }; + + master->button->numButtons = maxbuttons; ++ if (last_num_buttons < maxbuttons) { ++ master->button->xkb_acts = xnfreallocarray(master->button->xkb_acts, ++ maxbuttons, ++ sizeof(XkbAction)); ++ memset(&master->button->xkb_acts[last_num_buttons], ++ 0, ++ (maxbuttons - last_num_buttons) * sizeof(XkbAction)); ++ } + + memcpy(&event.buttons.names, master->button->labels, maxbuttons * + sizeof(Atom)); +-- +GitLab + diff --git a/meta/recipes-graphics/xwayland/xwayland/CVE-2023-6478.patch b/meta/recipes-graphics/xwayland/xwayland/CVE-2023-6478.patch new file mode 100644 index 0000000000..23fbc0e9e2 --- /dev/null +++ b/meta/recipes-graphics/xwayland/xwayland/CVE-2023-6478.patch @@ -0,0 +1,66 @@ +CVE: CVE-2023-6478 +Upstream-Status: Backport [ https://gitlab.freedesktop.org/xorg/xserver/-/commit/aaf854fb25541380cc38a221c15f0e8372f48872 ] +Signed-off-by: Lee Chee Yang + + +From aaf854fb25541380cc38a221c15f0e8372f48872 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Mon, 27 Nov 2023 16:27:49 +1000 +Subject: [PATCH] randr: avoid integer truncation in length check of + ProcRRChange*Property + +Affected are ProcRRChangeProviderProperty and ProcRRChangeOutputProperty. +See also xserver@8f454b79 where this same bug was fixed for the core +protocol and XI. + +This fixes an OOB read and the resulting information disclosure. + +Length calculation for the request was clipped to a 32-bit integer. With +the correct stuff->nUnits value the expected request size was +truncated, passing the REQUEST_FIXED_SIZE check. + +The server then proceeded with reading at least stuff->num_items bytes +(depending on stuff->format) from the request and stuffing whatever it +finds into the property. In the process it would also allocate at least +stuff->nUnits bytes, i.e. 4GB. + +CVE-2023-6478, ZDI-CAN-22561 + +This vulnerability was discovered by: +Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + +(cherry picked from commit 14f480010a93ff962fef66a16412fafff81ad632) +--- + randr/rrproperty.c | 2 +- + randr/rrproviderproperty.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/randr/rrproperty.c b/randr/rrproperty.c +index 25469f57b2..c4fef8a1f6 100644 +--- a/randr/rrproperty.c ++++ b/randr/rrproperty.c +@@ -530,7 +530,7 @@ ProcRRChangeOutputProperty(ClientPtr client) + char format, mode; + unsigned long len; + int sizeInBytes; +- int totalSize; ++ uint64_t totalSize; + int err; + + REQUEST_AT_LEAST_SIZE(xRRChangeOutputPropertyReq); +diff --git a/randr/rrproviderproperty.c b/randr/rrproviderproperty.c +index b79c17f9bf..90c5a9a933 100644 +--- a/randr/rrproviderproperty.c ++++ b/randr/rrproviderproperty.c +@@ -498,7 +498,7 @@ ProcRRChangeProviderProperty(ClientPtr client) + char format, mode; + unsigned long len; + int sizeInBytes; +- int totalSize; ++ uint64_t totalSize; + int err; + + REQUEST_AT_LEAST_SIZE(xRRChangeProviderPropertyReq); +-- +GitLab + diff --git a/meta/recipes-graphics/xwayland/xwayland_22.1.8.bb b/meta/recipes-graphics/xwayland/xwayland_22.1.8.bb index 94797be8e0..e6e17d7da5 100644 --- a/meta/recipes-graphics/xwayland/xwayland_22.1.8.bb +++ b/meta/recipes-graphics/xwayland/xwayland_22.1.8.bb @@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz \ file://CVE-2023-5367.patch \ + file://CVE-2023-6377.patch \ + file://CVE-2023-6478.patch \ " SRC_URI[sha256sum] = "d11eeee73290b88ea8da42a7d9350dedfaba856ce4ae44e58c045ad9ecaa2f73" From patchwork Thu Feb 1 19:37:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 38678 X-Patchwork-Delegate: steve@sakoman.com 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 D6ADEC48292 for ; Thu, 1 Feb 2024 19:37:52 +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.4928.1706816270366682710 for ; Thu, 01 Feb 2024 11:37:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=KvwGizEd; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-6ddcfda697cso1044594b3a.2 for ; Thu, 01 Feb 2024 11:37:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1706816269; x=1707421069; darn=lists.openembedded.org; 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=9KPsYFMC2RMX4mOQCkuVY2LJZQ9jKLXgUsYwnTMwXQs=; b=KvwGizEd3xuUu449oE4TKAwsrmGcGRNtXKm+35lf9l0a9jvVxmFPKPSKrW3M1atUJc Z+Sq7jRlITfrzwsIZS6f0vV4rUh6GA8fuUHw5K+HDT3JfKZoJ2LRixcCMISbU4E+Xlpz /2MFrLFKpceRBAhx8aVQfhIi3PzPvg/c2Lj6otZO7oYdI8RYozThYTExS348IGWKq6+p udrpGGnnFaEZV3WWfh49TW5rf4P0DZeZrPr23Hd0baROLI+M0NYyk7jW1KdG+DcrFx/z hHQku9x1IpCgHrGZt1mY8LReUgUQWQG8Y5bWeStovtvMgFBdUbdd21bg1GJCNMrO73Pi 9VXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706816269; x=1707421069; 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=9KPsYFMC2RMX4mOQCkuVY2LJZQ9jKLXgUsYwnTMwXQs=; b=u5K8p5htlOSJD+f4ECuqMaHt2agc7sC79u4y4o+LWnvSdm/z0hh9uhQ1zJzdHARroL GBY9rkjMHWlF7GVuir7CHGzKIf0WbFDLYWkzVl0Ukulinkjnspzdufh6g1BHNXR/Yqdx FQ+/vgCJ7nDDDEy142igbmX87gw1vGNgEOcN81d7nEIKyimLrKuBWJOhzTS1q4GVhRw1 Y9iNhjVyz4S6jWtpcBdL1o/yalh09sPrUUI7uFD1uDCDO1Xy8F2sm8lF09bjPjTdx9Lt Kmh2D71mKmtX28l0SCfRY3QOd3X+XyiMSmXS25MLybZEbu0/szwmvBlg+GBW5BQjUlzS 1cIA== X-Gm-Message-State: AOJu0YwQ59e/5Ywb91ZwP4uxGLMDtz9/n43TW9ZoSAw9+2ybi4bVUxnm OJwJnQ2WYEwR91BOEAV00bVBLLrFVvleVbivANiGVwMVpNueEcp5h+jLaO/rxAFhTIFlO4h29Ma BtO0= X-Google-Smtp-Source: AGHT+IGs0i8XZYduArjf5yaRjgXMeXldFvMZUv13FtDAMy0WshMf8J3x6AExFn7GFk+jGUvTkt58jw== X-Received: by 2002:a05:6a00:26df:b0:6de:325d:8ed9 with SMTP id p31-20020a056a0026df00b006de325d8ed9mr5985153pfw.29.1706816269374; Thu, 01 Feb 2024 11:37:49 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id e10-20020a056a001a8a00b006dbdbe7f71csm109717pfv.98.2024.02.01.11.37.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 11:37:49 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 2/4] python3-jinja2: upgrade 3.1.1 -> 3.1.2 Date: Thu, 1 Feb 2024 09:37:40 -1000 Message-Id: <90960bdef877c5dc03cc2cb03c77139d6d1e2f8f.1706815725.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 ; Thu, 01 Feb 2024 19:37:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/194736 From: Alexander Kanavin (cherry picked from OE-Core rev: 1e58fa1fff649a4ab07290d2b0e5a8d69d51ef16) Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie Signed-off-by: Lee Chee Yang Signed-off-by: Steve Sakoman --- .../python/{python3-jinja2_3.1.1.bb => python3-jinja2_3.1.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/python/{python3-jinja2_3.1.1.bb => python3-jinja2_3.1.2.bb} (92%) diff --git a/meta/recipes-devtools/python/python3-jinja2_3.1.1.bb b/meta/recipes-devtools/python/python3-jinja2_3.1.2.bb similarity index 92% rename from meta/recipes-devtools/python/python3-jinja2_3.1.1.bb rename to meta/recipes-devtools/python/python3-jinja2_3.1.2.bb index c38686a5c2..80e0b85670 100644 --- a/meta/recipes-devtools/python/python3-jinja2_3.1.1.bb +++ b/meta/recipes-devtools/python/python3-jinja2_3.1.2.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://pypi.org/project/Jinja2/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" -SRC_URI[sha256sum] = "640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9" +SRC_URI[sha256sum] = "31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852" PYPI_PACKAGE = "Jinja2" From patchwork Thu Feb 1 19:37:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 38679 X-Patchwork-Delegate: steve@sakoman.com 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 C0D97C48286 for ; Thu, 1 Feb 2024 19:37:52 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web10.4994.1706816272066126837 for ; Thu, 01 Feb 2024 11:37:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=g33+Sr4/; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-5d8b887bb0cso1266970a12.2 for ; Thu, 01 Feb 2024 11:37:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1706816271; x=1707421071; darn=lists.openembedded.org; 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=CCgeSMo2GrdKd9NM2kE6AqcH1XztEURMksl8Rv2UWbg=; b=g33+Sr4/061b44cSDI9wZdXQPGJ1ZEnQv56BvOTW2+1569ugRB3I+9MFmGgVugUyAb wGbfrOr4iphVBlzGCJjO5Ryx1xK1Ef/IxFl3rsWl/8A0aoz7cyi94F9CpELVnCeCyR7q OVV3tDrgdFt2mVg9y2L+HAxQ69UXeL4x5d2OtIfLW7AvxNbtP5REMp+MPgRRx20F6tdv 6hJO41N+6ikdnz8L6is2YqtRgSv+REtyDwvv4GCqqCmgvJwXJ2Nsq9srDR81LpFSE0OV BW6J/gMIHSqvUqOSYTayrMFjujxw6WURcZOg41yN2Gaw+tmMOij6VUQGc7AJmK2MXgew M3ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706816271; x=1707421071; 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=CCgeSMo2GrdKd9NM2kE6AqcH1XztEURMksl8Rv2UWbg=; b=utuyLd8NyuyFgg7w1YOnzUkyfTBsu8/PSNobzaC2WOxJdNsSpqIDTBL5DrXoo38hwB KDZFYpGGyquEJxc9H4H8FB8Z5cO0K34MiXedtu3ZP3Kj5kIqodfek3b2tCx7VbRe5vDP Ca2xXVWq2BGb0ENeatWMcZNda7vqLv7t0MsrrDGcLW8Ph/8oXwAjtd4DgnmdBQsT/Nad EV1z1jUULgYCttaus6YLAId+j41Mu6JNf3S+SkduuEWE0eNyWeYgeyWJrqYXIAFfcsp5 B081djttcOa7IPD7SR+6O5VpwOVlwLs1NjNKdXJKafA+esHCavaHtWzsuaS0Tdwg7OO8 V8XA== X-Gm-Message-State: AOJu0YxIihBN2OvqUjVtt8zdyVPDGqcDVPYI9nFe5WDlCz56NX/9n972 vB3uyACPyPZmYZar/FO1SH4sJhUvo7a2SOyJdAmK05H8oJxs4bVkf70oZGxlP3KMtyo8mMsSDMK iQG0= X-Google-Smtp-Source: AGHT+IFgD9mc/5U8H9pXiRuElePj76wf/YBI9LhPuPG8iYi1KO9eBv7tiU+SAt8Ri2a8PespjwlzuQ== X-Received: by 2002:a05:6a20:47ce:b0:19c:9219:f3eb with SMTP id ey14-20020a056a2047ce00b0019c9219f3ebmr5820591pzb.37.1706816271085; Thu, 01 Feb 2024 11:37:51 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id e10-20020a056a001a8a00b006dbdbe7f71csm109717pfv.98.2024.02.01.11.37.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 11:37:50 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 3/4] python3-jinja2: upgrade 3.1.2 -> 3.1.3 Date: Thu, 1 Feb 2024 09:37:41 -1000 Message-Id: <0f0dcf520505d809599a63961ecb5b1e74053b24.1706815725.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 ; Thu, 01 Feb 2024 19:37:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/194737 From: Wang Mingyu Changelog: ========== -Fix compiler error when checking if required blocks in parent templates are empty. -xmlattr filter does not allow keys with spaces. -Make error messages stemming from invalid nesting of {% trans %} blocks more helpful (cherry picked from OE-Core rev: 8a0524464583d69df7746253f5020c2c125a8e1f) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie Signed-off-by: Lee Chee Yang Signed-off-by: Steve Sakoman --- .../python/{python3-jinja2_3.1.2.bb => python3-jinja2_3.1.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/python/{python3-jinja2_3.1.2.bb => python3-jinja2_3.1.3.bb} (92%) diff --git a/meta/recipes-devtools/python/python3-jinja2_3.1.2.bb b/meta/recipes-devtools/python/python3-jinja2_3.1.3.bb similarity index 92% rename from meta/recipes-devtools/python/python3-jinja2_3.1.2.bb rename to meta/recipes-devtools/python/python3-jinja2_3.1.3.bb index 80e0b85670..068e21bf5f 100644 --- a/meta/recipes-devtools/python/python3-jinja2_3.1.2.bb +++ b/meta/recipes-devtools/python/python3-jinja2_3.1.3.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://pypi.org/project/Jinja2/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" -SRC_URI[sha256sum] = "31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852" +SRC_URI[sha256sum] = "ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90" PYPI_PACKAGE = "Jinja2" From patchwork Thu Feb 1 19:37:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 38682 X-Patchwork-Delegate: steve@sakoman.com 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 D7130C4828D for ; Thu, 1 Feb 2024 19:38:02 +0000 (UTC) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web11.4931.1706816273591653789 for ; Thu, 01 Feb 2024 11:37:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=cpM23bhn; spf=softfail (domain: sakoman.com, ip: 209.85.210.171, mailfrom: steve@sakoman.com) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-6ddc0c02665so863435b3a.0 for ; Thu, 01 Feb 2024 11:37:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1706816273; x=1707421073; darn=lists.openembedded.org; 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=vl0eAIhiGYkZlRENrZneh2pD0ndVybEqit5a4twiuqw=; b=cpM23bhnOABz07SbW4X2rDhS4IwObklCjm8aWdzPRFCgeVNy2GU7USDNw1N0giuhNe dxVPSxxapSqdhMsg6ARmgA836Vkb74FBzvvGR/jLxB9j6SqCR42Ue4GLyrv2Da38bDQV XsK4mq9MExzUn4OdAyGveM4YWubMN5zc1AgeHL8eEbsPjMkUiznq0trp3mSTBv4WaqNq wBKYXVz83l1z2c0Qa6AgLtW0STdNE/PQJkxzITdX8NgRcOzTEHbZlCsSJPCXOVRrS7yb HZqSgAT62/nCy0IE0i0BugpKEpN6VdTjazgqLxJqcIkJRRENpDvvTMk+q9cS0PJiAx/Y /Iew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706816273; x=1707421073; 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=vl0eAIhiGYkZlRENrZneh2pD0ndVybEqit5a4twiuqw=; b=kbe80FsG8WzyRCR2b2+m17jmCswB8A7+4IseAX0RRWJWFfKAool3Jr/bWIR4u7Cceq AXCnNtkyAlt9PqsoiLbiNyZMOYlwVMdLPMBKOe3BCmgkXtQjqiDmvcw2GJ1KuaAUcik7 Tb4NA0NwNsDvJ3z3/B2yIovYbmtCc8yJaOSFJMccW75QtD8sEJ4Szi9T3IW7CNDhfQrd k22jizBT+XefNqnOIeohC02WzcV5c0GrTTIJkbAYKT8WOZZKIaVA6OGkM9Gdh5f4lP1W Dy8sLFre1MdcuLaLzZGmwQVU0mDJtmsfaxmuKXcN/taC5EbBh+JdQxawnjKm7NrHvt1o GHxw== X-Gm-Message-State: AOJu0YyFghgqmWsc7Q1PmARlE59CWW5KAD8DPx0zstx6ThQ1sMBAC1BY k6Sy97IdYKQGfc+seoxEylTWC3CCkkbZ5hUPnJf0L5/ln5xgX9OgRk29XyQCNEopj0yFvQtlv7l 0Ejo= X-Google-Smtp-Source: AGHT+IHn/pdGWytbMYdz1cNHf2fV8jYIMcy+uOEX3FnCDl4ZC++xa4beAPzVJu80arXCIwbiXfZ42Q== X-Received: by 2002:a05:6a00:3206:b0:6db:b287:d43c with SMTP id bm6-20020a056a00320600b006dbb287d43cmr114876pfb.24.1706816272679; Thu, 01 Feb 2024 11:37:52 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id e10-20020a056a001a8a00b006dbdbe7f71csm109717pfv.98.2024.02.01.11.37.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 11:37:52 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 4/4] image-live.bbclass: LIVE_ROOTFS_TYPE support compression Date: Thu, 1 Feb 2024 09:37:42 -1000 Message-Id: <60d88989698968c13f8e641f0ba1a82fcf700fb7.1706815725.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 ; Thu, 01 Feb 2024 19:38:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/194738 From: Ludovic Jozeau The task for fstypes with compression is the same as the task for the uncompressed fstypes, e.g. when adding tar.xz to `IMAGE_FSTYPES`, it will be included into the do_image_tar task and not creating a separate do_image_tar.xz task. This commit fixes `LIVE_ROOTFS_TYPE` with compressed fstypes by depending on the actual task instead of the non-existent do_image_. task. Fixes [YOCTO #15331] Signed-off-by: Ludovic Jozeau Reviewed-by: Yoann Congal Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 67c507e3d42e52a6d452c4a453eeaf7f2e2d68d6) Signed-off-by: Steve Sakoman --- meta/classes/image-live.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass index 2c948190cf..c0c1fb31ac 100644 --- a/meta/classes/image-live.bbclass +++ b/meta/classes/image-live.bbclass @@ -30,7 +30,7 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \ virtual/kernel:do_deploy \ ${MLPREFIX}syslinux:do_populate_sysroot \ syslinux-native:do_populate_sysroot \ - ${@'%s:do_image_%s' % (d.getVar('PN'), d.getVar('LIVE_ROOTFS_TYPE').replace('-', '_')) if d.getVar('ROOTFS') else ''} \ + ${@'%s:do_image_%s' % (d.getVar('PN'), d.getVar('LIVE_ROOTFS_TYPE').replace('-', '_').split('.')[0]) if d.getVar('ROOTFS') else ''} \ "