From patchwork Tue Jul 9 19:29: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: 46116 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 94DE2C3DA42 for ; Tue, 9 Jul 2024 19:30:09 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web10.4643.1720553407403101182 for ; Tue, 09 Jul 2024 12:30:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=A7HFZ9X7; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-70b1207bc22so3262586b3a.3 for ; Tue, 09 Jul 2024 12:30:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1720553407; x=1721158207; 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=0fPsraDa4/zz+uwv4qc0VjzDwoUMjtNXM0WbTkUcByM=; b=A7HFZ9X7tvrjZU3yA3bgW6qd38uYkjw2zTKj1fjEvpxVgRWolOwp054ph4p+dsgTUa pO33jVxKP/eTf4BhILBtuIMVqI/DvvyLsc5BzD1dTsUEE6j1T6wRwxaXsl5FEisZJrdp QcWPgTqoN/ROnW8b3XeSgxcttdCyszowaFIAHpspdUBSF9SLrCNM70g/OjU77kgtX1rG f4AHjWRR25kW8OakjPzdPaNgt+Ua2rDKgkITQaJwf/yimIGQrTFoAP9iUCooWiZ+0wJp NYRAAZUayUkIgIH7FIMvMXUGpOQQXeORUPcxTJ+rPFLyQqz9GxaZI1CMgzkCgCIoAKUY t38Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720553407; x=1721158207; 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=0fPsraDa4/zz+uwv4qc0VjzDwoUMjtNXM0WbTkUcByM=; b=Yx0KTXq1b+5N0tvWLgIYeBq9RU/Zisb7DW08I9teNEjWIrrrRiNgVRDuNlwKw/jj3q H6mpozWFRZ5xgr40xFt1tA82kFvnRAtdgjv4L3hscqsl+cZ4DgaynbN+/R/W2yFGBf6m rPweT2LFQZPGVSmxQPFIf1zrKjLhshfjLvfsG8o5/kyyYtXS1zj01DzDpm47FL/YG4Xu FZS84NP5UnCJsPf+OBjDomXBD92ueJAnJ3vB3EYVjx7oHO+N19NLLnoa+NsQ0jyPkJAm 2Va79YEF85cmbNfGjdWlBLh+naLcYKeUzgagAjI913wkGACfhctjGBx8k2Vme0ibgvWR XY8g== X-Gm-Message-State: AOJu0Ywv0ZvxPGcwQD+7Q2UTwDUy0Si+5ZYFrXuQTYYkcx689RlWzLnn n4X6OvLYj+PNkGNWtKmSpvMTnUZYppIu5u6Tg7FaEy2y4WWFqwkmPOeyiKhiHXp3tFqA0JAmpxU c X-Google-Smtp-Source: AGHT+IEAflfcLi9p9EtVJxzQIzmSZo8yPpc1jlQylG6O4BHpEfidqlWngcnmX4IzdEbTlDxzdrtk7g== X-Received: by 2002:aa7:8894:0:b0:70a:f38c:74cc with SMTP id d2e1a72fcca58-70b4353854emr4935344b3a.8.1720553406413; Tue, 09 Jul 2024 12:30:06 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b438995a8sm2282780b3a.10.2024.07.09.12.30.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 12:30:06 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 1/7] ghostscript: upgrade 10.02.1 -> 10.03.1 Date: Tue, 9 Jul 2024 12:29:54 -0700 Message-Id: <2a19132aca9d62be0d1e58444b0a8881456311dc.1720553275.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, 09 Jul 2024 19:30:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/201674 From: Hitendra Prajapati avoid-host-contamination.patch refreshed for 10.03.1 Below patches are no longer needed as it's included in this upgrade. 1. CVE-2024-29510.patch 2. CVE-2024-33869-0001.patch 3. CVE-2024-33869-0002.patch 4. CVE-2024-33870.patch 5. CVE-2024-33871.patch 6. configure.ac-add-option-to-explicitly-disable-neon.patch other patch release to address security bugs: CVE-2024-29506 CVE-2024-29507 CVE-2024-29508 CVE-2024-29509 CVE-2024-29511 (From OE-Core rev: 9a424fbcdc0c792ff3b99bf0e8a5e380582f53bc) Signed-off-by: Changqing Li Signed-off-by: Alexandre Belloni Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- .../ghostscript/CVE-2024-29510.patch | 84 ---------------- .../ghostscript/CVE-2024-33869-0001.patch | 39 -------- .../ghostscript/CVE-2024-33869-0002.patch | 52 ---------- .../ghostscript/CVE-2024-33870.patch | 99 ------------------- .../ghostscript/CVE-2024-33871.patch | 43 -------- .../avoid-host-contamination.patch | 11 +-- ...dd-option-to-explicitly-disable-neon.patch | 99 ------------------- ...ript_10.02.1.bb => ghostscript_10.03.1.bb} | 8 +- 8 files changed, 5 insertions(+), 430 deletions(-) delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2024-29510.patch delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33869-0001.patch delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33869-0002.patch delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33870.patch delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33871.patch delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/configure.ac-add-option-to-explicitly-disable-neon.patch rename meta/recipes-extended/ghostscript/{ghostscript_10.02.1.bb => ghostscript_10.03.1.bb} (88%) diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-29510.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-29510.patch deleted file mode 100644 index 692d35157f..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-29510.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 3b1735085ecef20b29e8db3416ab36de93e86d1f Mon Sep 17 00:00:00 2001 -From: Ken Sharp -Date: Thu, 21 Mar 2024 09:01:15 +0000 -Subject: [PATCH 5/5] Uniprint device - prevent string configuration changes - when SAFER - -Bug #707662 - -We cannot sanitise the string arguments used by the Uniprint device -because they can potentially include anything. - -This commit ensures that these strings are locked and cannot be -changed by PostScript once SAFER is activated. Full configuration from -the command line is still possible (see the *.upp files in lib). - -This addresses CVE-2024-29510 - -CVE: CVE-2024-29510 - -Upstream-Status: Backport [https://cgit.ghostscript.com/cgi-bin/cgit.cgi/ghostpdl.git/commit/?id=3b1735085ecef20b29e] - -Signed-off-by: Archana Polampalli ---- - devices/gdevupd.c | 31 +++++++++++++++++++++++++++++++ - 1 file changed, 31 insertions(+) - -diff --git a/devices/gdevupd.c b/devices/gdevupd.c -index 740dae0..a50571a 100644 ---- a/devices/gdevupd.c -+++ b/devices/gdevupd.c -@@ -1887,6 +1887,16 @@ out on this copies. - if(!upd_strings[i]) continue; - UPD_PARAM_READ(param_read_string,upd_strings[i],value,udev->memory); - if(0 == code) { -+ if (gs_is_path_control_active(udev->memory)) { -+ if (strings[i].size != value.size) -+ error = gs_error_invalidaccess; -+ else { -+ if (strings[i].data && memcmp(strings[i].data, value.data, strings[i].size) != 0) -+ error = gs_error_invalidaccess; -+ } -+ if (error < 0) -+ goto exit; -+ } - if(0 <= error) error |= UPD_PUT_STRINGS; - UPD_MM_DEL_PARAM(udev->memory, strings[i]); - if(!value.size) { -@@ -1904,6 +1914,26 @@ out on this copies. - if(!upd_string_a[i]) continue; - UPD_PARAM_READ(param_read_string_array,upd_string_a[i],value,udev->memory); - if(0 == code) { -+ if (gs_is_path_control_active(udev->memory)) { -+ if (string_a[i].size != value.size) -+ error = gs_error_invalidaccess; -+ else { -+ int loop; -+ for (loop = 0;loop < string_a[i].size;loop++) { -+ gs_param_string *tmp1 = (gs_param_string *)&(string_a[i].data[loop]); -+ gs_param_string *tmp2 = (gs_param_string *)&value.data[loop]; -+ -+ if (tmp1->size != tmp2->size) -+ error = gs_error_invalidaccess; -+ else { -+ if (tmp1->data && memcmp(tmp1->data, tmp2->data, tmp1->size) != 0) -+ error = gs_error_invalidaccess; -+ } -+ } -+ } -+ if (error < 0) -+ goto exit; -+ } - if(0 <= error) error |= UPD_PUT_STRING_A; - UPD_MM_DEL_APARAM(udev->memory, string_a[i]); - if(!value.size) { -@@ -2098,6 +2128,7 @@ transferred into the device-structure. In the case of "uniprint", this may - if(0 > code) error = code; - } - -+exit: - if(0 < error) { /* Actually something loaded without error */ - - if(!(upd = udev->upd)) { --- -2.40.0 diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33869-0001.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33869-0001.patch deleted file mode 100644 index 2f20c66ea3..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33869-0001.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5ae2e320d69a7d0973011796bd388cd5befa1a43 Mon Sep 17 00:00:00 2001 -From: Ken Sharp -Date: Tue, 26 Mar 2024 12:02:57 +0000 -Subject: [PATCH 2/5] Bug #707691 - -Part 1; when stripping a potential Current Working Dirctory specifier -from a path, make certain it really is a CWD, and not simply large -ebough to be a CWD. - -Reasons are in the bug thread, this is not (IMO) serious. - -This is part of the fix for CVE-2024-33869 - -CVE: CVE-2024-33869 - -Upstream-Status: Backport [https://cgit.ghostscript.com/cgi-bin/cgit.cgi/ghostpdl.git/commit/?id=5ae2e320d69a7d0973] - -Signed-off-by: Archana Polampalli ---- - base/gpmisc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/base/gpmisc.c b/base/gpmisc.c -index c4a69b0..1d4d5d8 100644 ---- a/base/gpmisc.c -+++ b/base/gpmisc.c -@@ -1164,8 +1164,8 @@ gp_validate_path_len(const gs_memory_t *mem, - - continue; - } -- else if (code < 0 && cdirstrl > 0 && prefix_len == 0 && buffer == bufferfull) { -- buffer = bufferfull + cdirstrl + dirsepstrl; -+ else if (code < 0 && cdirstrl > 0 && prefix_len == 0 && buffer == bufferfull -+ && memcmp(buffer, cdirstr, cdirstrl) && !memcmp(buffer + cdirstrl, dirsepstr, dirsepstrl)) { - continue; - } - break; --- -2.40.0 diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33869-0002.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33869-0002.patch deleted file mode 100644 index 5dcbcca998..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33869-0002.patch +++ /dev/null @@ -1,52 +0,0 @@ -From f5336e5b4154f515ac83bc5b9eba94302e6618d4 Mon Sep 17 00:00:00 2001 -From: Ken Sharp -Date: Tue, 26 Mar 2024 12:07:18 +0000 -Subject: [PATCH 3/5] Bug 707691 part 2 - -See bug thread for details - -This is the second part of the fix for CVE-2024-33869 - -CVE: CVE-2024-33869 - -Upstream-Status: Backport [https://cgit.ghostscript.com/cgi-bin/cgit.cgi/ghostpdl.git/commit/?id=f5336e5b4154f515ac83] - -Signed-off-by: Archana Polampalli ---- - base/gpmisc.c | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/base/gpmisc.c b/base/gpmisc.c -index 1d4d5d8..b0d5c71 100644 ---- a/base/gpmisc.c -+++ b/base/gpmisc.c -@@ -1090,6 +1090,27 @@ gp_validate_path_len(const gs_memory_t *mem, - rlen = len; - } - else { -+ char *test = (char *)path, *test1; -+ uint tlen = len, slen; -+ -+ /* Look for any pipe (%pipe% or '|' specifications between path separators -+ * Reject any path spec which has a %pipe% or '|' anywhere except at the start. -+ */ -+ while (tlen > 0) { -+ if (test[0] == '|' || (tlen > 5 && memcmp(test, "%pipe", 5) == 0)) { -+ code = gs_note_error(gs_error_invalidfileaccess); -+ goto exit; -+ } -+ test1 = test; -+ slen = search_separator((const char **)&test, path + len, test1, 1); -+ if(slen == 0) -+ break; -+ test += slen; -+ tlen -= test - test1; -+ if (test >= path + len) -+ break; -+ } -+ - rlen = len+1; - bufferfull = (char *)gs_alloc_bytes(mem->thread_safe_memory, rlen + prefix_len, "gp_validate_path"); - if (bufferfull == NULL) --- -2.40.0 diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33870.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33870.patch deleted file mode 100644 index 9c2b9dcfa2..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33870.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 79aef19c685984dc3da2dc090450407d9fbcff80 Mon Sep 17 00:00:00 2001 -From: Ken Sharp -Date: Tue, 26 Mar 2024 12:00:14 +0000 -Subject: [PATCH 1/5] Bug #707686 - -See bug thread for details - -In addition to the noted bug; an error path (return from -gp_file_name_reduce not successful) could elad to a memory leak as we -did not free 'bufferfull'. Fix that too. - -This addresses CVE-2024-33870 - -CVE: CVE-2024-33870 - -Upstream-Status: Backport [https://cgit.ghostscript.com/cgi-bin/cgit.cgi/ghostpdl.git/commit/?id=79aef19c685984dc] - -Signed-off-by: Archana Polampalli ---- - base/gpmisc.c | 36 ++++++++++++++++++++++++++++++++---- - 1 file changed, 32 insertions(+), 4 deletions(-) - -diff --git a/base/gpmisc.c b/base/gpmisc.c -index 2b0064b..c4a69b0 100644 ---- a/base/gpmisc.c -+++ b/base/gpmisc.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2001-2023 Artifex Software, Inc. -+/* Copyright (C) 2001-2024 Artifex Software, Inc. - All Rights Reserved. - - This software is provided AS-IS with no warranty, either express or -@@ -1042,7 +1042,7 @@ gp_validate_path_len(const gs_memory_t *mem, - const uint len, - const char *mode) - { -- char *buffer, *bufferfull; -+ char *buffer, *bufferfull = NULL; - uint rlen; - int code = 0; - const char *cdirstr = gp_file_name_current(); -@@ -1096,8 +1096,10 @@ gp_validate_path_len(const gs_memory_t *mem, - return gs_error_VMerror; - - buffer = bufferfull + prefix_len; -- if (gp_file_name_reduce(path, (uint)len, buffer, &rlen) != gp_combine_success) -- return gs_error_invalidfileaccess; -+ if (gp_file_name_reduce(path, (uint)len, buffer, &rlen) != gp_combine_success) { -+ code = gs_note_error(gs_error_invalidfileaccess); -+ goto exit; -+ } - buffer[rlen] = 0; - } - while (1) { -@@ -1132,9 +1134,34 @@ gp_validate_path_len(const gs_memory_t *mem, - code = gs_note_error(gs_error_invalidfileaccess); - } - if (code < 0 && prefix_len > 0 && buffer > bufferfull) { -+ uint newlen = rlen + cdirstrl + dirsepstrl; -+ char *newbuffer; -+ int code; -+ - buffer = bufferfull; - memcpy(buffer, cdirstr, cdirstrl); - memcpy(buffer + cdirstrl, dirsepstr, dirsepstrl); -+ -+ /* We've prepended a './' or similar for the current working directory. We need -+ * to execute file_name_reduce on that, to eliminate any '../' or similar from -+ * the (new) full path. -+ */ -+ newbuffer = (char *)gs_alloc_bytes(mem->thread_safe_memory, newlen + 1, "gp_validate_path"); -+ if (newbuffer == NULL) { -+ code = gs_note_error(gs_error_VMerror); -+ goto exit; -+ } -+ -+ memcpy(newbuffer, buffer, rlen + cdirstrl + dirsepstrl); -+ newbuffer[newlen] = 0x00; -+ -+ code = gp_file_name_reduce(newbuffer, (uint)newlen, buffer, &newlen); -+ gs_free_object(mem->thread_safe_memory, newbuffer, "gp_validate_path"); -+ if (code != gp_combine_success) { -+ code = gs_note_error(gs_error_invalidfileaccess); -+ goto exit; -+ } -+ - continue; - } - else if (code < 0 && cdirstrl > 0 && prefix_len == 0 && buffer == bufferfull) { -@@ -1153,6 +1180,7 @@ gp_validate_path_len(const gs_memory_t *mem, - gs_path_control_flag_is_scratch_file); - } - -+exit: - gs_free_object(mem->thread_safe_memory, bufferfull, "gp_validate_path"); - #ifdef EACCES - if (code == gs_error_invalidfileaccess) --- -2.40.0 diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33871.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33871.patch deleted file mode 100644 index abe6384997..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33871.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 7145885041bb52cc23964f0aa2aec1b1c82b5908 Mon Sep 17 00:00:00 2001 -From: Zdenek Hutyra -Date: Mon, 22 Apr 2024 13:33:47 +0100 -Subject: [PATCH 4/5] OPVP device - prevent unsafe parameter change with SAFER - -Bug #707754 "OPVP device - Arbitrary code execution via custom Driver library" - -The "Driver" parameter for the "opvp"/"oprp" device specifies the name -of a dynamic library and allows any library to be loaded. - -The patch does not allow changing this parameter after activating path -control. - -This addresses CVE-2024-33871 - -CVE: CVE-2024-33871 - -Upstream-Status: Backport [https://cgit.ghostscript.com/cgi-bin/cgit.cgi/ghostpdl.git/commit/?id=7145885041bb52cc2396] - -Signed-off-by: Archana Polampalli ---- - contrib/opvp/gdevopvp.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/contrib/opvp/gdevopvp.c b/contrib/opvp/gdevopvp.c -index 74200cf..80eb23b 100644 ---- a/contrib/opvp/gdevopvp.c -+++ b/contrib/opvp/gdevopvp.c -@@ -3456,6 +3456,12 @@ _put_params(gx_device *dev, gs_param_list *plist) - code = param_read_string(plist, pname, &vdps); - switch (code) { - case 0: -+ if (gs_is_path_control_active(dev->memory) -+ && (!opdev->globals.vectorDriver || strlen(opdev->globals.vectorDriver) != vdps.size -+ || memcmp(opdev->globals.vectorDriver, vdps.data, vdps.size) != 0)) { -+ param_signal_error(plist, pname, gs_error_invalidaccess); -+ return_error(gs_error_invalidaccess); -+ } - buff = realloc(buff, vdps.size + 1); - memcpy(buff, vdps.data, vdps.size); - buff[vdps.size] = 0; --- -2.40.0 diff --git a/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch b/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch index 15c7eb5a77..67f14bd368 100644 --- a/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch +++ b/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch @@ -1,7 +1,7 @@ -From 0ccbaa134093bf6afc79f2d20d061bca5a8754ed Mon Sep 17 00:00:00 2001 +From b36713c8f1ba0e5755b78845a433354a63663b1a Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Thu, 29 Mar 2018 16:02:05 +0800 -Subject: [PATCH 04/10] avoid host contamination +Subject: [PATCH] avoid host contamination Remove hardcode path refer to host to avoid host contamination. @@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devices/devs.mak b/devices/devs.mak -index 846aa50..9570182 100644 +index 186f704..88ab8c9 100644 --- a/devices/devs.mak +++ b/devices/devs.mak -@@ -393,7 +393,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\ +@@ -397,7 +397,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\ ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(DEVS_MAK) $(MAKEDIRS) @@ -27,6 +27,3 @@ index 846aa50..9570182 100644 ###### --------------- Memory-buffered printer devices --------------- ###### --- -1.8.3.1 - diff --git a/meta/recipes-extended/ghostscript/ghostscript/configure.ac-add-option-to-explicitly-disable-neon.patch b/meta/recipes-extended/ghostscript/ghostscript/configure.ac-add-option-to-explicitly-disable-neon.patch deleted file mode 100644 index 7873396045..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript/configure.ac-add-option-to-explicitly-disable-neon.patch +++ /dev/null @@ -1,99 +0,0 @@ -From fd37229a17822c5ad21a369f670b8a6f6cc6b95b Mon Sep 17 00:00:00 2001 -From: Benjamin Bara -Date: Mon, 4 Sep 2023 12:16:39 +0200 -Subject: [PATCH] configure.ac: add option to explicitly disable neon - -Uncomment an already existing possibility to explicitly disable neon and -use it on both implemented neon checks. - -Upstream-Status: Submitted [https://bugs.ghostscript.com/show_bug.cgi?id=707097] - -Signed-off-by: Benjamin Bara ---- - configure.ac | 52 +++++++++++++++++++++++++++++----------------------- - 1 file changed, 29 insertions(+), 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 09d881dd1..62718e15e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -749,6 +749,33 @@ SUBCONFIG_OPTS="--build=$build --host=$host" - # SUBCONFIG_OPTS="$SUBCONFIG_OPTS --host=$host_alias" - #fi - -+dnl -------------------------------------------------- -+dnl Check for NEON support -+dnl -------------------------------------------------- -+save_cflags=$CFLAGS -+AC_MSG_CHECKING([neon support]) -+CFLAGS="$save_cflags $OPT_CFLAGS -mfpu=neon -mcpu=cortex-a53" -+HAVE_NEON="" -+AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM([#include "arm_neon.h"], [ -+ int32x4_t round = vdupq_n_s32(10); -+ return(0); -+ ])], -+ [HAVE_NEON="-DHAVE_NEON"], [HAVE_NEON=""]) -+ -+AC_ARG_ENABLE([neon], AS_HELP_STRING([--disable-neon], -+ [Do not use neon instrinsics]), [ -+ if test "x$enable_neon" = xno; then -+ HAVE_NEON="" -+ fi]) -+ -+if test "x$HAVE_NEON" != x; then -+ AC_MSG_RESULT(yes) -+else -+ AC_MSG_RESULT(no) -+fi -+CFLAGS=$save_cflags -+ - dnl -------------------------------------------------- - dnl Check for libraries - dnl -------------------------------------------------- -@@ -971,11 +998,12 @@ if test x$with_tesseract != xno; then - [TESS_NEON="-mfpu=neon -mcpu=cortex-a53 -D__ARM_NEON__"], - [TESS_NEON=""]) - -- if test "x$TESS_NEON" != x; then -+ if test "x$TESS_NEON" != x && test "x$enable_neon" != xno; then - AC_MSG_RESULT(yes) - TESS_CXXFLAGS="$TESS_CXXFLAGS -DHAVE_NEON" - else - AC_MSG_RESULT(no) -+ TESS_NEON="" - fi - - CXXFLAGS="$save_cxxflags" -@@ -2387,28 +2415,6 @@ if test x$WITH_CAL != x0; then - AC_MSG_RESULT(no) - fi - -- AC_MSG_CHECKING([neon support]) -- CFLAGS="$save_cflags $OPT_CFLAGS -mfpu=neon -mcpu=cortex-a53" -- HAVE_NEON="" -- AC_LINK_IFELSE( -- [AC_LANG_PROGRAM([#include "arm_neon.h"], [ -- int32x4_t round = vdupq_n_s32(10); -- return(0); -- ])], -- [HAVE_NEON="-DHAVE_NEON"], [HAVE_NEON=""]) -- -- #AC_ARG_ENABLE([neon], AS_HELP_STRING([--disable-neon], -- # [Do not use neon instrinsics]), [ -- # if test "x$enable_neon" = xno; then -- # HAVE_NEON="" -- # fi]) -- -- if test "x$HAVE_NEON" != x; then -- AC_MSG_RESULT(yes) -- else -- AC_MSG_RESULT(no) -- fi -- - #AC_SUBST(HAVE_SSE4_2) - #AC_SUBST(HAVE_NEON) - CFLAGS=$save_cflags --- -2.34.1 - diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb b/meta/recipes-extended/ghostscript/ghostscript_10.03.1.bb similarity index 88% rename from meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb rename to meta/recipes-extended/ghostscript/ghostscript_10.03.1.bb index db9481816a..0504f5244f 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_10.03.1.bb @@ -25,15 +25,9 @@ def gs_verdir(v): SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \ file://ghostscript-9.16-Werror-return-type.patch \ file://avoid-host-contamination.patch \ - file://configure.ac-add-option-to-explicitly-disable-neon.patch \ - file://CVE-2024-33870.patch \ - file://CVE-2024-33869-0001.patch \ - file://CVE-2024-33869-0002.patch \ - file://CVE-2024-33871.patch \ - file://CVE-2024-29510.patch \ " -SRC_URI[sha256sum] = "e429e4f5b01615a4f0f93a4128e8a1a4d932dff983b1774174c79c0630717ad9" +SRC_URI[sha256sum] = "31cd01682ad23a801cc3bbc222a55f07c4ea3e068bdfb447792d54db21a2e8ad" PACKAGECONFIG ??= "" PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" From patchwork Tue Jul 9 19:29:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46115 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 9384BC41513 for ; Tue, 9 Jul 2024 19:30:09 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web10.4644.1720553409052637471 for ; Tue, 09 Jul 2024 12:30:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=NjdumryY; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-70b4a8a5587so614494b3a.2 for ; Tue, 09 Jul 2024 12:30:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1720553408; x=1721158208; 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=5AkAM1EaOuWNSu5L68nqqUF6qxedoScBRBTYayAbNYM=; b=NjdumryYDUikSeM05EmHT3UXxI7XFP7FL2FVMLV6Xcsx7caTuWWOs23Rt5E9hXC3ek YV2PRJREWa4Kv1bA2gbO37dApVvqfqaAmyUuz6G7Zo1Pld7sXqF+0IemjtKxDfqsRDdZ dB0xCUDrrv5Fi8sIC4KMW8eKIRPR/kIp+6Q3+tIiwKVfGin3l4J5uuGX+YnYt0yGMtw6 ASPQzO48p7doZMiVX7wwe1lUKRSyHpB5xSLY2shmBi54bnp1ytf11KDQGsdnfPo2bXKu a8QOKq/OzQ3TP5fmzTIkZkLRJxP/b6/1NG8zpMVeqOpSXggKFjB665HnAT67Tg2O3KRA vsXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720553408; x=1721158208; 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=5AkAM1EaOuWNSu5L68nqqUF6qxedoScBRBTYayAbNYM=; b=NkFfCtkEriOQYRknfakX1w0BzM1Z1kOADDUpCQmP7GSl3U/2KVP2TBqxvjFJ5Eixo8 32ZLCYLBZ+CZA3ihfhksx6mMDWttnlxNjoQcpEMI4OeAJC28zW+f6uojhZvUpK0iKE5L QiCOvhaa/uZir9gwR6jwuf6OoXR6p5fyYXumlb4PVxM72ai1ZrMCvkDrW9/onrzXjnnm bU98CmjATvQZJUYxBkWj3DX8RI8siQWDN7R8DufncR3kFd8VeZ+hbE39sswSrVsxOYfz Gpmyytj8tGJGncPpl2yn64xfziWw8JoFe4K2P4jh/qb1ecfcqssrLWcI/GvcBZQvXYW2 ihcg== X-Gm-Message-State: AOJu0YzVH0ea3fhzjt8wDb2ie91+u8hQ3khptw+DTwQ6YERXSjIcFvYo fcL/0c3bKU8JCIG+MMyaiM1jEt6v6imCSpOaKgVm4H4StWxklbBf2aHVi0PP4MvqGW1IKDaule0 a X-Google-Smtp-Source: AGHT+IFeJK3AeeMnJ9CWH96SRW1doapQ4GUR4FfiC6jtiZw4HkuZkn9ayRl8tjSnT0otFOP3lQc0qg== X-Received: by 2002:a05:6a00:1797:b0:706:759a:70bf with SMTP id d2e1a72fcca58-70b435686b8mr4426087b3a.13.1720553408183; Tue, 09 Jul 2024 12:30:08 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b438995a8sm2282780b3a.10.2024.07.09.12.30.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 12:30:07 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 2/7] qemu: Upgrade 8.2.1 -> 8.2.2 Date: Tue, 9 Jul 2024 12:29:55 -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, 09 Jul 2024 19:30:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/201675 From: Xiangyu Chen This was a bugfix release, this version fixed several important fixes according to upstream. Dropped CVE-2023-6683.patch since already contained the fix. Signed-off-by: Xiangyu Chen Signed-off-by: Steve Sakoman --- ...u-native_8.2.1.bb => qemu-native_8.2.2.bb} | 0 ...e_8.2.1.bb => qemu-system-native_8.2.2.bb} | 0 meta/recipes-devtools/qemu/qemu.inc | 3 +- .../qemu/qemu/CVE-2023-6683.patch | 91 ------------------- .../qemu/{qemu_8.2.1.bb => qemu_8.2.2.bb} | 0 5 files changed, 1 insertion(+), 93 deletions(-) rename meta/recipes-devtools/qemu/{qemu-native_8.2.1.bb => qemu-native_8.2.2.bb} (100%) rename meta/recipes-devtools/qemu/{qemu-system-native_8.2.1.bb => qemu-system-native_8.2.2.bb} (100%) delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2023-6683.patch rename meta/recipes-devtools/qemu/{qemu_8.2.1.bb => qemu_8.2.2.bb} (100%) diff --git a/meta/recipes-devtools/qemu/qemu-native_8.2.1.bb b/meta/recipes-devtools/qemu/qemu-native_8.2.2.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-native_8.2.1.bb rename to meta/recipes-devtools/qemu/qemu-native_8.2.2.bb diff --git a/meta/recipes-devtools/qemu/qemu-system-native_8.2.1.bb b/meta/recipes-devtools/qemu/qemu-system-native_8.2.2.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-system-native_8.2.1.bb rename to meta/recipes-devtools/qemu/qemu-system-native_8.2.2.bb diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index d22bc31ce3..e121ae70cc 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -39,7 +39,6 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0003-linux-user-Add-strace-for-shmat.patch \ file://0004-linux-user-Rewrite-target_shmat.patch \ file://0005-tests-tcg-Check-that-shmat-does-not-break-proc-self-.patch \ - file://CVE-2023-6683.patch \ file://qemu-guest-agent.init \ file://qemu-guest-agent.udev \ file://CVE-2024-3446-01.patch \ @@ -63,7 +62,7 @@ SRC_URI:append:class-native = " \ file://0012-linux-user-workaround-for-missing-MAP_SHARED_VALIDAT.patch \ " -SRC_URI[sha256sum] = "8562751158175f9d187c5f22b57555abe3c870f0325c8ced12c34c6d987729be" +SRC_URI[sha256sum] = "847346c1b82c1a54b2c38f6edbd85549edeb17430b7d4d3da12620e2962bc4f3" CVE_STATUS[CVE-2007-0998] = "not-applicable-config: The VNC server can expose host files uder some circumstances. We don't enable it by default." diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2023-6683.patch b/meta/recipes-devtools/qemu/qemu/CVE-2023-6683.patch deleted file mode 100644 index 732cb6af18..0000000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2023-6683.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 405484b29f6548c7b86549b0f961b906337aa68a Mon Sep 17 00:00:00 2001 -From: Fiona Ebner -Date: Wed, 24 Jan 2024 11:57:48 +0100 -Subject: [PATCH] ui/clipboard: mark type as not available when there is no - data -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With VNC, a client can send a non-extended VNC_MSG_CLIENT_CUT_TEXT -message with len=0. In qemu_clipboard_set_data(), the clipboard info -will be updated setting data to NULL (because g_memdup(data, size) -returns NULL when size is 0). If the client does not set the -VNC_ENCODING_CLIPBOARD_EXT feature when setting up the encodings, then -the 'request' callback for the clipboard peer is not initialized. -Later, because data is NULL, qemu_clipboard_request() can be reached -via vdagent_chr_write() and vdagent_clipboard_recv_request() and -there, the clipboard owner's 'request' callback will be attempted to -be called, but that is a NULL pointer. - -In particular, this can happen when using the KRDC (22.12.3) VNC -client. - -Another scenario leading to the same issue is with two clients (say -noVNC and KRDC): - -The noVNC client sets the extension VNC_FEATURE_CLIPBOARD_EXT and -initializes its cbpeer. - -The KRDC client does not, but triggers a vnc_client_cut_text() (note -it's not the _ext variant)). There, a new clipboard info with it as -the 'owner' is created and via qemu_clipboard_set_data() is called, -which in turn calls qemu_clipboard_update() with that info. - -In qemu_clipboard_update(), the notifier for the noVNC client will be -called, i.e. vnc_clipboard_notify() and also set vs->cbinfo for the -noVNC client. The 'owner' in that clipboard info is the clipboard peer -for the KRDC client, which did not initialize the 'request' function. -That sounds correct to me, it is the owner of that clipboard info. - -Then when noVNC sends a VNC_MSG_CLIENT_CUT_TEXT message (it did set -the VNC_FEATURE_CLIPBOARD_EXT feature correctly, so a check for it -passes), that clipboard info is passed to qemu_clipboard_request() and -the original segfault still happens. - -Fix the issue by handling updates with size 0 differently. In -particular, mark in the clipboard info that the type is not available. - -While at it, switch to g_memdup2(), because g_memdup() is deprecated. - -Cc: qemu-stable@nongnu.org -Fixes: CVE-2023-6683 -Reported-by: Markus Frank -Suggested-by: Marc-André Lureau -Signed-off-by: Fiona Ebner -Reviewed-by: Marc-André Lureau -Tested-by: Markus Frank -Message-ID: <20240124105749.204610-1-f.ebner@proxmox.com> - -CVE: CVE-2023-6683 - -Upstream-Status: Backport [https://github.com/qemu/qemu/commit/405484b29f6548c7b86549b0f961b906337aa68a] -Signed-off-by: Simone Weiß - ---- - ui/clipboard.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/ui/clipboard.c b/ui/clipboard.c -index 3d14bffaf80f..b3f6fa3c9e1f 100644 ---- a/ui/clipboard.c -+++ b/ui/clipboard.c -@@ -163,9 +163,15 @@ void qemu_clipboard_set_data(QemuClipboardPeer *peer, - } - - g_free(info->types[type].data); -- info->types[type].data = g_memdup(data, size); -- info->types[type].size = size; -- info->types[type].available = true; -+ if (size) { -+ info->types[type].data = g_memdup2(data, size); -+ info->types[type].size = size; -+ info->types[type].available = true; -+ } else { -+ info->types[type].data = NULL; -+ info->types[type].size = 0; -+ info->types[type].available = false; -+ } - - if (update) { - qemu_clipboard_update(info); diff --git a/meta/recipes-devtools/qemu/qemu_8.2.1.bb b/meta/recipes-devtools/qemu/qemu_8.2.2.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_8.2.1.bb rename to meta/recipes-devtools/qemu/qemu_8.2.2.bb From patchwork Tue Jul 9 19:29:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46118 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 6F216C2BD09 for ; Tue, 9 Jul 2024 19:30:19 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.web10.4645.1720553410376633760 for ; Tue, 09 Jul 2024 12:30:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=jGFaIQhN; spf=softfail (domain: sakoman.com, ip: 209.85.215.169, mailfrom: steve@sakoman.com) Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-7594c490b04so3805539a12.3 for ; Tue, 09 Jul 2024 12:30:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1720553409; x=1721158209; 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=Za+OXcOLUquw5Ndo5AkywInwn3j7QxXkfO6T9dI8l/I=; b=jGFaIQhNtcBjeCsgJD5C++IaM3lRYJLdFzrtPLxsK9SIGIZdrVPqX0HeOm1yZF5zpy 3EV789aupTs+F8Qc3iat3HkiYr9fAKMc06TQ3xEotI/vHUKz1CEdAti64ZVyc2hsP5J8 8xEavZS2lnSI280IIR3en8dIf+d6E3FOmNTYF4FwzflAqIVqX6T/nrYCydRtG7+kRp+A 0kabssZaEwmq7nb2zVJiF9ar7lReaYk9snXJTHTLsKoak+wtmKl4aGlt0igjYcNKvMAO 0vJdQqGULLdnKqBPnmyYDhiXfxIg1+lr8bNSwcQVlGYsv43ZoGX59UVxAwcKv+4U/xzB MsaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720553409; x=1721158209; 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=Za+OXcOLUquw5Ndo5AkywInwn3j7QxXkfO6T9dI8l/I=; b=MBmuKr45WAFy45/DQVpPKyj8tPBQOEFFn2iKXc4CSDazbKBxDFbYy43M3RAg+vjmoZ ACX7VZKvUYW44FpclLzFIIe0MUiZ1M4D+S1s19YouDvDSV2Ng4oYXOY3e5Cw5HqTKl6t e1FzD3VFsjEBocEUyRvq939JqXRGEC9pRejBf93Aar4Mr0TpjeHbda2IfQhEgq6z97MQ /z9D/ZOiU9ti5po5+NpgLpyZbuR5X2Ie1+JdmjryFE4UvzoYS1bEfriWR+yzN8zWzWJM RRU2FtyD3vDuEkWIPsH0NnzaQvzhuJCJiL4voHnWm+g76BDWFYfVIYAcC2yNH4UFbIC5 lBtw== X-Gm-Message-State: AOJu0YyfrkucAfomCY8UVbLBP8aXshfaPWB3YiRPBinXetCXq/wpUNBt oT+CUHm4Y1jopZzwxwxE1S92M6RsecnpNt6drMD76fDLlxSY1COhy+BBeFaXjw2dCxXn7JWYRlZ Q X-Google-Smtp-Source: AGHT+IFNoAhjUugjfr2KBnLA+YoTI9WOMfyTmVfUPQuwraC1UcZHg1DiLng3af1Cvf+dNpvQPd4BhQ== X-Received: by 2002:a05:6a20:914a:b0:1c2:8e11:5ad0 with SMTP id adf61e73a8af0-1c29821db7dmr3988250637.25.1720553409563; Tue, 09 Jul 2024 12:30:09 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b438995a8sm2282780b3a.10.2024.07.09.12.30.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 12:30:09 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 3/7] apt-native: don't let dpkg overwrite files by default Date: Tue, 9 Jul 2024 12:29:56 -0700 Message-Id: <30cc69f094729e3d11dc6021daf77f5038c4de61.1720553275.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, 09 Jul 2024 19:30:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/201676 From: Changqing Li With --force-overwrite (implied by --force-all), dpkg will not abort when a package overwrites files from different packages. As this can also lead to "The following package disappeared from your system as all files have been overwritten by other packages: " and subsequently broken dependencies, this makes the simple case of conflicting files hard to debug. Instead of finding all possibly required force options, only disable overwrite for now. Signed-off-by: Jan Luebbe Signed-off-by: Richard Purdie Take back from https://git.openembedded.org/openembedded-core/commit/?id=4292387ef6c4e80428bad6a07c844a288b27d9a1 Signed-off-by: Changqing Li Signed-off-by: Steve Sakoman --- meta/recipes-devtools/apt/apt_2.6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/apt/apt_2.6.1.bb b/meta/recipes-devtools/apt/apt_2.6.1.bb index fb4ff899d2..e688d30cae 100644 --- a/meta/recipes-devtools/apt/apt_2.6.1.bb +++ b/meta/recipes-devtools/apt/apt_2.6.1.bb @@ -111,7 +111,7 @@ Acquire AllowInsecureRepositories "true"; }; -DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/lib/dpkg";"--force-all";"--no-debsig"}; +DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/lib/dpkg";"--force-all";"--no-force-overwrite";"--no-debsig"}; DPkg::Path ""; EOF } From patchwork Tue Jul 9 19:29:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46122 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 9565DC3DA42 for ; Tue, 9 Jul 2024 19:30:19 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web10.4648.1720553411946324630 for ; Tue, 09 Jul 2024 12:30:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=EuOiqGnY; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-767506e1136so68669a12.0 for ; Tue, 09 Jul 2024 12:30:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1720553411; x=1721158211; 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=tku0P874C6x3JdCQfpvSaumX2wl4mEi4nJ2AyXCkXlw=; b=EuOiqGnYUVcZ4TPeAd/12ytVPdBIA90C//QFuANuLxbM1/WTBylLSDwqbyj9vALUpC whIBngsHNHVn1zXs/eO7c2EFPztNBQ1QSOpShDgPJtvQBh+BG837D/+3XmW5eqoXsVlN qnS0OrA+bOjMhsX5PUeCVVgbGjSqwyw2Aql6IwgFaBqFuNhMcaocqGafpsZy6eFmiD4f OhVQDC6vZZqqGbJnxAnOxTAxVOzRXh0kPhoKOL0DKvwFWCXD7Jiusdlm68EJlWQrDgqW 6+d5IQmeWg85m4e7p3OiAubj6x1DvnbfjO2sRCn8LmEMnpGhbQ+wGa6ObDNxZpy52Hvo h+Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720553411; x=1721158211; 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=tku0P874C6x3JdCQfpvSaumX2wl4mEi4nJ2AyXCkXlw=; b=vVgxXquWmDdUWzPi49Ixiowzgmz3fZfoyvgk/cChh3+iO3LcdKXPRdaizXBW3eH6O5 E3h7zwcadf0+8kPJ4Wd9kimTezCrqiOXcWB2XTd8Z/ftDZ9QEXRYXaj3r+jLNQz9I4Kr FXBUaDYo0ZwkwIZySCpzeQGEPelENQMucWRoptDzYIjx3lo+HxpQs7ZDYQ3W7JVW96JP TWpejFp56C+9NqHpOzS97WXxiGTel1/SokxaB2rWH6v0Vh4uyhvgsHfOuuY2CLY0eRiy 6HPMycSK03UcFM13m1jtXLi2KHbzTLQm5ecsp9rx/MwgBDQOGduxf77vf4GEki10ZC/N jCQQ== X-Gm-Message-State: AOJu0YzNiCMwVrcOYXOqb7fvwrAC3sBExlFTK+WJ+Jvxrr8VMOIiKbVZ /Fysn2o6KBQqKbkCVOZQZQMlA1FCCRs0tpxwvJ9ZtOShKGvKfRl6XaCMJUMoi1SI3QbB16A4VUk d X-Google-Smtp-Source: AGHT+IGlDNXH2dEhVZvyc/8sL/70P1ktBcsK6V9WZ17Tsbem3OYpdF8SI965RNl4RN0FxqOdziLBEA== X-Received: by 2002:a05:6a20:8423:b0:1c2:a29b:efb4 with SMTP id adf61e73a8af0-1c2a29bf269mr2727641637.24.1720553411047; Tue, 09 Jul 2024 12:30:11 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b438995a8sm2282780b3a.10.2024.07.09.12.30.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 12:30:10 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 4/7] apt: runtime error: filename too long (tmpdir length) Date: Tue, 9 Jul 2024 12:29:57 -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, 09 Jul 2024 19:30:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/201677 From: Changqing Li when the tmpdir dir is longer than 220, there is no files saved in tmp/sysroots/x86_64-linux/var/lib/apt/lists/ after run apt-get update, this is because apt-get uses the path as the file name, but the file name can't be longer than 255 according to /usr/include/linux/limits.h. [YOCTO #2688] Signed-off-by: Robert Yang Take back from https://git.openembedded.org/openembedded-core/commit/?id=9a0c0393871eda4bbcecfdd4b595f0c1b8e42edf Signed-off-by: Changqing Li Signed-off-by: Steve Sakoman --- ...he-filename-can-t-be-longer-than-255.patch | 40 +++++++++++++++++++ meta/recipes-devtools/apt/apt_2.6.1.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-devtools/apt/apt/0001-strutl.cc-the-filename-can-t-be-longer-than-255.patch diff --git a/meta/recipes-devtools/apt/apt/0001-strutl.cc-the-filename-can-t-be-longer-than-255.patch b/meta/recipes-devtools/apt/apt/0001-strutl.cc-the-filename-can-t-be-longer-than-255.patch new file mode 100644 index 0000000000..311c3664ad --- /dev/null +++ b/meta/recipes-devtools/apt/apt/0001-strutl.cc-the-filename-can-t-be-longer-than-255.patch @@ -0,0 +1,40 @@ +From 918295aa1320718d342116f76c98d2289d377800 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Tue, 18 Jun 2024 10:32:55 +0800 +Subject: [PATCH] strutl.cc: the filename can't be longer than 255 + +The URItoFileName translates the path into the filename, but the +filename can't be longer than 255 according to +/usr/include/linux/limits.h. + +Truncate it when it is longer than 240 (leave some spaces for +".Packages" and "._Release" suffix) + +Upstream-Status: Submitted [https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1073591] +Signed-off-by: Robert Yang +Signed-off-by: Changqing Li +--- + apt-pkg/contrib/strutl.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc +index 67100f1..5076b35 100644 +--- a/apt-pkg/contrib/strutl.cc ++++ b/apt-pkg/contrib/strutl.cc +@@ -565,7 +565,12 @@ string URItoFileName(const string &URI) + // "\x00-\x20{}|\\\\^\\[\\]<>\"\x7F-\xFF"; + string NewURI = QuoteString(U,"\\|{}[]<>\"^~_=!@#$%^&*"); + replace(NewURI.begin(),NewURI.end(),'/','_'); +- return NewURI; ++ ++ // Truncate from the head when it is longer than 240 ++ if(NewURI.length() > 240) ++ return NewURI.substr(NewURI.length() - 240, NewURI.length() - 1); ++ else ++ return NewURI; + } + /*}}}*/ + // Base64Encode - Base64 Encoding routine for short strings /*{{{*/ +-- +2.25.1 + diff --git a/meta/recipes-devtools/apt/apt_2.6.1.bb b/meta/recipes-devtools/apt/apt_2.6.1.bb index e688d30cae..1eec7fe7a6 100644 --- a/meta/recipes-devtools/apt/apt_2.6.1.bb +++ b/meta/recipes-devtools/apt/apt_2.6.1.bb @@ -14,6 +14,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \ file://0001-Hide-fstatat64-and-prlimit64-defines-on-musl.patch \ file://0001-aptwebserver.cc-Include-array.patch \ file://0001-Remove-using-std-binary_function.patch \ + file://0001-strutl.cc-the-filename-can-t-be-longer-than-255.patch \ " SRC_URI:append:class-native = " \ From patchwork Tue Jul 9 19:29:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46121 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 85EC4C3DA49 for ; Tue, 9 Jul 2024 19:30:19 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.web10.4651.1720553413352940648 for ; Tue, 09 Jul 2024 12:30:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=jizoWIZx; spf=softfail (domain: sakoman.com, ip: 209.85.215.169, mailfrom: steve@sakoman.com) Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-6bce380eb96so3067381a12.0 for ; Tue, 09 Jul 2024 12:30:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1720553412; x=1721158212; 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=unR8DAk+bCwGCDNURmQ0zy+84zOZDBybMjl0vc3DQm0=; b=jizoWIZxaML9+FYjRtsRG3D2zEtdsBc3tX3w19z0viSPOG1ldmI1mZ4GXnewsMqCqa Q0/06ynGLTMoH8QuB6SumvcDdm34LlXdzgkvkHiB0Gt1ECpyFns4vXe1A58WEXtkD0Fs 569Gk1XrIoiWcp5FriFN7aPKuLv3vgQI1YFKZF3JoEbxz7pV4l0YAM0b20kUGksgSeja un+ctPFtPqEea1QHdnUp2NUJDJ1V6Nki31jN82ZAObecqpHO4QUowegkfjku5WxTJNBO BcOuuuvL+uHCBNNHC7iZFdqZ3arc47csBoFlwfs2CoFUnA5C2NXG0p40e0FU10Yj6sou FTLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720553412; x=1721158212; 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=unR8DAk+bCwGCDNURmQ0zy+84zOZDBybMjl0vc3DQm0=; b=CwWb8YE2atUrQC17FgaHWNXIa32Ve1v4S4NFPhrxs++75d2lvKz9TDMPH9/x9QiRSa L1Ly9PaT39LGxXDcSjyuKXdUAw4b4a6nSIyEZJ+Rq/9wWH9TmvsYlmWG+ZCLYIrsnQZ8 ta8YLPQW0wcWGY8qo90/wcoy1OVen/9yAccWpQJYD72sHneCBBur2a3iDOgpF5JQ02du fVOU+YU5Y32X4lKOrPDB4v07lnRfxTRk4nSJLvBaFtJ0a+X1lkv5ApuilqayiyJ/P6mi 2W/A/43cUv8v3682N4QK47gJ82DeTwac7W62tCRbg7rOgAyC7kjmdlccKE7XT+YjHRd8 S8IQ== X-Gm-Message-State: AOJu0YyOTDdlBXb3O1zBeX5iF4i339123Xf42pM3XsfQshWp6MprKMbb CyZjPQm8pjaB2zI0BfisxeIptJtBbTJMX35HyjJeQGhg0o3a2Hxg3+rSDUdKNaYaraqQlwxmF1P o X-Google-Smtp-Source: AGHT+IGpPVNEyjt+zWuZBavJNUioY4MEVWr6EujXqa88eZgxBDl0QLo5wFL1CQUQqGdbaiYmAdzTww== X-Received: by 2002:a05:6a21:3393:b0:1c2:8e77:a813 with SMTP id adf61e73a8af0-1c298205f0dmr4256314637.1.1720553412424; Tue, 09 Jul 2024 12:30:12 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b438995a8sm2282780b3a.10.2024.07.09.12.30.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 12:30:12 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 5/7] flac: fix buildpaths warnings Date: Tue, 9 Jul 2024 12:29:58 -0700 Message-Id: <860d4d6b54f61342f925ea522f9962555ae5d8ac.1720553275.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, 09 Jul 2024 19:30:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/201678 From: Peter Marko Generated documentation (html) contain absolute paths cources using buildpaths warnings. Replace them with relative links. The file with root path to sources is in my build /usr/share/doc/flac/api/dir_c122f5d6544f32779f55e8358fb78605.html which does not looks as stable name, so replace it in all files. Signed-off-by: Peter Marko Signed-off-by: Richard Purdie (cherry picked from commit c7d826c88933d53d550265f1cc382539c5c52994) Signed-off-by: Steve Sakoman --- meta/recipes-multimedia/flac/flac_1.4.3.bb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/recipes-multimedia/flac/flac_1.4.3.bb b/meta/recipes-multimedia/flac/flac_1.4.3.bb index d4e463cda5..87b67bee1f 100644 --- a/meta/recipes-multimedia/flac/flac_1.4.3.bb +++ b/meta/recipes-multimedia/flac/flac_1.4.3.bb @@ -34,3 +34,10 @@ PACKAGES += "libflac libflac++" FILES:${PN} = "${bindir}/*" FILES:libflac = "${libdir}/libFLAC.so.*" FILES:libflac++ = "${libdir}/libFLAC++.so.*" + +do_install:append() { + # make the links in documentation relative to avoid buildpaths reproducibility problem + sed -i "s#${S}/include#${includedir}#g" ${D}${docdir}/flac/FLAC.tag ${D}${docdir}/flac/api/*.html + # there is also one root path without trailing slash + sed -i "s#${S}#/#g" ${D}${docdir}/flac/api/*.html +} From patchwork Tue Jul 9 19:29:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46120 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 80FD4C3DA45 for ; Tue, 9 Jul 2024 19:30:19 +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.4578.1720553414494012761 for ; Tue, 09 Jul 2024 12:30:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=E8SveTEc; 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-701b0b0be38so4276341b3a.0 for ; Tue, 09 Jul 2024 12:30:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1720553414; x=1721158214; 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=oW27BesJt0aiUEYKOEanofyUyEqJub/i/2kdI0NCotc=; b=E8SveTEcUex/uLNwwVrY4m4l0L/MPgY62QTRsc9Z64DOhpAFpOxjk0mbTwFyutq0m3 RnzJMIqOsfyUtb4SuJBIC3tICnHjw2i4T3PwJXI2gf15lTgwVuNv1JnaR7JogUz0Q+lX h5hQ1cAdM2HKatXJutf8zR4J0kaONaj8ynDP1XhoRkhSoGnqxcUPqmR3YGi4Wzvl//UB kpAi3lrDXhiwX6K4eHp/4ZPc0151IUzeVN1PRGRbUacpKjgG3UFtmviphZ9Hb5OTiU7W A4WgoNbsYKvr+ulSMlUQHxgs05fGfxuCsG27Cxa2nKUwJS5E64tjvyh05ho9jWM/A+nV pRKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720553414; x=1721158214; 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=oW27BesJt0aiUEYKOEanofyUyEqJub/i/2kdI0NCotc=; b=b10100puUUtPWMnSUGoThVktlAM+Tb+lVKzX5JDuaLmK3iI92TcOj/H+Ur8aC4Pj8g P5yb/apI3+kT5tU4JILPgbOr1I509AG/u/GOAmYVCyAdISi4SQ3bhQEz9v2MuvUzr0Yu b14jzgRlo+jz5Jnz99Uu3auyh5nwXtKOYQ0CbPzvAKmB3RmLB7fkxpAnrJeNJkPBlnRW ti5YQAx1kwozUV+oH9zjozeA+5eXc1+Jg6svw/9xqMIRbqVaDuNZ77+G9nOhG/KpngPR bImJ2I65XvngHaJSO1c/GGads8A9tKUTxWcYmcJv+6q8C9uMpeZg+2Xdtys6EjFgmmn2 mo4g== X-Gm-Message-State: AOJu0Yz7CzepNwG6BMp3Uac1BfmWgpwHVm5UUJmoi4vxpNMdeLH0JRDk ufQnT11CaFSp94A+5yRggWKr+E//uW3dDz035EG4DhOJShmJN+Bxtdky9T/NRCsF//KJB5ZRUgr g X-Google-Smtp-Source: AGHT+IHPMnwZDkxyQH41hXFl4FN5VgrE+gp4ch0Ceab+HspXdyBpJn/DEko3C9nnSfRE4IiqohBeQQ== X-Received: by 2002:a05:6a00:1894:b0:704:24fb:11c6 with SMTP id d2e1a72fcca58-70b43543549mr4493928b3a.12.1720553413689; Tue, 09 Jul 2024 12:30:13 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b438995a8sm2282780b3a.10.2024.07.09.12.30.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 12:30:13 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 6/7] cargo: remove True option to getVar calls Date: Tue, 9 Jul 2024 12:29:59 -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, 09 Jul 2024 19:30:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/201679 From: Peter Marko Layer cleanup similar to https://git.openembedded.org/openembedded-core/commit/?id=26c74fd10614582e177437608908eb43688ab510 Signed-off-by: Peter Marko Signed-off-by: Richard Purdie (cherry picked from commit 9a2ed52473a3e4eb662509824ef8e59520ebdefb) Signed-off-by: Steve Sakoman --- meta/classes-recipe/cargo_common.bbclass | 4 ++-- meta/classes-recipe/ptest-cargo.bbclass | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/meta/classes-recipe/cargo_common.bbclass b/meta/classes-recipe/cargo_common.bbclass index 0fb443edbd..19c497b8d6 100644 --- a/meta/classes-recipe/cargo_common.bbclass +++ b/meta/classes-recipe/cargo_common.bbclass @@ -41,7 +41,7 @@ CARGO_SRC_DIR ??= "" CARGO_MANIFEST_PATH ??= "${S}/${CARGO_SRC_DIR}/Cargo.toml" # Path to Cargo.lock -CARGO_LOCK_PATH ??= "${@ os.path.join(os.path.dirname(d.getVar('CARGO_MANIFEST_PATH', True)), 'Cargo.lock')}" +CARGO_LOCK_PATH ??= "${@ os.path.join(os.path.dirname(d.getVar('CARGO_MANIFEST_PATH')), 'Cargo.lock')}" CARGO_RUST_TARGET_CCLD ??= "${RUST_TARGET_CCLD}" cargo_common_do_configure () { @@ -171,7 +171,7 @@ python cargo_common_do_patch_paths() { # here is better than letting cargo tell (in case the file is missing) # "Cargo.lock should be modified but --frozen was given" - lockfile = d.getVar("CARGO_LOCK_PATH", True) + lockfile = d.getVar("CARGO_LOCK_PATH") if not os.path.exists(lockfile): bb.fatal(f"{lockfile} file doesn't exist") diff --git a/meta/classes-recipe/ptest-cargo.bbclass b/meta/classes-recipe/ptest-cargo.bbclass index c46df362bf..fd1df9d7c9 100644 --- a/meta/classes-recipe/ptest-cargo.bbclass +++ b/meta/classes-recipe/ptest-cargo.bbclass @@ -12,10 +12,10 @@ python do_compile_ptest_cargo() { import subprocess import json - cargo = bb.utils.which(d.getVar("PATH"), d.getVar("CARGO", True)) - cargo_build_flags = d.getVar("CARGO_BUILD_FLAGS", True) - rust_flags = d.getVar("RUSTFLAGS", True) - manifest_path = d.getVar("CARGO_MANIFEST_PATH", True) + cargo = bb.utils.which(d.getVar("PATH"), d.getVar("CARGO")) + cargo_build_flags = d.getVar("CARGO_BUILD_FLAGS") + rust_flags = d.getVar("RUSTFLAGS") + manifest_path = d.getVar("CARGO_MANIFEST_PATH") project_manifest_path = os.path.normpath(manifest_path) manifest_dir = os.path.dirname(manifest_path) @@ -66,7 +66,7 @@ python do_compile_ptest_cargo() { if not test_bins: bb.fatal("Unable to find any test binaries") - cargo_test_binaries_file = d.getVar('CARGO_TEST_BINARIES_FILES', True) + cargo_test_binaries_file = d.getVar('CARGO_TEST_BINARIES_FILES') bb.note(f"Found {len(test_bins)} tests, write their paths into {cargo_test_binaries_file}") with open(cargo_test_binaries_file, "w") as f: for test_bin in test_bins: @@ -77,10 +77,10 @@ python do_compile_ptest_cargo() { python do_install_ptest_cargo() { import shutil - dest_dir = d.getVar("D", True) - pn = d.getVar("PN", True) - ptest_path = d.getVar("PTEST_PATH", True) - cargo_test_binaries_file = d.getVar('CARGO_TEST_BINARIES_FILES', True) + dest_dir = d.getVar("D") + pn = d.getVar("PN") + ptest_path = d.getVar("PTEST_PATH") + cargo_test_binaries_file = d.getVar('CARGO_TEST_BINARIES_FILES') rust_test_args = d.getVar('RUST_TEST_ARGS') or "" ptest_dir = os.path.join(dest_dir, ptest_path.lstrip('/')) From patchwork Tue Jul 9 19:30:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 46119 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 6F2FBC41513 for ; Tue, 9 Jul 2024 19:30:19 +0000 (UTC) Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) by mx.groups.io with SMTP id smtpd.web11.4579.1720553416565067352 for ; Tue, 09 Jul 2024 12:30:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=k7/2ZDwe; spf=softfail (domain: sakoman.com, ip: 209.85.167.182, mailfrom: steve@sakoman.com) Received: by mail-oi1-f182.google.com with SMTP id 5614622812f47-3d9bcb47182so235190b6e.3 for ; Tue, 09 Jul 2024 12:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1720553416; x=1721158216; 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=9h4ydLAfOMrdo9oypE8ejNYavaUOGBZbH6+QmReoqsM=; b=k7/2ZDwe1p62PLEbnN8DxyTcavndd3XoZqRawTN/ofSHhqvII5W0XTkDPfzWLHfLMN SirUxpRRCs7xptzIttF5KESsndu6F5V+v2C9jUxp/xC9ySxnPXC5xtCe71PTTEVc8QUF JdabRJsw4TXe1GBmlK8rqJxxwLkobaVXaGJ3OAoFtP+FwV+PeY6Qo8XU2c7Z1d/oyeYq zOmTla9LCXJ4cNLFKVowHxwU/kB8511eN3Sjzx1I1oyJ46I/RLdtxbAdJ0xq53OD69bL jwCfwNWsYT4glq/CboEimgSOUXevVQhGQWUjbw1oEb0E1AS7iAQ1Mds3/zBkf9rq+jS+ OlcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720553416; x=1721158216; 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=9h4ydLAfOMrdo9oypE8ejNYavaUOGBZbH6+QmReoqsM=; b=BcEw92g+amIZ/8ftOwXyKFtW2WLa+eW5DEubPrgd9EsvFUbxAQauzyHcSI2qOX4uPX 5/NvcikHMtDo4m+l1sQm0N94VgfQ4BNeJkrMVQ1VG9Kt2AYGhAXIS9PIBQn3ICyhQcWm dPq3oPxmSg9turIn2ZdJ+XXALmaFvCncwOe2TXJy6hn2Alv5s135b8mIrZaWq8mCS9V+ SRmrlse/6NecxVmEsAiHEYrIchYm/9CPQouk5tLjdLkcO/4c8TUAmIIom0601V2YhoaE sBnWQABZRYRSnWP2ZFXhgljSHdcSrT5+WA8YI3IvJNuzatGYdPipUdKOF5ic3DvTBJDq 8L8Q== X-Gm-Message-State: AOJu0YxpylEaRwAqrGmtOulDRMMh/zFAkGuwsOZV79v/J/yXLdjjH4xk fhtJdT90cV7sBhf+x+0xX+p4EESmqoIGIdNNnF0mQhAIA/0l6YriGy84FKHAqlJ3zDsq4oAquFG n X-Google-Smtp-Source: AGHT+IG18RMpFmz8WfoSK1W5mewxqR9y3Gvt0KqfiR27I8C50ghvbH3Da6623e9he+HG6NUNc91VqA== X-Received: by 2002:a05:6870:c69d:b0:25e:1711:90e3 with SMTP id 586e51a60fabf-25eae7645c5mr2942468fac.2.1720553415646; Tue, 09 Jul 2024 12:30:15 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b438995a8sm2282780b3a.10.2024.07.09.12.30.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 12:30:15 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 7/7] xz: Update LICENSE variable for xz packages Date: Tue, 9 Jul 2024 12:30:00 -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, 09 Jul 2024 19:30:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/201680 From: aszh07 Update LICENSE defined for xz packages to match the license information provided in the xz COPYING file. The License information from PACKAGERS file of xz mentions packages with lzma files are in public domain.They ask to use GPLv2+, if only it's not possible to mention "PD and GPLv2+". Include PD license with GPLv2 to packages with lzma content: xz-dev package contains lzma header xz-doc package contains lzma man pages xz packages contains lzma binaries Links: https://github.com/tukaani-project/xz/blob/v5.4.6/COPYING https://github.com/tukaani-project/xz/blob/v5.4.6/PACKAGERS Signed-off-by: Bhabu Bindu Signed-off-by: Richard Purdie (cherry picked from commit 4e5b955def5d9f305f5aba2c68b73287c03fd163) Signed-off-by: Steve Sakoman --- meta/recipes-extended/xz/xz_5.4.6.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/xz/xz_5.4.6.bb b/meta/recipes-extended/xz/xz_5.4.6.bb index da3b75a10b..3f82e476bf 100644 --- a/meta/recipes-extended/xz/xz_5.4.6.bb +++ b/meta/recipes-extended/xz/xz_5.4.6.bb @@ -9,10 +9,10 @@ SECTION = "base" # libgnu, which appears to be used for DOS builds. So we're left with # GPL-2.0-or-later and PD. LICENSE = "GPL-2.0-or-later & GPL-3.0-with-autoconf-exception & LGPL-2.1-or-later & PD" -LICENSE:${PN} = "GPL-2.0-or-later" -LICENSE:${PN}-dev = "GPL-2.0-or-later" +LICENSE:${PN} = "PD & GPL-2.0-or-later" +LICENSE:${PN}-dev = "PD & GPL-2.0-or-later" LICENSE:${PN}-staticdev = "GPL-2.0-or-later" -LICENSE:${PN}-doc = "GPL-2.0-or-later" +LICENSE:${PN}-doc = "PD & GPL-2.0-or-later" LICENSE:${PN}-dbg = "GPL-2.0-or-later" LICENSE:${PN}-locale = "GPL-2.0-or-later" LICENSE:liblzma = "PD"