From patchwork Tue Oct 15 18:50:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 50724 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 ADAE8D1F9A2 for ; Tue, 15 Oct 2024 18:51:10 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web11.4783.1729018263770644795 for ; Tue, 15 Oct 2024 11:51:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=xn8yoYXZ; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-71e592d7f6eso2046408b3a.3 for ; Tue, 15 Oct 2024 11:51:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1729018263; x=1729623063; 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=Fyu0BJXC2Xhje3ifuya7XT7eepCZnL7ypb3nNV8clYY=; b=xn8yoYXZqmMlRefkDfZyHcqufjXr+eSOjIsj+UkRv1wDQWNA0BjG05U+qqcfgNPrmo LuJ8OH3u9mthbkGXdl2TkeGrcM3rebhUuNICMTA8z+ymhRUSiQltzr+Sa9onL78+A1pM vqujlpOp5pILOKut97qKFxoNi49f7iUiiQQ/UnsqaEyyNViiSgcq2/Jt74+G8Z6JjiUC Pg3Pd/5dLyHrDCBbC5Tciy4DH9RpqwfhmaoFSgl1hVhvz8+21mz/EmaJ2SLWvYDo36lu Jytqdl2VsXb5Ukgs/cstr49bvEeafbvl/TOsiTLA0TvnQ0uiNnTLaW8j3J5lbR8q6Wxx KYKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729018263; x=1729623063; 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=Fyu0BJXC2Xhje3ifuya7XT7eepCZnL7ypb3nNV8clYY=; b=Cg53JOfGllXY7Yk8OLO9mj9szeAWdgKx3jOOMUK08XLHHopzX64i5EzdXV0haWGCuA iKXQQwDwhEmdCk1bNA7GBByiQf/nyBZ/eqV+O/6DCSZ4QtrBgK7yNZxmIXrXhYiLDVEr jhQFGnouUjDu4u3TrRq8lIhuEwpYWh2G6DxSI6hetP2ZHXMTp+5tCk/xtWoVEza2J/0H wXAK9he9oPCKlUbDS7yZB8QMnZMz+wj5XyS6vKZlXS9fliiaQOXQTSW2VCiUWK/rzDSU vYMXsBlEno5v4Vyj5kaBToikOTCIrI0sBj+qX2SaZDCiWjrZXgKhrq3W96bZMAsBqPrl 6xzQ== X-Gm-Message-State: AOJu0Yx3kgBau1UQmhOS3R1o5EOJQaCXnAxCqv2A+u/VB7COSO6KHx/Q v2JebJPHCmmeWisu0hfuuFY/+daTqqS7mrwi2+u4WiwfgGCY7K7vMVOMExBX4ayhtYTXFQqWdGY Z X-Google-Smtp-Source: AGHT+IEBLzui2OHgEIXJqHH6sMOHuB2uuWmxiHbxz2DTnEazLHxP7kTzd06nKTkCS3CppID+ScqBPg== X-Received: by 2002:a05:6a21:3946:b0:1d4:eb96:8685 with SMTP id adf61e73a8af0-1d8c96c2cc2mr21985855637.45.1729018262831; Tue, 15 Oct 2024 11:51:02 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e773717b9sm1616187b3a.9.2024.10.15.11.51.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 11:51:02 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 01/18] rust: ignore CVE-2024-43402 Date: Tue, 15 Oct 2024 11:50:37 -0700 Message-Id: <6ed9968bf3e35aca316227ee23294c683f77055d.1729018153.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Oct 2024 18:51:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205925 From: Peter Marko This CVE was created because fix for CVE-2024-24576 was incomplete. Ignore the new CVE in the same way as the old one. See https://nvd.nist.gov/vuln/detail/CVE-2024-43402 Signed-off-by: Peter Marko Signed-off-by: Steve Sakoman --- meta/recipes-devtools/rust/rust-source.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index b14221b6cb..8a8e48b8ca 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -22,3 +22,4 @@ UPSTREAM_CHECK_URI = "https://forge.rust-lang.org/infra/other-installation-metho UPSTREAM_CHECK_REGEX = "rustc-(?P\d+(\.\d+)+)-src" CVE_STATUS[CVE-2024-24576] = "not-applicable-platform: Issue only applies on Windows" +CVE_STATUS[CVE-2024-43402] = "not-applicable-platform: Issue only applies on Windows" From patchwork Tue Oct 15 18:50:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 50723 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 ABEF8D1D89D for ; Tue, 15 Oct 2024 18:51: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.4785.1729018265819918203 for ; Tue, 15 Oct 2024 11:51:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=nYcS59Kc; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-7ea78037b7eso2611931a12.0 for ; Tue, 15 Oct 2024 11:51:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1729018265; x=1729623065; 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=cX4uEgNwO9DLgIgjziCwyDYvL3DTPR5pqATKlemMjeE=; b=nYcS59KcbzAZZ5emA7IalL8kspTOY5aWQ0xMOkTiS3/w2vm+4Yvou0pMKo4pLfKrX3 R4ZYLs+9+Wl8gdeofB4K11bObVXK92f0c7PwG5Y6u3HKjdEDIQcFmG+QOIHnu0rYpaUl vn9Y44hQGru76SfPblgp2QR5ftS2CqUUs/JEEKyx5S73OC6qyItqDSXhVB/oEHMhoqHA lugEQNxIa1nSFvBCLg2v2DELcRpOIt9yh1u3uZ6qvsK0h2iNxQe5mTv8b868qpnvJN5P g1OwlRZ0dwekaEV1RaKv4GZn4qYVNKclYipreXN7neFpc7GdYEvbmAfRfz6xfQZdoiyY UhyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729018265; x=1729623065; 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=cX4uEgNwO9DLgIgjziCwyDYvL3DTPR5pqATKlemMjeE=; b=va5I7GkOWRobz7ZxECjgPhmWiZ18nCi7/mSkm3Si5mda+JHSC4gXISTGpQ4gC93plj Htqotrq1VfF4031dKFmbvxMNGga4Z65gi9g8U0bDTzcgCE/Oxd8/tyemuEUfwn6cAezj uu5qjEMcj4KgNY65Nrh9tzpfYLS8F6cAsSfNO1Bz/BrDxaPqtyxj3g6F2mO5GHA+Bc0x kZR9YG4v3jzp7ga2ZtnZWgYsI93veOogQDriuDyMfbwsSKi2ZCACDXNH5FI8ncvU1HYJ Ojw9VMyfe+D4+137DrngVcBQuBZZcxCzqDPAwkYbB9oQVvlZt4MVyIe8aYnB3cQsGxKU NKMQ== X-Gm-Message-State: AOJu0YzJK4L0Azh8NAHTVVZMYZN9zvCIpoXcfEG85nPUWlGQ7C8k+t+c cRgP33wXOBPSDL8TeuwzffRbSloFIGOvX1NAkC9ut3+8JMFrC8YSTREZeNIl17oXnryM1oPn+sN e X-Google-Smtp-Source: AGHT+IHAIv6bJ5VOe9ZhuehB7lrMTVZex7sQK9iu6rbxLhCCyYq7K/jIsXeq+k3W4tjj324sEh7SEQ== X-Received: by 2002:a05:6a20:b58b:b0:1d8:a6bb:2760 with SMTP id adf61e73a8af0-1d8bcfc225dmr24634284637.47.1729018264526; Tue, 15 Oct 2024 11:51:04 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e773717b9sm1616187b3a.9.2024.10.15.11.51.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 11:51:04 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 02/18] cups: Backport fix for CVE-2024-47175 Date: Tue, 15 Oct 2024 11:50:38 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Oct 2024 18:51:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205926 From: Hitendra Prajapati Upstream-Status: Backport from https://github.com/OpenPrinting/cups/commit/9939a70b750edd9d05270060cc5cf62ca98cfbe5 & https://github.com/OpenPrinting/cups/commit/04bb2af4521b56c1699a2c2431c56c05a7102e69 & https://github.com/OpenPrinting/cups/commit/e0630cd18f76340d302000f2bf6516e99602b844 & https://github.com/OpenPrinting/cups/commit/1e6ca5913eceee906038bc04cc7ccfbe2923bdfd & https://github.com/OpenPrinting/cups/commit/2abe1ba8a66864aa82cd9836b37e57103b8e1a3b Reference: https://security-tracker.debian.org/tracker/CVE-2024-47175 Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- meta/recipes-extended/cups/cups.inc | 5 + .../cups/cups/CVE-2024-47175-1.patch | 73 +++++ .../cups/cups/CVE-2024-47175-2.patch | 151 +++++++++++ .../cups/cups/CVE-2024-47175-3.patch | 119 +++++++++ .../cups/cups/CVE-2024-47175-4.patch | 249 ++++++++++++++++++ .../cups/cups/CVE-2024-47175-5.patch | 40 +++ 6 files changed, 637 insertions(+) create mode 100644 meta/recipes-extended/cups/cups/CVE-2024-47175-1.patch create mode 100644 meta/recipes-extended/cups/cups/CVE-2024-47175-2.patch create mode 100644 meta/recipes-extended/cups/cups/CVE-2024-47175-3.patch create mode 100644 meta/recipes-extended/cups/cups/CVE-2024-47175-4.patch create mode 100644 meta/recipes-extended/cups/cups/CVE-2024-47175-5.patch diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index b70ba3ae58..5590eb0fa0 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -15,6 +15,11 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/cups-${PV}-source.tar.gz \ file://0004-cups-fix-multilib-install-file-conflicts.patch \ file://volatiles.99_cups \ file://cups-volatiles.conf \ + file://CVE-2024-47175-1.patch \ + file://CVE-2024-47175-2.patch \ + file://CVE-2024-47175-3.patch \ + file://CVE-2024-47175-4.patch \ + file://CVE-2024-47175-5.patch \ " GITHUB_BASE_URI = "https://github.com/OpenPrinting/cups/releases" diff --git a/meta/recipes-extended/cups/cups/CVE-2024-47175-1.patch b/meta/recipes-extended/cups/cups/CVE-2024-47175-1.patch new file mode 100644 index 0000000000..8ec720ea0d --- /dev/null +++ b/meta/recipes-extended/cups/cups/CVE-2024-47175-1.patch @@ -0,0 +1,73 @@ +From 9939a70b750edd9d05270060cc5cf62ca98cfbe5 Mon Sep 17 00:00:00 2001 +From: Michael R Sweet +Date: Mon, 9 Sep 2024 10:03:10 -0400 +Subject: [PATCH] Mirror IPP Everywhere printer changes from master. + +Upstream-Status: Backport [https://github.com/OpenPrinting/cups/commit/9939a70b750edd9d05270060cc5cf62ca98cfbe5] +CVE: CVE-2024-47175 +Signed-off-by: Hitendra Prajapati +--- + cups/ppd-cache.c | 10 +++++----- + scheduler/ipp.c | 7 +++++++ + 2 files changed, 12 insertions(+), 5 deletions(-) + +diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c +index e750fcc..cd2d6cb 100644 +--- a/cups/ppd-cache.c ++++ b/cups/ppd-cache.c +@@ -3317,10 +3317,10 @@ _ppdCreateFromIPP2( + } + cupsFilePuts(fp, "\"\n"); + +- if ((attr = ippFindAttribute(supported, "printer-more-info", IPP_TAG_URI)) != NULL) ++ if ((attr = ippFindAttribute(supported, "printer-more-info", IPP_TAG_URI)) != NULL && ippValidateAttribute(attr)) + cupsFilePrintf(fp, "*APSupplies: \"%s\"\n", ippGetString(attr, 0, NULL)); + +- if ((attr = ippFindAttribute(supported, "printer-charge-info-uri", IPP_TAG_URI)) != NULL) ++ if ((attr = ippFindAttribute(supported, "printer-charge-info-uri", IPP_TAG_URI)) != NULL && ippValidateAttribute(attr)) + cupsFilePrintf(fp, "*cupsChargeInfoURI: \"%s\"\n", ippGetString(attr, 0, NULL)); + + if ((attr = ippFindAttribute(supported, "printer-strings-uri", IPP_TAG_URI)) != NULL) +@@ -3389,10 +3389,10 @@ _ppdCreateFromIPP2( + if (ippGetBoolean(ippFindAttribute(supported, "job-accounting-user-id-supported", IPP_TAG_BOOLEAN), 0)) + cupsFilePuts(fp, "*cupsJobAccountingUserId: True\n"); + +- if ((attr = ippFindAttribute(supported, "printer-privacy-policy-uri", IPP_TAG_URI)) != NULL) ++ if ((attr = ippFindAttribute(supported, "printer-privacy-policy-uri", IPP_TAG_URI)) != NULL && ippValidateAttribute(attr)) + cupsFilePrintf(fp, "*cupsPrivacyURI: \"%s\"\n", ippGetString(attr, 0, NULL)); + +- if ((attr = ippFindAttribute(supported, "printer-mandatory-job-attributes", IPP_TAG_KEYWORD)) != NULL) ++ if ((attr = ippFindAttribute(supported, "printer-mandatory-job-attributes", IPP_TAG_KEYWORD)) != NULL && ippValidateAttribute(attr)) + { + char prefix = '\"'; // Prefix for string + +@@ -3410,7 +3410,7 @@ _ppdCreateFromIPP2( + cupsFilePuts(fp, "\"\n"); + } + +- if ((attr = ippFindAttribute(supported, "printer-requested-job-attributes", IPP_TAG_KEYWORD)) != NULL) ++ if ((attr = ippFindAttribute(supported, "printer-requested-job-attributes", IPP_TAG_KEYWORD)) != NULL && ippValidateAttribute(attr)) + { + char prefix = '\"'; // Prefix for string + +diff --git a/scheduler/ipp.c b/scheduler/ipp.c +index 37623c5..836e41d 100644 +--- a/scheduler/ipp.c ++++ b/scheduler/ipp.c +@@ -5417,6 +5417,13 @@ create_local_bg_thread( + } + } + ++ // Validate response from printer... ++ if (!ippValidateAttributes(response)) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "%s: Printer returned invalid data: %s", printer->name, cupsLastErrorString()); ++ return (NULL); ++ } ++ + // TODO: Grab printer icon file... + httpClose(http); + +-- +2.25.1 + diff --git a/meta/recipes-extended/cups/cups/CVE-2024-47175-2.patch b/meta/recipes-extended/cups/cups/CVE-2024-47175-2.patch new file mode 100644 index 0000000000..11e8209626 --- /dev/null +++ b/meta/recipes-extended/cups/cups/CVE-2024-47175-2.patch @@ -0,0 +1,151 @@ +From 04bb2af4521b56c1699a2c2431c56c05a7102e69 Mon Sep 17 00:00:00 2001 +From: Michael R Sweet +Date: Mon, 9 Sep 2024 14:05:42 -0400 +Subject: [PATCH] Refactor make-and-model code. + +Upstream-Status: Backport [https://github.com/OpenPrinting/cups/commit/04bb2af4521b56c1699a2c2431c56c05a7102e69] +CVE: CVE-2024-47175 +Signed-off-by: Hitendra Prajapati +--- + cups/ppd-cache.c | 103 +++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 87 insertions(+), 16 deletions(-) + +diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c +index cd2d6cb..a4d7403 100644 +--- a/cups/ppd-cache.c ++++ b/cups/ppd-cache.c +@@ -3197,9 +3197,10 @@ _ppdCreateFromIPP2( + ipp_t *media_col, /* Media collection */ + *media_size; /* Media size collection */ + char make[256], /* Make and model */ +- *model, /* Model name */ ++ *mptr, /* Pointer into make and model */ + ppdname[PPD_MAX_NAME]; + /* PPD keyword */ ++ const char *model; /* Model name */ + int i, j, /* Looping vars */ + count, /* Number of values */ + bottom, /* Largest bottom margin */ +@@ -3260,34 +3261,104 @@ _ppdCreateFromIPP2( + } + + /* +- * Standard stuff for PPD file... ++ * Get a sanitized make and model... + */ + +- cupsFilePuts(fp, "*PPD-Adobe: \"4.3\"\n"); +- cupsFilePuts(fp, "*FormatVersion: \"4.3\"\n"); +- cupsFilePrintf(fp, "*FileVersion: \"%d.%d\"\n", CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR); +- cupsFilePuts(fp, "*LanguageVersion: English\n"); +- cupsFilePuts(fp, "*LanguageEncoding: ISOLatin1\n"); +- cupsFilePuts(fp, "*PSVersion: \"(3010.000) 0\"\n"); +- cupsFilePuts(fp, "*LanguageLevel: \"3\"\n"); +- cupsFilePuts(fp, "*FileSystem: False\n"); +- cupsFilePuts(fp, "*PCFileName: \"ippeve.ppd\"\n"); ++ if ((attr = ippFindAttribute(supported, "printer-make-and-model", IPP_TAG_TEXT)) != NULL && ippValidateAttribute(attr)) ++ { ++ /* ++ * Sanitize the model name to only contain PPD-safe characters. ++ */ + +- if ((attr = ippFindAttribute(supported, "printer-make-and-model", IPP_TAG_TEXT)) != NULL) + strlcpy(make, ippGetString(attr, 0, NULL), sizeof(make)); ++ ++ for (mptr = make; *mptr; mptr ++) ++ { ++ if (*mptr < ' ' || *mptr >= 127 || *mptr == '\"') ++ { ++ /* ++ * Truncate the make and model on the first bad character... ++ */ ++ ++ *mptr = '\0'; ++ break; ++ } ++ } ++ ++ while (mptr > make) ++ { ++ /* ++ * Strip trailing whitespace... ++ */ ++ ++ mptr --; ++ if (*mptr == ' ') ++ *mptr = '\0'; ++ } ++ ++ if (!make[0]) ++ { ++ /* ++ * Use a default make and model if nothing remains... ++ */ ++ ++ strlcpy(make, "Unknown", sizeof(make)); ++ } ++ } + else +- strlcpy(make, "Unknown Printer", sizeof(make)); ++ { ++ /* ++ * Use a default make and model... ++ */ ++ ++ strlcpy(make, "Unknown", sizeof(make)); ++ } + + if (!_cups_strncasecmp(make, "Hewlett Packard ", 16) || !_cups_strncasecmp(make, "Hewlett-Packard ", 16)) + { ++ /* ++ * Normalize HP printer make and model... ++ */ ++ + model = make + 16; + strlcpy(make, "HP", sizeof(make)); ++ ++ if (!_cups_strncasecmp(model, "HP ", 3)) ++ model += 3; ++ } ++ else if ((mptr = strchr(make, ' ')) != NULL) ++ { ++ /* ++ * Separate "MAKE MODEL"... ++ */ ++ ++ while (*mptr && *mptr == ' ') ++ *mptr++ = '\0'; ++ ++ model = mptr; + } +- else if ((model = strchr(make, ' ')) != NULL) +- *model++ = '\0'; + else +- model = make; ++ { ++ /* ++ * No separate model name... ++ */ + ++ model = "Printer"; ++ } ++ ++ /* ++ * Standard stuff for PPD file... ++ */ ++ ++ cupsFilePuts(fp, "*PPD-Adobe: \"4.3\"\n"); ++ cupsFilePuts(fp, "*FormatVersion: \"4.3\"\n"); ++ cupsFilePrintf(fp, "*FileVersion: \"%d.%d\"\n", CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR); ++ cupsFilePuts(fp, "*LanguageVersion: English\n"); ++ cupsFilePuts(fp, "*LanguageEncoding: ISOLatin1\n"); ++ cupsFilePuts(fp, "*PSVersion: \"(3010.000) 0\"\n"); ++ cupsFilePuts(fp, "*LanguageLevel: \"3\"\n"); ++ cupsFilePuts(fp, "*FileSystem: False\n"); ++ cupsFilePuts(fp, "*PCFileName: \"ippeve.ppd\"\n"); + cupsFilePrintf(fp, "*Manufacturer: \"%s\"\n", make); + cupsFilePrintf(fp, "*ModelName: \"%s\"\n", model); + cupsFilePrintf(fp, "*Product: \"(%s)\"\n", model); +-- +2.25.1 + diff --git a/meta/recipes-extended/cups/cups/CVE-2024-47175-3.patch b/meta/recipes-extended/cups/cups/CVE-2024-47175-3.patch new file mode 100644 index 0000000000..e7d012fb8a --- /dev/null +++ b/meta/recipes-extended/cups/cups/CVE-2024-47175-3.patch @@ -0,0 +1,119 @@ +From e0630cd18f76340d302000f2bf6516e99602b844 Mon Sep 17 00:00:00 2001 +From: Michael R Sweet +Date: Mon, 9 Sep 2024 15:59:57 -0400 +Subject: [PATCH] PPDize preset and template names. + +Upstream-Status: Backport [https://github.com/OpenPrinting/cups/commit/e0630cd18f76340d302000f2bf6516e99602b844] +CVE: CVE-2024-47175 +Signed-off-by: Hitendra Prajapati +--- + cups/ppd-cache.c | 33 ++++++++++++++++++++++++--------- + 1 file changed, 24 insertions(+), 9 deletions(-) + +diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c +index a4d7403..53c22be 100644 +--- a/cups/ppd-cache.c ++++ b/cups/ppd-cache.c +@@ -4976,12 +4976,14 @@ _ppdCreateFromIPP2( + + cupsArrayAdd(templates, (void *)keyword); + ++ pwg_ppdize_name(keyword, ppdname, sizeof(ppdname)); ++ + snprintf(msgid, sizeof(msgid), "finishing-template.%s", keyword); + if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr)) + if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid) + msgstr = keyword; + +- cupsFilePrintf(fp, "*cupsFinishingTemplate %s: \"\n", keyword); ++ cupsFilePrintf(fp, "*cupsFinishingTemplate %s: \"\n", ppdname); + for (finishing_attr = ippFirstAttribute(finishing_col); finishing_attr; finishing_attr = ippNextAttribute(finishing_col)) + { + if (ippGetValueTag(finishing_attr) == IPP_TAG_BEGIN_COLLECTION) +@@ -4994,7 +4996,7 @@ _ppdCreateFromIPP2( + } + } + cupsFilePuts(fp, "\"\n"); +- cupsFilePrintf(fp, "*%s.cupsFinishingTemplate %s/%s: \"\"\n", lang->language, keyword, msgstr); ++ cupsFilePrintf(fp, "*%s.cupsFinishingTemplate %s/%s: \"\"\n", lang->language, ppdname, msgstr); + cupsFilePuts(fp, "*End\n"); + } + +@@ -5040,7 +5042,8 @@ _ppdCreateFromIPP2( + if (!preset || !preset_name) + continue; + +- cupsFilePrintf(fp, "*APPrinterPreset %s: \"\n", preset_name); ++ pwg_ppdize_name(preset_name, ppdname, sizeof(ppdname)); ++ cupsFilePrintf(fp, "*APPrinterPreset %s: \"\n", ppdname); + for (member = ippFirstAttribute(preset); member; member = ippNextAttribute(preset)) + { + member_name = ippGetName(member); +@@ -5081,7 +5084,10 @@ _ppdCreateFromIPP2( + fin_col = ippGetCollection(member, i); + + if ((keyword = ippGetString(ippFindAttribute(fin_col, "finishing-template", IPP_TAG_ZERO), 0, NULL)) != NULL) +- cupsFilePrintf(fp, "*cupsFinishingTemplate %s\n", keyword); ++ { ++ pwg_ppdize_name(keyword, ppdname, sizeof(ppdname)); ++ cupsFilePrintf(fp, "*cupsFinishingTemplate %s\n", ppdname); ++ } + } + } + else if (!strcmp(member_name, "media")) +@@ -5108,13 +5114,13 @@ _ppdCreateFromIPP2( + if ((keyword = ippGetString(ippFindAttribute(media_col, "media-source", IPP_TAG_ZERO), 0, NULL)) != NULL) + { + pwg_ppdize_name(keyword, ppdname, sizeof(ppdname)); +- cupsFilePrintf(fp, "*InputSlot %s\n", keyword); ++ cupsFilePrintf(fp, "*InputSlot %s\n", ppdname); + } + + if ((keyword = ippGetString(ippFindAttribute(media_col, "media-type", IPP_TAG_ZERO), 0, NULL)) != NULL) + { + pwg_ppdize_name(keyword, ppdname, sizeof(ppdname)); +- cupsFilePrintf(fp, "*MediaType %s\n", keyword); ++ cupsFilePrintf(fp, "*MediaType %s\n", ppdname); + } + } + else if (!strcmp(member_name, "print-quality")) +@@ -5160,7 +5166,10 @@ _ppdCreateFromIPP2( + cupsFilePuts(fp, "\"\n*End\n"); + + if ((localized_name = _cupsMessageLookup(strings, preset_name)) != preset_name) +- cupsFilePrintf(fp, "*%s.APPrinterPreset %s/%s: \"\"\n", lang->language, preset_name, localized_name); ++ { ++ pwg_ppdize_name(preset_name, ppdname, sizeof(ppdname)); ++ cupsFilePrintf(fp, "*%s.APPrinterPreset %s/%s: \"\"\n", lang->language, ppdname, localized_name); ++ } + } + } + +@@ -5544,7 +5553,7 @@ pwg_ppdize_name(const char *ipp, /* I - IPP keyword */ + *end; /* End of name buffer */ + + +- if (!ipp) ++ if (!ipp || !_cups_isalnum(*ipp)) + { + *name = '\0'; + return; +@@ -5559,8 +5568,14 @@ pwg_ppdize_name(const char *ipp, /* I - IPP keyword */ + ipp ++; + *ptr++ = (char)toupper(*ipp++ & 255); + } +- else ++ else if (*ipp == '_' || *ipp == '.' || *ipp == '-' || _cups_isalnum(*ipp)) ++ { + *ptr++ = *ipp++; ++ } ++ else ++ { ++ ipp ++; ++ } + } + + *ptr = '\0'; +-- +2.25.1 + diff --git a/meta/recipes-extended/cups/cups/CVE-2024-47175-4.patch b/meta/recipes-extended/cups/cups/CVE-2024-47175-4.patch new file mode 100644 index 0000000000..7665513485 --- /dev/null +++ b/meta/recipes-extended/cups/cups/CVE-2024-47175-4.patch @@ -0,0 +1,249 @@ +From 1e6ca5913eceee906038bc04cc7ccfbe2923bdfd Mon Sep 17 00:00:00 2001 +From: Michael R Sweet +Date: Mon, 23 Sep 2024 09:36:39 -0400 +Subject: [PATCH] Quote PPD localized strings. + +Upstream-Status: Backport [https://github.com/OpenPrinting/cups/commit/1e6ca5913eceee906038bc04cc7ccfbe2923bdfd] +CVE: CVE-2024-47175 +Signed-off-by: Hitendra Prajapati +--- + cups/ppd-cache.c | 93 +++++++++++++++++++++++++++--------------------- + 1 file changed, 53 insertions(+), 40 deletions(-) + +diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c +index 53c22be..f425ac0 100644 +--- a/cups/ppd-cache.c ++++ b/cups/ppd-cache.c +@@ -32,6 +32,7 @@ + static int cups_connect(http_t **http, const char *url, char *resource, size_t ressize); + static int cups_get_url(http_t **http, const char *url, char *name, size_t namesize); + static const char *ppd_inputslot_for_keyword(_ppd_cache_t *pc, const char *keyword); ++static void ppd_put_string(cups_file_t *fp, cups_lang_t *lang, cups_array_t *strings, const char *ppd_option, const char *ppd_choice, const char *pwg_msgid); + static void pwg_add_finishing(cups_array_t *finishings, ipp_finishings_t template, const char *name, const char *value); + static void pwg_add_message(cups_array_t *a, const char *msg, const char *str); + static int pwg_compare_finishings(_pwg_finishings_t *a, _pwg_finishings_t *b); +@@ -3394,7 +3395,7 @@ _ppdCreateFromIPP2( + if ((attr = ippFindAttribute(supported, "printer-charge-info-uri", IPP_TAG_URI)) != NULL && ippValidateAttribute(attr)) + cupsFilePrintf(fp, "*cupsChargeInfoURI: \"%s\"\n", ippGetString(attr, 0, NULL)); + +- if ((attr = ippFindAttribute(supported, "printer-strings-uri", IPP_TAG_URI)) != NULL) ++ if ((attr = ippFindAttribute(supported, "printer-strings-uri", IPP_TAG_URI)) != NULL && ippValidateAttribute(attr)) + { + http_t *http = NULL; /* Connection to printer */ + char stringsfile[1024]; /* Temporary strings file */ +@@ -3438,7 +3439,7 @@ _ppdCreateFromIPP2( + + response = cupsDoRequest(http, request, resource); + +- if ((attr = ippFindAttribute(response, "printer-strings-uri", IPP_TAG_URI)) != NULL) ++ if ((attr = ippFindAttribute(response, "printer-strings-uri", IPP_TAG_URI)) != NULL && ippValidateAttribute(attr)) + cupsFilePrintf(fp, "*cupsStringsURI %s: \"%s\"\n", keyword, ippGetString(attr, 0, NULL)); + + ippDelete(response); +@@ -4044,18 +4045,16 @@ _ppdCreateFromIPP2( + cupsFilePrintf(fp, "*DefaultInputSlot: %s\n", ppdname); + + for (j = 0; j < (int)(sizeof(sources) / sizeof(sources[0])); j ++) ++ { + if (!strcmp(sources[j], keyword)) + { + snprintf(msgid, sizeof(msgid), "media-source.%s", keyword); + +- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr)) +- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid) +- msgstr = keyword; +- + cupsFilePrintf(fp, "*InputSlot %s: \"<>setpagedevice\"\n", ppdname, j); +- cupsFilePrintf(fp, "*%s.InputSlot %s/%s: \"\"\n", lang->language, ppdname, msgstr); ++ ppd_put_string(fp, lang, strings, "InputSlot", ppdname, msgid); + break; + } ++ } + } + cupsFilePuts(fp, "*CloseUI: *InputSlot\n"); + } +@@ -4081,12 +4080,9 @@ _ppdCreateFromIPP2( + pwg_ppdize_name(keyword, ppdname, sizeof(ppdname)); + + snprintf(msgid, sizeof(msgid), "media-type.%s", keyword); +- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr)) +- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid) +- msgstr = keyword; + + cupsFilePrintf(fp, "*MediaType %s: \"<>setpagedevice\"\n", ppdname, ppdname); +- cupsFilePrintf(fp, "*%s.MediaType %s/%s: \"\"\n", lang->language, ppdname, msgstr); ++ ppd_put_string(fp, lang, strings, "MediaType", ppdname, msgid); + } + cupsFilePuts(fp, "*CloseUI: *MediaType\n"); + } +@@ -4547,12 +4543,9 @@ _ppdCreateFromIPP2( + pwg_ppdize_name(keyword, ppdname, sizeof(ppdname)); + + snprintf(msgid, sizeof(msgid), "output-bin.%s", keyword); +- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr)) +- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid) +- msgstr = keyword; + + cupsFilePrintf(fp, "*OutputBin %s: \"\"\n", ppdname); +- cupsFilePrintf(fp, "*%s.OutputBin %s/%s: \"\"\n", lang->language, ppdname, msgstr); ++ ppd_put_string(fp, lang, strings, "OutputBin", ppdname, msgid); + + if ((tray_ptr = ippGetOctetString(trays, i, &tray_len)) != NULL) + { +@@ -4671,9 +4664,6 @@ _ppdCreateFromIPP2( + cupsArrayAdd(names, (char *)keyword); + + snprintf(msgid, sizeof(msgid), "finishings.%d", value); +- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr)) +- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid) +- msgstr = keyword; + + if (value >= IPP_FINISHINGS_NONE && value <= IPP_FINISHINGS_LAMINATE) + ppd_keyword = base_keywords[value - IPP_FINISHINGS_NONE]; +@@ -4688,7 +4678,7 @@ _ppdCreateFromIPP2( + continue; + + cupsFilePrintf(fp, "*StapleLocation %s: \"\"\n", ppd_keyword); +- cupsFilePrintf(fp, "*%s.StapleLocation %s/%s: \"\"\n", lang->language, ppd_keyword, msgstr); ++ ppd_put_string(fp, lang, strings, "StapleLocation", ppd_keyword, msgid); + cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*StapleLocation %s\"\n", value, keyword, ppd_keyword); + } + +@@ -4751,9 +4741,6 @@ _ppdCreateFromIPP2( + cupsArrayAdd(names, (char *)keyword); + + snprintf(msgid, sizeof(msgid), "finishings.%d", value); +- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr)) +- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid) +- msgstr = keyword; + + if (value >= IPP_FINISHINGS_NONE && value <= IPP_FINISHINGS_LAMINATE) + ppd_keyword = base_keywords[value - IPP_FINISHINGS_NONE]; +@@ -4768,7 +4755,7 @@ _ppdCreateFromIPP2( + continue; + + cupsFilePrintf(fp, "*FoldType %s: \"\"\n", ppd_keyword); +- cupsFilePrintf(fp, "*%s.FoldType %s/%s: \"\"\n", lang->language, ppd_keyword, msgstr); ++ ppd_put_string(fp, lang, strings, "FoldType", ppd_keyword, msgid); + cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*FoldType %s\"\n", value, keyword, ppd_keyword); + } + +@@ -4839,9 +4826,6 @@ _ppdCreateFromIPP2( + cupsArrayAdd(names, (char *)keyword); + + snprintf(msgid, sizeof(msgid), "finishings.%d", value); +- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr)) +- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid) +- msgstr = keyword; + + if (value >= IPP_FINISHINGS_NONE && value <= IPP_FINISHINGS_LAMINATE) + ppd_keyword = base_keywords[value - IPP_FINISHINGS_NONE]; +@@ -4856,7 +4840,7 @@ _ppdCreateFromIPP2( + continue; + + cupsFilePrintf(fp, "*PunchMedia %s: \"\"\n", ppd_keyword); +- cupsFilePrintf(fp, "*%s.PunchMedia %s/%s: \"\"\n", lang->language, ppd_keyword, msgstr); ++ ppd_put_string(fp, lang, strings, "PunchMedia", ppd_keyword, msgid); + cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*PunchMedia %s\"\n", value, keyword, ppd_keyword); + } + +@@ -4927,9 +4911,6 @@ _ppdCreateFromIPP2( + cupsArrayAdd(names, (char *)keyword); + + snprintf(msgid, sizeof(msgid), "finishings.%d", value); +- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr)) +- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid) +- msgstr = keyword; + + if (value == IPP_FINISHINGS_TRIM) + ppd_keyword = "Auto"; +@@ -4937,7 +4918,7 @@ _ppdCreateFromIPP2( + ppd_keyword = trim_keywords[value - IPP_FINISHINGS_TRIM_AFTER_PAGES]; + + cupsFilePrintf(fp, "*CutMedia %s: \"\"\n", ppd_keyword); +- cupsFilePrintf(fp, "*%s.CutMedia %s/%s: \"\"\n", lang->language, ppd_keyword, msgstr); ++ ppd_put_string(fp, lang, strings, "CutMedia", ppd_keyword, msgid); + cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*CutMedia %s\"\n", value, keyword, ppd_keyword); + } + +@@ -4979,9 +4960,6 @@ _ppdCreateFromIPP2( + pwg_ppdize_name(keyword, ppdname, sizeof(ppdname)); + + snprintf(msgid, sizeof(msgid), "finishing-template.%s", keyword); +- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr)) +- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid) +- msgstr = keyword; + + cupsFilePrintf(fp, "*cupsFinishingTemplate %s: \"\n", ppdname); + for (finishing_attr = ippFirstAttribute(finishing_col); finishing_attr; finishing_attr = ippNextAttribute(finishing_col)) +@@ -4996,7 +4974,7 @@ _ppdCreateFromIPP2( + } + } + cupsFilePuts(fp, "\"\n"); +- cupsFilePrintf(fp, "*%s.cupsFinishingTemplate %s/%s: \"\"\n", lang->language, ppdname, msgstr); ++ ppd_put_string(fp, lang, strings, "cupsFinishingTemplate", ppdname, msgid); + cupsFilePuts(fp, "*End\n"); + } + +@@ -5165,11 +5143,9 @@ _ppdCreateFromIPP2( + + cupsFilePuts(fp, "\"\n*End\n"); + +- if ((localized_name = _cupsMessageLookup(strings, preset_name)) != preset_name) +- { +- pwg_ppdize_name(preset_name, ppdname, sizeof(ppdname)); +- cupsFilePrintf(fp, "*%s.APPrinterPreset %s/%s: \"\"\n", lang->language, ppdname, localized_name); +- } ++ snprintf(msgid, sizeof(msgid), "preset-name.%s", preset_name); ++ pwg_ppdize_name(preset_name, ppdname, sizeof(ppdname)); ++ ppd_put_string(fp, lang, strings, "APPrinterPreset", ppdname, msgid); + } + } + +@@ -5440,6 +5416,43 @@ cups_get_url(http_t **http, /* IO - Current HTTP connection */ + } + + ++/* ++ * 'ppd_put_strings()' - Write localization attributes to a PPD file. ++ */ ++ ++static void ++ppd_put_string(cups_file_t *fp, /* I - PPD file */ ++ cups_lang_t *lang, /* I - Language */ ++ cups_array_t *strings, /* I - Strings */ ++ const char *ppd_option,/* I - PPD option */ ++ const char *ppd_choice,/* I - PPD choice */ ++ const char *pwg_msgid) /* I - PWG message ID */ ++{ ++ const char *text; /* Localized text */ ++ ++ ++ if ((text = _cupsLangString(lang, pwg_msgid)) == pwg_msgid || !strcmp(pwg_msgid, text)) ++ { ++ if ((text = _cupsMessageLookup(strings, pwg_msgid)) == pwg_msgid) ++ return; ++ } ++ ++ // Add the first line of localized text... ++ cupsFilePrintf(fp, "*%s.%s %s/", lang->language, ppd_option, ppd_choice); ++ while (*text && *text != '\n') ++ { ++ // Escape ":" and "<"... ++ if (*text == ':' || *text == '<') ++ cupsFilePrintf(fp, "<%02X>", *text); ++ else ++ cupsFilePutChar(fp, *text); ++ ++ text ++; ++ } ++ cupsFilePuts(fp, ": \"\"\n"); ++} ++ ++ + /* + * 'pwg_add_finishing()' - Add a finishings value. + */ +-- +2.25.1 + diff --git a/meta/recipes-extended/cups/cups/CVE-2024-47175-5.patch b/meta/recipes-extended/cups/cups/CVE-2024-47175-5.patch new file mode 100644 index 0000000000..77a30857e2 --- /dev/null +++ b/meta/recipes-extended/cups/cups/CVE-2024-47175-5.patch @@ -0,0 +1,40 @@ +From 2abe1ba8a66864aa82cd9836b37e57103b8e1a3b Mon Sep 17 00:00:00 2001 +From: Michael R Sweet +Date: Mon, 23 Sep 2024 10:11:31 -0400 +Subject: [PATCH] Fix warnings for unused vars. + +Upstream-Status: Backport [https://github.com/OpenPrinting/cups/commit/2abe1ba8a66864aa82cd9836b37e57103b8e1a3b] +CVE: CVE-2024-47175 +Signed-off-by: Hitendra Prajapati +--- + cups/ppd-cache.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c +index f425ac0..d2533b7 100644 +--- a/cups/ppd-cache.c ++++ b/cups/ppd-cache.c +@@ -3223,8 +3223,7 @@ _ppdCreateFromIPP2( + int have_qdraft = 0,/* Have draft quality? */ + have_qhigh = 0; /* Have high quality? */ + char msgid[256]; /* Message identifier (attr.value) */ +- const char *keyword, /* Keyword value */ +- *msgstr; /* Localized string */ ++ const char *keyword; /* Keyword value */ + cups_array_t *strings = NULL;/* Printer strings file */ + struct lconv *loc = localeconv(); + /* Locale data */ +@@ -5010,9 +5009,8 @@ _ppdCreateFromIPP2( + { + ipp_t *preset = ippGetCollection(attr, i); + /* Preset collection */ +- const char *preset_name = ippGetString(ippFindAttribute(preset, "preset-name", IPP_TAG_ZERO), 0, NULL), ++ const char *preset_name = ippGetString(ippFindAttribute(preset, "preset-name", IPP_TAG_ZERO), 0, NULL); + /* Preset name */ +- *localized_name; /* Localized preset name */ + ipp_attribute_t *member; /* Member attribute in preset */ + const char *member_name; /* Member attribute name */ + char member_value[256]; /* Member attribute value */ +-- +2.25.1 + From patchwork Tue Oct 15 18:50: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: 50726 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 BE147D1F9A5 for ; Tue, 15 Oct 2024 18:51:10 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web10.4732.1729018267105590847 for ; Tue, 15 Oct 2024 11:51:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Y//x7S1o; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-71e681bc315so115511b3a.0 for ; Tue, 15 Oct 2024 11:51:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1729018266; x=1729623066; 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=9YwhNlzJc8qMT/DiFlMSRofKxh0gzarrgeqR3+1MKRY=; b=Y//x7S1oDxxi55kFwU1Ng2b0zwRt2IM8MzpvKlsQjwRAXhqEyNNV98ENtMLUQ0xHot ZubhSDAAGK+grS+0SiE2PWUB1zM4duTiIWb4YBYZeTxktt1637+q/x9uMZdkgpI7RYvz aGnIVg+FFhKYeaM+1dXiVk3ctiBIHvmXhpfYD9RZgO+HB7DDOnMsCer+CUDE6f8qicsy S+b9h5U6rzClYwlVWyJ86IBzlln+uzJSEb6tl6P06GE/0NrwrS1ReAXF8O6ZrQC1hvIf WYmOx9BSNXS2SPk1kN9aYWgIpuVcMN57kfVOqlwamYAZsE4V94Wrzb0O6gsYLfSuVbWw Jlag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729018266; x=1729623066; 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=9YwhNlzJc8qMT/DiFlMSRofKxh0gzarrgeqR3+1MKRY=; b=Yv1n7r2JP4kUNuc38sUnwTtAEba+l/IwmRlXR0/CerZMcsYeDblCwqHnLtrkTXD4e1 HaLOcvIhACFOdKR2yGRORAVdk7VCbpIi6UbZ6p3cRG5rplFZvtasQbqMjYs7mGSV0ScN sLZv3x1rdtJXcmmYTVqXkyIEVRSl8BDZ0Sz0raNoXOIItXRyk8bttZgSRwBMolZC9gg9 NTx9ljAkmD39khi0RnpZmBfkqqvbA8E3Jf0zah4XbUZYB3PL436yftcd70x9RrbL6Q+F cZDDKeXt+8sAEML02qUhbAjLnbZBcH2kC+DRLQ+AIYFqgj4WUR5aLeZiTg7fiizKeNWM JOhg== X-Gm-Message-State: AOJu0YyJBg0zTve9n96iBTI4Eh3kYnnRuZGVXXAwTzWeoFLoBxx5kcSx oMiIsLCMEj85Q9799LNHTG3ot0wYgRQsW64QWvmexyyc3nIVz5a0fsTYvw7lXefuBtnnRfgMCGN 2 X-Google-Smtp-Source: AGHT+IFTv/U7ZaG3u157qPovy8WGyL5M886PJK2VqzunK8+LTbi9Nh4eryjM+mp/YCVPQjhop9ZCxA== X-Received: by 2002:a05:6a00:18a4:b0:71e:4a46:fdb6 with SMTP id d2e1a72fcca58-71e4a46ff66mr20345451b3a.3.1729018266164; Tue, 15 Oct 2024 11:51:06 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e773717b9sm1616187b3a.9.2024.10.15.11.51.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 11:51:05 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 03/18] libarchive: fix CVE-2024-48957 & CVE-2024-48958 Date: Tue, 15 Oct 2024 11:50:39 -0700 Message-Id: <8b520c3cea136591128f6601718c23334afd7a55.1729018153.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Oct 2024 18:51:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205927 From: Hitendra Prajapati Backport fixes for: * CVE-2024-48957 - Upstream-Status: Backport from https://github.com/libarchive/libarchive/commit/3006bc5d02ad3ae3c4f9274f60c1f9d2d834734b * CVE-2024-48958 - Upstream-Status: Backport from https://github.com/libarchive/libarchive/commit/a1cb648d52f5b6d3f31184d9b6a7cbca628459b7 Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- .../libarchive/CVE-2024-48957.patch | 36 +++++++++++++++++ .../libarchive/CVE-2024-48958.patch | 40 +++++++++++++++++++ .../libarchive/libarchive_3.7.4.bb | 5 ++- 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2024-48957.patch create mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2024-48958.patch diff --git a/meta/recipes-extended/libarchive/libarchive/CVE-2024-48957.patch b/meta/recipes-extended/libarchive/libarchive/CVE-2024-48957.patch new file mode 100644 index 0000000000..98877cf72c --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/CVE-2024-48957.patch @@ -0,0 +1,36 @@ +From 3006bc5d02ad3ae3c4f9274f60c1f9d2d834734b Mon Sep 17 00:00:00 2001 +From: Wei-Cheng Pan +Date: Mon, 29 Apr 2024 06:53:19 +0900 +Subject: [PATCH] fix: OOB in rar audio filter (#2149) + +This patch ensures that `src` won't move ahead of `dst`, so `src` will +not OOB. Similar situation like in a1cb648. + +Upstream-Status: Backport [https://github.com/libarchive/libarchive/commit/3006bc5d02ad3ae3c4f9274f60c1f9d2d834734b] +CVE: CVE-2024-48957 +Signed-off-by: Hitendra Prajapati +--- + libarchive/archive_read_support_format_rar.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c +index 79669a8..95a91dc 100644 +--- a/libarchive/archive_read_support_format_rar.c ++++ b/libarchive/archive_read_support_format_rar.c +@@ -3714,6 +3714,13 @@ execute_filter_audio(struct rar_filter *filter, struct rar_virtual_machine *vm) + memset(&state, 0, sizeof(state)); + for (j = i; j < length; j += numchannels) + { ++ /* ++ * The src block should not overlap with the dst block. ++ * If so it would be better to consider this archive is broken. ++ */ ++ if (src >= dst) ++ return 0; ++ + int8_t delta = (int8_t)*src++; + uint8_t predbyte, byte; + int prederror; +-- +2.25.1 + diff --git a/meta/recipes-extended/libarchive/libarchive/CVE-2024-48958.patch b/meta/recipes-extended/libarchive/libarchive/CVE-2024-48958.patch new file mode 100644 index 0000000000..de266e9d95 --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/CVE-2024-48958.patch @@ -0,0 +1,40 @@ +From a1cb648d52f5b6d3f31184d9b6a7cbca628459b7 Mon Sep 17 00:00:00 2001 +From: Wei-Cheng Pan +Date: Mon, 29 Apr 2024 06:50:22 +0900 +Subject: [PATCH] fix: OOB in rar delta filter (#2148) + +Ensure that `src` won't move ahead of `dst`, so `src` will not OOB. +Since `dst` won't move in this function, and we are only increasing `src` +position, this check should be enough. It should be safe to early return +because this function does not allocate resources. + +Upstream-Status: Backport [https://github.com/libarchive/libarchive/commit/a1cb648d52f5b6d3f31184d9b6a7cbca628459b7] +CVE: CVE-2024-48958 +Signed-off-by: Hitendra Prajapati +--- + libarchive/archive_read_support_format_rar.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c +index 95a91dc..4fc6626 100644 +--- a/libarchive/archive_read_support_format_rar.c ++++ b/libarchive/archive_read_support_format_rar.c +@@ -3612,7 +3612,15 @@ execute_filter_delta(struct rar_filter *filter, struct rar_virtual_machine *vm) + { + uint8_t lastbyte = 0; + for (idx = i; idx < length; idx += numchannels) ++ { ++ /* ++ * The src block should not overlap with the dst block. ++ * If so it would be better to consider this archive is broken. ++ */ ++ if (src >= dst) ++ return 0; + lastbyte = dst[idx] = lastbyte - *src++; ++ } + } + + filter->filteredblockaddress = length; +-- +2.25.1 + diff --git a/meta/recipes-extended/libarchive/libarchive_3.7.4.bb b/meta/recipes-extended/libarchive/libarchive_3.7.4.bb index da85764116..6e406611f9 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.7.4.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.7.4.bb @@ -30,7 +30,10 @@ PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd," EXTRA_OECONF += "--enable-largefile --without-iconv" SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" -SRC_URI += "file://configurehack.patch" +SRC_URI += "file://configurehack.patch \ + file://CVE-2024-48957.patch \ + file://CVE-2024-48958.patch \ + " UPSTREAM_CHECK_URI = "http://libarchive.org/" SRC_URI[sha256sum] = "7875d49596286055b52439ed42f044bd8ad426aa4cc5aabd96bfe7abb971d5e8" From patchwork Tue Oct 15 18:50: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: 50740 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 EBA07D1F9B7 for ; Tue, 15 Oct 2024 18:51:40 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web11.4807.1729018298211715221 for ; Tue, 15 Oct 2024 11:51:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Jrl3GeWE; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-7e6cbf6cd1dso4001100a12.3 for ; Tue, 15 Oct 2024 11:51:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1729018297; x=1729623097; 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=/1LwgDwIudy7PCh5ck7CKjMe2Y2zMKxnZaOYOxE12CM=; b=Jrl3GeWEtabQ6v5QA9+NB/lQ+EHA/lojB3hFZDpqYbzliB4WN//6zE6g/r7mIa01cl JiIVg5Bhzmpgvfp65xukMhYUgSkd9/CXDhfDW1nJWNcXkUAZdFZtmjugnaIJP73/xZ/7 KqMKxRwgThTjEEPuIJJCYpVaiTr4a5O/peS4uUHhVrOfrxkbc63HZ3con5RCbxMm8rGT 491BtTpSTh2MmYzUS5nlsIEuVwaI+igm3u4XcqOgF9FXcBzIglEG1BD0FJP+uEkDPgNr o8/CRWXpo+BvtYoThPd06PLOOXyA7sgAmSFQtSU6BRQOR5sAZUZnOoa86jl2Bk2sHd+9 /8dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729018297; x=1729623097; 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=/1LwgDwIudy7PCh5ck7CKjMe2Y2zMKxnZaOYOxE12CM=; b=rP8eUcIM60vjCjmGRJfREKq7fCQ52MXULM/PGvclwcucWHGTQvknKwaAWNELYuT0hx oRNx9hUsjF2a2GYUOfkN+txUkuF61XkUWg/c6uEDXtiGwmqCvaUNs3AZecaIA0NIT6cy W/UaueRZa69aK2Glo9YGuJYvJ/DXHiVPOl0TxAkALu1oFuGwoHXAJc/TeiOk3uS+pSRM XoZjHoB1N2TFb+fU7zYdqZXQi7gmkKzm77/Ri5Ovrb4qSj5iL2GfKTJWLntJPLUWs18W 5H3YDfvb7M2wZmSW8ouRmPAhjxS0kW1AeZqSj27EiGV5INM2GaNe9UYKvKenAxuwct2N m8Ow== X-Gm-Message-State: AOJu0YzoKBRWJrEAbrhtjs0YBiBmEjUIuK/bW37bnvhA6KzblNlukKuf 1JkuKOWBGTm+KwvNQXoufjQflTPdC5vhwpHwED0MeXF//lZ6kIoQRx5cgXZ10RQW9/NWpp8VQwu R X-Google-Smtp-Source: AGHT+IEPYRxZR10itZ2KS07Tc8hi0oaMWR2I6qq4X/LyOpSv1tiqWbdBgVpv9jshNCiA6LUBUOcLow== X-Received: by 2002:a05:6a20:bf10:b0:1d8:fc13:2399 with SMTP id adf61e73a8af0-1d8fc132868mr2427059637.16.1729018267569; Tue, 15 Oct 2024 11:51:07 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e773717b9sm1616187b3a.9.2024.10.15.11.51.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 11:51:07 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 04/18] linux-firmware: upgrade 20240312 -> 20240909 Date: Tue, 15 Oct 2024 11:50:40 -0700 Message-Id: <14b1560b2fb303eb63fc1c6853ca4e3e8ef9355b.1729018153.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Oct 2024 18:51:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205941 From: Macpaul Lin License-Update: additional files Signed-off-by: Macpaul Lin Signed-off-by: Steve Sakoman --- ...ux-firmware_20240312.bb => linux-firmware_20240909.bb} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20240312.bb => linux-firmware_20240909.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20240312.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20240312.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb index 5819d9287c..30c47d7720 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20240312.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb @@ -82,7 +82,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=a2589a05ea5b6bd2b7f4f623c7e7a649 \ + file://LICENSE.amdgpu;md5=1433dfea38c97a2e563a248a863dcb94 \ file://LICENSE.amd-ucode;md5=6ca90c57f7b248de1e25c7f68ffc4698 \ file://LICENSE.amlogic_vdec;md5=dc44f59bf64a81643e500ad3f39a468a \ file://LICENSE.amphion_vpu;md5=2bcdc00527b2d0542bd92b52aaec2b60 \ @@ -142,7 +142,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \ file://LICENSE.sdma_firmware;md5=51e8c19ecc2270f4b8ea30341ad63ce9 \ file://LICENCE.siano;md5=4556c1bf830067f12ca151ad953ec2a5 \ - file://LICENCE.ti-connectivity;md5=c5e02be633f1499c109d1652514d85ec \ + file://LICENCE.ti-connectivity;md5=3b1e9cf54aba8146dad4b735777d406f \ file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c \ file://LICENCE.ueagle-atm4-firmware;md5=4ed7ea6b507ccc583b9d594417714118 \ file://LICENCE.via_vt6656;md5=e4159694cba42d4377a912e78a6e850f \ @@ -154,7 +154,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 = "514da1cd8b363373030f0c16749feb8d" +WHENCE_CHKSUM = "6ae5ffd807c84809977286ad0b37acdb" # These are not common licenses, set NO_GENERIC_LICENSE for them # so that the license files will be copied from fetched source @@ -241,7 +241,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] = "b2327a54ad1897c828008caf63af5ee15469ba723a5016be58f2b44f07bd4b94" +SRC_URI[sha256sum] = "943fbd19883cf8eadf89e0b22422549db056557b1ecd30a56400615971369671" inherit allarch From patchwork Tue Oct 15 18:50: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: 50727 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 BECD8D1F9AD for ; Tue, 15 Oct 2024 18:51:10 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web10.4735.1729018270477117974 for ; Tue, 15 Oct 2024 11:51:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Fr/kAm5B; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-71e5a62031aso2007767b3a.1 for ; Tue, 15 Oct 2024 11:51:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1729018270; x=1729623070; 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=AupKjxbYm6hkFrV/vYdoHnnGKoHUG78Uspot3OSMjZs=; b=Fr/kAm5BbrXn2dZe2SdvpQaonLIKAYu+h9zkg57Sokp2zZ6KtrcV1oD5cI8E/VGnve S15zSSQuk1D/uZBmI39/qCGmew+EULXZjCTE0dO8bTIupJvU2q5WMA69MbUcN/MFjR3W mYJPr3UTiV1hLaSsR8PeJnDtF0TTFycDuPY5U9mRbka3G9YMpTLMq822gPzW0VZTnVa6 Vz9ypcYByuZJ1fEeTa4LI42U4NsnB5lgz/B2zxZWeX121RIzXoDzz4w+t/6KwAofzt9O i36DHtaqrY13OTffoQLcD1hqt9PNMzwEP+MbXPzP+WgRfOsVa/ve+wBdJIJO86GNvPYc TSfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729018270; x=1729623070; 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=AupKjxbYm6hkFrV/vYdoHnnGKoHUG78Uspot3OSMjZs=; b=MXDoMC2uZsz70sGrAFPo1gnKn3Ak3UgYyBXz4DPYY5787pdFAZROyy5HSPqWnvAUhi cgVLHguFVGnF+IosoPIIhpqNVub24pmJr1jkWxxS4XMVNZs0A7C+oUAN1qm2Kge/ycFM z5fmw+jFv71NDFOZEbaGTSSCMeObypS8s+v8V2+1Jj423ifgui6Yj/G8ShFvwQfWpxOR yFgGed+BBMpHFdkQHofmmj3a2wM3jhSmd82rccoEcosqxbk5yLOAfd/6mFZ3L68VVxLn l4R9Gjdq7QBt8NbmDTix500k9a66C5HguK/wZN/ct8+AhfM4AkbOuF6/uKIoqpLMoq0W hJxw== X-Gm-Message-State: AOJu0YzrClSVwf+8HYth6UZXom4T9ChOwdN61mzkIrxv86Hrn3qKWOw6 gcS48lHhtZbURrdS779n6M2l7HAkz8H/Q8v44rJ3tfMGDMvCznwXcVD3WXl0kCMLeIeuECqWdqu Y X-Google-Smtp-Source: AGHT+IEorpPnWHBQAAz0KqbOkz2k4VzniQEprLdz+xnfCbmFExUb524Z50k27H5v6I+190lOsIVeKA== X-Received: by 2002:a05:6a20:d487:b0:1d9:553:8a2f with SMTP id adf61e73a8af0-1d905538b87mr1956129637.21.1729018269431; Tue, 15 Oct 2024 11:51:09 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e773717b9sm1616187b3a.9.2024.10.15.11.51.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 11:51:09 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 05/18] ruby: upgrade 3.2.2 -> 3.3.5 Date: Tue, 15 Oct 2024 11:50:41 -0700 Message-Id: <69ffe5bc09260918fb32bfcb29586dcaa1958a5c.1729018153.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Oct 2024 18:51:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205928 From: Yogita Urade Includes fix for CVE-2024-41123 & CVE-2024-41946 Release notes: https://github.com/ruby/ruby/releases/tag/v3_3_5 Rebase: 0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch 0006-Make-gemspecs-reproducible.patch Drop: 0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch 0002-Obey-LDFLAGS-for-the-link-of-libruby.patch CVE-2023-36617_1.patch CVE-2023-36617_2.patch CVE-2024-27281.patch CVE-2024-27282.patch (merged upstream) 0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch 0002-template-Makefile.in-filter-out-f-prefix-map.patch remove_has_include_macros.patch (code rewritten upstream) License-Update: Updated LEGAL section Signed-off-by: Yogita Urade Signed-off-by: Steve Sakoman --- ...Alignof-to-define-ALIGN_OF-when-poss.patch | 52 ---------- ...e.in-do-not-write-host-cross-cc-item.patch | 32 ------ ...Obey-LDFLAGS-for-the-link-of-libruby.patch | 25 ----- ...-Makefile.in-filter-out-f-prefix-map.patch | 42 -------- ...eproducible-change-fixing-784225-too.patch | 26 ++--- .../0006-Make-gemspecs-reproducible.patch | 18 ++-- .../ruby/ruby/CVE-2023-36617_1.patch | 56 ----------- .../ruby/ruby/CVE-2023-36617_2.patch | 52 ---------- .../ruby/ruby/CVE-2024-27281.patch | 97 ------------------- .../ruby/ruby/CVE-2024-27282.patch | 28 ------ .../ruby/ruby/remove_has_include_macros.patch | 35 ------- .../ruby/{ruby_3.2.2.bb => ruby_3.3.5.bb} | 13 +-- 12 files changed, 25 insertions(+), 451 deletions(-) delete mode 100644 meta/recipes-devtools/ruby/ruby/0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch delete mode 100644 meta/recipes-devtools/ruby/ruby/0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch delete mode 100644 meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch delete mode 100644 meta/recipes-devtools/ruby/ruby/0002-template-Makefile.in-filter-out-f-prefix-map.patch delete mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2023-36617_1.patch delete mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2023-36617_2.patch delete mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2024-27281.patch delete mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2024-27282.patch delete mode 100644 meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch rename meta/recipes-devtools/ruby/{ruby_3.2.2.bb => ruby_3.3.5.bb} (88%) diff --git a/meta/recipes-devtools/ruby/ruby/0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch b/meta/recipes-devtools/ruby/ruby/0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch deleted file mode 100644 index 1dff9c0f8c..0000000000 --- a/meta/recipes-devtools/ruby/ruby/0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 6b3c202b46b9312c5bb0789145f13d8086e70948 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 15 Jan 2023 02:34:17 -0800 -Subject: [PATCH] fiddle: Use C11 _Alignof to define ALIGN_OF when possible - -WG14 N2350 made very clear that it is an UB having type definitions -within "offsetof" [1]. This patch enhances the implementation of macro -ALIGN_OF to use builtin "_Alignof" to avoid undefined behavior -when using std=c11 or newer - -clang 16+ has started to flag this [2] - -Fixes build when using -std >= gnu11 and using clang16+ - -Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it -may support C11, exclude those compiler versions - -[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm -[2] https://reviews.llvm.org/D133574 - -Upstream-Status: Submitted [https://github.com/ruby/fiddle/pull/120] -Signed-off-by: Khem Raj ---- - ext/fiddle/fiddle.h | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/ext/fiddle/fiddle.h b/ext/fiddle/fiddle.h -index 10eb9ce..ffb395e 100644 ---- a/ext/fiddle/fiddle.h -+++ b/ext/fiddle/fiddle.h -@@ -196,7 +196,17 @@ - #endif - #define TYPE_UINTPTR_T (-TYPE_INTPTR_T) - --#define ALIGN_OF(type) offsetof(struct {char align_c; type align_x;}, align_x) -+/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 -+ . -+ clang versions < 8.0.0 have the same bug. */ -+#if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ -+ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ -+ && !defined __clang__) \ -+ || (defined __clang__ && __clang_major__ < 8)) -+# define ALIGN_OF(type) offsetof(struct {char align_c; type align_x;}, align_x) -+#else -+# define ALIGN_OF(type) _Alignof(type) -+#endif - - #define ALIGN_VOIDP ALIGN_OF(void*) - #define ALIGN_CHAR ALIGN_OF(char) --- -2.39.0 - diff --git a/meta/recipes-devtools/ruby/ruby/0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch b/meta/recipes-devtools/ruby/ruby/0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch deleted file mode 100644 index 226ef3af75..0000000000 --- a/meta/recipes-devtools/ruby/ruby/0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2368d07660a93a2c41d63f3ab6054ca4daeef820 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 17 Nov 2020 18:31:40 +0000 -Subject: [PATCH] template/Makefile.in: do not write host cross-cc items into - target config - -This helps reproducibility. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - template/Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/template/Makefile.in b/template/Makefile.in -index 10dc826..940ee07 100644 ---- a/template/Makefile.in -+++ b/template/Makefile.in -@@ -657,11 +657,11 @@ mjit_config.h: - echo '#endif'; \ - quote MJIT_MIN_HEADER_NAME "$(MJIT_MIN_HEADER_NAME)"; \ - sep=,; \ -- quote "MJIT_CC_COMMON " $(MJIT_CC); \ -+ quote "MJIT_CC_COMMON " ; \ - quote "MJIT_CFLAGS MJIT_ARCHFLAG" $(MJIT_CFLAGS); \ - quote "MJIT_OPTFLAGS " $(MJIT_OPTFLAGS); \ - quote "MJIT_DEBUGFLAGS " $(MJIT_DEBUGFLAGS); \ -- quote "MJIT_LDSHARED " $(MJIT_LDSHARED); \ -+ quote "MJIT_LDSHARED " ; \ - quote "MJIT_DLDFLAGS MJIT_ARCHFLAG" $(MJIT_DLDFLAGS); \ - quote "MJIT_LIBS " $(LIBRUBYARG_SHARED); \ - quote 'PRELOADENV "@PRELOADENV@"'; \ diff --git a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch deleted file mode 100644 index 96ae86263b..0000000000 --- a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 21d8e7700fa0a9c4bf569dd366134060ae858832 Mon Sep 17 00:00:00 2001 -From: Christopher Larson -Date: Thu, 5 May 2016 10:59:07 -0700 -Subject: [PATCH] Obey LDFLAGS for the link of libruby - -Signed-off-by: Christopher Larson -Upstream-Status: Pending - ---- - template/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/template/Makefile.in b/template/Makefile.in -index 1456313..15b98a4 100644 ---- a/template/Makefile.in -+++ b/template/Makefile.in -@@ -127,7 +127,7 @@ ENABLE_SHARED = @ENABLE_SHARED@ - LDSHARED = @LIBRUBY_LDSHARED@ - DLDSHARED = @DLDSHARED@ - XDLDFLAGS = @DLDFLAGS@ --DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) -+DLDFLAGS = @LIBRUBY_DLDFLAGS@ @LDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) - SOLIBS = @SOLIBS@ - ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@ - MAINLIBS = $(YJIT_LIBS) @MAINLIBS@ diff --git a/meta/recipes-devtools/ruby/ruby/0002-template-Makefile.in-filter-out-f-prefix-map.patch b/meta/recipes-devtools/ruby/ruby/0002-template-Makefile.in-filter-out-f-prefix-map.patch deleted file mode 100644 index 2efbad7513..0000000000 --- a/meta/recipes-devtools/ruby/ruby/0002-template-Makefile.in-filter-out-f-prefix-map.patch +++ /dev/null @@ -1,42 +0,0 @@ -Subject: [PATCH] template/Makefile.in: filter out -f*prefix-map - -If we add DEBUG_PREFIX_MAP into LDFLAGS, ruby and ruby-dbg are no longer -reproducible. Fix this. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Tony Battersby ---- ---- a/tool/mjit_archflag.sh -+++ b/tool/mjit_archflag.sh -@@ -7,6 +7,20 @@ quote() { - echo - } - -+quote_filtered() { -+ printf "#${indent}define $1" -+ while shift && [ "$#" -gt 0 ]; do -+ case "$1" in -+ -ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*) -+ ;; -+ *) -+ printf ' "%s"'$sep "$1" -+ ;; -+ esac -+ done -+ echo -+} -+ - archs="" - arch_flag="" - ---- a/template/Makefile.in -+++ b/template/Makefile.in -@@ -666,7 +666,7 @@ mjit_config.h: - quote "MJIT_OPTFLAGS " $(MJIT_OPTFLAGS); \ - quote "MJIT_DEBUGFLAGS " $(MJIT_DEBUGFLAGS); \ - quote "MJIT_LDSHARED " ; \ -- quote "MJIT_DLDFLAGS MJIT_ARCHFLAG" $(MJIT_DLDFLAGS); \ -+ quote_filtered "MJIT_DLDFLAGS MJIT_ARCHFLAG" $(MJIT_DLDFLAGS); \ - quote "MJIT_LIBS " $(LIBRUBYARG_SHARED); \ - quote 'PRELOADENV "@PRELOADENV@"'; \ - indent=$${archs:+' '}; \ diff --git a/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch b/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch index 41f206523e..0902a201ec 100644 --- a/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch +++ b/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch @@ -12,20 +12,20 @@ Upstream-Status: Backport [debian] 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb -index 0d72cee..eb7bc25 100644 +index d6eac7f..4b2e95e 100644 --- a/lib/rubygems/specification.rb +++ b/lib/rubygems/specification.rb -@@ -1691,7 +1691,9 @@ class Gem::Specification < Gem::BasicSpecification - raise(Gem::InvalidSpecificationException, - "invalid date format in specification: #{date.inspect}") - end -- when Time, DateLike then -+ when Time then -+ Time.utc(date.utc.year, date.utc.month, date.utc.day) -+ when DateLike then - Time.utc(date.year, date.month, date.day) - else - TODAY +@@ -1707,7 +1707,9 @@ class Gem::Specification < Gem::BasicSpecification + raise(Gem::InvalidSpecificationException, + "invalid date format in specification: #{date.inspect}") + end +- when Time, DateLike then ++ when Time then ++ Time.utc(date.utc.year, date.utc.month, date.utc.day) ++ when DateLike then + Time.utc(date.year, date.month, date.day) + else + TODAY -- -2.25.1 +2.40.0 diff --git a/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch b/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch index 0a87cae17f..d32e209129 100644 --- a/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch +++ b/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch @@ -7,7 +7,6 @@ Without an explicit date, they will get the current date and make the build unreproducible Upstream-Status: Backport [debian] - --- ext/bigdecimal/bigdecimal.gemspec | 1 + ext/fiddle/fiddle.gemspec | 1 + @@ -17,12 +16,12 @@ Upstream-Status: Backport [debian] 5 files changed, 5 insertions(+) diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec -index d215757..5148d56 100644 +index f9f3b45..b9a469d 100644 --- a/ext/bigdecimal/bigdecimal.gemspec +++ b/ext/bigdecimal/bigdecimal.gemspec -@@ -4,6 +4,7 @@ Gem::Specification.new do |s| - s.name = "bigdecimal" - s.version = "3.1.3" +@@ -14,6 +14,7 @@ Gem::Specification.new do |s| + s.name = name + s.version = source_version s.authors = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"] + s.date = RUBY_RELEASE_DATE s.email = ["mrkn@mrkn.jp"] @@ -41,10 +40,10 @@ index 8781093..efdca32 100644 spec.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"] diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec -index d26a757..cc88c55 100644 +index d4f5276..8f89611 100644 --- a/ext/io/console/io-console.gemspec +++ b/ext/io/console/io-console.gemspec -@@ -4,6 +4,7 @@ _VERSION = "0.6.0" +@@ -4,6 +4,7 @@ _VERSION = "0.7.1" Gem::Specification.new do |s| s.name = "io-console" s.version = _VERSION @@ -65,7 +64,7 @@ index 1f4798e..48743cf 100644 spec.email = ["knu@idaemons.org", "ume@mahoroba.org"] diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec -index 3c96f7d..fec0872 100644 +index 93a281c..cc5c155 100644 --- a/lib/rdoc/rdoc.gemspec +++ b/lib/rdoc/rdoc.gemspec @@ -7,6 +7,7 @@ end @@ -76,3 +75,6 @@ index 3c96f7d..fec0872 100644 s.version = RDoc::VERSION s.authors = [ +-- +2.40.0 + diff --git a/meta/recipes-devtools/ruby/ruby/CVE-2023-36617_1.patch b/meta/recipes-devtools/ruby/ruby/CVE-2023-36617_1.patch deleted file mode 100644 index 17c7e30176..0000000000 --- a/meta/recipes-devtools/ruby/ruby/CVE-2023-36617_1.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2ebb50d2dc302917a6f57c1239dc9e700dfe0e34 Mon Sep 17 00:00:00 2001 -From: Nobuyoshi Nakada -Date: Thu, 27 Jul 2023 15:53:01 +0800 -Subject: [PATCH] Fix quadratic backtracking on invalid relative URI - -https://hackerone.com/reports/1958260 - -CVE: CVE-2023-36617 - -Upstream-Status: Backport [https://github.com/ruby/uri/commit/9010ee2536adda10a0555ae1ed6fe2f5808e6bf1] - -Signed-off-by: Mingli Yu ---- - lib/uri/rfc2396_parser.rb | 4 ++-- - test/uri/test_parser.rb | 12 ++++++++++++ - 2 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/lib/uri/rfc2396_parser.rb b/lib/uri/rfc2396_parser.rb -index 76a8f99..00c66cf 100644 ---- a/lib/uri/rfc2396_parser.rb -+++ b/lib/uri/rfc2396_parser.rb -@@ -497,8 +497,8 @@ module URI - ret = {} - - # for URI::split -- ret[:ABS_URI] = Regexp.new('\A\s*' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED) -- ret[:REL_URI] = Regexp.new('\A\s*' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED) -+ ret[:ABS_URI] = Regexp.new('\A\s*+' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED) -+ ret[:REL_URI] = Regexp.new('\A\s*+' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED) - - # for URI::extract - ret[:URI_REF] = Regexp.new(pattern[:URI_REF]) -diff --git a/test/uri/test_parser.rb b/test/uri/test_parser.rb -index 72fb590..721e05e 100644 ---- a/test/uri/test_parser.rb -+++ b/test/uri/test_parser.rb -@@ -79,4 +79,16 @@ class URI::TestParser < Test::Unit::TestCase - assert_equal([nil, nil, "example.com", nil, nil, "", nil, nil, nil], URI.split("//example.com")) - assert_equal([nil, nil, "[0::0]", nil, nil, "", nil, nil, nil], URI.split("//[0::0]")) - end -+ -+ def test_rfc2822_parse_relative_uri -+ pre = ->(length) { -+ " " * length + "\0" -+ } -+ parser = URI::RFC2396_Parser.new -+ assert_linear_performance((1..5).map {|i| 10**i}, pre: pre) do |uri| -+ assert_raise(URI::InvalidURIError) do -+ parser.split(uri) -+ end -+ end -+ end - end --- -2.25.1 - diff --git a/meta/recipes-devtools/ruby/ruby/CVE-2023-36617_2.patch b/meta/recipes-devtools/ruby/ruby/CVE-2023-36617_2.patch deleted file mode 100644 index 7c51deaa42..0000000000 --- a/meta/recipes-devtools/ruby/ruby/CVE-2023-36617_2.patch +++ /dev/null @@ -1,52 +0,0 @@ -From eea5868120509c245216c4b5c2d4b5db1c593d0e Mon Sep 17 00:00:00 2001 -From: Nobuyoshi Nakada -Date: Thu, 27 Jul 2023 16:16:30 +0800 -Subject: [PATCH] Fix quadratic backtracking on invalid port number - -https://hackerone.com/reports/1958260 - -CVE: CVE-2023-36617 - -Upstream-Status: Backport [https://github.com/ruby/uri/commit/9d7bcef1e6ad23c9c6e4932f297fb737888144c8] - -Signed-off-by: Mingli Yu ---- - lib/uri/rfc3986_parser.rb | 2 +- - test/uri/test_parser.rb | 10 ++++++++++ - 2 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/lib/uri/rfc3986_parser.rb b/lib/uri/rfc3986_parser.rb -index dd24a40..9b1663d 100644 ---- a/lib/uri/rfc3986_parser.rb -+++ b/lib/uri/rfc3986_parser.rb -@@ -100,7 +100,7 @@ module URI - QUERY: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/, - FRAGMENT: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/, - OPAQUE: /\A(?:[^\/].*)?\z/, -- PORT: /\A[\x09\x0a\x0c\x0d ]*\d*[\x09\x0a\x0c\x0d ]*\z/, -+ PORT: /\A[\x09\x0a\x0c\x0d ]*+\d*[\x09\x0a\x0c\x0d ]*\z/, - } - end - -diff --git a/test/uri/test_parser.rb b/test/uri/test_parser.rb -index 721e05e..cee0acb 100644 ---- a/test/uri/test_parser.rb -+++ b/test/uri/test_parser.rb -@@ -91,4 +91,14 @@ class URI::TestParser < Test::Unit::TestCase - end - end - end -+ -+ def test_rfc3986_port_check -+ pre = ->(length) {"\t" * length + "a"} -+ uri = URI.parse("http://my.example.com") -+ assert_linear_performance((1..5).map {|i| 10**i}, pre: pre) do |port| -+ assert_raise(URI::InvalidComponentError) do -+ uri.port = port -+ end -+ end -+ end - end --- -2.25.1 - diff --git a/meta/recipes-devtools/ruby/ruby/CVE-2024-27281.patch b/meta/recipes-devtools/ruby/ruby/CVE-2024-27281.patch deleted file mode 100644 index f69f3bcf4f..0000000000 --- a/meta/recipes-devtools/ruby/ruby/CVE-2024-27281.patch +++ /dev/null @@ -1,97 +0,0 @@ -From da7a0c7553ef7250ca665a3fecdc01dbaacbb43d Mon Sep 17 00:00:00 2001 -From: Nobuyoshi Nakada -Date: Mon, 15 Apr 2024 11:40:00 +0000 -Subject: [PATCH] Filter marshaled objets - -CVE: CVE-2024-27281 -Upstream-Status: Backport [https://github.com/ruby/rdoc/commit/da7a0c7553ef7250ca665a3fecdc01dbaacbb43d] -Signed-off-by: Hitendra Prajapati ---- - lib/rdoc/store.rb | 45 ++++++++++++++++++++++++++------------------- - 1 file changed, 26 insertions(+), 19 deletions(-) - -diff --git a/lib/rdoc/store.rb b/lib/rdoc/store.rb -index 9fc540d..5b663d7 100644 ---- a/lib/rdoc/store.rb -+++ b/lib/rdoc/store.rb -@@ -556,9 +556,7 @@ class RDoc::Store - def load_cache - #orig_enc = @encoding - -- File.open cache_path, 'rb' do |io| -- @cache = Marshal.load io -- end -+ @cache = marshal_load(cache_path) - - load_enc = @cache[:encoding] - -@@ -615,9 +613,7 @@ class RDoc::Store - def load_class_data klass_name - file = class_file klass_name - -- File.open file, 'rb' do |io| -- Marshal.load io -- end -+ marshal_load(file) - rescue Errno::ENOENT => e - error = MissingFileError.new(self, file, klass_name) - error.set_backtrace e.backtrace -@@ -630,14 +626,10 @@ class RDoc::Store - def load_method klass_name, method_name - file = method_file klass_name, method_name - -- File.open file, 'rb' do |io| -- obj = Marshal.load io -- obj.store = self -- obj.parent = -- find_class_or_module(klass_name) || load_class(klass_name) unless -- obj.parent -- obj -- end -+ obj = marshal_load(file) -+ obj.store = self -+ obj.parent ||= find_class_or_module(klass_name) || load_class(klass_name) -+ obj - rescue Errno::ENOENT => e - error = MissingFileError.new(self, file, klass_name + method_name) - error.set_backtrace e.backtrace -@@ -650,11 +642,9 @@ class RDoc::Store - def load_page page_name - file = page_file page_name - -- File.open file, 'rb' do |io| -- obj = Marshal.load io -- obj.store = self -- obj -- end -+ obj = marshal_load(file) -+ obj.store = self -+ obj - rescue Errno::ENOENT => e - error = MissingFileError.new(self, file, page_name) - error.set_backtrace e.backtrace -@@ -976,4 +966,21 @@ class RDoc::Store - @unique_modules - end - -+ private -+ def marshal_load(file) -+ File.open(file, 'rb') {|io| Marshal.load(io, MarshalFilter)} -+ end -+ -+ MarshalFilter = proc do |obj| -+ case obj -+ when true, false, nil, Array, Class, Encoding, Hash, Integer, String, Symbol, RDoc::Text -+ else -+ unless obj.class.name.start_with("RDoc::") -+ raise TypeError, "not permitted class: #{obj.class.name}" -+ end -+ end -+ obj -+ end -+ private_constant :MarshalFilter -+ - end --- -2.25.1 - diff --git a/meta/recipes-devtools/ruby/ruby/CVE-2024-27282.patch b/meta/recipes-devtools/ruby/ruby/CVE-2024-27282.patch deleted file mode 100644 index dde7979278..0000000000 --- a/meta/recipes-devtools/ruby/ruby/CVE-2024-27282.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 989a2355808a63fc45367785c82ffd46d18c900a Mon Sep 17 00:00:00 2001 -From: Hiroshi SHIBATA -Date: Fri, 12 Apr 2024 15:01:47 +1000 -Subject: [PATCH] Fix Use-After-Free issue for Regexp - -Co-authored-by: Isaac Peka <7493006+isaac-peka@users.noreply.github.com> - -Upstream-Status: Backport [https://github.com/ruby/ruby/commit/989a2355808a63fc45367785c82ffd46d18c900a] -CVE: CVE-2024-27282 -Signed-off-by: Ashish Sharma - - regexec.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/regexec.c b/regexec.c -index 73694ab14a0b0a..140691ad42489f 100644 ---- a/regexec.c -+++ b/regexec.c -@@ -3449,8 +3449,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end, - CASE(OP_MEMORY_END_PUSH_REC) MOP_IN(OP_MEMORY_END_PUSH_REC); - GET_MEMNUM_INC(mem, p); - STACK_GET_MEM_START(mem, stkp); /* should be before push mem-end. */ -- STACK_PUSH_MEM_END(mem, s); - mem_start_stk[mem] = GET_STACK_INDEX(stkp); -+ STACK_PUSH_MEM_END(mem, s); - MOP_OUT; - JUMP; - diff --git a/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch b/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch deleted file mode 100644 index b78e3db892..0000000000 --- a/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e74b57febec9bd806e29025e6eeb8091e7021d75 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 26 Jan 2020 11:27:40 -0800 -Subject: [PATCH] Filter out __has_include* compiler defines - -They are internal to compiler and this header is later on includes in C -files, but newer gcc >= 10 complains about it. - -error in initial header file: -| In file included from /tmp/20200124-86625-14hiju4.c:1: -| /tmp/20200124-86625-11y6l6i.h:13849:9: error: "__has_include" cannot be used as a macro name -| 13849 | #define __has_include __has_include -| | ^~~~~~~~~~~~~ -| compilation terminated due to -Wfatal-errors. - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- - common.mk | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/common.mk b/common.mk -index 664f750..3b8fbe6 100644 ---- a/common.mk -+++ b/common.mk -@@ -238,6 +238,8 @@ $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time: probes.h vm.$(OBJE - $(ECHO) building $(@F:.time=.h) - $(Q)$(MINIRUBY) $(tooldir)/mjit_tabs.rb "$(MJIT_TABS)" \ - $(CPP) -DMJIT_HEADER $(MJIT_HEADER_FLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/vm.c $(CPPOUTFLAG)$(@F:.time=.h).new -+ $(Q)sed -i -e "/#define __has_include __has_include/d" $(@F:.time=.h).new -+ $(Q)sed -i -e "/#define __has_include_next __has_include_next/d" $(@F:.time=.h).new - $(Q) $(IFCHANGE) "--timestamp=$@" $(@F:.time=.h) $(@F:.time=.h).new - - $(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h: $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time diff --git a/meta/recipes-devtools/ruby/ruby_3.2.2.bb b/meta/recipes-devtools/ruby/ruby_3.3.5.bb similarity index 88% rename from meta/recipes-devtools/ruby/ruby_3.2.2.bb rename to meta/recipes-devtools/ruby/ruby_3.3.5.bb index 508154dad5..fb0d711765 100644 --- a/meta/recipes-devtools/ruby/ruby_3.2.2.bb +++ b/meta/recipes-devtools/ruby/ruby_3.3.5.bb @@ -10,7 +10,7 @@ LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPL-2.0-only | ISC | MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \ file://BSDL;md5=8b50bc6de8f586dc66790ba11d064d75 \ file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LEGAL;md5=bcd74b47bbaf2051c5e49811a5faa97a \ + file://LEGAL;md5=81e6a4d81533b9263da4c3485a0ad883 \ " DEPENDS = "zlib openssl libyaml gdbm readline libffi" @@ -20,21 +20,12 @@ DEPENDS:append:class-nativesdk = " ruby-native" SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ file://0001-extmk-fix-cross-compilation-of-external-gems.patch \ - file://0002-Obey-LDFLAGS-for-the-link-of-libruby.patch \ - file://remove_has_include_macros.patch \ file://run-ptest \ - file://0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch \ - file://0002-template-Makefile.in-filter-out-f-prefix-map.patch \ file://0003-rdoc-build-reproducible-documentation.patch \ file://0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch \ file://0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch \ file://0006-Make-gemspecs-reproducible.patch \ file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \ - file://0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch \ - file://CVE-2023-36617_1.patch \ - file://CVE-2023-36617_2.patch \ - file://CVE-2024-27281.patch \ - file://CVE-2024-27282.patch \ " UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/" @@ -55,7 +46,7 @@ do_configure:prepend() { DEPENDS:append:libc-musl = " libucontext" -SRC_URI[sha256sum] = "96c57558871a6748de5bc9f274e93f4b5aad06cd8f37befa0e8d94e7b8a423bc" +SRC_URI[sha256sum] = "3781a3504222c2f26cb4b9eb9c1a12dbf4944d366ce24a9ff8cf99ecbce75196" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" From patchwork Tue Oct 15 18:50:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 50728 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 C1290D1F9A5 for ; Tue, 15 Oct 2024 18:51:20 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web11.4787.1729018271970418122 for ; Tue, 15 Oct 2024 11:51:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=cbCvqZSx; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-71e5b2814f6so2324154b3a.2 for ; Tue, 15 Oct 2024 11:51:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1729018271; x=1729623071; 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=WGnf6rUJ6bJ1lZO3FXmCE5kwzSinMpUe+zuzQ3oghJQ=; b=cbCvqZSxCIr4u+txi5tz30Vi93/2yPeCx3G10UmxbIt3vJhdbeDXtnaCbCVjlYxcwK wfPaSTRm9ZTpVdiFYQ9ClS4qD3RLasur71GzQoIrMM0oYWp7r5bxJPWMhSKuC23uQkPa mY3+w1fPcsVg2Dh6ZANoUFKjvYmgXzadAurdpvAF7gcDx/NCYLUYUEClXX2P6RgBhiK3 yaIK/Jun0tyuRIk/pDTTLZ5sdtoRcDTDH6Jb+dC/PiH4mNMl5ZMDKuqVCfPfkMbUPbEc NTgJdSruqFz5Kam+F9uoQDbzmeGXpsaX7iYw5BXyRJaS2my72DPdoZwWCz7BuZsXbzWk kS3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729018271; x=1729623071; 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=WGnf6rUJ6bJ1lZO3FXmCE5kwzSinMpUe+zuzQ3oghJQ=; b=Uj99svUehJUOwipt5Z1inoAegLwMeL493HAtBxDH+HGPVuNos8UQWFRQp2mdwU0ZOv lki8HEWuBdrjGAL5nD/QCW4ZmRzxljYu68E4HZHxea24n59ZM2L6EKjKXwqP3O/6+V+d rzrtYPqJQLOY4ZcwpeqTrS5cBp9M9jGya43Op83NvE7GHz8ngbs/IrKl6q0MasbfmHzM mmpRfRxYG+81bEa8/TB4S8vx89bVYy5XUJ+GcaNBFXrOH2qEB3kq4Nx0rwWvTQ5iKI7S /3mBaaN5rqU+bS/pMr9j3Kn4b6z8vMqOxU/0gLvwhwypOd3/rrbcbRYPxa2uO55S27sK zDxQ== X-Gm-Message-State: AOJu0YwmHd9IbS3ciK1zQDc0c064gikULe8QrLujAAQ+QnOQcCJka6fg xfqHJLhgkz/S8c+OjF93cFejC2F1R064uRxcMlsu8ovUrh6uC9pjZ1LB6HAY9EgFA5y6vnlM4lN h X-Google-Smtp-Source: AGHT+IFODOBTPYwwbMUUVeZS53urPtfU4mPmcOZD+YQ/exluQVBmFlIHyg3WxeXTjNWOjdLIFr1WyA== X-Received: by 2002:a05:6a00:1817:b0:71e:8049:4730 with SMTP id d2e1a72fcca58-71e80494912mr275305b3a.3.1729018271225; Tue, 15 Oct 2024 11:51:11 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e773717b9sm1616187b3a.9.2024.10.15.11.51.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 11:51:10 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 06/18] ptest-runner: Update 2.4.4 -> 2.4.5 Date: Tue, 15 Oct 2024 11:50:42 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Oct 2024 18:51:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205929 From: Jörg Sommer Changelog: aea9f42 ptest_list_remove: Fix pointer adjustment of prev and next Signed-off-by: Jörg Sommer Signed-off-by: Richard Purdie (cherry picked from commit f70ec9bcd379b5fc4c85d7479d42789c2e22f4a9) Signed-off-by: Steve Sakoman --- .../{ptest-runner_2.4.4.bb => ptest-runner_2.4.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/ptest-runner/{ptest-runner_2.4.4.bb => ptest-runner_2.4.5.bb} (95%) diff --git a/meta/recipes-support/ptest-runner/ptest-runner_2.4.4.bb b/meta/recipes-support/ptest-runner/ptest-runner_2.4.5.bb similarity index 95% rename from meta/recipes-support/ptest-runner/ptest-runner_2.4.4.bb rename to meta/recipes-support/ptest-runner/ptest-runner_2.4.5.bb index 2263e07280..d28ae7ca91 100644 --- a/meta/recipes-support/ptest-runner/ptest-runner_2.4.4.bb +++ b/meta/recipes-support/ptest-runner/ptest-runner_2.4.5.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/ptest-runner2/about/" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "95f528cff0bc52903b98c292d4a322fcffa74471" +SRCREV = "aea9f42f87f2a78a973ae22cade8e45259f754e1" PV .= "+git" SRC_URI = "git://git.yoctoproject.org/ptest-runner2;branch=master;protocol=https \ From patchwork Tue Oct 15 18:50:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 50729 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 C1F77D1D89D for ; Tue, 15 Oct 2024 18:51:20 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web11.4791.1729018273512724878 for ; Tue, 15 Oct 2024 11:51:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=BYn0pX/s; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-7d4fa972cbeso4458882a12.2 for ; Tue, 15 Oct 2024 11:51:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1729018273; x=1729623073; 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=P4Pb4OiD8JicQGC/ShVUEbwxThHAIuWrUkNbiXDx9Oc=; b=BYn0pX/s/AIzJgUTcSl+IvouFktFwDMVnzQDPXNN4GTUtYk/x4fCcAOs125FsXHddH kNFBqHcap++0PttJ7NMqnK3LbVy8MbbrjXe2BE//1T3y21UjdPW7fJGrT+1MytnD27vc 6gURbsDRvvRYyRsnTXK5YZ95rZxzdJH1g1cbpraEJJ0BfGgsnbN7sR0+q6pz9dJzyUSw rRT2RkS3ZmLI7TOLz90M8s59qDXEeV0GbM/zGFUNS82rgUj5SZyJxt7bITt/TNfmzmJN DWDyYXLsAcwkeEwgbadPTf2ih6QZitW932sgEQJBiexGnH1yNCN6wmxlkSXWcAbzakD2 6Lpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729018273; x=1729623073; 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=P4Pb4OiD8JicQGC/ShVUEbwxThHAIuWrUkNbiXDx9Oc=; b=JknSP2Niz0pda9pZLRxncye+kr6AHXD6lbKx6BBc/qjrf9fEDN4HWsQ+0Z4asFYq8L qPeRJNfFj8MG98qLPxaz3D69berEx+Y091zGmSxJWDFfef7nRr4hrh9Ox98iZJSgXsDL jbmHLKzN8Pi8iuSuBhP8sF03gMeZBUpCPHC4nFF3ofQ3lscXs5hApOaMm43mi35MynMa 0CRnsMN3t/lgd/7DsHe6VCHVEoeWt0WDNwJ0BIi4f6n/G05ZcZEGS5T42gEd97cQnOHz O8KeWxm8S1o98Pjia9xtE/qwWLEPD2c6D2a4tLChrTBbKzYEfjm+88eRAKIEyPalX2qF m1uw== X-Gm-Message-State: AOJu0Yx+N0aO3k7mlzF56uovJpWuhI8f2RcKqANs6CdxK+xXxsjRMoH9 /BbHT47QTBSQ3A0LPwj2SZGAyUrZHI9kob8TJu3VEJtC464OyGF7L/MLqCNMiNuMwYQV1TJnYgZ f X-Google-Smtp-Source: AGHT+IEVIKsOV2lUN4No6d4dbMSPHkIuoJ9+OUIeos8OvNYiGpN3VEXdX3ZW9Zi5UnCcLs8x7Rssbg== X-Received: by 2002:a05:6a20:c70b:b0:1d8:f679:ee03 with SMTP id adf61e73a8af0-1d905effa5amr1719094637.27.1729018272661; Tue, 15 Oct 2024 11:51:12 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e773717b9sm1616187b3a.9.2024.10.15.11.51.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 11:51:12 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 07/18] sysvinit: take release tarballs from github Date: Tue, 15 Oct 2024 11:50:43 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Oct 2024 18:51:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205930 From: Alexander Kanavin Upstream no longer publishes them on savannah, e.g. release announcement for 3.10: https://lists.gnu.org/archive/html/sysvinit-devel/2024-07/msg00016.html There's been several new versions since: https://github.com/slicer69/sysvinit/releases Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 6cb71eaf3d225de14e62cfc1b76dc8094f8f4aed) Signed-off-by: Steve Sakoman --- meta/recipes-core/sysvinit/sysvinit_3.04.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/sysvinit/sysvinit_3.04.bb b/meta/recipes-core/sysvinit/sysvinit_3.04.bb index 6a612468f3..1dd5f575d2 100644 --- a/meta/recipes-core/sysvinit/sysvinit_3.04.bb +++ b/meta/recipes-core/sysvinit/sysvinit_3.04.bb @@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ RDEPENDS:${PN} = "${PN}-inittab" -SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ +GITHUB_BASE_URI = "https://github.com/slicer69/${BPN}/releases/" +SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.xz \ file://install.patch \ file://crypt-lib.patch \ file://pidof-add-m-option.patch \ @@ -27,7 +28,7 @@ SRC_URI[sha256sum] = "2a621fe6e4528bc91308b74867ddaaebbdf7753f02395c0c5bae817bd2 S = "${WORKDIR}/sysvinit-${PV}" -inherit update-alternatives features_check +inherit update-alternatives features_check github-releases DEPENDS:append = " update-rc.d-native base-passwd virtual/crypt" do_package_setscene[depends] = "${MLPREFIX}base-passwd:do_populate_sysroot" From patchwork Tue Oct 15 18:50:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 50730 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 C12E1D1F9AA for ; Tue, 15 Oct 2024 18:51:20 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web11.4792.1729018274731994476 for ; Tue, 15 Oct 2024 11:51:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=nNEKzE7/; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-71e57d89ffaso2135998b3a.1 for ; Tue, 15 Oct 2024 11:51:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1729018274; x=1729623074; 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=QgJXDO5LiD5XDXR2OWj5YllMvueGYL5NpWm/iZGConI=; b=nNEKzE7///ekiFCHNNIz05E75GWpyt4FcZRub3AaC5aHYIdxIOUTSlbsS4+s4UymWE tFnOXWqHO+PpCsBow0InmdHAplGWSkK2Zy+P0MepDW+Su8HwMYrcrDuhwn322Uo54z70 Pzoy8FLKFf3Uc/196qv32i4Y5HsdNLXJmDxFOwS8myyXOHarm80BiZdigGi/MJ/p/5UA UMUOei/bc0Dn1vT60vY9gQktgpu1BrYo1BDROhhbpGxUb+ndsvO4L3MFDWuvT43TVR9j GHQx68uBnXtmDHDtNo/SaRTB0b0NfWD6r2uBIvjZDzP3ZU7NAjfUl55IoGXg2eYzMajg zlpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729018274; x=1729623074; 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=QgJXDO5LiD5XDXR2OWj5YllMvueGYL5NpWm/iZGConI=; b=tRUL9GBLdiSu1RyEWtJ0Z4f4fDNRN4HOxHCsATrX2sW+j6iu3VH6fLd06nRYJlWnCR Vamqj14O0nrpipKE/ZaK/1eOuWzJkl/I/tPH8LkYVsmtEqRS0K7DrX3lgOb+9xchYm3w FRACT/7QDRu4sqEOf8wibNuW5io4VwAbCPCM+dZy4e5lB3kJVmHf2qQMv6R1mhasR+6f oSh0UtKPNsdExAN3twRdZ6b27wCEI+pD/v20jXPCooLtl5yHZ3MmVBz5zXrL7r7DU3dE rnu1+t3Zlu+JJsyFYY0QbJr+oULK3658CcgodPV0gqpoUilWUwwtqneINovsITaJ2qgW Qt5Q== X-Gm-Message-State: AOJu0YwtRGVDRvcRwweDjgiphOwxPDR/2HZGSSFia1kSG0ocNQNPkzTQ jhGA821daFMJAmB38QeV1ivRuEPlp3vbo0GneZqcjOpe9ZYgQvKd0og6s1KqpVoZlz9DqcdMB2X L X-Google-Smtp-Source: AGHT+IHSdi4dq5akIsySbgE9nDdngyE/zuw4/Gqmpl6F0z415K+iNDiBUV/tlcZVcFzeDXpgIVQmWA== X-Received: by 2002:a05:6a00:194c:b0:71e:755c:6dad with SMTP id d2e1a72fcca58-71e755c772emr4702083b3a.5.1729018274049; Tue, 15 Oct 2024 11:51:14 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e773717b9sm1616187b3a.9.2024.10.15.11.51.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 11:51:13 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 08/18] libpcre2: Update base uri PhilipHazel -> PCRE2Project Date: Tue, 15 Oct 2024 11:50:44 -0700 Message-Id: <31861ad29c18ee76185970335fe86441ffba0442.1729018153.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Oct 2024 18:51:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205931 From: Khem Raj Signed-off-by: Khem Raj Signed-off-by: Richard Purdie (cherry picked from commit bd6d18228835773163a085070651e13ed961d66d) Signed-off-by: Steve Sakoman --- meta/recipes-support/libpcre/libpcre2_10.43.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/libpcre/libpcre2_10.43.bb b/meta/recipes-support/libpcre/libpcre2_10.43.bb index fd0bd79212..f744df88fa 100644 --- a/meta/recipes-support/libpcre/libpcre2_10.43.bb +++ b/meta/recipes-support/libpcre/libpcre2_10.43.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=321a5eb46acae6b6c1ff2c7a866d836a" SRC_URI = "${GITHUB_BASE_URI}/download/pcre2-${PV}/pcre2-${PV}.tar.bz2" -GITHUB_BASE_URI = "https://github.com/PhilipHazel/pcre2/releases" +GITHUB_BASE_URI = "https://github.com/PCRE2Project/pcre2/releases" UPSTREAM_CHECK_REGEX = "releases/tag/pcre2-(?P\d+(\.\d+)+)$" SRC_URI[sha256sum] = "e2a53984ff0b07dfdb5ae4486bbb9b21cca8e7df2434096cc9bf1b728c350bcb" From patchwork Tue Oct 15 18:50:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 50733 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 CE32FD1F9AD for ; Tue, 15 Oct 2024 18:51: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.4795.1729018276374651675 for ; Tue, 15 Oct 2024 11:51:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=leU2eXI4; spf=softfail (domain: sakoman.com, ip: 209.85.215.180, mailfrom: steve@sakoman.com) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-7ea7ad1e01fso116587a12.0 for ; Tue, 15 Oct 2024 11:51:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1729018276; x=1729623076; 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=0z5YAccJO6aSargXND4DNXKmV//bAWr6p2JW68wC7Ow=; b=leU2eXI4Y8HIRPKaU4gT+Ip/CK7w4hgBKZpV5Owa2oiB8c1MpJ0QO49r45mSw2/Fkb zAvMJmjpjwSfd9uA3gmMnLgf944qw50nOPvPsc04b0BzMw/ecfMBRIk8VaNXN+4fTAvu ynWorLDB/NkL3Qbnh8WF1jTXv4e7wk6MIh+Tg0RdSGYwHADR6JhZnX4TV/Vc8axMHaJu Km+JD1hJhjNLAYTloKmzsiIr5P7+9HSy92hGmmUrYowV7a3+nZ34q2yM/hzVCN0vCdnv dh7jAsnsglh8EghnVP7M1WZL45Kr9tfEhx/wGa30vOG0vvi+7qnmVJmUzfkVEsaTP0CK z/RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729018276; x=1729623076; 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=0z5YAccJO6aSargXND4DNXKmV//bAWr6p2JW68wC7Ow=; b=lFhmuTYE2sMdmB00rworHoHG/n2U6uVPQKuF4Vwz/i51GWte/TSWPAQTHCsAHIyHwR bJEZUorkoaNiabd0OC1O1TtHe8fI6DHE9eY3JbdwOCsr2F+JIjf1ukvnjpmkrHFekuh4 wY7UDXYRoBAthkIrx2A2vUmEQxaLK3pmGVrxI0hmtzSkrufBJ0vHwPyzTPC8iX8DePho 5omZzBFhCTADvhzbd30xPlXv+AZiqy74+2oGF81HWgtjS1rjZwBlIRxbYEdwYicObuQ9 VyvYX1pebQrdN8tHMBh/GzeSjZqaohd017cLIuANDJJaImwUGJCw2NsHUYGa9WJ7OMGh 9HZQ== X-Gm-Message-State: AOJu0YyJwmoA9rJxbKoLBQbC7L7J0O7Mat2zotI9rspb+mywRPN9bzpG VNII50dFsQpnhq5Tsp9bSY3xZl1xd8cTkJvg/vURDWVWMDicTpeXisnvUcoU6ckVkQ4WwpYUiqu J X-Google-Smtp-Source: AGHT+IHs9H6LlYLY8ZnREa7/oaJe8dWc81cwZygMYpuFsvTdDNqjKtQEql+b9VutOGN+ZxfmH8yOkg== X-Received: by 2002:a05:6a20:c888:b0:1c8:de01:e7e5 with SMTP id adf61e73a8af0-1d8bc8c8c47mr19679013637.15.1729018275617; Tue, 15 Oct 2024 11:51:15 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e773717b9sm1616187b3a.9.2024.10.15.11.51.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 11:51:15 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 09/18] license: Fix directory layout issues Date: Tue, 15 Oct 2024 11:50:45 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Oct 2024 18:51:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205932 From: Richard Purdie There are several issues: a) pointless empty directories were being created as a path wasn't fixed in a previous commit b) SSTATE_PKGARCH wasn't being captured into the task signature since it is in the ignore list by default. We want to capture the absolute value, not the dependencies c) with those issues fixed, cross/native issues became apparent so those need to be fixed too. Signed-off-by: Richard Purdie Backport from oe-core master: f68aed302a0e4b86fb8c16a6ef4e7295bed48b86 Signed-off-by: Mark Hatle Signed-off-by: Steve Sakoman --- meta/classes-global/license.bbclass | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/meta/classes-global/license.bbclass b/meta/classes-global/license.bbclass index b2e0d3faba..d7c5d08a77 100644 --- a/meta/classes-global/license.bbclass +++ b/meta/classes-global/license.bbclass @@ -18,8 +18,14 @@ LICENSE_CREATE_PACKAGE ??= "0" LICENSE_PACKAGE_SUFFIX ??= "-lic" LICENSE_FILES_DIRECTORY ??= "${datadir}/licenses/" +LICENSE_DEPLOY_PATHCOMPONENT = "${SSTATE_PKGARCH}" +LICENSE_DEPLOY_PATHCOMPONENT:class-cross = "native" +LICENSE_DEPLOY_PATHCOMPONENT:class-native = "native" +# Ensure the *value* of SSTATE_PKGARCH is captured as it is used in the output paths +LICENSE_DEPLOY_PATHCOMPONENT[vardepvalue] += "${LICENSE_DEPLOY_PATHCOMPONENT}" + addtask populate_lic after do_patch before do_build -do_populate_lic[dirs] = "${LICSSTATEDIR}/${PN}" +do_populate_lic[dirs] = "${LICSSTATEDIR}/${LICENSE_DEPLOY_PATHCOMPONENT}/${PN}" do_populate_lic[cleandirs] = "${LICSSTATEDIR}" python do_populate_lic() { @@ -29,7 +35,7 @@ python do_populate_lic() { lic_files_paths = find_license_files(d) # The base directory we wrangle licenses to - destdir = os.path.join(d.getVar('LICSSTATEDIR'), d.getVar('SSTATE_PKGARCH'), d.getVar('PN')) + destdir = os.path.join(d.getVar('LICSSTATEDIR'), d.getVar('LICENSE_DEPLOY_PATHCOMPONENT'), d.getVar('PN')) copy_license_files(lic_files_paths, destdir) info = get_recipe_info(d) with open(os.path.join(destdir, "recipeinfo"), "w") as f: From patchwork Tue Oct 15 18:50:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 50732 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 CE601D1F9B5 for ; Tue, 15 Oct 2024 18:51:20 +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.4796.1729018278698715313 for ; Tue, 15 Oct 2024 11:51:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=g0h4w8o6; 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-71e3fce4a60so2968109b3a.0 for ; Tue, 15 Oct 2024 11:51:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1729018278; x=1729623078; 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=dnfdE7P0Mlsfs95T7zSskqSvvgl2vq64BMlf/DvAdXw=; b=g0h4w8o6q5julsm6GzhYYE7I4A4UstFIISwDnfm8Fb6F4i4QPpNO4xbWV/kFe5ycZF c2JOV1ON5EAi4p9EaKbTxW1iVAd+/rgsXv51iB3K7//EeEpptbk1rKF+rj8SiWj+8xAj JZ4Ppa4udnG8yp1KFlEkf+Gud4cFHI0pJj+trRz8/V5KWYJNA+cUzhKSoJa0O2PQVhWm HVKbxgistTuoMLYtNJhc17QqyfXaaoeHWPEiwc/2y+P5AO4nHuy6LbwoQwphSERmsCyt PTNkDiW3YYAanGKr76TAFFl5hKpxQ9L8Hajbko0zIiek6ycmD4qQK8sDECen1ZMBAgik tdDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729018278; x=1729623078; 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=dnfdE7P0Mlsfs95T7zSskqSvvgl2vq64BMlf/DvAdXw=; b=nF1UqUyVxOrCtwL/6ers67e+aNyfqzV0Y6SW3qvXWGI+BudjXwKHtZeVbaROmnE1i4 xWAGG1je3ZvbJlzHLA7KF0hz/5Ef9+Me55hg9azjue9BltrRArZ4gtKAiOuJecdX1gvN yGs7KMwXMdaeYi1w9oTZdCVnPfQ1hhPU52Gh9ma5VEsxiDngMOxZlz1tCfeX4CAEzYj5 vKkQfb0cQ2VknRHQPhX7I5wlzP5ZVy6237jyyhPMbhC0B/uCoUVZXamNRpWaG2nEuoMa DkaMQVtWlxlu4EipZAtVtwqj8vfDEQeR7iM195qvoy64T5fUNRofejkNBbfmxi9ocDrV XmiA== X-Gm-Message-State: AOJu0YxMo3RbzLP3tET14Tu4qxsrGl5KkCDhyguTWeW/7t2v0MZXZZwG rfTYrWiqCl3dVq1WK1NO0r1ijizYVlgKMRD9gouUgBSji9sq3sYDoMEzNGzI0JAw+TnQUvB915N f X-Google-Smtp-Source: AGHT+IGpZ1HMGroVzGhQaU58itPnQIpA1cEHXNdwfYDHO7TEEqSZdOin7P08ClRHNkHP9/XVxOcPyA== X-Received: by 2002:a05:6a00:10c8:b0:71e:72b5:3094 with SMTP id d2e1a72fcca58-71e7db1cc99mr1911461b3a.28.1729018277398; Tue, 15 Oct 2024 11:51:17 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e773717b9sm1616187b3a.9.2024.10.15.11.51.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 11:51:17 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 10/18] virglrenderer: Add patch to fix -int-conversion build issue Date: Tue, 15 Oct 2024 11:50:46 -0700 Message-Id: <17049482f0a112781026376245437c4c8343d28a.1729018153.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Oct 2024 18:51:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205933 From: Purushottam Choudhary Fix int conversion related error during compilation as some of the platforms where EGLNativeDisplayType is an int instead of a pointer with GCC-14. Signed-off-by: Purushottam Choudhary Signed-off-by: Richard Purdie (cherry picked from commit f71f4936a273262343e34f278e6cfcc1e419aea3) Signed-off-by: Steve Sakoman --- ...nversion-fatal-build-error-with-GCC-.patch | 41 +++++++++++++++++++ .../virglrenderer/virglrenderer_1.0.1.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch new file mode 100644 index 0000000000..9c49ee512a --- /dev/null +++ b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch @@ -0,0 +1,41 @@ +From 464deabe4d1bfce6b8f414ab0945d9a62b66ddd4 Mon Sep 17 00:00:00 2001 +From: Purushottam Choudhary +Date: Tue, 8 Oct 2024 11:47:21 +0530 +Subject: [PATCH] vrend: Fix int-conversion fatal build error with GCC-14 + +Getting below error int conversion during compilation as one the +platforms where EGLNativeDisplayType is an int instead of a pointer. + +| ../git/src/vrend_winsys_egl.c: In function 'virgl_egl_init': +| ../git/src/vrend_winsys_egl.c:364:62: error: passing argument 2 of 'egl->funcs.epoxy_eglGetPlatformDisplay' makes pointer from +| 364 | (EGLNativeDisplayType)egl->gbm->device, NULL); +| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +| | | +| | int +| ../git/src/vrend_winsys_egl.c:364:62: note: expected 'void *' but argument is of type 'int' + +Upstream-Status: Backport [https://gitlab.freedesktop.org/virgl/virglrenderer/-/commit/464deabe4d1bfce6b8f414ab0945d9a62b66ddd4] + +Signed-off-by: Purushottam Choudhary +Part-of: +--- + + src/vrend_winsys_egl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/vrend_winsys_egl.c b/src/vrend_winsys_egl.c +index 9d9f410c..8750f6b2 100644 +--- a/src/vrend_winsys_egl.c ++++ b/src/vrend_winsys_egl.c +@@ -361,7 +361,7 @@ struct virgl_egl *virgl_egl_init(EGLNativeDisplayType display_id, bool surfacele + #ifdef ENABLE_GBM + else + egl->egl_display = egl->funcs.eglGetPlatformDisplay(EGL_PLATFORM_GBM_KHR, +- (EGLNativeDisplayType)egl->gbm->device, NULL); ++ (EGLNativeDisplayType*)egl->gbm->device, NULL); + #endif + } else { + #ifdef ENABLE_GBM +-- +2.34.1 + diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.1.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.1.bb index 0501b0c59c..87f25a3461 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.1.bb +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.1.bb @@ -12,6 +12,7 @@ DEPENDS = "libdrm libepoxy virtual/egl virtual/libgbm" SRCREV = "690680e5f0f952e22424fca1538c1b24457a0868" SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=main;protocol=https \ file://0001-meson.build-use-python3-directly-for-python.patch \ + file://0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch \ " S = "${WORKDIR}/git" From patchwork Tue Oct 15 18:50:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 50731 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 DAC54D1F9B7 for ; Tue, 15 Oct 2024 18:51:20 +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.4740.1729018279904196478 for ; Tue, 15 Oct 2024 11:51:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Hbs8aBPV; spf=softfail (domain: sakoman.com, ip: 209.85.210.177, mailfrom: steve@sakoman.com) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-71e5130832aso2143477b3a.0 for ; Tue, 15 Oct 2024 11:51:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1729018279; x=1729623079; 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=ZR9szJTYHAA+5hHVaAaYJBZWXd/eZxs14F4rhxsofXQ=; b=Hbs8aBPVc+Rlcy0KBSSGkCVRqPQJWEZvu3ZDi3uDb0l6jSN+GnvLU0czD+d4ZXOQKN KYnJ25IRKh/8aVwK+zJIOMFPMH8JO6Sv+DZNBVVO8dS691XeUSyA3VBrBbHXnkZqK+AV R+jsAjh8y/JDqA1hwVfKNWWm3N1NdnSU3ktt/uPbOiYqj4GJ9DBCCLHdoia6YKYDdxf3 aiSBLbPoqUzDYn0k89KN+h0ppQ7Gh9K39MgZp6ZCcBKnRwI5vfCQPYUHAPmpngE+suT+ FVeNY8oaRhl6RBxgfo9VmLFgXRyAE/QiVzlU9NK9fBjcWwrVtfcxgCn01+3C0UjTMDUu +lBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729018279; x=1729623079; 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=ZR9szJTYHAA+5hHVaAaYJBZWXd/eZxs14F4rhxsofXQ=; b=IdqyHaHBHwcAC+i+TWILCNF4vxJA1izpn9p5zta/t48qCeNOFO67gVlHXUkfhqiJPf UrrPX46TI197qDxMDbnzlSMlzmdg1IxfJ+W4Ts9dA+aLMLIFR9/hEGXguEuEXFoNy9yv dyrxVymnpapSdzC6R6gbZwQEUpSjrHftpgx/bqXoS+1onNcAoJFWgcQuGYhRSBRcFwIu R4zJKu04OiImJ7L6F41uPZolyrfyVXvg76z0FiCTYLPzlzLGqs3jwl2iK6t+NaA4u1ax VoO6BcvDLgIsC3BlrOwr4ZkY/UucY0BqKxafj3v/Sa6fkZQ9UNeSPc5vpvlzqohaexED 8zqw== X-Gm-Message-State: AOJu0YzqJ7bjy+reCPpz1jSjUjCjrWv0yZxNov/qpPvGb+App4+IRHVo UD8bNaJFG5SfmcjSeIm/z4IVBSbqGDSgFy44ryuJyCwnm9pPVHhKx3CBJt2aKkUQpUsnJV1mEZN D X-Google-Smtp-Source: AGHT+IGkEpQU5XyzYtNxRrQXR9Tp3pYKMT5SCY/onsDp6TBswnISogV66QHI8Di+HViznDprWIb/5A== X-Received: by 2002:aa7:88d1:0:b0:71e:4a51:2007 with SMTP id d2e1a72fcca58-71e4c13daadmr22789740b3a.4.1729018279039; Tue, 15 Oct 2024 11:51:19 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e773717b9sm1616187b3a.9.2024.10.15.11.51.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 11:51:18 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 11/18] lib/oe/package-manager: skip processing installed-pkgs with empty globs Date: Tue, 15 Oct 2024 11:50:47 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Oct 2024 18:51:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205934 From: Claus Stovgaard We can skip processing the installed-pkgs file if globs is empty. This is the case if self.d.getVar for IMAGE_INSTALL_COMPLEMENTARY returns an empty string. If globs is an empty string the result from processing with empty glob in oe-pkgdata-util will always be 0 packages to install. Instead of return early on this we just skip and still generate the locale archive if needed. Signed-off-by: Claus Stovgaard Signed-off-by: Richard Purdie (cherry picked from commit 160c45c83d5addf01e4834cf896af871bd6fca7f) Signed-off-by: Steve Sakoman --- meta/lib/oe/package_manager/__init__.py | 76 ++++++++++++------------- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/meta/lib/oe/package_manager/__init__.py b/meta/lib/oe/package_manager/__init__.py index d3b2317894..2100a97c12 100644 --- a/meta/lib/oe/package_manager/__init__.py +++ b/meta/lib/oe/package_manager/__init__.py @@ -365,45 +365,43 @@ class PackageManager(object, metaclass=ABCMeta): for complementary_linguas in (self.d.getVar('IMAGE_LINGUAS_COMPLEMENTARY') or "").split(): globs += (" " + complementary_linguas) % lang - if globs is None: - return - - # we need to write the list of installed packages to a file because the - # oe-pkgdata-util reads it from a file - with tempfile.NamedTemporaryFile(mode="w+", prefix="installed-pkgs") as installed_pkgs: - pkgs = self.list_installed() - - provided_pkgs = set() - for pkg in pkgs.values(): - provided_pkgs |= set(pkg.get('provs', [])) - - output = oe.utils.format_pkg_list(pkgs, "arch") - installed_pkgs.write(output) - installed_pkgs.flush() - - cmd = ["oe-pkgdata-util", - "-p", self.d.getVar('PKGDATA_DIR'), "glob", installed_pkgs.name, - globs] - exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY') - if exclude: - cmd.extend(['--exclude=' + '|'.join(exclude.split())]) - try: - bb.note('Running %s' % cmd) - proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = proc.communicate() - if stderr: bb.note(stderr.decode("utf-8")) - complementary_pkgs = stdout.decode("utf-8") - complementary_pkgs = set(complementary_pkgs.split()) - skip_pkgs = sorted(complementary_pkgs & provided_pkgs) - install_pkgs = sorted(complementary_pkgs - provided_pkgs) - bb.note("Installing complementary packages ... %s (skipped already provided packages %s)" % ( - ' '.join(install_pkgs), - ' '.join(skip_pkgs))) - self.install(install_pkgs, hard_depends_only=True) - except subprocess.CalledProcessError as e: - bb.fatal("Could not compute complementary packages list. Command " - "'%s' returned %d:\n%s" % - (' '.join(cmd), e.returncode, e.output.decode("utf-8"))) + if globs: + # we need to write the list of installed packages to a file because the + # oe-pkgdata-util reads it from a file + with tempfile.NamedTemporaryFile(mode="w+", prefix="installed-pkgs") as installed_pkgs: + pkgs = self.list_installed() + + provided_pkgs = set() + for pkg in pkgs.values(): + provided_pkgs |= set(pkg.get('provs', [])) + + output = oe.utils.format_pkg_list(pkgs, "arch") + installed_pkgs.write(output) + installed_pkgs.flush() + + cmd = ["oe-pkgdata-util", + "-p", self.d.getVar('PKGDATA_DIR'), "glob", installed_pkgs.name, + globs] + exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY') + if exclude: + cmd.extend(['--exclude=' + '|'.join(exclude.split())]) + try: + bb.note('Running %s' % cmd) + proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = proc.communicate() + if stderr: bb.note(stderr.decode("utf-8")) + complementary_pkgs = stdout.decode("utf-8") + complementary_pkgs = set(complementary_pkgs.split()) + skip_pkgs = sorted(complementary_pkgs & provided_pkgs) + install_pkgs = sorted(complementary_pkgs - provided_pkgs) + bb.note("Installing complementary packages ... %s (skipped already provided packages %s)" % ( + ' '.join(install_pkgs), + ' '.join(skip_pkgs))) + self.install(install_pkgs, hard_depends_only=True) + except subprocess.CalledProcessError as e: + bb.fatal("Could not compute complementary packages list. Command " + "'%s' returned %d:\n%s" % + (' '.join(cmd), e.returncode, e.output.decode("utf-8"))) if self.d.getVar('IMAGE_LOCALES_ARCHIVE') == '1': target_arch = self.d.getVar('TARGET_ARCH') From patchwork Tue Oct 15 18:50:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 50735 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 D7B2DD1F9B7 for ; Tue, 15 Oct 2024 18:51:30 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web10.4741.1729018281469204952 for ; Tue, 15 Oct 2024 11:51:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Z9Dd2tTB; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-71e483c83dbso3757048b3a.3 for ; Tue, 15 Oct 2024 11:51:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1729018281; x=1729623081; 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=L8G3xgz+qILKRXneAvXd5PpO/QQlFGN/Lsv327BaPFc=; b=Z9Dd2tTBZuEXfgz+6E3MXNoDCo/KvxK2Nu3wLGxItx2jmGuvQj0KAFGSYzeS4sLV1N Wg6XdWf7A0T4kE4trWS4bEGk/HgNb7lJ7hJC8JZxBuhaiaAi9N2TDQ1CODAB3ABYsKxk hd7lOkWlE0wxlwUGg60fnWzu1yR+A4Y/NRb2tBpoYy/37umInILBlmSKFb5/gFZNer54 uKwYW8W7HG4giXnf+IuJa18TPkBrp3hZt/mb908AeVcCTBV8f9ynJ0zNDwY1BfAB1pfX l/mbCP97iC/UtEOdV0JFAbdkalfTAWh5RMj1i1Ds/fIMP88MuOsGSUFGwKO3xTwrZM0T rJHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729018281; x=1729623081; 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=L8G3xgz+qILKRXneAvXd5PpO/QQlFGN/Lsv327BaPFc=; b=vzwGJV1nVtZw0kbyaQ2yr9Nj2+CZi63zj+KZ56b5LtdxVShpIctLyME0CZ2Sr86ZOG qNWBczJPxl/tQrAWO5a6wyNCsTCMnlwX+lD477X2K5PqOAS0Ht1wTsrzhPfEMyPhALWS Q5Qc28lkjmk+/v79seGNoY4UX1N561roLu5hCdvAQRYuG64UiEvJs/NueXsLMnkXUBK0 jCEW5DRzJ3xcSKxqDxjTLLZQn8icJsj4U91sgMq5UkzA+pjuZyP3b19mEz/KqbUGQzSl WJ4XXtfyCVwve8zRN4eTYz4v3Be5FQyn1bofz8OeHG8EHhRgvPyKU3KWhZKFGjV2ZNqV AB9A== X-Gm-Message-State: AOJu0Yz5E1DxeJNuBPv0ADJ7gHxnjsabkhfXb9wvlvNXTOewHhlutvhk pMpGZc7tV9Gx3/RhBlRwRbOD9RVVKDkjGJ1Ro8cesOqr6aTXUiOSJ70Loh+7uzQupv8MdLTi6Yt Y X-Google-Smtp-Source: AGHT+IHXF88epwxlkfZbHoXv3CBNwPBQeKTk28Vl83/9Xt9oRwBJljkNudeqL8FJppZUVYH3tSI3BQ== X-Received: by 2002:a05:6a00:cd6:b0:71e:692e:7afb with SMTP id d2e1a72fcca58-71e7da06ccbmr1845564b3a.5.1729018280710; Tue, 15 Oct 2024 11:51:20 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e773717b9sm1616187b3a.9.2024.10.15.11.51.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 11:51:20 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 12/18] makedevs: Fix matching uid/gid Date: Tue, 15 Oct 2024 11:50:48 -0700 Message-Id: <865b7149da5dd6301c1d9805a1e7bac8dcac82a9.1729018153.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Oct 2024 18:51:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205935 From: Jaeyoon Jung Correct the length to compare in convert2guid() to fix an issue where it ends up with returning a wrong id that matches partially. Also fix the length of usr_buf and grp_buf in interpret_table_entry() which are used as arguments of convert2guid(). Signed-off-by: Jaeyoon Jung Signed-off-by: Richard Purdie (cherry picked from commit ca9d193a21e6b8669c4da1a68cd5e0791bb80a4b) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/makedevs/makedevs/makedevs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/recipes-devtools/makedevs/makedevs/makedevs.c b/meta/recipes-devtools/makedevs/makedevs/makedevs.c index 2254b54891..411a669153 100644 --- a/meta/recipes-devtools/makedevs/makedevs/makedevs.c +++ b/meta/recipes-devtools/makedevs/makedevs/makedevs.c @@ -202,7 +202,7 @@ static unsigned long convert2guid(char *id_buf, struct name_id *search_list) // Check for bad user/group name node = search_list; while (node != NULL) { - if (!strncmp(node->name, id_buf, strlen(id_buf))) { + if (!strncmp(node->name, id_buf, MAX_ID_LEN)) { fprintf(stderr, "WARNING: Bad user/group name %s detected\n", id_buf); break; } @@ -212,7 +212,7 @@ static unsigned long convert2guid(char *id_buf, struct name_id *search_list) } else { node = search_list; while (node != NULL) { - if (!strncmp(node->name, id_buf, strlen(id_buf))) + if (!strncmp(node->name, id_buf, MAX_ID_LEN)) return node->id; node = node->next; } @@ -362,13 +362,13 @@ static void add_new_fifo(char *name, char *path, unsigned long uid, static int interpret_table_entry(char *line) { char *name; - char usr_buf[MAX_ID_LEN]; - char grp_buf[MAX_ID_LEN]; - char path[4096], type; + char usr_buf[MAX_ID_LEN+1]; + char grp_buf[MAX_ID_LEN+1]; + char path[PATH_MAX], type; unsigned long mode = 0755, uid = 0, gid = 0, major = 0, minor = 0; unsigned long start = 0, increment = 1, count = 0; - if (0 > sscanf(line, "%4095s %c %lo %39s %39s %lu %lu %lu %lu %lu", path, + if (0 > sscanf(line, "%4095s %c %lo %40s %40s %lu %lu %lu %lu %lu", path, &type, &mode, usr_buf, grp_buf, &major, &minor, &start, &increment, &count)) { From patchwork Tue Oct 15 18:50:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 50738 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 D709DD1F9B5 for ; Tue, 15 Oct 2024 18:51:30 +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.web10.4744.1729018283106697808 for ; Tue, 15 Oct 2024 11:51:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=upfRUg/x; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-7db90a28cf6so115026a12.0 for ; Tue, 15 Oct 2024 11:51:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1729018282; x=1729623082; 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=aHhFc45gkTDwnVX7xEfn1lHsJujv42R3yYz/bSTiI3o=; b=upfRUg/x/vS8caRbVsZW/sqzITWTqlKSoAgiJCBIoMIVL4xPiEj08uCgZnWR7wggks ogEOQz1HgRPkbykkFZHlXZfbYYMRgLKAI0TFKX5EhweAKIt+ecb4fDIzinXAwzI1+FHJ AKYDbMkshmhQTnh/B1uRP3AkovaUvxVnUMxFA3Zu7LgLeRirZG7g+92udwvE1bCqKEmU H2XxP6nenlfwnnriPefDSNQTkgDkwjRSi0MoP7QcpMWxwp0eXbnlu7KRHTkO8dR7/ZrI vn2YjTI2JvJR/lW8ryTG4oYss5aH5f+XubGf2KaGmvv+lO2k3rZdmsSvcVhH14XETlh0 dLHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729018282; x=1729623082; 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=aHhFc45gkTDwnVX7xEfn1lHsJujv42R3yYz/bSTiI3o=; b=b7ymdHGZsarck2hap3JRpLk0K+vXZU+O4XWAEHOyCapukntsC5xIv1O/J/Ff7llx4T iL9XbttJ47x/K9TodES0O6qWCDOo7s5+YnY67To4eCgmj9oTD2juqq6xX943NrSTBJfb u4nq7vClBVO6jWE1/9cuWnpkdlYCA56Vm7Sgv5tXoI0tXAn5eaGEKG/PYd1oyxs6SJrf FWLPQ9kVJo9qeoiH6k49f0I+Aql8zoZr3xb7lrnxi4K5+30UIHe0UdqdWrMlmhiiglyU ABrByi7RDMqR9X1zLqk2IFm55NPSL7sfdwroLG7qCy/uuRryERwsznulikRKqMajYldT JXdQ== X-Gm-Message-State: AOJu0YyAl7q4PvhylCmp8IZh1ymL203inrf7JHqFO/2JEL00bWD5pMkr 4f5XXDNXrdQfrleqVii+7U1r5KhsDD1UXuYZnQj1AiTXwepkSB7W4lmbU+/dIvhnGjHrrA5rYW4 a X-Google-Smtp-Source: AGHT+IH6NKh6V8VLWvkzzjuLC7y49ZyKaU0dXQr5vnR3N6ZiVo5cbjPGJDuT8OrPgKf6OGRnugNUVA== X-Received: by 2002:a05:6a21:168e:b0:1d3:418a:e42 with SMTP id adf61e73a8af0-1d8bc81269amr23003019637.10.1729018282373; Tue, 15 Oct 2024 11:51:22 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e773717b9sm1616187b3a.9.2024.10.15.11.51.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 11:51:22 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 13/18] runqemu: Fix detection of -serial parameter Date: Tue, 15 Oct 2024 11:50:49 -0700 Message-Id: <44c1f003d617ac20527926b4b321ffd1fe4462bb.1729018153.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Oct 2024 18:51:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205936 From: Jörg Sommer The pattern `-serial` matches also `-device usb-serial` and `virtio-serial` which are not the desired parameter. This causes the serial console ttyS1 is missing and Systemd's getty@ttyS1 fails constantly. Signed-off-by: Jörg Sommer Signed-off-by: Richard Purdie (cherry picked from commit b6d035894120b45b42f146ab5b3110522c58d178) Signed-off-by: Steve Sakoman --- scripts/runqemu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index fe395d1bc6..2ab36fd03d 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -1487,7 +1487,7 @@ to your build configuration. # If no serial or serialtcp options were specified, only ttyS0 is created # and sysvinit shows an error trying to enable ttyS1: # INIT: Id "S1" respawning too fast: disabled for 5 minutes - serial_num = len(re.findall("-serial", self.qemu_opt)) + serial_num = len(re.findall("(^| )-serial ", self.qemu_opt)) # Assume if the user passed serial options, they know what they want # and pad to two devices @@ -1507,7 +1507,7 @@ to your build configuration. self.qemu_opt += " %s" % self.get("QB_SERIAL_OPT") - serial_num = len(re.findall("-serial", self.qemu_opt)) + serial_num = len(re.findall("(^| )-serial ", self.qemu_opt)) if serial_num < 2: self.qemu_opt += " -serial null" From patchwork Tue Oct 15 18:50:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 50734 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 D74A6D1F9B6 for ; Tue, 15 Oct 2024 18:51:30 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web10.4745.1729018285020878108 for ; Tue, 15 Oct 2024 11:51:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=vOry8dkL; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-7e6ed072cdaso3678151a12.0 for ; Tue, 15 Oct 2024 11:51:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1729018284; x=1729623084; 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=mwyr2+NzoqCcbw/eg/fHvFsf2/f5sJGfUR0fMbhz0ig=; b=vOry8dkL0z9N11sIZjdzw4RWyKjcqO/3mkxAhSt10nPzL5ud+wBkjWshHVf3wCfLos o7Kv4r1/uy0iwobj3EZFUStjxXMT0gCmpSXZstIqXerf4zJk5goOgp+041+lA4TqRclJ ee5WEmZzNnDdB/gLeeIUUEEOJiVCaRw9YcvBh/U2vIXHvqFD9BaJjpZOFrNfYX885zQt 0/3Q4Tc/v0bxCSm8SbcVQ/HdysmOfEdyBWokgc1iPIfe8IHR9D7sfmKqfg+vC1Nn1+1H RmPWJeNPcB9IvO10jaGwrDXP02vTpTFRtn0/MmDCrocbjfvn/QMnOFP7pvjlvqatn4T9 iIZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729018284; x=1729623084; 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=mwyr2+NzoqCcbw/eg/fHvFsf2/f5sJGfUR0fMbhz0ig=; b=GZb4E0r69pnEKtKdP/8FaWDRWkbTKSfAEle1ZPNyYXxdQhT9w/TOkw5rc8yXQwu1w+ Hk8p37KNXAwlPALGx260H/+Oh93vOgfH5sB2H3vH6iT2GhGhhQ3n5d4aCXyil8c/Oy04 L9HxkLVTQdqCKK9QGS+PRfkARI+J1YfOw64EGx2R1PM8aO48VxCe5OrwACcFn0waVEk/ VoLiih4NNCKvG7My1WhdaamkGqTWMC66wxrIUaqz0xqygmUxsBjCymCPC9gbLbCwvZW6 UMl3oA0XfJ2X4BvxdSmFkpzaHm2+z94X7vkH9RPFK+8Q6k14um755FNo4ffhYtHl3UMn ntPg== X-Gm-Message-State: AOJu0YxFHTiimRNCRqxV/r7GtVwNPIuf1p7eX4tOiLKvHjHqkH8bM57+ /sI5sATOTmML7brk9AxtBHFZJeA/+1yuFMqQrxGfOtYwpeY+XFTuzTJvFF40Nc5WOtpW061YTEy h X-Google-Smtp-Source: AGHT+IGS6/shqVQzziX4DUiIuHNqkxvyUF18QkwONxTdDPaMPNsEjIkyH9Nn3oKxKLe/t3LqHTMUAA== X-Received: by 2002:a05:6a20:4387:b0:1d6:fd8c:fa16 with SMTP id adf61e73a8af0-1d8c96ba661mr16549574637.46.1729018284272; Tue, 15 Oct 2024 11:51:24 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e773717b9sm1616187b3a.9.2024.10.15.11.51.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 11:51:24 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 14/18] uboot-sign: fix counters in do_uboot_assemble_fitimage Date: Tue, 15 Oct 2024 11:50:50 -0700 Message-Id: <7f81c38e91563d6d77621a3bfcb155cd226c9b74.1729018153.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Oct 2024 18:51:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205937 From: Paul Gerber Without unsetting `j` and `k` for each `UBOOT_MACHINE`, `j` and `k` are incremented in the same frequency as `i` and therefore `$j -eq $i` and `$k -eq $i` is always true for the first `type` from `UBOOT_CONFIG` and the first `binary` from `UBOOT_BINARIES`. Signed-off-by: Paul Gerber Signed-off-by: Richard Purdie (cherry picked from commit 3aef55c7ceb654b0012f20618bfd6ead1ef578b6) Signed-off-by: Steve Sakoman --- meta/classes-recipe/uboot-sign.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes-recipe/uboot-sign.bbclass b/meta/classes-recipe/uboot-sign.bbclass index c8e097f2f2..3e5f5dcf66 100644 --- a/meta/classes-recipe/uboot-sign.bbclass +++ b/meta/classes-recipe/uboot-sign.bbclass @@ -356,8 +356,9 @@ do_uboot_assemble_fitimage() { fi if [ -n "${UBOOT_CONFIG}" ]; then - unset i j k + unset i for config in ${UBOOT_MACHINE}; do + unset j k i=$(expr $i + 1); for type in ${UBOOT_CONFIG}; do j=$(expr $j + 1); From patchwork Tue Oct 15 18:50:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 50737 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 E527FD1F9BD for ; Tue, 15 Oct 2024 18:51:30 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web11.4801.1729018286406226511 for ; Tue, 15 Oct 2024 11:51:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=UdF0S2ep; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-71e52582cf8so2211409b3a.2 for ; Tue, 15 Oct 2024 11:51:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1729018286; x=1729623086; 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=r5GqWygiqKPQ3YSwgrNKoRuD0vlGPDc52BttpQIHufk=; b=UdF0S2eprg+QlV8lX86EJ1ynF92cHIoy5AJPwYt3i8NMas59/G1u2Jd8j5vyXSeqq1 P9ctaJ5H5CXDdXXlXyr1a770+D/lSR3DRx2PHYV1YBIOh4lFpntZt2THJ8RRQeyFa2W9 nNL+NkOXl+JoZ5D/zRksiWd0Mi4NB8tEf9lMYfw2VBA9fRKeTUveGdZhOZaLuC1bRe/R q6ooYMxdKSzNWYgr577NipEuRpTNPE3tCqwGCB+ZwRuDAODTZTE+y6BOuAXAW9e/OpBU 8pA4eh13hkxzgZMKqmwLi2i2dZyPBhncjhAKvPq0EsvzmyrwjmD9iftjKqzBJu8nKivz Q8cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729018286; x=1729623086; 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=r5GqWygiqKPQ3YSwgrNKoRuD0vlGPDc52BttpQIHufk=; b=aRfwGVP7/XytNIWlkPd3RNoGs8qZ3E4fjwFBsVlCYb8uzLfCnDo7ISoyRNMWLYl4fu LiDc1PPXxZg9YGG7YxMI8QH4qojOhKcjKMdaTSvP0boUO2PqFW2JTzcO2xllsJEDRLAY wahlIDMeTGwypQUvPDZRFwSNqZpMn0aY7sSZLnArx4JFQQfrEKz6L7dXvkIXDxgTku72 qv7YinNrKQvaJYiwBxnzqwrYe0MTEBQQHY8LSWTPe5fQkxie6WqXFVTmLTtUGe/kFqcJ nJAMTBM1cuTbr6ZTP4vj+q9bM6u9VY48YxSQUorRUkcuL+WGeWjkip8oqVlITjVo196G RegA== X-Gm-Message-State: AOJu0YzBA93UvQX1j8bbqei//2b+1L2S7k/L8FBQZ8JyxkWfVc1u+YAd jPyEAEDnzJSSutK5/MtyywIhJQ796wCWVnTB5mF5C/5hpOAPuf2YoK3/feyGi+jhW4dDGAMUdAD a X-Google-Smtp-Source: AGHT+IFUkBDEvOK+4m/nycnXVc0MuQZ3LrY2a+8mn//TQDrydBTdyJMRBXFF+SNYa2LGqckCwfHbvg== X-Received: by 2002:a05:6a20:d81a:b0:1d9:a72:87e9 with SMTP id adf61e73a8af0-1d90a728911mr641544637.10.1729018285627; Tue, 15 Oct 2024 11:51:25 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e773717b9sm1616187b3a.9.2024.10.15.11.51.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 11:51:25 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 15/18] recipes-bsp: usbutils: Fix usb-devices command using busybox Date: Tue, 15 Oct 2024 11:50:51 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Oct 2024 18:51:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205938 From: Teresa Remmet Unknown find parameter -printf makes usb-devices script unusable with busybox. Replace the parameter to fix this issue. Signed-off-by: Teresa Remmet Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit c7c9f827e914b7c27856d995da553a2e41372321) Signed-off-by: Steve Sakoman --- ...devices-Fix-usb-devices-with-busybox.patch | 37 +++++++++++++++++++ meta/recipes-bsp/usbutils/usbutils_017.bb | 1 + 2 files changed, 38 insertions(+) create mode 100755 meta/recipes-bsp/usbutils/usbutils/0001-usb-devices-Fix-usb-devices-with-busybox.patch diff --git a/meta/recipes-bsp/usbutils/usbutils/0001-usb-devices-Fix-usb-devices-with-busybox.patch b/meta/recipes-bsp/usbutils/usbutils/0001-usb-devices-Fix-usb-devices-with-busybox.patch new file mode 100755 index 0000000000..dbe5d7c18b --- /dev/null +++ b/meta/recipes-bsp/usbutils/usbutils/0001-usb-devices-Fix-usb-devices-with-busybox.patch @@ -0,0 +1,37 @@ +From da155d965a34b5c5770dc30fa52eb7ef405f3a30 Mon Sep 17 00:00:00 2001 +From: Teresa Remmet +Date: Thu, 5 Sep 2024 08:37:48 +0200 +Subject: [PATCH] usb-devices: Fix usb-devices with busybox + +The busybox find command is missing the -printf parameter leading to +the error: + +find: unrecognized: -printf + +Replace the parameter with sed. + +This patch was originally created by Daniel Fancsali. + +Upstream-Status: Backport [https://github.com/gregkh/usbutils/commit/da155d965a34b5c5770dc30fa52eb7ef405f3a30] + +Signed-off-by: Teresa Remmet +--- + usb-devices | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usb-devices b/usb-devices +index 5f60ad5a1ed0..51f48b4ad628 100755 +--- a/usb-devices ++++ b/usb-devices +@@ -192,7 +192,7 @@ if [ ! -d /sys/bus ]; then + exit 1 + fi + +-for device in $(find /sys/bus/usb/devices -name 'usb*' -printf '%f\n' | sort -V) ++for device in $(find /sys/bus/usb/devices -name 'usb*' | sed -E 's#^.*/##g' | sort -V) + do + print_device "/sys/bus/usb/devices/$device" 0 0 0 + done +-- +2.34.1 + diff --git a/meta/recipes-bsp/usbutils/usbutils_017.bb b/meta/recipes-bsp/usbutils/usbutils_017.bb index a2e340ea4f..83d5c7287d 100644 --- a/meta/recipes-bsp/usbutils/usbutils_017.bb +++ b/meta/recipes-bsp/usbutils/usbutils_017.bb @@ -13,6 +13,7 @@ DEPENDS = "libusb1 virtual/libiconv udev" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ file://0001-usbutils.pc.in-Fix-Cflags-entry.patch \ + file://0001-usb-devices-Fix-usb-devices-with-busybox.patch \ " SRC_URI[sha256sum] = "f704c4cb78a060db88b43aac6ebfd3d93c2c5cf1d6dd0e42936faaf00814ab00" From patchwork Tue Oct 15 18:50:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 50736 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 E545CD1F9C0 for ; Tue, 15 Oct 2024 18:51:30 +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.4802.1729018288370607492 for ; Tue, 15 Oct 2024 11:51:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Z47vV6A0; spf=softfail (domain: sakoman.com, ip: 209.85.216.47, mailfrom: steve@sakoman.com) Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2e2e88cb0bbso3233012a91.3 for ; Tue, 15 Oct 2024 11:51:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1729018287; x=1729623087; 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=JgBt8MWXu7nn18oyoHZzsYZZNRypkDPQYMmFhZSS164=; b=Z47vV6A0vBdOuNFjkwPvVAYxjTUgSpWSwnGuQnpi9eYozTqtIbhEZ6YLl0Xgj2Y7MF 6CL7jQa1gKxAjoauBJWW7dEkvO2SvAoIUHrxeMaXscS5RXsyaCG6/V7QMCMbxM+j1qAF Gsi2coOx6C+d9jk+PcjGe/XT9EF13cacxOfco9wS4h5YBeriI0738iAgbjA9PmuZx5UW 6wbW9NSDKSmz8PVf4vHuV+TWCVPsr9uckH2Uy/pqLAB0Q9YQC4tu4LRRhH2VwVqnKDgr znDMqZ/qjxF57hakGhwcHuq82ZIzW9itfemw/a26dqENSfVZCyYW6dv4cIrpH8HVkqRL Gg9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729018287; x=1729623087; 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=JgBt8MWXu7nn18oyoHZzsYZZNRypkDPQYMmFhZSS164=; b=Sf6fGESZFGf2Giooy4aovgkAHFIsrBnKYNkHVB0grBbJ1Wb6GpsvYB3ydQvsYXg6BY PISENEYtFnituIviYHMk4AldB5MIAz2X5qwTFvDYGozYtzwvdY8x/RNnvdEhElp5TCZ3 wqQf+unEU2iRymLWy/4gIGM+9TabEb93C2kheIa+pTp/sf670TfpO0QN6zOaulkG9hCx xW5NYK6cM3K9yy8IL1rBE9/3WQLL+vF2JAS4rqcHYDMxmrEH6xnAChOXr35YDdrbWF8r gcTn+nGMcqst0JCORCriICJUFD5tiWFfOV29hf3q7BT+/6b/yjtODkUYx4/k96wamveq CMug== X-Gm-Message-State: AOJu0YxPOuP2zeMgudU9Rz169+Vt2FOJZcI+knkoJxXWWjqGL+UDPOJk zH4cK1xQvTJjdseXpZvAXK/v1FLZiSVycW/0xhLVeve671xBpeYKdcXBgcneUp9B6mvC5IEe80g G X-Google-Smtp-Source: AGHT+IEODpBbpLT35r6cH2ul+opptE731CTYcdY3vrzOFAPyCeyOR3KZm1RuFL1wgl7nUQbiVaLlDg== X-Received: by 2002:a05:6a20:d806:b0:1d8:f418:3323 with SMTP id adf61e73a8af0-1d905ea0c9fmr1672432637.2.1729018287468; Tue, 15 Oct 2024 11:51:27 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e773717b9sm1616187b3a.9.2024.10.15.11.51.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 11:51:27 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 16/18] libsdl2: Fix non-deterministic configure option for libsamplerate Date: Tue, 15 Oct 2024 11:50:52 -0700 Message-Id: <7ee654579ccf818708989251a97662ea11218d14.1729018153.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Oct 2024 18:51:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205939 From: Richard Purdie The libsamplerate option was floating and being enabled on some systems and not others. Fix this to be deterministic. Signed-off-by: Richard Purdie (cherry picked from commit 61455a839e568a3ae7e059ea95c02a1c88d39e1a) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/libsdl2/libsdl2_2.30.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.30.1.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.30.1.bb index 891e91190a..7a14104671 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.30.1.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.30.1.bb @@ -67,6 +67,7 @@ PACKAGECONFIG[directfb] = "-DSDL_DIRECTFB=ON,-DSDL_DIRECTFB=OFF,directfb,direc PACKAGECONFIG[gles2] = "-DSDL_OPENGLES=ON,-DSDL_OPENGLES=OFF,virtual/libgles2" PACKAGECONFIG[jack] = "-DSDL_JACK=ON,-DSDL_JACK=OFF,jack" PACKAGECONFIG[kmsdrm] = "-DSDL_KMSDRM=ON,-DSDL_KMSDRM=OFF,libdrm virtual/libgbm" +PACKAGECONFIG[libsamplerate] = "-DSDL_LIBSAMPLERATE=ON,-DSDL_LIBSAMPLERATE=OFF,libsamplerate0" # The hidraw support doesn't catch Xbox, PS4 and Nintendo controllers, # so we'll just use libusb when it's available. PACKAGECONFIG[libusb] = ",,libusb1" From patchwork Tue Oct 15 18:50:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 50739 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 003B9D1F9C5 for ; Tue, 15 Oct 2024 18:51:31 +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.4803.1729018290074098910 for ; Tue, 15 Oct 2024 11:51:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=FGYZL4VQ; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-7ea7ad1e01fso116743a12.0 for ; Tue, 15 Oct 2024 11:51:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1729018289; x=1729623089; 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=ZmdzOR/XoH0QBHB6d8Ste7GecB7HNBJWYo2es0+abBc=; b=FGYZL4VQG2oK7/mMel2259qmV9j+LmhxV0n3qMcpZZ2AHvEbkDLdZftMW7yChyK0aa nqiRHX8qpNktKJ3Pp4AQ4P+I7GHZ7QBAni4HVprDM1TUrLF9/1VfvWd6WmotxekIkfeH DeYwpfIEqqdfcn+NfuWZcwYP3Lkq+MPd+6kc86OQRuqYizmq+M9JEJ5DE2t1y4uGJNQs /Z9ION63oOuWZc8WOkLnCB4J+c86paDhAQKKElVhoLe2EQF6CaHvZW4lv8Pswl0FHqcn xGydyBx7NuF7rBwFn286uunZP+aC/hoQKXEl+m/Za/dvNWVw7ypG0lCmRFC6E3i0iY4K XmOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729018289; x=1729623089; 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=ZmdzOR/XoH0QBHB6d8Ste7GecB7HNBJWYo2es0+abBc=; b=IelX8g75Yiz3Aq9LDMU3J4eJw55ONv9L9wyKqGID3gKi2H1AyuKr9HHSzi6MKuGCza a8RQkith1iin3STPn53K1kQost8Wibsezurw8pyswC60BCArjAoxqVhnwiDPQORetYDA flhrUACvLSTerMsWRXbX2meH+i9unW8zeLMK+FKFlUqxsOZJOSAVAy/fErGeLd3zgoXa VDh3RoD127/xQ3uniH00jDn63fT0j5JeUi5sArc5VPqvBYgzZTztjrxkA0XmEjP6Ppkf SX9of1h/7bddTDlIpSauvDtuzvnVPuWocWF0ji2GdEkxSMROhSBqXIi0VDJWpXXUAQo2 jogw== X-Gm-Message-State: AOJu0YwmrMy22IlWaS4O79bxP1UqdhbiH1SsuUYQEAJOv/vrhDkXPXkA g01n16itmR67XKc656VOXhT9NICtsrFXa+v540RRCif/ZbcOZRzYPa4pqCg4IRloUWhMiwr7/Um k X-Google-Smtp-Source: AGHT+IHirkvQdBsou87f1n9fp3DDqejqZkqu/5bRQkiWnfsnbpYGlhc/l9IXI/Z7KmQYZPrGI7Kf/g== X-Received: by 2002:a05:6a00:4fca:b0:71e:44f6:690f with SMTP id d2e1a72fcca58-71e44f66cb1mr21789879b3a.8.1729018289317; Tue, 15 Oct 2024 11:51:29 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e773717b9sm1616187b3a.9.2024.10.15.11.51.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 11:51:28 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 17/18] image_qa: fix error handling Date: Tue, 15 Oct 2024 11:50:53 -0700 Message-Id: <8fe7aef17eefa70e3f7c07077b8c695e5c00ed5e.1729018153.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Oct 2024 18:51:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205940 From: Louis Rannou Make ImageQAFailed inherit BBHandledException so exceptions raised in tests are catched when the actual test function is executed by bb.utils.better_exec. Change the do_image_qa tasks so errors are handled with oe.qa.handle_error. Add some comment to explain this requires to list the test in ERROR_QA or WARN_QA. [YOCTO #14807] https://bugzilla.yoctoproject.org/show_bug.cgi?id=14807 Signed-off-by: Louis Rannou Signed-off-by: Richard Purdie (cherry picked from commit 905e224849fbbed1719e0add231b00e2d570b3b4) Signed-off-by: Steve Sakoman --- meta/classes-recipe/image.bbclass | 11 ++++++----- meta/lib/oe/utils.py | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass index 28be6c6362..a682b5f3b2 100644 --- a/meta/classes-recipe/image.bbclass +++ b/meta/classes-recipe/image.bbclass @@ -308,23 +308,24 @@ addtask do_image_complete_setscene # # The functions should use ${IMAGE_ROOTFS} to find the unpacked rootfs # directory, which if QA passes will be the basis for the images. +# +# The functions should use oe.utils.ImageQAFailed(description, name) to raise +# errors. The name must be listed in ERROR_QA or WARN_QA to prompt. fakeroot python do_image_qa () { from oe.utils import ImageQAFailed qa_cmds = (d.getVar('IMAGE_QA_COMMANDS') or '').split() - qamsg = "" for cmd in qa_cmds: try: bb.build.exec_func(cmd, d) except oe.utils.ImageQAFailed as e: - qamsg = qamsg + '\tImage QA function %s failed: %s\n' % (e.name, e.description) + qamsg = 'Image QA function %s failed: %s\n' % (e.name, e.description) + oe.qa.handle_error(e.name, qamsg, d) except Exception as e: qamsg = qamsg + '\tImage QA function %s failed: %s\n' % (cmd, e) - if qamsg: - imgname = d.getVar('IMAGE_NAME') - bb.fatal("QA errors found whilst validating image: %s\n%s" % (imgname, qamsg)) + oe.qa.exit_if_errors(d) } addtask do_image_qa after do_rootfs before do_image diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 14a7d07ef0..83f1440887 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -482,7 +482,7 @@ def get_multilib_datastore(variant, d): localdata.setVar("MLPREFIX", "") return localdata -class ImageQAFailed(Exception): +class ImageQAFailed(bb.BBHandledException): def __init__(self, description, name=None, logfile=None): self.description = description self.name = name From patchwork Tue Oct 15 18:50:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 50742 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 EE74FD1F9BD for ; Tue, 15 Oct 2024 18:52: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.web10.4758.1729018321368309814 for ; Tue, 15 Oct 2024 11:52:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Wm+MKsy6; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-7ea78037b7eso2612604a12.0 for ; Tue, 15 Oct 2024 11:52:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1729018321; x=1729623121; 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=oSNu9m1EWefviKNDfFxAOteKGwrHvJycJ7vM9XedQTw=; b=Wm+MKsy6k2754zqst9ZLKRdGcRlWMhWFIJpNsnlSyWtNkaNt/6mLRB+3zQCP7i4CGs 2jA/S97SKMYKjuQRZ4ylyP2No8cfvGtOwXuHL9K+7pC2Kbx6G7jKaDvbcRVvl6vhZno6 wZnH4vp7rNl0dGlyEdF3Urj8VVOrLb3mg3kvsVxx98HFQ3ODuu0AAjkn4SW+0KeJVwIR AlgHMKDU0SI+NhQy19uYrVakfiEd0Oi7ad2x4ub1WcxpvUvXN/vHu5b9V9gYt3HqVSIb uczfuZniOHYFPkE8mlWh95vUhaz8i+E+KYRvrWlvkEw8OY/bvH4AtRw28qjbq6xY516L l3Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729018321; x=1729623121; 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=oSNu9m1EWefviKNDfFxAOteKGwrHvJycJ7vM9XedQTw=; b=ZW3RPloml9eKxIyy0EnLXkivcQ3Vs+HG0e2dkestmUjnHgAg/LpsYAImtMpUxL7+QO ANgpEDvnw/RYmSEapi/+/b+YQv9Tp4saBL+rI8a9wdYPU9BGtrRhiBBpOom+/IdRN1bl BZ+Mn0IdoZPfQ6kD/3eJABhM2XiEO9Df7+XJpBi4sQsixsEfRPa3iK5QzhbhkzV0PpQT UNhgiyOnZ8YuZzMcaSaipUtoCDkuEyJh7Ip90qLpVKBTRSUUfJrSPNJAXJs5kcooZnsf th8ulr0N8oY2tPy3E7FqeVRNPjA+CD+7bZMTwTGUBG6h93ceBtEoD8ZRFq+zV3R2Eo6I BEYA== X-Gm-Message-State: AOJu0YyHSJUgYQTVtJXMi+5urGOxuW8iumHRi7Nozp5g37OYbBYnkmMI Pv0IMt99k+6Ne/aTgNGH28amGEsVvBsiGHiAJRzRUs3rkt+xhnJMFm12oNlPx4cTEwB4Ak4Izv/ k X-Google-Smtp-Source: AGHT+IEYcQNzD1ce+PgAhHNC7mMVDlSgasdSBES+DhZJU1ARVRrQxW8iuzXSQM3MgDsYPNM38hrXBw== X-Received: by 2002:a05:6a21:3947:b0:1d9:2a8:ce2a with SMTP id adf61e73a8af0-1d902a8d057mr1824014637.45.1729018290727; Tue, 15 Oct 2024 11:51:30 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e773717b9sm1616187b3a.9.2024.10.15.11.51.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 11:51:30 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 18/18] meta-ide-support: Mark recipe as MACHINE-specific Date: Tue, 15 Oct 2024 11:50:54 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Oct 2024 18:52:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205942 From: Paul Barker meta-ide-support:do_write_test_data dumps the bitbake data dictionary to a file using export2json(). As this obviously includes the value of MACHINE, and other MACHINE-specific variables, the recipe needs to be marked as MACHINE-specific. RP: Note that this patch does change the name of the environment script since it is no longer package arch specific but machine arch specific. [RP: Fix selftest to reference new environment file] Signed-off-by: Paul Barker Signed-off-by: Richard Purdie (cherry picked from commit 3be2bc8a9b0c9d6a178329c8b451a6bedf255d6c) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/meta_ide.py | 4 ++-- meta/recipes-core/meta/meta-ide-support.bb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py index ffe0d2604d..5a17ca52ea 100644 --- a/meta/lib/oeqa/selftest/cases/meta_ide.py +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py @@ -20,8 +20,8 @@ class MetaIDE(OESelftestTestCase): bitbake('meta-ide-support') bitbake('build-sysroots -c build_native_sysroot') bitbake('build-sysroots -c build_target_sysroot') - bb_vars = get_bb_vars(['MULTIMACH_TARGET_SYS', 'DEPLOY_DIR_IMAGE', 'COREBASE']) - cls.environment_script = 'environment-setup-%s' % bb_vars['MULTIMACH_TARGET_SYS'] + bb_vars = get_bb_vars(['MACHINE_ARCH', 'TARGET_VENDOR', 'TARGET_OS', 'DEPLOY_DIR_IMAGE', 'COREBASE']) + cls.environment_script = 'environment-setup-%s%s-%s' % (bb_vars['MACHINE_ARCH'], bb_vars['TARGET_VENDOR'], bb_vars['TARGET_OS']) cls.deploydir = bb_vars['DEPLOY_DIR_IMAGE'] cls.environment_script_path = '%s/%s' % (cls.deploydir, cls.environment_script) cls.corebasedir = bb_vars['COREBASE'] diff --git a/meta/recipes-core/meta/meta-ide-support.bb b/meta/recipes-core/meta/meta-ide-support.bb index d85aa120c0..7ed422ce4d 100644 --- a/meta/recipes-core/meta/meta-ide-support.bb +++ b/meta/recipes-core/meta/meta-ide-support.bb @@ -1,6 +1,7 @@ SUMMARY = "Integrated Development Environment support" DESCRIPTION = "Meta package for ensuring the build directory contains all appropriate toolchain packages for using an IDE" LICENSE = "MIT" +PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "virtual/libc gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native unfs3-native cmake-native autoconf-native automake-native meson-native intltool-native pkgconfig-native" RM_WORK_EXCLUDE += "${PN}"