From patchwork Fri Oct 13 21:52:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32165 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 6D8BACDB484 for ; Fri, 13 Oct 2023 21:53:13 +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.51137.1697233983811050153 for ; Fri, 13 Oct 2023 14:53:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=aGI90Ei7; 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-6b70a73f8c4so506857b3a.2 for ; Fri, 13 Oct 2023 14:53:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697233983; x=1697838783; 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=AbLr4e3zmLcOe3UphSpmdHOPATJPataVXPrNkbfZVlM=; b=aGI90Ei7iHVfVb9gENpgurMcne2fjtWEKsXtSG2MC0D8UQ2boqphNJpOKlG+u6BXqH KBzArKqKJoAIdhz5vQlvD/meJ7frKdPsT/g6iQowKW8U9mKWixNzgqu7gekd+VIsVbnc bGbYf4XEjjjtyP6moa+Gwr+qKvNX7p8oyo+nrAT9uNMgdpqbOf55tmIjSYN4fPAJGzIy xMWcGY1SjuwE1t68i7skeWK9nTdE/mS3UeJxZinay3xAMO4tHWn1QUQKzfxFBMD1WSVV zENNhya3e1o8gfHSEd+jL3FjwDGggtlg+Jw0ODCYV7PvHQJ0URvn/Km4cqeZLZo4g+wv 64jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697233983; x=1697838783; 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=AbLr4e3zmLcOe3UphSpmdHOPATJPataVXPrNkbfZVlM=; b=SObQfJWWpjlUbINJuiLixcxEvGz68yhL7fJC3junBuhF0fqa2lagPJm/kZNpBpX+wA 9ZAh9dhE7yzz5tGefr05vsYV/DQyZAJdU7zU642fB+MKipcpu0VumOkOJDKGYt+DcUoL DmJMk3SwyKcBU+i6IlreQBU/HB+wPI9/bUqmwbpFK1aN3EdeT5SSmLY+iQh+CHvEQ8L7 6PAAEArKvVWTUl79ASZ0ksbJaEVHY9n3wNDm9KF7MC7xaZbMkFCj58SCUzFLGXbArEgF 14Mmr3lpJ4GrEmaneNBYdvXeGtQOa1E4B8ei3rIlP9O2VdK7mAe4XqEQGW1apzJbu0eX QXMg== X-Gm-Message-State: AOJu0Yz9zES3tAA+61quMc5EjrRTswI4QDOKyfAfh2bVsFlOCN8UghuR sSqAwenN7PSqzAE6P6G15izWXyEx6/DtEBjxwnQ= X-Google-Smtp-Source: AGHT+IHjWD4yY9w1HJu0wtM3qtVD5/y3jKUXnjvQx5VHH73OmzO9pDhPXDupHpsG2sn69xJVjEK6ww== X-Received: by 2002:a05:6a00:1388:b0:68c:a81:4368 with SMTP id t8-20020a056a00138800b0068c0a814368mr29488306pfg.6.1697233982783; Fri, 13 Oct 2023 14:53:02 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:02 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 01/27] tiff: fix CVE-2023-40745 Date: Fri, 13 Oct 2023 11:52:25 -1000 Message-Id: <3340e024ae8676081488f23a0678c28c23ab0b42.1697233866.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 ; Fri, 13 Oct 2023 21:53:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189078 From: Yogita Urade libtiff: integer overflow in tiffcp.c References: https://security-tracker.debian.org/tracker/CVE-2023-40745 https://gitlab.com/libtiff/libtiff/-/issues/591 https://bugzilla.redhat.com/show_bug.cgi?id=2235265 Signed-off-by: Yogita Urade Signed-off-by: Richard Purdie (cherry picked from commit c3d4fbeb51278a04a6800c894c681733ad2259ca) Signed-off-by: Steve Sakoman --- .../libtiff/files/CVE-2023-40745.patch | 35 +++++++++++++++++++ meta/recipes-multimedia/libtiff/tiff_4.5.1.bb | 4 ++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2023-40745.patch diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2023-40745.patch b/meta/recipes-multimedia/libtiff/files/CVE-2023-40745.patch new file mode 100644 index 0000000000..73f1f37bab --- /dev/null +++ b/meta/recipes-multimedia/libtiff/files/CVE-2023-40745.patch @@ -0,0 +1,35 @@ +From 4fc16f649fa2875d5c388cf2edc295510a247ee5 Mon Sep 17 00:00:00 2001 +From: Arie Haenel +Date: Thu, 14 Sep 2023 04:31:35 +0000 +Subject: [PATCH] tiffcp: fix memory corruption (overflow) on hostile images + (fixes #591) + +CVE: CVE-2023-40745 + +Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/commit/4fc16f649fa2875d5c388cf2edc295510a247ee5] + +Signed-off-by: Yogita Urade +--- + tools/tiffcp.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/tools/tiffcp.c b/tools/tiffcp.c +index 3b2d1dd..57fa6e8 100644 +--- a/tools/tiffcp.c ++++ b/tools/tiffcp.c +@@ -1754,6 +1754,13 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer) + "Width * Samples/Pixel)"); + return 0; + } ++ ++ if ( (imagew - tilew * spp) > INT_MAX ){ ++ TIFFError(TIFFFileName(in), ++ "Error, image raster scan line size is too large"); ++ return 0; ++ } ++ + iskew = imagew - tilew * spp; + tilebuf = limitMalloc(tilesize); + if (tilebuf == 0) +-- +2.35.5 diff --git a/meta/recipes-multimedia/libtiff/tiff_4.5.1.bb b/meta/recipes-multimedia/libtiff/tiff_4.5.1.bb index 5af3f84265..9cd790a2da 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.5.1.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.5.1.bb @@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a3e32d664d6db1386b4689c8121531c3" CVE_PRODUCT = "libtiff" -SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz" +SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ + file://CVE-2023-40745.patch \ + " SRC_URI[sha256sum] = "d7f38b6788e4a8f5da7940c5ac9424f494d8a79eba53d555f4a507167dca5e2b" From patchwork Fri Oct 13 21:52:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32168 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 96797CDB485 for ; Fri, 13 Oct 2023 21:53:13 +0000 (UTC) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web11.51155.1697233985638462597 for ; Fri, 13 Oct 2023 14:53:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=nKM7bg0Q; spf=softfail (domain: sakoman.com, ip: 209.85.210.171, mailfrom: steve@sakoman.com) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-6b36e1fcea0so805679b3a.1 for ; Fri, 13 Oct 2023 14:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697233985; x=1697838785; 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=821Uia7rSkThgpi/fOYW7Y/KdPt6Bu7jZKrZl5STKQ0=; b=nKM7bg0QeWKeJ1AovNUZSfzb9wFvM7DodqgBPGT3G5051jqXlt/D+/YPel1y5iu+VN QggzOc5E54hPnUTwLMqyNyrF/M7eLw1/Bs2HUds3s3YHJsZ/6WgFjg30VpdA8VCRsN3Y E9HHv8phuZPB9+ShFR6o4FeuJ9wqGBJydpP1105pz7z32VUwgT9fJ39k3J2KigjLSzUl lZvhDQ8ETREG3y3ZVcikZrNdsrcFktLuj84eqfDBODFmwDz3BvtoF7BY17YVLTX83xRZ LkpUdKvOhlTyrBLLxeG/YDNcjfNsKI9zimjSnxOH0tuHrgERohmZfUSkF72JTy5IofuL 8KOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697233985; x=1697838785; 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=821Uia7rSkThgpi/fOYW7Y/KdPt6Bu7jZKrZl5STKQ0=; b=KK/o2yGTFg9ReRkODrAFmQ8YU5n5jr6g0s9heiJHUaWO7uxOhN4E5JwgmlPoXpcx38 DrXoyEXMmAjCsMQ8GATSqJr4NzgS3/Fzr8W68J6lJci/+yMIDL8DlcN/1wBmzq2/Of6x uTV+rsh2JOvP018EtSOJ3VEWJiLTEo7hsdHoiO+Tto/dF/jofyl1sc0XVhFoShaz4mWK LakxoWYbRquVtSeFzTEZK+VQlwjN7XtHLXy3SFrpOmSg9WTlws1Tgtr1nLJe69bx927E OMn+7eDLCtklR9fFaepsl77liG+21nt+SFMSJzP67JWPoGKq5x1aFqp4nEtKIlBkDIfe Il9g== X-Gm-Message-State: AOJu0Yz83tK/y4S+Xe9tVVTfLMdHppFFV58/TsBE6Dvfe1UWGBbPWvnK lDfaEcbtjEqcb1hpUEtYbIhaeQjJXXN3/Wsx5+Q= X-Google-Smtp-Source: AGHT+IENTE8W75JbkDk1iC8tflLQNn587hUPMYOUE0vo8NVm6C4KxePY6yJhrG2lpv5suR/xbIpvvA== X-Received: by 2002:aa7:9689:0:b0:6b6:7a04:6f9 with SMTP id f9-20020aa79689000000b006b67a0406f9mr1404501pfk.28.1697233984637; Fri, 13 Oct 2023 14:53:04 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:04 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 02/27] tiff: fix CVE-2023-41175 Date: Fri, 13 Oct 2023 11:52:26 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 13 Oct 2023 21:53:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189079 From: Yogita Urade libtiff: potential integer overflow in raw2tiff.c References: https://bugzilla.redhat.com/show_bug.cgi?id=2235264 https://security-tracker.debian.org/tracker/CVE-2023-41175 https://gitlab.com/libtiff/libtiff/-/issues/592 Signed-off-by: Yogita Urade Signed-off-by: Richard Purdie (cherry picked from commit 4ee806cbc12fbc830b09ba6222e96b1e5f24539f) Signed-off-by: Steve Sakoman --- .../libtiff/files/CVE-2023-41175.patch | 63 +++++++++++++++++++ meta/recipes-multimedia/libtiff/tiff_4.5.1.bb | 1 + 2 files changed, 64 insertions(+) create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2023-41175.patch diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2023-41175.patch b/meta/recipes-multimedia/libtiff/files/CVE-2023-41175.patch new file mode 100644 index 0000000000..cca30b2196 --- /dev/null +++ b/meta/recipes-multimedia/libtiff/files/CVE-2023-41175.patch @@ -0,0 +1,63 @@ +From 6e2dac5f904496d127c92ddc4e56eccfca25c2ee Mon Sep 17 00:00:00 2001 +From: Arie Haenel +Date: Thu, 14 Sep 2023 04:36:58 +0000 +Subject: [PATCH] raw2tiff: fix integer overflow and bypass of the check (fixes + #592) + +CVE: CVE-2023-41175 + +Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/commit/6e2dac5f904496d127c92ddc4e56eccfca25c2ee] + +Signed-off-by: Yogita Urade +--- + tools/raw2tiff.c | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +diff --git a/tools/raw2tiff.c b/tools/raw2tiff.c +index 4ee59e5..a811077 100644 +--- a/tools/raw2tiff.c ++++ b/tools/raw2tiff.c +@@ -101,6 +101,7 @@ int main(int argc, char *argv[]) + int fd; + char *outfilename = NULL; + TIFF *out; ++ uint32_t temp_limit_check = 0; /* temp for integer overflow checking*/ + + uint32_t row, col, band; + int c; +@@ -221,6 +222,33 @@ int main(int argc, char *argv[]) + if (guessSize(fd, dtype, hdr_size, nbands, swab, &width, &length) < 0) + return EXIT_FAILURE; + ++ /* check for integer overflow in */ ++ /* hdr_size + (*width) * (*length) * nbands * depth */ ++ ++ if ((width == 0) || (length == 0) ){ ++ fprintf(stderr, "Too large nbands value specified.\n"); ++ return (EXIT_FAILURE); ++ } ++ ++ temp_limit_check = nbands * depth; ++ ++ if ( !temp_limit_check || length > ( UINT_MAX / temp_limit_check ) ) { ++ fprintf(stderr, "Too large length size specified.\n"); ++ return (EXIT_FAILURE); ++ } ++ temp_limit_check = temp_limit_check * length; ++ ++ if ( !temp_limit_check || width > ( UINT_MAX / temp_limit_check ) ) { ++ fprintf(stderr, "Too large width size specified.\n"); ++ return (EXIT_FAILURE); ++ } ++ temp_limit_check = temp_limit_check * width; ++ ++ if ( !temp_limit_check || hdr_size > ( UINT_MAX - temp_limit_check ) ) { ++ fprintf(stderr, "Too large header size specified.\n"); ++ return (EXIT_FAILURE); ++ } ++ + if (outfilename == NULL) + outfilename = argv[optind + 1]; + out = TIFFOpen(outfilename, "w"); +-- +2.35.5 diff --git a/meta/recipes-multimedia/libtiff/tiff_4.5.1.bb b/meta/recipes-multimedia/libtiff/tiff_4.5.1.bb index 9cd790a2da..2a5b7e7fcf 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.5.1.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.5.1.bb @@ -10,6 +10,7 @@ CVE_PRODUCT = "libtiff" SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ file://CVE-2023-40745.patch \ + file://CVE-2023-41175.patch \ " SRC_URI[sha256sum] = "d7f38b6788e4a8f5da7940c5ac9424f494d8a79eba53d555f4a507167dca5e2b" From patchwork Fri Oct 13 21:52:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32170 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 A2A01CDB486 for ; Fri, 13 Oct 2023 21:53:13 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web11.51156.1697233987619084178 for ; Fri, 13 Oct 2023 14:53:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=lboGmXSP; spf=softfail (domain: sakoman.com, ip: 209.85.210.176, mailfrom: steve@sakoman.com) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-6b1ef786b7fso1092066b3a.3 for ; Fri, 13 Oct 2023 14:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697233987; x=1697838787; 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=LUDpaCppW3BLZkbi1TL7Caurk+Nf06aSbpRp0Uwdm78=; b=lboGmXSPLofzffUfLZ+scd6MoK3xE95ymyzs1YFhLkcBMT9ZZp1gam75MaNL8WBolQ CiZOZ4c/s3K7kt/S+sLqBz+ewaQOdKoeSjT79uK8dBh2vkAGWaJ3SMXyU+dPaVLqCFjl ALLbn1wodjgWhIvPput5L2Zr9rY6P23WPPJq+sA7fgO0EQhhNMI69gUJYXXIEsAAvtz8 aVtxsrVPTZew8kXGOHUV9+A2GZKrPd0QgmpvnykFALdTG0LPUSOcBJhiPlwqQSLCZ0zA 9BLajGnVQb12r9wdqGVRbD7WrScxoqqF77WIPtJaCstWpfjUXh6PjQWKi8DT+92TbUMT Ca0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697233987; x=1697838787; 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=LUDpaCppW3BLZkbi1TL7Caurk+Nf06aSbpRp0Uwdm78=; b=L+bSlehB3T5QRwFeaYMULmOsJTFtr6Q05IU//oXKScUw9oblPAlVigBD1xdq5j3/p/ /4iu/LieKy1sh0InoDU/03EYXpFbUUpuUadoE+CwAPP0zt+yShR3xSwM8tpqEwv7LyTA WGDIs9LwnrunJofizzhRnb5MH/O4h53aCzZCnU949f/iP2EPMgz5qJWA7xfZsSo0uLYT z3B9AhcuEAJIw3nmJj3hsBgtGM99gsp9LpIOkpcR9PbN04cCoywFHZYIRnFjQ/WaOUAR llcRv9SVDqVczA3tAoX3ncadl2pZsQMVgxnc4rnBxQb+AT5Zl/0g5gIy+UQUgQp5RGMT DNjQ== X-Gm-Message-State: AOJu0YyaJS0D4LiSMPmgwTw/UuimD6BtQFtT2RSPS4Qb79Snbu6kRs63 hzhosDxwdNgDaDbdB55fi9OpQ8PuFyr86K+qMCI= X-Google-Smtp-Source: AGHT+IFGP4mW1u0npf/i05trJA64EUqItzIUiceObCqF+TuBJnf81LGkX2QdJQEy0j2NcHW1NyX7fQ== X-Received: by 2002:a05:6a00:1255:b0:68a:5449:7436 with SMTP id u21-20020a056a00125500b0068a54497436mr31052571pfi.32.1697233986521; Fri, 13 Oct 2023 14:53:06 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:06 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 03/27] ghostscript: fix CVE-2023-43115 Date: Fri, 13 Oct 2023 11:52:27 -1000 Message-Id: <80a9b54ca94a9fe5818daa1cd03ae8035043e1e8.1697233866.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 ; Fri, 13 Oct 2023 21:53:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189080 From: Joe Slater The patch is copied from kirkstone. master has advanced to ghostscript 10.02.0 which includes the fix. Signed-off-by: Joe Slater Signed-off-by: Steve Sakoman --- .../ghostscript/CVE-2023-43115.patch | 62 +++++++++++++++++++ .../ghostscript/ghostscript_10.0.0.bb | 1 + 2 files changed, 63 insertions(+) create mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2023-43115.patch diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2023-43115.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2023-43115.patch new file mode 100644 index 0000000000..979f354ed5 --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/CVE-2023-43115.patch @@ -0,0 +1,62 @@ +From 8b0f20002536867bd73ff4552408a72597190cbe Mon Sep 17 00:00:00 2001 +From: Ken Sharp +Date: Thu, 24 Aug 2023 15:24:35 +0100 +Subject: [PATCH] IJS device - try and secure the IJS server startup + +Bug #707051 ""ijs" device can execute arbitrary commands" + +The problem is that the 'IJS' device needs to start the IJS server, and +that is indeed an arbitrary command line. There is (apparently) no way +to validate it. Indeed, this is covered quite clearly in the comments +at the start of the source: + + * WARNING: The ijs server can be selected on the gs command line + * which is a security risk, since any program can be run. + +Previously this used the awful LockSafetyParams hackery, which we +abandoned some time ago because it simply couldn't be made secure (it +was implemented in PostScript and was therefore vulnerable to PostScript +programs). + +This commit prevents PostScript programs switching to the IJS device +after SAFER has been activated, and prevents changes to the IjsServer +parameter after SAFER has been activated. + +SAFER is activated, unless explicitly disabled, before any user +PostScript is executed which means that the device and the server +invocation can only be configured on the command line. This does at +least provide minimal security against malicious PostScript programs. + +Upstream-Status: Backport [https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=8b0f20002536867bd73ff4552408a72597190cbe] + +CVE: CVE-2023-43115 + +Signed-off-by: Archana Polampalli +--- + devices/gdevijs.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/devices/gdevijs.c b/devices/gdevijs.c +index 8cbd84b97..16f5a1752 100644 +--- a/devices/gdevijs.c ++++ b/devices/gdevijs.c +@@ -888,6 +888,8 @@ gsijs_initialize_device(gx_device *dev) + static const char rgb[] = "DeviceRGB"; + gx_device_ijs *ijsdev = (gx_device_ijs *)dev; + ++ if (ijsdev->memory->gs_lib_ctx->core->path_control_active) ++ return_error(gs_error_invalidaccess); + if (!ijsdev->ColorSpace) { + ijsdev->ColorSpace = gs_malloc(ijsdev->memory, sizeof(rgb), 1, + "gsijs_initialize"); +@@ -1326,7 +1328,7 @@ gsijs_put_params(gx_device *dev, gs_param_list *plist) + if (code >= 0) + code = gsijs_read_string(plist, "IjsServer", + ijsdev->IjsServer, sizeof(ijsdev->IjsServer), +- dev->LockSafetyParams, is_open); ++ ijsdev->memory->gs_lib_ctx->core->path_control_active, is_open); + + if (code >= 0) + code = gsijs_read_string_malloc(plist, "DeviceManufacturer", +-- +2.40.0 diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.0.0.bb b/meta/recipes-extended/ghostscript/ghostscript_10.0.0.bb index 9e2cd01ff4..5c6be991d9 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_10.0.0.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_10.0.0.bb @@ -37,6 +37,7 @@ SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/d file://cve-2023-28879.patch \ file://cve-2023-36664.patch \ file://CVE-2023-38559.patch \ + file://CVE-2023-43115.patch \ " SRC_URI = "${SRC_URI_BASE} \ From patchwork Fri Oct 13 21:52:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32167 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 6E93FC41513 for ; Fri, 13 Oct 2023 21:53:13 +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.51158.1697233989225837811 for ; Fri, 13 Oct 2023 14:53:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=xEsuEBhX; 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-690fe10b6a4so2091918b3a.3 for ; Fri, 13 Oct 2023 14:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697233988; x=1697838788; 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=6kDUfaJ9xTodrJzy0szn8B9NgvXoILY2H6s68H3nMNs=; b=xEsuEBhXI9SZx4I0TjiDtIBFQYzbB9vJyaK4/Gw6jNS+6iWgp99bJAwECJcZf2miZp GXxDiAZ8uOxYIwrgcxCht2lO0BTRBnhhRlhyuA7W4fEUkzj37Dv8W/ueDoXBCkDpcHR4 zMONKAcohzd8zQl0n7lc9xiaOeq+G5rZC9TlWqvrubYIO/iqtXUq3FoBrlB0GL9HGIOc nA8+LNqrz2D3c+zdAu98JegOv3gIRT+c4jx2hSrZeiK+HX4z84KMhX7WvVhfjcp9KG99 +7U/jH3SZysxBDDomdl3NhU4XLnaeeXLLzFeTfmoO9p9/sVF4GcNDqDcj7NR9OWNKF4E v9Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697233988; x=1697838788; 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=6kDUfaJ9xTodrJzy0szn8B9NgvXoILY2H6s68H3nMNs=; b=hvX5y4JGFxUiSmmp/n2W5Nb5haLrAYz2Il1rPGSyCDQ4EeeGsqhS0fRqp4041z3d6C cXloORiWsSFBP3aJydWapCB8HT04b35DE2vh7xop4aCEpZhGkrbRcCMEQcRMZFTT75in 9V8nFhliN6g5sdViofPyPaRNiWwNyPVvHY+NDi37vrZX01IA6B1FC6aYoS+dA6VIdfQI FYsa4MkLcrwOzS6Gzf8VB3oFZ/zrePs6stZ37ZJsI4qrBNsYx8p3TOv2zMuKqeBVSVJc g1lwXpq/pYYF5DPxsOufTLBrntbnSNay7bvAmioGKmrRYcO3orNuxwyUFeWGUqFhcb6w 3NWA== X-Gm-Message-State: AOJu0Ywvw16vd+iBmuGLydtq16D3a8dI+S5W9ZDzmSzsGPu5o+hHgKjX h7vLRreGDwxuZ5LxjGswJvazJsw+jh4Uu5HkoBQ= X-Google-Smtp-Source: AGHT+IH7adfVKhWnOcMWkgCIA9xrWpbOW+PbsvuXLtnOK0GAoNuzttxM9TClwuai9C3+82aWhXdGIA== X-Received: by 2002:a05:6a00:2e95:b0:68f:f741:57a1 with SMTP id fd21-20020a056a002e9500b0068ff74157a1mr39267002pfb.7.1697233988324; Fri, 13 Oct 2023 14:53:08 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:08 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 04/27] curl: fix CVE-2023-38545 Date: Fri, 13 Oct 2023 11:52:28 -1000 Message-Id: <9b0867861a9c053f19bdb99bd6cba44ee5cb64e1.1697233866.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 ; Fri, 13 Oct 2023 21:53:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189081 From: Archana Polampalli This flaw makes curl overflow a heap based buffer in the SOCKS5 proxy handshake. Signed-off-by: Archana Polampalli Signed-off-by: Steve Sakoman --- .../curl/curl/CVE-2023-38545.patch | 133 ++++++++++++++++++ meta/recipes-support/curl/curl_8.0.1.bb | 1 + 2 files changed, 134 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2023-38545.patch diff --git a/meta/recipes-support/curl/curl/CVE-2023-38545.patch b/meta/recipes-support/curl/curl/CVE-2023-38545.patch new file mode 100644 index 0000000000..b90677fa5f --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2023-38545.patch @@ -0,0 +1,133 @@ +From fb4415d8aee6c1045be932a34fe6107c2f5ed147 Mon Sep 17 00:00:00 2001 +From: Jay Satiro +Date: Wed, 11 Oct 2023 07:34:19 +0200 +Subject: [PATCH] socks: return error if hostname too long for remote resolve + +Prior to this change the state machine attempted to change the remote +resolve to a local resolve if the hostname was longer than 255 +characters. Unfortunately that did not work as intended and caused a +security issue. + +Bug: https://curl.se/docs/CVE-2023-38545.html + +Upstream-Status: Backport [https://github.com/curl/curl/commit/fb4415d8aee6c1045be932a34fe6107c2f5ed147] +CVE: CVE-2023-38545 +Signed-off-by: Archana Polampalli +--- + lib/socks.c | 8 +++--- + tests/data/Makefile.inc | 2 +- + tests/data/test722 | 64 +++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 69 insertions(+), 5 deletions(-) + create mode 100644 tests/data/test722 + +diff --git a/lib/socks.c b/lib/socks.c +index 95c2b00..8cf694d 100644 +--- a/lib/socks.c ++++ b/lib/socks.c +@@ -588,9 +588,9 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf, + + /* RFC1928 chapter 5 specifies max 255 chars for domain name in packet */ + if(!socks5_resolve_local && hostname_len > 255) { +- infof(data, "SOCKS5: server resolving disabled for hostnames of " +- "length > 255 [actual len=%zu]", hostname_len); +- socks5_resolve_local = TRUE; ++ failf(data, "SOCKS5: the destination hostname is too long to be " ++ "resolved remotely by the proxy."); ++ return CURLPX_LONG_HOSTNAME; + } + + if(auth & ~(CURLAUTH_BASIC | CURLAUTH_GSSAPI)) +@@ -904,7 +904,7 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf, + } + else { + socksreq[len++] = 3; +- socksreq[len++] = (char) hostname_len; /* one byte address length */ ++ socksreq[len++] = (unsigned char) hostname_len; /* one byte length */ + memcpy(&socksreq[len], sx->hostname, hostname_len); /* w/o NULL */ + len += hostname_len; + } +diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc +index 7ed03a2..643c9fe 100644 +--- a/tests/data/Makefile.inc ++++ b/tests/data/Makefile.inc +@@ -100,7 +100,7 @@ test679 test680 test681 test682 test683 test684 test685 test686 \ + \ + test700 test701 test702 test703 test704 test705 test706 test707 test708 \ + test709 test710 test711 test712 test713 test714 test715 test716 test717 \ +-test718 test719 test720 test721 \ ++test718 test719 test720 test721 test722 \ + \ + test800 test801 test802 test803 test804 test805 test806 test807 test808 \ + test809 test810 test811 test812 test813 test814 test815 test816 test817 \ +diff --git a/tests/data/test722 b/tests/data/test722 +new file mode 100644 +index 0000000..05bcf28 +--- /dev/null ++++ b/tests/data/test722 +@@ -0,0 +1,64 @@ ++ ++ ++ ++HTTP ++HTTP GET ++SOCKS5 ++SOCKS5h ++followlocation ++ ++ ++ ++# ++# Server-side ++ ++# The hostname in this redirect is 256 characters and too long (> 255) for ++# SOCKS5 remote resolve. curl must return error CURLE_PROXY in this case. ++ ++HTTP/1.1 301 Moved Permanently ++Location: http://AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/ ++Content-Length: 0 ++Connection: close ++ ++ ++ ++ ++# ++# Client-side ++ ++ ++proxy ++ ++ ++http ++socks5 ++ ++ ++SOCKS5h with HTTP redirect to hostname too long ++ ++ ++--no-progress-meter --location --proxy socks5h://%HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER ++ ++ ++ ++# ++# Verify data after the test has been "shot" ++ ++ ++GET /%TESTNUMBER HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++User-Agent: curl/%VERSION ++Accept: */* ++ ++ ++ ++97 ++ ++# the error message is verified because error code CURLE_PROXY (97) may be ++# returned for any number of reasons and we need to make sure it is ++# specifically for the reason below so that we know the check is working. ++ ++curl: (97) SOCKS5: the destination hostname is too long to be resolved remotely by the proxy. ++ ++ ++ +-- +2.40.0 diff --git a/meta/recipes-support/curl/curl_8.0.1.bb b/meta/recipes-support/curl/curl_8.0.1.bb index 708f622fe1..bdffe7be34 100644 --- a/meta/recipes-support/curl/curl_8.0.1.bb +++ b/meta/recipes-support/curl/curl_8.0.1.bb @@ -19,6 +19,7 @@ SRC_URI = " \ file://CVE-2023-28321.patch \ file://CVE-2023-32001.patch \ file://CVE-2023-28320-fol1.patch \ + file://CVE-2023-38545.patch \ " SRC_URI[sha256sum] = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0" From patchwork Fri Oct 13 21:52:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32166 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 7D1D8CDB483 for ; Fri, 13 Oct 2023 21:53:13 +0000 (UTC) Received: from mail-oo1-f49.google.com (mail-oo1-f49.google.com [209.85.161.49]) by mx.groups.io with SMTP id smtpd.web11.51159.1697233991420895189 for ; Fri, 13 Oct 2023 14:53:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=oTckYzIE; spf=softfail (domain: sakoman.com, ip: 209.85.161.49, mailfrom: steve@sakoman.com) Received: by mail-oo1-f49.google.com with SMTP id 006d021491bc7-57bab4e9e1aso1470005eaf.3 for ; Fri, 13 Oct 2023 14:53:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697233990; x=1697838790; 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=ZwNjVicnRTiPVda1+moLlJexpk6+hcFX+PhlKPlFlYA=; b=oTckYzIE2TSf/ZlabAgws/sG45ENl2SiPNc+/VB+kNK6Bq4U6WYh+VcMu2qiPacfAJ qPuB8cvp1KkCU4OweAWKPGeWwzUfGLR8yD/ooEx+X+AkI7wlQ8qlIZ/zDsTjyF/MW1RN QcRo8KfaO1HIk967lzZ2waTx1+egQprfA6WgudHXkVWnSJwfPeynzCQO8SjJU58SMo1G lwotbfr4JltvWoNLbtRx5+u7Z8Iu2CUEwXKF/4yme/RpzyvgzrCuJFF+rzYGokGJlrtd kucWYZI2Z+4toqQ7TJ47R9yjREKoMVhpqpiltjmQzih1XOswUyy3ogWwzc8E1HlTT2Yo sf4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697233990; x=1697838790; 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=ZwNjVicnRTiPVda1+moLlJexpk6+hcFX+PhlKPlFlYA=; b=A/CLVhS3HXm3LE3Lq8N4JXWuZDh8LZJJmpeWExaKA8bIxKw5PpQd9EH9agRfBKBKiy e13fLiKmQEkmn5qDUYdwzRl5QpWkZeawpm5ST1wi55Z5ceA6XIO7s1riYzFPGNLH+dTO 3PR4CNNgEH2tCHfY4IhImjNDa6zG4MKwnICh0MO95/csjqat5RYVKjwFOjVgwmtUWnZB O45iEv7rF+AGn+h4Fyw+8bnhd2CEhPEwte1CKWaP1ttS0MfC6GvqpG2KU19JJzOYCpy/ qS4he9SIq+QovA31kjiusiXV9aVV94nnQly6jp+a8V2liNK5Bnd0DTOvzOFFQJ1XWGGe MopA== X-Gm-Message-State: AOJu0Yxcd71E2edCnFYV/KfmKPvbL2m6cVOH5Gl/NSllFYxyZl5aRFSv xSl+fdURU2CTDH0usdAFFMurv01dwTn/7J8zmvw= X-Google-Smtp-Source: AGHT+IGbS8hQ5ZZbH5/k8zOm6wGgPbyJXteq5EflsxyT2iS8gzr7sLhm7cCy9V98VD+kdOYnBjmGnQ== X-Received: by 2002:a05:6358:6f06:b0:143:5eaf:d6fa with SMTP id r6-20020a0563586f0600b001435eafd6famr26508351rwn.9.1697233989985; Fri, 13 Oct 2023 14:53:09 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:09 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 05/27] curl: fix CVE-2023-38546 Date: Fri, 13 Oct 2023 11:52:29 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 13 Oct 2023 21:53:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189082 From: Archana Polampalli A flaw was found in the Curl package. This flaw allows an attacker to insert cookies into a running program using libcurl if the specific series of conditions are met. Signed-off-by: Archana Polampalli Signed-off-by: Steve Sakoman --- .../curl/curl/CVE-2023-38546.patch | 137 ++++++++++++++++++ meta/recipes-support/curl/curl_8.0.1.bb | 1 + 2 files changed, 138 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2023-38546.patch diff --git a/meta/recipes-support/curl/curl/CVE-2023-38546.patch b/meta/recipes-support/curl/curl/CVE-2023-38546.patch new file mode 100644 index 0000000000..2c97c4d5a5 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2023-38546.patch @@ -0,0 +1,137 @@ +From 61275672b46d9abb3285740467b882e22ed75da8 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Thu, 14 Sep 2023 23:28:32 +0200 +Subject: [PATCH] cookie: remove unnecessary struct fields + +Plus: reduce the hash table size from 256 to 63. It seems unlikely to +make much of a speed difference for most use cases but saves 1.5KB of +data per instance. + +Closes #11862 + +Upstream-Status: Backport [https://github.com/curl/curl/commit/61275672b46d9abb32857404] + +CVE: CVE-2023-38546 + +Signed-off-by: Archana Polampalli +--- + lib/cookie.c | 13 +------------ + lib/cookie.h | 14 ++++---------- + lib/easy.c | 4 +--- + 3 files changed, 6 insertions(+), 25 deletions(-) + +diff --git a/lib/cookie.c b/lib/cookie.c +index 0c6e0f7..d346203 100644 +--- a/lib/cookie.c ++++ b/lib/cookie.c +@@ -119,7 +119,6 @@ static void freecookie(struct Cookie *co) + free(co->name); + free(co->value); + free(co->maxage); +- free(co->version); + free(co); + } + +@@ -726,11 +725,7 @@ Curl_cookie_add(struct Curl_easy *data, + } + } + else if((nlen == 7) && strncasecompare("version", namep, 7)) { +- strstore(&co->version, valuep, vlen); +- if(!co->version) { +- badcookie = TRUE; +- break; +- } ++ /* just ignore */ + } + else if((nlen == 7) && strncasecompare("max-age", namep, 7)) { + /* +@@ -1174,7 +1169,6 @@ Curl_cookie_add(struct Curl_easy *data, + free(clist->path); + free(clist->spath); + free(clist->expirestr); +- free(clist->version); + free(clist->maxage); + + *clist = *co; /* then store all the new data */ +@@ -1238,9 +1232,6 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data, + c = calloc(1, sizeof(struct CookieInfo)); + if(!c) + return NULL; /* failed to get memory */ +- c->filename = strdup(file?file:"none"); /* copy the name just in case */ +- if(!c->filename) +- goto fail; /* failed to get memory */ + /* + * Initialize the next_expiration time to signal that we don't have enough + * information yet. +@@ -1394,7 +1385,6 @@ static struct Cookie *dup_cookie(struct Cookie *src) + CLONE(name); + CLONE(value); + CLONE(maxage); +- CLONE(version); + d->expires = src->expires; + d->tailmatch = src->tailmatch; + d->secure = src->secure; +@@ -1611,7 +1601,6 @@ void Curl_cookie_cleanup(struct CookieInfo *c) + { + if(c) { + unsigned int i; +- free(c->filename); + for(i = 0; i < COOKIE_HASH_SIZE; i++) + Curl_cookie_freelist(c->cookies[i]); + free(c); /* free the base struct as well */ +diff --git a/lib/cookie.h b/lib/cookie.h +index 39bb08b..3a43bbf 100644 +--- a/lib/cookie.h ++++ b/lib/cookie.h +@@ -36,11 +36,7 @@ struct Cookie { + char *domain; /* domain = */ + curl_off_t expires; /* expires = */ + char *expirestr; /* the plain text version */ +- +- /* RFC 2109 keywords. Version=1 means 2109-compliant cookie sending */ +- char *version; /* Version = */ + char *maxage; /* Max-Age = */ +- + bool tailmatch; /* whether we do tail-matching of the domain name */ + bool secure; /* whether the 'secure' keyword was used */ + bool livecookie; /* updated from a server, not a stored file */ +@@ -56,18 +52,16 @@ struct Cookie { + #define COOKIE_PREFIX__SECURE (1<<0) + #define COOKIE_PREFIX__HOST (1<<1) + +-#define COOKIE_HASH_SIZE 256 ++#define COOKIE_HASH_SIZE 63 + + struct CookieInfo { + /* linked list of cookies we know of */ + struct Cookie *cookies[COOKIE_HASH_SIZE]; +- +- char *filename; /* file we read from/write to */ +- long numcookies; /* number of cookies in the "jar" */ ++ curl_off_t next_expiration; /* the next time at which expiration happens */ ++ int numcookies; /* number of cookies in the "jar" */ ++ int lastct; /* last creation-time used in the jar */ + bool running; /* state info, for cookie adding information */ + bool newsession; /* new session, discard session cookies on load */ +- int lastct; /* last creation-time used in the jar */ +- curl_off_t next_expiration; /* the next time at which expiration happens */ + }; + + /* This is the maximum line length we accept for a cookie line. RFC 2109 +diff --git a/lib/easy.c b/lib/easy.c +index 27124a7..fddf047 100644 +--- a/lib/easy.c ++++ b/lib/easy.c +@@ -911,9 +911,7 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data) + if(data->cookies) { + /* If cookies are enabled in the parent handle, we enable them + in the clone as well! */ +- outcurl->cookies = Curl_cookie_init(data, +- data->cookies->filename, +- outcurl->cookies, ++ outcurl->cookies = Curl_cookie_init(data, NULL, outcurl->cookies, + data->set.cookiesession); + if(!outcurl->cookies) + goto fail; +-- +2.40.0 diff --git a/meta/recipes-support/curl/curl_8.0.1.bb b/meta/recipes-support/curl/curl_8.0.1.bb index bdffe7be34..375b4d2f93 100644 --- a/meta/recipes-support/curl/curl_8.0.1.bb +++ b/meta/recipes-support/curl/curl_8.0.1.bb @@ -20,6 +20,7 @@ SRC_URI = " \ file://CVE-2023-32001.patch \ file://CVE-2023-28320-fol1.patch \ file://CVE-2023-38545.patch \ + file://CVE-2023-38546.patch \ " SRC_URI[sha256sum] = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0" From patchwork Fri Oct 13 21:52:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32164 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 872D4C46CA1 for ; Fri, 13 Oct 2023 21:53:13 +0000 (UTC) Received: from mail-oo1-f52.google.com (mail-oo1-f52.google.com [209.85.161.52]) by mx.groups.io with SMTP id smtpd.web11.51160.1697233992932243368 for ; Fri, 13 Oct 2023 14:53:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=H5fZZGpB; spf=softfail (domain: sakoman.com, ip: 209.85.161.52, mailfrom: steve@sakoman.com) Received: by mail-oo1-f52.google.com with SMTP id 006d021491bc7-57bca5b9b0aso1370264eaf.3 for ; Fri, 13 Oct 2023 14:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697233992; x=1697838792; 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=0TIjkC2w/yML05Qb9CWIdFHmjRuqopCTX6YOaqYwcK4=; b=H5fZZGpBlfzHMBxuFaGZlW5tHuIzYfiisZLOMw1AlvU/nsTYN+0F0NXlDepRTPnmrJ AOqOqOKzkE/EGeZGEJpaVciBTe++wtGOVxrXJKXzA1RTFbFfx0sYIHXHqnYMhvozcgJp 5US2DKYaGVIC7suxkBLKufOmyDC3LFhEI05t5mmMd7qdRPx7sWQBC7IYlWw2wWawAswk GCi1ivhqa/eYD004IGYTI0RzR56q5P9R07uEcUsIcSUW5d7HTVzm/PS8Ul4PO7JEM/AW e4YsBZXQ7t5ahf/e012I14RQQB3ezUaWl00KUBw7PLf/IqSRB3zzcdy9eipuz8EpmZ5m VEAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697233992; x=1697838792; 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=0TIjkC2w/yML05Qb9CWIdFHmjRuqopCTX6YOaqYwcK4=; b=tl9nfEhiShXgKY1K8RxlNCLp06nkmP9D5KhjtqLu71p8tnA8Jeu6FQWKiMlMJuAJLs omBeYwld4FqExSKK4jDIhV++9RRjLn22EtRnasFgv4Vde3qkB68Kkbrsq6Dh8k6Zz5Jv 7tc72DCUn663lsT4wzuYTME1XW784nkeAVHy5RF5H0b7knMdFZLb0SuO2aaKTVkn3ihv 234Ou809OmtBy5dvpKtc9JB/0qe3Ga3+7SS8T3nbxNOIxhgn70negnXNE8ODU0BKhLeR h0tFs5LsnT7Y9rJEbE1iEv8Vfigfzg9zzfegzqF8nfF71phaiuJeLS6VQAzo99t/0Q1u 0Q5w== X-Gm-Message-State: AOJu0YzSkkSXJPaVhL4ypVaTncKxZWQN2F91wKEn0duuJmCRUTwQ7i7M ncCpoSvTelYuvT48w61znBIJx1bP8dorC1MJZTw= X-Google-Smtp-Source: AGHT+IENQ+hBuJoxRikG5flmx3MLJgtdsK9YFeSsWZl3cQyawF+LY9biYT+GFGfI2R6hOzYp13b6MQ== X-Received: by 2002:a05:6358:88f:b0:135:47e8:76e2 with SMTP id m15-20020a056358088f00b0013547e876e2mr33562928rwj.4.1697233991839; Fri, 13 Oct 2023 14:53:11 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:11 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 06/27] dbus: upgrade 1.14.8 -> 1.14.10 Date: Fri, 13 Oct 2023 11:52:30 -1000 Message-Id: <67ddf87d3286007a68071685d28a8f9e1ce7f3fa.1697233866.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 ; Fri, 13 Oct 2023 21:53:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189083 From: Wang Mingyu Changelog: =========== • Avoid a dbus-daemon crash if re-creating a connection's policy fails. • If getting the groups from a user ID fails, report the error correctly, instead of logging "(null)" • Return the primary group ID in GetConnectionCredentials()' UnixGroupIDs field for processes with a valid-but-empty supplementary group list Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie (cherry picked from commit aeabd6dd4e65e5cc31f4c2acc5cc46ea03737bed) Signed-off-by: Steve Sakoman --- meta/recipes-core/dbus/{dbus_1.14.8.bb => dbus_1.14.10.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/dbus/{dbus_1.14.8.bb => dbus_1.14.10.bb} (98%) diff --git a/meta/recipes-core/dbus/dbus_1.14.8.bb b/meta/recipes-core/dbus/dbus_1.14.10.bb similarity index 98% rename from meta/recipes-core/dbus/dbus_1.14.8.bb rename to meta/recipes-core/dbus/dbus_1.14.10.bb index 2dcbadd50b..2a256beabf 100644 --- a/meta/recipes-core/dbus/dbus_1.14.8.bb +++ b/meta/recipes-core/dbus/dbus_1.14.10.bb @@ -16,7 +16,7 @@ SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.xz \ file://dbus-1.init \ " -SRC_URI[sha256sum] = "a6bd5bac5cf19f0c3c594bdae2565a095696980a683a0ef37cb6212e093bde35" +SRC_URI[sha256sum] = "ba1f21d2bd9d339da2d4aa8780c09df32fea87998b73da24f49ab9df1e36a50f" EXTRA_OECONF = "--disable-xml-docs \ --disable-doxygen-docs \ From patchwork Fri Oct 13 21:52:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32169 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 93E2CCDB482 for ; Fri, 13 Oct 2023 21:53:23 +0000 (UTC) Received: from mail-oo1-f43.google.com (mail-oo1-f43.google.com [209.85.161.43]) by mx.groups.io with SMTP id smtpd.web10.51140.1697233994775813719 for ; Fri, 13 Oct 2023 14:53:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=x1Wfz0Cu; spf=softfail (domain: sakoman.com, ip: 209.85.161.43, mailfrom: steve@sakoman.com) Received: by mail-oo1-f43.google.com with SMTP id 006d021491bc7-5815818406dso1391244eaf.2 for ; Fri, 13 Oct 2023 14:53:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697233993; x=1697838793; 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=PMw7lAA4+7b1Li64sg8sOdu0NKrVOVompYgl9JZVdqk=; b=x1Wfz0CuIuoVqiTp+a71x6YhbZ/NH7/5tGufUXE06lfY1HmLtOYH8qIwnizIlxRFe9 KPmXZAyTBD9EtrQcZ2nR/ofkT5hSiAgG1QfxMyL1UnUMUtMEaeFFY+SyGEmSYJLaNo87 5be27Tz5jU0MSMQXR6on5rd8XO58pAx7Da7k/zMtVfUshyNFLsF0lXj/wjiBglHqv//5 R34h1EwYuD9OCONyNopOkDgkkq4OH891lS+vwuggs0BBBPahOCKGspg00W73LtYAygFq SyiTmvGMNOx55CIrzMMU2t0pF80R8LvMitPDdraw+aYG24kdvKW2jKu8wN7JiQD09ZNP KbgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697233994; x=1697838794; 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=PMw7lAA4+7b1Li64sg8sOdu0NKrVOVompYgl9JZVdqk=; b=TWNAx/d5rK1U7EXk3+e+vm2nmayGroo9o1BXW9lgq8SzxZrYjZw3JwU5/2X+E9thkV NF51cwBDaK0CACaIA8Wx1U8AYPwfLMPneJTv4BpsL/jleMTztSBPFCHgcSpdqR31Ya2H ZXyHUjJ1NNlEZq+5WAFjLHTUHpgJF+AxQ1ZatJ/6/0sY/s1ZiAyY/1PCVpxTcjW7qFjl 1gubG2VvTd0SdfVs/k1yJCcUfH1Dt+cz69PJ4ntbxt6Z8j1GKuLXjDTwDtwtyNiAJM8Q Ul/HzrDIKP2qWGvjPxt12ZvJal+NEWNHPiY0Ekzspfv6OTZoHjCfHUXBYkEihUzXnuqb xTFA== X-Gm-Message-State: AOJu0YyU4tyXOZqD9KxIKR2bAZqQ1GniaLGgmdveNsKiV2AYA7gT9tSB n9uHns8Scxi9SBZxj9P4bJbd4V7ejeSaklNKPVw= X-Google-Smtp-Source: AGHT+IEsuS4zxjYcHO5XzE9ctN5goW/TYIF3jIssDgPj1/DU2Ylo5+vbMiD08u69WZAk1FDfKRQG2w== X-Received: by 2002:a05:6358:e49d:b0:133:a8e:6feb with SMTP id by29-20020a056358e49d00b001330a8e6febmr28774848rwb.12.1697233993721; Fri, 13 Oct 2023 14:53:13 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:13 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 07/27] wireless-regdb: upgrade 2023.05.03 -> 2023.09.01 Date: Fri, 13 Oct 2023 11:52:31 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 13 Oct 2023 21:53:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189084 From: Wang Mingyu Changelog: ========== wireless-regdb: update regulatory database based on preceding changes wireless-regdb: Update regulatory rules for Australia (AU) for June 2023 wireless-regdb: Update regulatory info for Türkiye (TR) wireless-regdb: Update regulatory rules for Egypt (EG) from March 2022 guidel... wireless-regdb: Update regulatory rules for Philippines (PH) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie (cherry picked from commit 2f5edb6904bf16a9c52a9b124aeb5297487cd716) Signed-off-by: Steve Sakoman --- ...ireless-regdb_2023.05.03.bb => wireless-regdb_2023.09.01.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2023.05.03.bb => wireless-regdb_2023.09.01.bb} (94%) diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.05.03.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.09.01.bb similarity index 94% rename from meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.05.03.bb rename to meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.09.01.bb index cd3f52fc76..c09600ecbe 100644 --- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.05.03.bb +++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.09.01.bb @@ -5,7 +5,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" -SRC_URI[sha256sum] = "f254d08ab3765aeae2b856222e11a95d44aef519a6663877c71ef68fae4c8c12" +SRC_URI[sha256sum] = "26d4c2a727cc59239b84735aad856b7c7d0b04e30aa5c235c4f7f47f5f053491" inherit bin_package allarch From patchwork Fri Oct 13 21:52:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32173 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 A805FC41513 for ; Fri, 13 Oct 2023 21:53:23 +0000 (UTC) Received: from mail-oo1-f41.google.com (mail-oo1-f41.google.com [209.85.161.41]) by mx.groups.io with SMTP id smtpd.web10.51143.1697233996545901906 for ; Fri, 13 Oct 2023 14:53:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=txlr/Ekh; spf=softfail (domain: sakoman.com, ip: 209.85.161.41, mailfrom: steve@sakoman.com) Received: by mail-oo1-f41.google.com with SMTP id 006d021491bc7-57babef76deso1361151eaf.0 for ; Fri, 13 Oct 2023 14:53:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697233995; x=1697838795; 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=dw5pNiEjvVmits/I/DLIV5NgFigud/AJQ6vHH2JgatE=; b=txlr/EkhETz+VNtDjaslIptNKNAuFMw7Ptt8KDP8mB3hzKuUIDSE9jSJwKz9pXqH4K Q0mGbNIiENnB33r+JxMUig/6zjDBLY/n/UHY9dLDrI5z8n3sKRaHHTpOnc1E7cLxuFmd 2SxA752iBTT47vOTxCOYtKBHg6nK0+6hkIRgsQ6Efdx5uOiUXqn/NsRsXkTEmPw41ryH puR0DPlG32Gq5f8gCigCyV5Er+FuUs2p+Rc6bW9I/W9kl28Bjm5Pbdommu09ylPqaUZ1 KxJAmEvz4MlAcCyRjFW6CKDv37NrBkQ/bBSryhros5rrvoSfnTEM+36qjPQhDD9QcW4m Qn8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697233995; x=1697838795; 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=dw5pNiEjvVmits/I/DLIV5NgFigud/AJQ6vHH2JgatE=; b=bqjzGL+FJshgpNF5gSsOObktVW2a3/FlZS6exF1fQ7yC8KTLCu7t9xnk67nkaDee9i jTOzyYXx7XWkjmMgPTBY9xmQYFLhTgfAOhNF5jVn2Ds3MbtnaUhQRCqbYDq3CG5VtyUa XFU41HTYF7mSOpWC4jSZZhi+J0Hd/qOdP37n/4gwPAAFllVpT/e0/7OGAhuyUx/vMeQg hTWOwnaK1obh7DwXWNb/haVNG9u/Wcb8lXm++TgCQBOjoDigs2Se+7hpb1uSkQ62DnWC zzEf5AEX2iAn0ObByUB/hBq9j1hXO5sJRdy/JZrTxulnRtoSc4toQDrGGD+/ff7dBhhq fDXA== X-Gm-Message-State: AOJu0YwAqqRSlUt0EfnR+UTmW4TX3lcowYPygwvDAhWSRWUqV7n4u3V9 UUSYs+ltvviuDkzE8P/6opgbr+jklpwpXR7cdl0= X-Google-Smtp-Source: AGHT+IGQWXcgBzI+9HO6Zb/kg4JxyJ3bzh0mr0OWkvwp0JkYfXvTEm0oTlwsXOFKhbtDiO6OQdMMCA== X-Received: by 2002:a05:6358:261a:b0:14f:d52:39cb with SMTP id l26-20020a056358261a00b0014f0d5239cbmr33775500rwc.26.1697233995478; Fri, 13 Oct 2023 14:53:15 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:15 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 08/27] gzip: update 1.12 -> 1.13 Date: Fri, 13 Oct 2023 11:52:32 -1000 Message-Id: <8ca6589c1cb37cd0ba446cfd58e5f7f90832b93c.1697233866.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 ; Fri, 13 Oct 2023 21:53:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189085 From: Alexander Kanavin Stable release update Drop autoconf-2.73.patch as issue resolved upstream. License-update: http -> https Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 1ddf9e053b17913718c780ad4c877d5ddb6ff536) Signed-off-by: Steve Sakoman --- .../gzip/{gzip-1.12 => gzip-1.13}/wrong-path-fix.patch | 0 meta/recipes-extended/gzip/{gzip_1.12.bb => gzip_1.13.bb} | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-extended/gzip/{gzip-1.12 => gzip-1.13}/wrong-path-fix.patch (100%) rename meta/recipes-extended/gzip/{gzip_1.12.bb => gzip_1.13.bb} (88%) diff --git a/meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch similarity index 100% rename from meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch rename to meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch diff --git a/meta/recipes-extended/gzip/gzip_1.12.bb b/meta/recipes-extended/gzip/gzip_1.13.bb similarity index 88% rename from meta/recipes-extended/gzip/gzip_1.12.bb rename to meta/recipes-extended/gzip/gzip_1.13.bb index 14de50b230..fd846b30a5 100644 --- a/meta/recipes-extended/gzip/gzip_1.12.bb +++ b/meta/recipes-extended/gzip/gzip_1.13.bb @@ -6,10 +6,10 @@ LICENSE = "GPL-3.0-or-later" SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \ file://run-ptest \ - " + " SRC_URI:append:class-target = " file://wrong-path-fix.patch" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" PROVIDES:append:class-native = " gzip-replacement-native" @@ -38,4 +38,4 @@ do_install_ptest() { ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile } -SRC_URI[sha256sum] = "5b4fb14d38314e09f2fc8a1c510e7cd540a3ea0e3eb9b0420046b82c3bf41085" +SRC_URI[sha256sum] = "20fc818aeebae87cdbf209d35141ad9d3cf312b35a5e6be61bfcfbf9eddd212a" From patchwork Fri Oct 13 21:52:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32174 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 C7124CDB485 for ; Fri, 13 Oct 2023 21:53:23 +0000 (UTC) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web11.51163.1697233998280703030 for ; Fri, 13 Oct 2023 14:53:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Fppe6/1V; spf=softfail (domain: sakoman.com, ip: 209.85.210.175, mailfrom: steve@sakoman.com) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-6b709048f32so501265b3a.0 for ; Fri, 13 Oct 2023 14:53:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697233997; x=1697838797; 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=jgd9F4g4ZPnWHRvpaLfg2kQ0v3TT7bhYHllHkhkaYaY=; b=Fppe6/1V8KdNwUMwfcO/Rg/Xn+sj5RK7YUa/MkOP6Rs1ucb4r/chA0/fuAdYzK6P4P BuUerO0T4jPge2myjD2ru1nyWzt42vvJNvwpovqBSX0mYywKzuIgkBRDKCL2Q3N+hS2i NJWqRmxg05Z6H28HlRCaPNHcC8KDHOGkgzcTlUeevMMPycCK+IKDnuaq/cFg2/Hj71vU pDC5kG8gHh781smLSMw6qaouZu4DivudJzB1Ce5ahxupdlyvUy50clCvw86hMzLmPXxs 08miqKgDnJI0XuRdLH7FYSp2usDBeqhxJ1YWPJtpewUL+lZX3euHyJ77J9NhJbvVkfhu T0gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697233997; x=1697838797; 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=jgd9F4g4ZPnWHRvpaLfg2kQ0v3TT7bhYHllHkhkaYaY=; b=hXnBAc+56pWPRXbzDia2Feas0VCXi7lx90w8tIPsktnHKe9IJZcyG3olODTGAJiyv2 jHdNzlBvbZFFv7svwD8BABEr+1zweW99lVc2kVNsPzvhV1J+rKNxdYj2CTdBNdF/xZbv XmukMHsLpUN43cnDDMjsiS3Z4UZjcBI+KFCWieAc0EagtmbHuhBS5R15m68KamfGn69J AWTlHjBxd0rh3gpSG4EEiuKeARkOo0n39Cgv+78lPGnF3AGbh0NeiVF9XR2IyA5RXCDZ lZZxBK9Vmh+MmNAENRjRAE4TtOOTMIHYV29BIS+eAJzPNOh297p0XCSPXwc7KYUEOkvA YysQ== X-Gm-Message-State: AOJu0YzqquSQyD9i9Ib6awaQPHey/jdaMV7EH77l1jJ89rGBdx7ryax3 4RT4A/tDXBSzWAiWwATRAXbeWLXsz4qUHSIp9Dw= X-Google-Smtp-Source: AGHT+IETe+69MEG42n+m9WLIYJhWxGfqC9fBOUVGUhSEOuaP+KBeBstXJo4Z1Ma39ZVgoLoeDwRNlw== X-Received: by 2002:a05:6a00:13aa:b0:6b5:92d9:ef44 with SMTP id t42-20020a056a0013aa00b006b592d9ef44mr2498426pfg.7.1697233997220; Fri, 13 Oct 2023 14:53:17 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:16 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 09/27] screen: update 4.9.0 -> 4.9.1 Date: Fri, 13 Oct 2023 11:52:33 -1000 Message-Id: <224f1929b92b38993e5f50100ce6306f63ee8ade.1697233866.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 ; Fri, 13 Oct 2023 21:53:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189086 From: Alexander Kanavin * Support stop/parity bits on serial port * Add needed system headers in checks and return values for implicit function declarations * Fixes: - Avoid zombies after shell exit - Missed signal sending permission check on failed query messages (CVE-2023-24626) - manpage fixes - source code fixes during cleanup - UTF-8 encoding can emit invalid UTF-8 sequences for out of range unicode values Remove patches; they are merged upstream or backported. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 2566f8e51d56848d8b28f37462160e90253b79fc) Signed-off-by: Steve Sakoman --- ...-Add-needed-system-headers-in-checks.patch | 151 ------------------ .../screen/screen/signal-permission.patch | 40 ----- .../{screen_4.9.0.bb => screen_4.9.1.bb} | 4 +- 3 files changed, 1 insertion(+), 194 deletions(-) delete mode 100644 meta/recipes-extended/screen/screen/0001-configure-Add-needed-system-headers-in-checks.patch delete mode 100644 meta/recipes-extended/screen/screen/signal-permission.patch rename meta/recipes-extended/screen/{screen_4.9.0.bb => screen_4.9.1.bb} (89%) diff --git a/meta/recipes-extended/screen/screen/0001-configure-Add-needed-system-headers-in-checks.patch b/meta/recipes-extended/screen/screen/0001-configure-Add-needed-system-headers-in-checks.patch deleted file mode 100644 index 80659942c7..0000000000 --- a/meta/recipes-extended/screen/screen/0001-configure-Add-needed-system-headers-in-checks.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 4e102de2e6204c1d8e8be00bb5ffd4587e70350c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 15 Aug 2022 10:35:53 -0700 -Subject: [PATCH] configure: Add needed system headers in checks - -Newer compilers throw warnings when a funciton is used with implicit -declaration and enabling -Werror can silently fail these tests and -result in wrong configure results. Therefore add the needed headers in -the AC_TRY_LINK macros - - * configure.ac: Add missing system headers in AC_TRY_LINK. - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/screen-devel/2022-08/msg00000.html] -Signed-off-by: Khem Raj ---- - configure.ac | 57 +++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 43 insertions(+), 14 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c0f02df..d308079 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -233,6 +233,7 @@ AC_CHECKING(BSD job jontrol) - AC_TRY_LINK( - [#include - #include -+#include - ], [ - #ifdef POSIX - tcsetpgrp(0, 0); -@@ -250,12 +251,16 @@ dnl - dnl **** setresuid(), setreuid(), seteuid() **** - dnl - AC_CHECKING(setresuid) --AC_TRY_LINK(,[ --setresuid(0, 0, 0); -+AC_TRY_LINK([ -+#include -+],[ -+return setresuid(0, 0, 0); - ], AC_DEFINE(HAVE_SETRESUID)) - AC_CHECKING(setreuid) --AC_TRY_LINK(,[ --setreuid(0, 0); -+AC_TRY_LINK([ -+#include -+],[ -+return setreuid(0, 0); - ], AC_DEFINE(HAVE_SETREUID)) - dnl - dnl seteuid() check: -@@ -274,7 +279,9 @@ seteuid(0); - - dnl execvpe - AC_CHECKING(execvpe) --AC_TRY_LINK(,[ -+AC_TRY_LINK([ -+ #include -+],[ - execvpe(0, 0, 0); - ], AC_DEFINE(HAVE_EXECVPE) - CFLAGS="$CFLAGS -D_GNU_SOURCE") -@@ -284,10 +291,18 @@ dnl **** select() **** - dnl - - AC_CHECKING(select) --AC_TRY_LINK(,[select(0, 0, 0, 0, 0);],, -+AC_TRY_LINK([ -+ #include -+],[ -+ select(0, 0, 0, 0, 0); -+],, - LIBS="$LIBS -lnet -lnsl" - AC_CHECKING(select with $LIBS) --AC_TRY_LINK(,[select(0, 0, 0, 0, 0);],, -+AC_TRY_LINK([ -+ #include -+],[ -+ select(0, 0, 0, 0, 0); -+],, - AC_MSG_ERROR(!!! no select - no screen)) - ) - dnl -@@ -624,11 +639,19 @@ dnl - dnl **** termcap or terminfo **** - dnl - AC_CHECKING(for tgetent) --AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, -+AC_TRY_LINK([ -+ #include -+ #include -+],[ -+ tgetent((char *)0, (char *)0); -+],, - olibs="$LIBS" - LIBS="-lcurses $olibs" - AC_CHECKING(libcurses) --AC_TRY_LINK(,[ -+AC_TRY_LINK([ -+ #include -+ #include -+],[ - #ifdef __hpux - __sorry_hpux_libcurses_is_totally_broken_in_10_10(); - #else -@@ -871,7 +894,7 @@ test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil" - fi - - AC_CHECKING(getloadavg) --AC_TRY_LINK(,[getloadavg((double *)0, 0);], -+AC_TRY_LINK([#include ],[getloadavg((double *)0, 0);], - AC_DEFINE(LOADAV_GETLOADAVG) load=1, - if test "$cross_compiling" = no && test -f /usr/lib/libkvm.a ; then - olibs="$LIBS" -@@ -1109,10 +1132,10 @@ AC_CHECKING(IRIX sun library) - AC_TRY_LINK(,,,LIBS="$oldlibs") - - AC_CHECKING(syslog) --AC_TRY_LINK(,[closelog();], , [oldlibs="$LIBS" -+AC_TRY_LINK([#include ],[closelog();], , [oldlibs="$LIBS" - LIBS="$LIBS -lbsd" - AC_CHECKING(syslog in libbsd.a) --AC_TRY_LINK(, [closelog();], AC_NOTE(- found.), [LIBS="$oldlibs" -+AC_TRY_LINK([#include ], [closelog();], AC_NOTE(- found.), [LIBS="$oldlibs" - AC_NOTE(- bad news: syslog missing.) AC_DEFINE(NOSYSLOG)])]) - - AC_EGREP_CPP(YES_IS_DEFINED, -@@ -1149,7 +1172,7 @@ AC_CHECKING(getspnam) - AC_TRY_LINK([#include ], [getspnam("x");],AC_DEFINE(SHADOWPW)) - - AC_CHECKING(getttyent) --AC_TRY_LINK(,[getttyent();], AC_DEFINE(GETTTYENT)) -+AC_TRY_LINK([#include ],[getttyent();], AC_DEFINE(GETTTYENT)) - - AC_CHECKING(fdwalk) - AC_TRY_LINK([#include ], [fdwalk(NULL, NULL);],AC_DEFINE(HAVE_FDWALK)) -@@ -1204,7 +1227,13 @@ main() { - AC_SYS_LONG_FILE_NAMES - - AC_MSG_CHECKING(for vsprintf) --AC_TRY_LINK([#include ],[va_list valist; vsprintf(0,0,valist);], AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS), AC_MSG_RESULT(no)) -+AC_TRY_LINK([ -+ #include -+ #include -+],[ -+ va_list valist; -+ vsprintf(0,0,valist); -+], AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS), AC_MSG_RESULT(no)) - - AC_HEADER_DIRENT - diff --git a/meta/recipes-extended/screen/screen/signal-permission.patch b/meta/recipes-extended/screen/screen/signal-permission.patch deleted file mode 100644 index 77dc649090..0000000000 --- a/meta/recipes-extended/screen/screen/signal-permission.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e9ad41bfedb4537a6f0de20f00b27c7739f168f7 Mon Sep 17 00:00:00 2001 -From: Alexander Naumov -Date: Mon, 30 Jan 2023 17:22:25 +0200 -Subject: fix: missing signal sending permission check on failed query messages - -Signed-off-by: Alexander Naumov - -CVE: CVE-2023-24626 -Upstream-Status: Backport -Signed-off-by: Ross Burton ---- - src/socket.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/socket.c b/src/socket.c -index 147dc54..54d8cb8 100644 ---- a/socket.c -+++ b/socket.c -@@ -1285,11 +1285,16 @@ ReceiveMsg() - else - queryflag = -1; - -- Kill(m.m.command.apid, -+ if (CheckPid(m.m.command.apid)) { -+ Msg(0, "Query attempt with bad pid(%d)!", m.m.command.apid); -+ } -+ else { -+ Kill(m.m.command.apid, - (queryflag >= 0) - ? SIGCONT - : SIG_BYE); /* Send SIG_BYE if an error happened */ -- queryflag = -1; -+ queryflag = -1; -+ } - } - break; - case MSG_COMMAND: --- -cgit v1.1 - diff --git a/meta/recipes-extended/screen/screen_4.9.0.bb b/meta/recipes-extended/screen/screen_4.9.1.bb similarity index 89% rename from meta/recipes-extended/screen/screen_4.9.0.bb rename to meta/recipes-extended/screen/screen_4.9.1.bb index 235cd8c6cf..7b040e6b57 100644 --- a/meta/recipes-extended/screen/screen_4.9.0.bb +++ b/meta/recipes-extended/screen/screen_4.9.1.bb @@ -21,11 +21,9 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ file://0002-comm.h-now-depends-on-term.h.patch \ file://0001-fix-for-multijob-build.patch \ file://0001-Remove-more-compatibility-stuff.patch \ - file://0001-configure-Add-needed-system-headers-in-checks.patch \ - file://signal-permission.patch \ " -SRC_URI[sha256sum] = "f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4" +SRC_URI[sha256sum] = "26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69" inherit autotools texinfo From patchwork Fri Oct 13 21:52:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32171 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 9E2C6CDB484 for ; Fri, 13 Oct 2023 21:53:23 +0000 (UTC) Received: from mail-oo1-f46.google.com (mail-oo1-f46.google.com [209.85.161.46]) by mx.groups.io with SMTP id smtpd.web11.51164.1697234000070154942 for ; Fri, 13 Oct 2023 14:53:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=PMgTK5W5; spf=softfail (domain: sakoman.com, ip: 209.85.161.46, mailfrom: steve@sakoman.com) Received: by mail-oo1-f46.google.com with SMTP id 006d021491bc7-57b5f0d658dso1398539eaf.0 for ; Fri, 13 Oct 2023 14:53:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697233999; x=1697838799; 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=Af2iQh1Giec74SifKfAE8V3fhososzB5a+GbLBsL1i8=; b=PMgTK5W5hvFZ9RSZw18yShy5cEUqtx1N71vl0OMsQ9/R2dnex072ZKBx32rAX0gJYF UIHrKzcFCucAbTnytHnckRfOsX3ylfnVotVXd4bcJn5U5biV2ypA0emfrtWuXC6YJPxc 8Vt/XhU+pa/7/XqsnrICaQGY+HaPNzCyGEVrgYRQCAerzFsa0Z4ZYsZMlolIhqU/bSR3 Cl5HLaZ/pFxZZbskw0nDRYgeJ+lTIPYLYHmaIaa6PXx0kquW+fQeCCT888/je4H9SM+X nEGA8Hy5AM2QJjQ2mwQtHfKHSyAJiDE8t0oFRYnt5UZFWCfnDxo8mg2S24vq3ddw8Xpd MJQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697233999; x=1697838799; 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=Af2iQh1Giec74SifKfAE8V3fhososzB5a+GbLBsL1i8=; b=nKlJe+OeeWlR0D02R8JeCBI3hEuuNxGcSLL5Lwf55TcE4K8QL7rzLX+/LCIAtm38+F nZhr7JlG9exTqVBv6ZSkmKsDZkCry06vhYYEw6PxM92vb8TvLaPoMmNz0PAMNNYLn6vQ EL3PI2TQEQpIMQ3+d+agj9fXe6GAQO2pftB6SkxgPfs21y0+7i02ETXD1leaBIePJX0E JN8+uq3pQrlD+LpEWDiT79999aVoailDABDQnoQRUAwnkNxWo8cdEkHo+q+FSu/e/fSZ 9BpfhF9MELGCGNUyNseAxXZBYeDGr4HNnL9oS6g9dl8oLMGy+CzC4/vzaB6qttdojElX JFVQ== X-Gm-Message-State: AOJu0YzgQA7PGU8eIIg+W3TFXQh7BifEFfrhgA2N8bZqNfSdmJ4BTtSU pDFljt6L4YwisSPVCDnlmQb3vijTTAEsWq3vSck= X-Google-Smtp-Source: AGHT+IEXKFjSrNKp+ZF61KRuzrsRcGsLPk1vN+78/MiuasEroA9CMGRJ1MGphbYOFonVwZric/qj2g== X-Received: by 2002:a05:6358:8a0:b0:143:27e:d3cf with SMTP id m32-20020a05635808a000b00143027ed3cfmr33620387rwj.4.1697233998976; Fri, 13 Oct 2023 14:53:18 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:18 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 10/27] vim: Upgrade 9.0.1894 -> 9.0.2009 Date: Fri, 13 Oct 2023 11:52:34 -1000 Message-Id: <7166f503211c39542d828aa3fef5006dccf2c07a.1697233866.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 ; Fri, 13 Oct 2023 21:53:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189087 From: Siddharth Doshi This includes CVE fix for CVE-2023-5441. Signed-off-by: Siddharth Doshi Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 5f55f590e6..5e06866692 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -19,8 +19,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".1894" -SRCREV = "e5f7cd0a60d0eeab84f7aeb35c13d3af7e50072e" +PV .= ".2009" +SRCREV = "54844857fd6933fa4f6678e47610c4b9c9f7a091" # Do not consider .z in x.y.z, as that is updated with every commit UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+)\.0" From patchwork Fri Oct 13 21:52:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32172 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 A7EF8CDB483 for ; Fri, 13 Oct 2023 21:53:23 +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.51145.1697234001663590019 for ; Fri, 13 Oct 2023 14:53:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=EQxRhM8x; 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-6b7f0170d7bso366687b3a.2 for ; Fri, 13 Oct 2023 14:53:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697234001; x=1697838801; 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=YWtAzkwpBMwDVCD0rJNVdshahtDA1V6UOzr8dJWXaBE=; b=EQxRhM8xVyAmzL2pEKZ2BArkvVhnVfRGqjk/J/3wkP16WsAmEvynTRrlmvtaTb/TM4 FCu1E3mj7oOTS/1QBGbZqEUJG6a1O/e73Gioan3Njlf2DV0+OkjxqyiKrM2nRpsyxQ/W O5SBYDxPKOaMBlBiMd9DciHD6PtRoT2Su2ViRlH2/nELbLx0gfl626TCPoMmPItSdxYi Dn2agXKBLlvDEEQwSX9nrDCSXSBEtwxFHghWx35UK/lLK4upNeAGdq5yhUz2iHAHgfTu 75q/XQN//klmSbZtdAx9gQYaWWkUuXLhYu6B5AUx1AV7u6ThUtFAlhsG/OmKAtWQgSSM 1Bww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697234001; x=1697838801; 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=YWtAzkwpBMwDVCD0rJNVdshahtDA1V6UOzr8dJWXaBE=; b=ZKIPzmavGOAM2mlEV10hc1/sjN1LguRmbXQ3Ix+E4Yr1ogj5oPvboLxkrqgLesBDFn 3CkCRizC4CwpF5EPkw/HH43yFHv6Xo/M1ytfpZNRUXifx70jdE2/0TY568x4eSIFNyyY SbTR7CPAuCwlgLBDw8LQLpnIHseKkQZSsdVu6l3PXEb07TduPdemPf6Mx6VShw8tQFC7 GuS9zO/c0LXIAkGljzizlnZKrhVAf3rUe/sHUKOIO4rfbeZ62TAylywbDj0J4flIflnV qQY6oz9rklJm/P6nDEHC6SQptdmZTOq1rs2Sip4YrdI9l4Hb9TQ5TLdKn63vR+A4VZZX VDng== X-Gm-Message-State: AOJu0YzNLTk1a7tbNGAj2Ox9eQTyVsRytzLTGBzA0nla64FNO8zSIzc5 z3gXUxIoOP8zoPnaPzCyjzBdQjDuZTvE9TUPBp8= X-Google-Smtp-Source: AGHT+IF+bG/zqD9x3GSfB4pmP9B91XvMewMp971J2B2TON0ztCKXb/iW5MBGI9gs6sP4q5NxpnF6ew== X-Received: by 2002:a62:f20b:0:b0:6b4:ac0e:2f70 with SMTP id m11-20020a62f20b000000b006b4ac0e2f70mr1937657pfh.29.1697234000757; Fri, 13 Oct 2023 14:53:20 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:20 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 11/27] nativesdk-intercept: Fix bad intercept chgrp/chown logic Date: Fri, 13 Oct 2023 11:52:35 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 13 Oct 2023 21:53:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189088 From: Eilís 'pidge' Ní Fhlannagáin Running either of these ends up corrupting the os.execv args. If we run: ./scripts/nativesdk-intercept/chown -R foo:foo bar The loop here ends up missing the conversion of foo:foo to root:root because it sees sys.argv[0] and assumes that it's the user:group argument and that we should convert that. We end up a os.execv(path, args) that have the following args: ['root:root', '-R', 'foo:foo', 'bar'] As os.execv ignores args[0], we can just populate it with sys.argv[0] and then loop through sys.argv[1:]. As both chgrp and chown would have either flags and USER[:GROUP] next, this fixes the issue. Signed-off-by: Eilís 'pidge' Ní Fhlannagáin Signed-off-by: Richard Purdie (cherry picked from commit 2a75f647ec7696d353f4b09099d777ba53f34d36) Signed-off-by: Steve Sakoman --- scripts/nativesdk-intercept/chgrp | 5 ++++- scripts/nativesdk-intercept/chown | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/nativesdk-intercept/chgrp b/scripts/nativesdk-intercept/chgrp index 30cc417d3a..f8ae84b8b3 100755 --- a/scripts/nativesdk-intercept/chgrp +++ b/scripts/nativesdk-intercept/chgrp @@ -14,7 +14,10 @@ real_chgrp = shutil.which('chgrp', path=path) args = list() found = False -for i in sys.argv: + +args.append(real_chgrp) + +for i in sys.argv[1:]: if i.startswith("-"): args.append(i) continue diff --git a/scripts/nativesdk-intercept/chown b/scripts/nativesdk-intercept/chown index 3914b3e384..0805ceb70a 100755 --- a/scripts/nativesdk-intercept/chown +++ b/scripts/nativesdk-intercept/chown @@ -14,7 +14,10 @@ real_chown = shutil.which('chown', path=path) args = list() found = False -for i in sys.argv: + +args.append(real_chown) + +for i in sys.argv[1:]: if i.startswith("-"): args.append(i) continue From patchwork Fri Oct 13 21:52:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32175 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 AF56ACDB47E for ; Fri, 13 Oct 2023 21:53:33 +0000 (UTC) Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by mx.groups.io with SMTP id smtpd.web11.51168.1697234003756594190 for ; Fri, 13 Oct 2023 14:53:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=cg/WBHrH; spf=softfail (domain: sakoman.com, ip: 209.85.167.176, mailfrom: steve@sakoman.com) Received: by mail-oi1-f176.google.com with SMTP id 5614622812f47-3b2b1af964dso677216b6e.1 for ; Fri, 13 Oct 2023 14:53:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697234003; x=1697838803; 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=ORGXUCHwvI8GGJsBNCuTNC8JTZfunpkQvc0n730BFRM=; b=cg/WBHrHT4N/FkLdRYLiyJmjb5nyV5RPk+u4q5BiJ+dplcq6M6YgFsdE3OzlUBSgn6 YmWWhpi4/peihU1OY/ZF2b9E9mQA7ZeCnFI2IqzulVyvLIP66Q/P9S/ripOeu3kU2+/k NvSBJlas+h173U+qMB0XmVV5SqqyYTpQbyTg5PA6ShAAfXu0dcMdAdttXixPoHMVG6uO J1A1W124nhaMP7xHbAfOjr2LjQ6rpiadiFzLtFwztkQz/MiYgoIffZFa+Ht7a4JPK/0t Ni2P95f208YYLMZ9xfiQH1xzjvqna/614Gu6heg1NuGAPbhCLoQvGq5emDLBE3jVv+oU mTEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697234003; x=1697838803; 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=ORGXUCHwvI8GGJsBNCuTNC8JTZfunpkQvc0n730BFRM=; b=kwz3s0QAg5PZ8zHisypwnkxpV6P1DEUfpUCuAF2zXHD18xkqFuA7GVP/DeMv5/MWOU PGDL4FSszQ8xTAqQDmPc90rYcjJLZ2TE4ha3CgsXKtd3I5FuTDD58h1lIG6IHm48a8xs OereNs4uYmfWkZAs5feSmNDvANywoYHiq/kxpjrmTs98ClgtzrP8dhq7cVOg3717k3Br JYnlPwRkhLnkBFZmglaawGRRCpApdicmXOyX/hF+G2ee1GGFgIGLPxobVVw4nJJIqd9N oE+/UfVws4x6VwEGqG8sPt+1adfXAPzQqaFQ/Y2RcjY9KSK0k4ovCj3nlMZbxXyfPfMy Fv0g== X-Gm-Message-State: AOJu0Ywt1IqV7WWj4C6j56VCQ8YABV0b9Y4eAzOye/u7JrySthkWjNOp PMy+W6NpVumscZk3LeN5wbJ3gafS/kCIoca6X2c= X-Google-Smtp-Source: AGHT+IE0MIRNnY6iN7vZ4n/XdKxNQd+IN71l2fvbe83eqTerSyPD4jGGS19vX9NLMvYpFH6Otsbx1w== X-Received: by 2002:a05:6808:8fb:b0:3af:7ac8:c413 with SMTP id d27-20020a05680808fb00b003af7ac8c413mr28357693oic.40.1697234002679; Fri, 13 Oct 2023 14:53:22 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:22 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 12/27] avahi: handle invalid service types gracefully Date: Fri, 13 Oct 2023 11:52:36 -1000 Message-Id: <273aed0462728508506a4c65d367d583a86a54c3.1697233866.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 ; Fri, 13 Oct 2023 21:53:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189089 From: Ross Burton Services which broadcast an invalid service type will cause the browse to fail. Instead of failing, replace the service type and continue. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit e581da6c4db21312833395e96b48e868a202f0f9) Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/avahi/avahi_0.8.bb | 1 + .../avahi/files/invalid-service.patch | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-connectivity/avahi/files/invalid-service.patch diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb b/meta/recipes-connectivity/avahi/avahi_0.8.bb index 8649140a45..3fb082cf3f 100644 --- a/meta/recipes-connectivity/avahi/avahi_0.8.bb +++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb @@ -26,6 +26,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/avahi-${PV}.tar.gz \ file://0001-Fix-opening-etc-resolv.conf-error.patch \ file://handle-hup.patch \ file://local-ping.patch \ + file://invalid-service.patch \ " GITHUB_BASE_URI = "https://github.com/lathiat/avahi/releases/" diff --git a/meta/recipes-connectivity/avahi/files/invalid-service.patch b/meta/recipes-connectivity/avahi/files/invalid-service.patch new file mode 100644 index 0000000000..8f188aff2c --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/invalid-service.patch @@ -0,0 +1,29 @@ +From 46490e95151d415cd22f02565e530eb5efcef680 Mon Sep 17 00:00:00 2001 +From: Asger Hautop Drewsen +Date: Mon, 9 Aug 2021 14:25:08 +0200 +Subject: [PATCH] Fix avahi-browse: Invalid service type + +Invalid service types will stop the browse from completing, or +in simple terms "my washing machine stops me from printing". + +Upstream-Status: Submitted [https://github.com/lathiat/avahi/pull/472] +Signed-off-by: Ross Burton +--- + avahi-core/browse-service.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c +index 63e0275a..ac3d2ecb 100644 +--- a/avahi-core/browse-service.c ++++ b/avahi-core/browse-service.c +@@ -103,7 +103,9 @@ AvahiSServiceBrowser *avahi_s_service_browser_prepare( + AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_PROTO_VALID(protocol), AVAHI_ERR_INVALID_PROTOCOL); + AVAHI_CHECK_VALIDITY_RETURN_NULL(server, !domain || avahi_is_valid_domain_name(domain), AVAHI_ERR_INVALID_DOMAIN_NAME); + AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_FLAGS_VALID(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST), AVAHI_ERR_INVALID_FLAGS); +- AVAHI_CHECK_VALIDITY_RETURN_NULL(server, avahi_is_valid_service_type_generic(service_type), AVAHI_ERR_INVALID_SERVICE_TYPE); ++ ++ if (!avahi_is_valid_service_type_generic(service_type)) ++ service_type = "_invalid._tcp"; + + if (!domain) + domain = server->domain_name; From patchwork Fri Oct 13 21:52:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32179 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 CEB9EC41513 for ; Fri, 13 Oct 2023 21:53:33 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web11.51170.1697234005460857388 for ; Fri, 13 Oct 2023 14:53:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=mWNVxXH6; 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-690b7cb71aeso1928915b3a.0 for ; Fri, 13 Oct 2023 14:53:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697234004; x=1697838804; 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=euNEbQsuec6wuVRrg/IhF+uiLtg9A08NmB0BrDaGwrw=; b=mWNVxXH6QkY9VqJh3USZcy6M2F4r0Jm8Bo/mtfCy0nPyrsxJjlDOUllObYZd2Vh6+Q DDpasIhxwTreK5dlgK3Ybfjd1Wokv/48GZnhFt6JTrGTLIfy75Q0Af/RHalIUxG+kr7B 5OdwlzMXQytaWtXkc6YQJu1edsfnToKOw8q1LTBO9IH1BW3iGjxSi/+ElkB8QpQgP1Hq Ahg4SwLbKED2RTV0YZo50SaEC22kQ9ZmD/9Drfn/P1Q2RmZCLS6tXRbo/6qZHKW4he/s WbZgCdkmuBXSE1hjjoP3+KqlFoJcOBNjxyLnyQDNMH2i/VsMmL5RylzjneF9tS5B0+1+ 319w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697234004; x=1697838804; 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=euNEbQsuec6wuVRrg/IhF+uiLtg9A08NmB0BrDaGwrw=; b=La8OalB1VKQ97w8wHNrnviQf71uu92R+jhkcpPsPmw9bWzSUh1r7YegQab763bxnYD vUIfQ9uqAwKbEPXNHU0babwWQUx23bgh9AXA5haquogZgmhWFj4ucilJewPhP6IBqDJG 9RK3PzwiyblwJ6cLICCGOf9f5hGmNAE4CcIc9SuXV/WnkLUV9uzgekoznepwa5PHrSXe LKpZbru/sJ+CckWXPT+XHHSjfNpU6oXB0krCK+EKQnldj/MgOVf1t8epF6NHNfi8MNCk gn4N9iAeibX+RyATsM+7Igl4vI/7442Q067ePhCYRIlAipVzYPWnKguUo0MAL7UmWX7K BHvw== X-Gm-Message-State: AOJu0YxQyrHqB6oXj/y3KLuOKietFV383jMBOOLswW6EUPSyC4y+5cF1 pmYVz4Hz8HIIvtP1m83pulZKX1npxaIJACIfFn4= X-Google-Smtp-Source: AGHT+IGFqMkEbKKXrD5Bu+aMiVLFRvY3V/kC6UNLSW735I3mqwVRw6l2076NQ4aGm0ZRuYWSDGeHSA== X-Received: by 2002:a05:6a00:a29:b0:692:6417:728a with SMTP id p41-20020a056a000a2900b006926417728amr2595815pfh.14.1697234004612; Fri, 13 Oct 2023 14:53:24 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:24 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 13/27] runqemu: check permissions of available render nodes as well as their presence Date: Fri, 13 Oct 2023 11:52:37 -1000 Message-Id: <12ae43abbc4e7d6184198a912487ace3a4e66e50.1697233866.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 ; Fri, 13 Oct 2023 21:53:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189090 From: Alexander Kanavin qemu itself is not helpful when render nodes exist, but can't be opened: qemu-system-x86_64: egl: render node init failed To fix this, users likely need to * modprobe vgem (presence when physical graphic card is absent or has a driver without support for render nodes, such as many older cards found in server machines) * add their user to "render" group to write to /dev/dri/renderD* (permissions) With this change runqemu should print hints for the above as appropriate from probing the nodes. Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit acd85925cb197b7a31a25b60e8de762e2c3697ef) Signed-off-by: Steve Sakoman --- scripts/runqemu | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index ef24ddc6b2..ea44600e64 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -1374,8 +1374,18 @@ to your build configuration. render_hint = """If /dev/dri/renderD* is absent due to lack of suitable GPU, 'modprobe vgem' will create one suitable for mesa llvmpipe software renderer.""" try: content = os.listdir("/dev/dri") - if len([i for i in content if i.startswith('render')]) == 0: - raise RunQemuError("No render nodes found in /dev/dri: %s. %s" %(content, render_hint)) + nodes = [i for i in content if i.startswith('renderD')] + if len(nodes) == 0: + raise RunQemuError("No render nodes found in /dev/dri/: %s. %s" %(content, render_hint)) + for n in nodes: + try: + with open(os.path.join("/dev/dri", n), "w") as f: + f.close() + break + except IOError: + pass + else: + raise RunQemuError("None of the render nodes in /dev/dri/ are accessible: %s; you may need to add yourself to 'render' group or otherwise ensure you have read-write permissions on one of them." %(nodes)) except FileNotFoundError: raise RunQemuError("/dev/dri directory does not exist; no render nodes available on this machine. %s" %(render_hint)) From patchwork Fri Oct 13 21:52:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32178 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 D6F15CDB484 for ; Fri, 13 Oct 2023 21:53:33 +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.web10.51149.1697234007429971435 for ; Fri, 13 Oct 2023 14:53:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=NEDeCabQ; 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-6b7f0170d7bso366710b3a.2 for ; Fri, 13 Oct 2023 14:53:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697234006; x=1697838806; 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=h9Nxr34LASJQh3dumGc2mAVzTOweuKad35QwmgcClnU=; b=NEDeCabQq2BZPGgu9H/msjNU2vN4g+/AuiUf1CJeDgpgvR2JcMW5JNGEjfxBOCEeWg lEbKEBXvDLxZhmVU0ZybqLXVo0/0h1L+at4hZ7bghMqQv8y+dfB2bCwSO7mJgeBszpB8 vTxdjyZw52rN7entC/XRQUC764qTgKrcA7NknNKTs1PW5ypLZaf+ifPngudWGuS1x+Cj nBT2IDLX8GxB3JyaGeE1VDCWriBPDQ0U4bu3E2bycDz51AMDhuEhqMy8LmnFo1ESnO+R h/7WS1CODJWg3dD9FgYyTzsJQzQJqDal/iImQ3lYS+d18cl/plEUSNKpITYmdX29kFbY ibbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697234006; x=1697838806; 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=h9Nxr34LASJQh3dumGc2mAVzTOweuKad35QwmgcClnU=; b=LWRhBsZvD36AZuv9PzyuAsNxA5EXt6d7exMojUFzoseIatNT7l2DoVu+R+bsU+IJ0d lmbtIBsUKwlyh7niM+ceTW7ZBSwVm7DhygJ2GmD06sSTwhgAoLoAeQgZw+W+10/xneAc Ihifm4xz6AD48Y/3OLQOuSEhqfd8hRLBC8UneinLM3y9EC9F89K1oPbkxnLyUJUQbQSG 4L3lamM9OG4iILooyjXH7k8nm3ak8SBT+BUpMYSbId/m1pfQjNz+n8hCdtpRVomXihex TmDbw6TzfUpOxnOjDAaDMhV3bjsRmjWmy0KoiqrqtRnCkzVNvElcFUu0OKnVKFgp8Eo5 so7Q== X-Gm-Message-State: AOJu0YznBwwvrq9bQY9IRa9KQRDzNM/R2Rr9/BHL4KtFTer1hD2LPTnv TPwxMBw7EtkaLKOFUkFd9gMqJ1OQw1pA/QP5P5I= X-Google-Smtp-Source: AGHT+IGtdOdxtbDSplMLNcz8YpfrbJDTxWtMctkDlSB/ZzPfEsnGpSWzge4jTgl9jYprZ4sf5d+Uvw== X-Received: by 2002:a05:6a00:2394:b0:690:2ad9:1454 with SMTP id f20-20020a056a00239400b006902ad91454mr35271667pfc.33.1697234006544; Fri, 13 Oct 2023 14:53:26 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:26 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 14/27] build-sysroots: target or native sysroot population need to be selected explicitly Date: Fri, 13 Oct 2023 11:52:38 -1000 Message-Id: <93e864a23e3f82edc2b2fa2207b2bc4b56c230a9.1697233866.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 ; Fri, 13 Oct 2023 21:53:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189091 From: Alexander Kanavin Running them in parallel is prone to races as postinsts from target sysroots rely on executables from native sysroots which may or may not be fully prepared yet. This was observed for example here: https://autobuilder.yoctoproject.org/typhoon/#/builders/146/builds/468/steps/12/logs/stdio https://autobuilder.yoctoproject.org/typhoon/#/builders/147/builds/467/steps/12/logs/stdio Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit 38d7a2e45b883cf999a86af05bcc0eaa875bb47c) Signed-off-by: Steve Sakoman --- meta/files/ext-sdk-prepare.py | 2 +- meta/lib/oeqa/selftest/cases/meta_ide.py | 5 +++-- meta/recipes-core/meta/build-sysroots.bb | 12 ++++++++++-- scripts/lib/devtool/sdk.py | 3 ++- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/meta/files/ext-sdk-prepare.py b/meta/files/ext-sdk-prepare.py index d191e5e19c..89b0403089 100644 --- a/meta/files/ext-sdk-prepare.py +++ b/meta/files/ext-sdk-prepare.py @@ -71,7 +71,7 @@ def main(): ret = run_command_interruptible('BB_SETSCENE_ENFORCE=1 bitbake --quiet %s' % ' '.join(sdk_targets)) if not ret: - ret = run_command_interruptible('bitbake --quiet build-sysroots') + ret = run_command_interruptible('bitbake --quiet build-sysroots -c build_native_sysroot && bitbake --quiet build-sysroots -c build_target_sysroot') lastlog = get_last_consolelog() if lastlog: with open(lastlog, 'r') as f: diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py index bae98359e5..59270fb3e0 100644 --- a/meta/lib/oeqa/selftest/cases/meta_ide.py +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py @@ -18,7 +18,8 @@ class MetaIDE(OESelftestTestCase): def setUpClass(cls): super(MetaIDE, cls).setUpClass() bitbake('meta-ide-support') - bitbake('build-sysroots') + 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'] cls.deploydir = bb_vars['DEPLOY_DIR_IMAGE'] @@ -55,5 +56,5 @@ class MetaIDE(OESelftestTestCase): def test_meta_ide_can_run_sdk_tests(self): bitbake('-c populate_sysroot gtk+3') - bitbake('build-sysroots') + bitbake('build-sysroots -c build_target_sysroot') bitbake('-c testsdk meta-ide-support') diff --git a/meta/recipes-core/meta/build-sysroots.bb b/meta/recipes-core/meta/build-sysroots.bb index 1a3b692a1b..db05c111ab 100644 --- a/meta/recipes-core/meta/build-sysroots.bb +++ b/meta/recipes-core/meta/build-sysroots.bb @@ -22,6 +22,14 @@ deltask collect_spdx_deps deltask create_runtime_spdx deltask recipe_qa +do_build_warn () { + bbwarn "Native or target sysroot population needs to be explicitly selected; please use +bitbake -c build_native_sysroot build-sysroots +bitbake -c build_target_sysroot build-sysroots +or both." +} +addtask do_build_warn before do_build + python do_build_native_sysroot () { targetsysroot = d.getVar("STANDALONE_SYSROOT") nativesysroot = d.getVar("STANDALONE_SYSROOT_NATIVE") @@ -31,7 +39,7 @@ python do_build_native_sysroot () { } do_build_native_sysroot[cleandirs] = "${STANDALONE_SYSROOT_NATIVE}" do_build_native_sysroot[nostamp] = "1" -addtask do_build_native_sysroot before do_build +addtask do_build_native_sysroot python do_build_target_sysroot () { targetsysroot = d.getVar("STANDALONE_SYSROOT") @@ -42,6 +50,6 @@ python do_build_target_sysroot () { } do_build_target_sysroot[cleandirs] = "${STANDALONE_SYSROOT}" do_build_target_sysroot[nostamp] = "1" -addtask do_build_target_sysroot before do_build +addtask do_build_target_sysroot do_clean[cleandirs] += "${STANDALONE_SYSROOT} ${STANDALONE_SYSROOT_NATIVE}" diff --git a/scripts/lib/devtool/sdk.py b/scripts/lib/devtool/sdk.py index d717b6c2b8..9aefd7e354 100644 --- a/scripts/lib/devtool/sdk.py +++ b/scripts/lib/devtool/sdk.py @@ -300,7 +300,8 @@ def sdk_install(args, config, basepath, workspace): return 2 try: - exec_build_env_command(config.init_path, basepath, 'bitbake build-sysroots', watch=True) + exec_build_env_command(config.init_path, basepath, 'bitbake build-sysroots -c build_native_sysroot', watch=True) + exec_build_env_command(config.init_path, basepath, 'bitbake build-sysroots -c build_target_sysroot', watch=True) except bb.process.ExecutionError as e: raise DevtoolError('Failed to bitbake build-sysroots:\n%s' % (str(e))) From patchwork Fri Oct 13 21:52:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32176 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 B7379CDB483 for ; Fri, 13 Oct 2023 21:53:33 +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.51151.1697234009366609525 for ; Fri, 13 Oct 2023 14:53:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Lv8xICH9; 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-6b497c8575aso782502b3a.1 for ; Fri, 13 Oct 2023 14:53:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697234008; x=1697838808; 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=oWcBNN6+nxlsuTLGgQjZNlLzlP/Dtjgm6X7JQgbeR2c=; b=Lv8xICH9+u6RObfoLDMIFMFPvPh9421IsbMXRrww0DNfChodMyFvn2/hTL5yZbUQBV HCZTOEcoMqeFs/1a5/mPCia9eZF7TWlVRIFROhzaXXyCEzXC3dMVIA+r6tCdYrhqOJnZ 32ChIkSu0QrooG8Xgth3gqamhYKNgMMaT9rdzW5a6BvmYfJKVYcF3rnI7TsIXS6c2pFC gqfJPPXcJBtWBWNIh4obUxtyEFUXgznnFx44SDhxuoE9gNB0vXGu5VFl5NJL22VM61hG 2G9QURQ4b+bTu6tX1L11pxo2Y3yCjdG5LBTYPFmiR44A1xegQ7JM4+uoClHfuy6CW8Uu 3aYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697234008; x=1697838808; 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=oWcBNN6+nxlsuTLGgQjZNlLzlP/Dtjgm6X7JQgbeR2c=; b=VHqrJc2Dc4AwnG5KddAcv8lMGeh2aL49zecS7/taORmMkD72jNwOMm6XSbdbHUIWHC vvX9v5pjG/iAGodrTbBaxYXi4nRLtwktNX3m1D0bUwbRSSAj4IwXiOLN8VZmKny8IVQn HvmR3tbYIISaOAC+TODj57YUBuHROp7OxUKlm+vEf4hkribfJ3m9DOLVqlWEv2zzNmTZ U+aSEpYk2Bk3Q/c3DqES8adiddyTWxSQTV0dxTW4Vaw90goELVtn0aa8skaTmAurHymz TpVXElWaKSj70G6imHaA27hYkUPnKODok1dS1tDyFW1CodnWBOznI6W4UtjnYCvRVVbY HXzQ== X-Gm-Message-State: AOJu0YyJNDtl3S7vZerlmqyS+8ccXwTelayW6j1SVIfdJ+QWffAUEPnM 6sl/fWksFUBUI82oyTTuN11Eyd1e6d543rqWvOk= X-Google-Smtp-Source: AGHT+IFdHFShPUXyaJ7vxh23wQ4YEhfBjyq/Xrk6NKIAZowQxoCSClMRe55H/Vzv+CME7f5c7ISaRQ== X-Received: by 2002:a05:6a00:1248:b0:690:2ecd:a597 with SMTP id u8-20020a056a00124800b006902ecda597mr32316870pfi.21.1697234008521; Fri, 13 Oct 2023 14:53:28 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:28 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 15/27] weston-init: remove misleading comment about udev rule Date: Fri, 13 Oct 2023 11:52:39 -1000 Message-Id: <35367d029fedc78724396d94abd899e4bd8bef0c.1697233866.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 ; Fri, 13 Oct 2023 21:53:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189092 From: Otavio Salvador The udev rule has been removed but the comment has kept, by mistake. Remove it. Fixes: dd83fb40f7 ("weston-init: Stop running weston as root") Tested-by: Tom Hochstein Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie (cherry picked from commit 8aa3d43fa1c53cdce45ec88a49f27b076d3812ac) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/wayland/weston-init.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb index 99b99f72f1..c2708e38d6 100644 --- a/meta/recipes-graphics/wayland/weston-init.bb +++ b/meta/recipes-graphics/wayland/weston-init.bb @@ -35,7 +35,7 @@ do_install() { sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}/${sysconfdir}/init.d/weston fi - # Install Weston systemd service and accompanying udev rule + # Install Weston systemd service if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -D -p -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service install -D -p -m0644 ${WORKDIR}/weston.socket ${D}${systemd_system_unitdir}/weston.socket From patchwork Fri Oct 13 21:52:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32177 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 C3D0FCDB482 for ; Fri, 13 Oct 2023 21:53:33 +0000 (UTC) Received: from mail-oo1-f46.google.com (mail-oo1-f46.google.com [209.85.161.46]) by mx.groups.io with SMTP id smtpd.web10.51152.1697234011750871531 for ; Fri, 13 Oct 2023 14:53:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=jrpHqFkO; spf=softfail (domain: sakoman.com, ip: 209.85.161.46, mailfrom: steve@sakoman.com) Received: by mail-oo1-f46.google.com with SMTP id 006d021491bc7-57bbb38d5d4so1301161eaf.2 for ; Fri, 13 Oct 2023 14:53:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697234011; x=1697838811; 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=mhOdPua4lEyr/gp5PS3UecArM1XwDixugcl4W/wTDJ0=; b=jrpHqFkOS6ZzUW1XGqRfIOoSRwqQstXIUEr1+0AI02nlJ8UJseV+mmkyQGi+BWBaSt 8XCHo0fJknGDZllu8TwzQpxmFxxdxrXViqdrUHhDVPcG2A4wVvWCjxeY+YODG4QJcsA/ iKJvE/gbXtuwe5ZOoxDLm3KrHGvbwWmtoOhcZaSFeNUE0n4Lh4EVgNOp99z5j8JKXz3E /4WPsSBsLhzLWYmJbq+9kFM4uKZ96v+ahCvEpLsXnz/IBRiuOZh0UJfL0vuVZF7z+ODz oLnHBtmVRwPd7b7kp2g1w2TW0iFIYp+Dx09lMI7uIMlBCvlaPVbIxQaTioegByItFXyy FVgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697234011; x=1697838811; 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=mhOdPua4lEyr/gp5PS3UecArM1XwDixugcl4W/wTDJ0=; b=GMzpKMdCxa0Tui+Fb+doMkHzIZhL0yWDKfxlrrYTvv1dfSJVKgWB2hV2eItHSkUInM AxJEylfvsmwbjeg6y/c8LfrRnNHm+9OT+BVSkQYyqrb16VIFjRX4v7Qm+KZI9WeIa06a 7ZuUoZyZ+T049z1P3P/HVOJ++k5WM1aNeerEhKwBEAn0ufUst9FpZkgLa4qgR5+AYcCn CK9Kna0KOzF85bL+ueHv7kW0OCElrFfc3shylTkbnO9KHg3t7MCDsMvp2C+w13Ss7QP2 ZtMgBspqRMCSYS5huX3lp3niicBFXXH26qnQGC2VEmJtjLBcGI2QcODGLQMOjnTEg5nr od0Q== X-Gm-Message-State: AOJu0YzmqUWTix9Bc32KE0Vjix4NqXgWIqr0EQZVYTJun9zhKuYKsK5j TWBrawyzoq9MuHpUVTeU7pUODRppEvzX1Yjp6VM= X-Google-Smtp-Source: AGHT+IGxHqipxIGvJNwqVxbxB81pBgoqQxcndqLfKhaRntOOC/TbjmTWhUmfvLsTDP5sNhq8yvBqbw== X-Received: by 2002:a05:6358:2904:b0:141:bfc:b11d with SMTP id y4-20020a056358290400b001410bfcb11dmr31080822rwb.16.1697234010706; Fri, 13 Oct 2023 14:53:30 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:30 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 16/27] weston-init: fix init code indentation Date: Fri, 13 Oct 2023 11:52:40 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 13 Oct 2023 21:53:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189093 From: Otavio Salvador Tested-by: Tom Hochstein Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie (cherry picked from commit c08d474c97ce071ba376b66f30d6ee0a6159d596) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/wayland/weston-init/init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/wayland/weston-init/init b/meta/recipes-graphics/wayland/weston-init/init index d3b0d1873e..a5c54e001e 100644 --- a/meta/recipes-graphics/wayland/weston-init/init +++ b/meta/recipes-graphics/wayland/weston-init/init @@ -30,7 +30,7 @@ done case "$1" in start) . /etc/profile - export HOME=ROOTHOME + export HOME=ROOTHOME WESTON_USER=weston weston-start $OPTARGS & ;; From patchwork Fri Oct 13 21:52:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32180 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 E2A3DCDB485 for ; Fri, 13 Oct 2023 21:53:33 +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.51153.1697234013573250338 for ; Fri, 13 Oct 2023 14:53:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=ZCHfswBC; 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-6b201a93c9cso1061597b3a.0 for ; Fri, 13 Oct 2023 14:53:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697234013; x=1697838813; 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=XyCdyjcDMkJHbxv+zSMG5TaqJBSdITQcicdgpNISoKQ=; b=ZCHfswBC7mCrWvWooAI4zS6bhm69yseu3IQRuIZKxZRFZ3t3nbJ/7Ou0IVnRLnndzO skxX9zHjFG5fwOZAE0nJaTcwcsEDznn1ua/uQtdNjSXnQsJxAnSmngIIPOOckvWWsFZh eUz95jtc3FVrF0gFzfh0yzYYTcDKBFI6T76ovLg3SCligYjw+YNrggbOYrH1JJ6ealsi OfNV7ggH5WJuzV4/73jZYI0d7NKWs9cIRdeOi+W10W9UvpYL+8TD/oXOzRlATK81Nc0N 7OLWsu8/dGcl8SPOZMmgNhIGHp0qQKVyKzWDn0PaFRyw9klA/0uPjtyBZ5Xt9c7TJF2a ra2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697234013; x=1697838813; 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=XyCdyjcDMkJHbxv+zSMG5TaqJBSdITQcicdgpNISoKQ=; b=uAVtA6XZLH6X8HntOt9V6TZFcPk2M1ilLrmbkP7k72paUKrKqDPFtUia9xyRCVH1cf sY9CRYhIDbPaAcCj359AP1/MSHMe/mlIeCnpqV7Azq0rY3o4fSLB3kcQJL64pDA0Oz6n FYdRYRB3nmmPowwbS90LLbpeIQn7rrRjbXUL7aA5QZcaLTmvQO69BqcT040r8W/D4jhM kBO+YosL4MyH0PIn880IYS+QMQ2FxSxj78NokWExYeLGMZQ4aLGXO1HyUcR1s1YVOaTP TuT7GmMk2rDqobrvPEDU13f53yYgPiuLgZtvxEOi5QIl8i0BtoS+q5cxq+ZnY8pvGjYq WNKA== X-Gm-Message-State: AOJu0Yx/vMKyRtO07fQWoWXrzxu+CFAwoFEdGxkZxLNTtkZUrl81zWv+ ukQ8jXwXP8ocMZt4R0eHUq/gK88/+fGnO1SzbEU= X-Google-Smtp-Source: AGHT+IFXSbs0n4nyoR/wS24BV86gNSJD6SXhlVGGem9ZuKBDnAbadXCf5P8o4LNlkhEdJ20oJ6DSEA== X-Received: by 2002:aa7:88c2:0:b0:6b2:2a2d:7a25 with SMTP id k2-20020aa788c2000000b006b22a2d7a25mr3719566pff.29.1697234012749; Fri, 13 Oct 2023 14:53:32 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:32 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 17/27] libc-test: Run as non-root user Date: Fri, 13 Oct 2023 11:52:41 -1000 Message-Id: <16075f19b49cb23ead2dec6746d2be6773ae4ae7.1697233866.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 ; Fri, 13 Oct 2023 21:53:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189094 From: Khem Raj Some of tests impose rlimit on it before running which wont be imposed when running as root user. Fixes src/regression/pthread_atfork-errno-clobber.c:23: (pid = fork()) == -1 failed: fork succeeded despite rlimit src/regression/pthread_atfork-errno-clobber.c:23: (pid = fork()) == -1 failed: fork succeeded despite rlimit FAIL src/regression/pthread_atfork-errno-clobber-static.exe [status 1] Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni (cherry picked from commit 585bf4b780a8ad60ba2b33cede4f0092ff61ddfc) Signed-off-by: Steve Sakoman --- .../musl/libc-test/run-libc-ptests | 28 ++++++++++++++++++ meta/recipes-core/musl/libc-test/run-ptest | 29 ++----------------- meta/recipes-core/musl/libc-test_git.bb | 5 ++++ 3 files changed, 35 insertions(+), 27 deletions(-) create mode 100644 meta/recipes-core/musl/libc-test/run-libc-ptests diff --git a/meta/recipes-core/musl/libc-test/run-libc-ptests b/meta/recipes-core/musl/libc-test/run-libc-ptests new file mode 100644 index 0000000000..0b4b687dec --- /dev/null +++ b/meta/recipes-core/musl/libc-test/run-libc-ptests @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +cd /opt/libc-test +make cleanall +make run || true + +echo "" +echo "--- ptest result ---" +# libc-test runs tests by module(e.g. src/api) and generates sub-module test +# report(e.g. src/api/REPORT) first. After all tests finish, it generates the +# consolidated report file src/REPORT. +report="/opt/libc-test/src/REPORT" +if ! [ -f "${report}" ]; then + echo "${report} not found!" + echo "FAIL: libc-test" + exit 1 +# libc-test prints error on failure and prints nothing on success. +elif grep -q '^FAIL src.*\.exe.*' "${report}"; then + # Print test failure in ptest format. + # e.g. "FAIL src/api/main.exe [status 1]" -> "FAIL: api_main" + grep '^FAIL src.*\.exe.*' "${report}" \ + | sed 's|^FAIL src/|FAIL: |;s|/|_|;s|\.exe.*\]||' + exit 1 +else + echo "PASS: libc-test" +fi diff --git a/meta/recipes-core/musl/libc-test/run-ptest b/meta/recipes-core/musl/libc-test/run-ptest index 0b4b687dec..53cd34f506 100644 --- a/meta/recipes-core/musl/libc-test/run-ptest +++ b/meta/recipes-core/musl/libc-test/run-ptest @@ -1,28 +1,3 @@ #!/bin/sh - -set -e - -cd /opt/libc-test -make cleanall -make run || true - -echo "" -echo "--- ptest result ---" -# libc-test runs tests by module(e.g. src/api) and generates sub-module test -# report(e.g. src/api/REPORT) first. After all tests finish, it generates the -# consolidated report file src/REPORT. -report="/opt/libc-test/src/REPORT" -if ! [ -f "${report}" ]; then - echo "${report} not found!" - echo "FAIL: libc-test" - exit 1 -# libc-test prints error on failure and prints nothing on success. -elif grep -q '^FAIL src.*\.exe.*' "${report}"; then - # Print test failure in ptest format. - # e.g. "FAIL src/api/main.exe [status 1]" -> "FAIL: api_main" - grep '^FAIL src.*\.exe.*' "${report}" \ - | sed 's|^FAIL src/|FAIL: |;s|/|_|;s|\.exe.*\]||' - exit 1 -else - echo "PASS: libc-test" -fi +chown -R ptest:ptest /opt/libc-test + su -c ./run-libc-ptests ptest diff --git a/meta/recipes-core/musl/libc-test_git.bb b/meta/recipes-core/musl/libc-test_git.bb index 6d64592f0c..060f5f9f12 100644 --- a/meta/recipes-core/musl/libc-test_git.bb +++ b/meta/recipes-core/musl/libc-test_git.bb @@ -13,6 +13,7 @@ SRCREV = "18e28496adee3d84fefdda6efcb9c5b8996a2398" SRC_URI = " \ git://repo.or.cz/libc-test;branch=master;protocol=https \ file://run-ptest \ + file://run-libc-ptests \ " PV = "0+git${SRCPV}" @@ -47,5 +48,9 @@ do_install () { cp -r ${S}/src ${D}${install_path} } +do_install_ptest_base:append() { + install -Dm 0755 ${WORKDIR}/run-libc-ptests ${D}${PTEST_PATH}/run-libc-ptests +} + COMPATIBLE_HOST = "null" COMPATIBLE_HOST:libc-musl = "(.*)" From patchwork Fri Oct 13 21:52:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32183 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 D623FCDB483 for ; Fri, 13 Oct 2023 21:53:43 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web11.51174.1697234015370640623 for ; Fri, 13 Oct 2023 14:53:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=vAHACnMA; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1c9e06f058bso16491755ad.0 for ; Fri, 13 Oct 2023 14:53:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697234014; x=1697838814; 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=8dloikt7380rj+S/SxNq/ezfzKccD/U1fVvxoUfz9Sc=; b=vAHACnMADkXFEOADSDeuEqgcLbaOFeZmZuHDvC9grXl+C7omdf5c58QpdG5Ga09AFn WYWKPaadgrtcPLMWfmQpizheFPpqNbPWVKB3u8GhfiTgOcC7alAES8cgu33T6Xf8ipqI RIvJGMi149u9vtEKApBpbx1zfpqRBgbGlIt2S/XCCgwi0Jptq2cQZS97hxtPMtQv6sa+ /iUZKNzeiMdxo6R1Wg802Ix8mO340Dy3IitRbxEQSVdg6YJ0WJG2gSLwos2J4RG2LIil OTQfFkU3u9zXNCEqlFbrcs4Wr2mzaeD93uUhHBjxKO6B0hePxme10L2e5P9xp2DnZiu8 Cdxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697234014; x=1697838814; 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=8dloikt7380rj+S/SxNq/ezfzKccD/U1fVvxoUfz9Sc=; b=Y3R946JdoEiT6V/nRzMnDS3bi30ereuk9OGD1PjAtfXlhGCmZ+kOI+yqM04eNMobRx Z7goS2BrzcUQ3OdFG9hUn1vTiW/EDULDS2ghmkkDtvi4MnNXNF3YzGkky3MohiT4g2UO 6tVXn3R+ENE65tRzgk9RMuaRawh6TVgOxaeiezvDx8Qb5EsqW5zil3mJYBTtyx+d7rkg 6iqhcBITcT2q/sZHbd3F87zFrohZIM5qok8qf5g3J+w7K/wQ5iSxo3PM4h+U1iIP1tth GjtXcFYOFjAMLDwqt9w1Ppxou7T//iSzLbN1znX6oMdIEviZilTOfD1bf05Y/IFoASbg 8qWg== X-Gm-Message-State: AOJu0YyIBLrFEh9NL8w012R5+UMvknEp0IcnC/p4UjU9VEXpApC6BWlF BHV3T7Rga7dBxL05aMYSzocqw9UJc45IRjkvJIQ= X-Google-Smtp-Source: AGHT+IEBDk48GOIV5PEODMJLqu56lfvg7qyQuGm5iPS0+hL139JMa30SaaLbNovvy4K2FQoCtCyaFg== X-Received: by 2002:a17:903:22c6:b0:1c5:9d00:be84 with SMTP id y6-20020a17090322c600b001c59d00be84mr1894891plg.33.1697234014549; Fri, 13 Oct 2023 14:53:34 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:34 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 18/27] oeqa dnf_runtime.py: fix HTTP server IP address and port Date: Fri, 13 Oct 2023 11:52:42 -1000 Message-Id: <68f0100b779bac1788818320f8aa64d79e3db3c2.1697233866.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 ; Fri, 13 Oct 2023 21:53:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189095 From: Mikko Rapeli Use correct HTTPService parameters like apt.py when setting up the repo server. These work with qemu tun and slirp networking. Fixes test failure with slirp networking when executing testimage.bbclass selftests "oe-selftest -r runtime_test.TestImage". Signed-off-by: Mikko Rapeli (cherry picked from commit 764424df2f4b6bf0e89fb20b4253a7601468f70d) Signed-off-by: Steve Sakoman --- meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py b/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py index 64a3502370..d2f0f88f7d 100644 --- a/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py +++ b/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py @@ -10,7 +10,8 @@ class DnfSelftest(DnfTest): import tempfile cls.temp_dir = tempfile.TemporaryDirectory(prefix="oeqa-remotefeeds-") cls.repo_server = HTTPService(os.path.join(cls.tc.td['WORKDIR'], 'oe-rootfs-repo'), - cls.tc.target.server_ip) + '0.0.0.0', port=cls.tc.target.server_port, + logger=cls.tc.logger) cls.repo_server.start() @classmethod From patchwork Fri Oct 13 21:52:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32182 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 E7B9CCDB482 for ; Fri, 13 Oct 2023 21:53:43 +0000 (UTC) Received: from mail-oo1-f51.google.com (mail-oo1-f51.google.com [209.85.161.51]) by mx.groups.io with SMTP id smtpd.web10.51156.1697234017356912944 for ; Fri, 13 Oct 2023 14:53:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=hxGxeIql; spf=softfail (domain: sakoman.com, ip: 209.85.161.51, mailfrom: steve@sakoman.com) Received: by mail-oo1-f51.google.com with SMTP id 006d021491bc7-58111e624bdso1425478eaf.3 for ; Fri, 13 Oct 2023 14:53:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697234016; x=1697838816; 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=Od4FbCMx9lJ460sPk7oYrt4TWBuYZhGb1a/0XqnNICA=; b=hxGxeIql0qxFdbuBTdbp5fSqyM9TbHlFTSTjJUtDfNLkWjTgtUCLfpmElsdiGOPohZ 2UzPHjCf5N9LFt+gNnRUammmQpxrHd+z3o+KSxT4+f/Cy8v1nXZ7vaV1C0JtDHMghHUD tCBuScK2YznGOSgdY1F6kfIYr7fjSKHngSC0vr/TRIoJXnd8DwgoiQ1qsF9loi1PtEqq KBNR3otT0ZFUb4Q434YzoekKFqPBNRBFovavYFu8aeTzfNKr2d+RX+Xj+0jWyXYBthyj n2b8ZFP/Nj9nvpHHmdr2ebFqlJKPqlcTSGPWgsR+zR36P69MdQhETqjHTKbdiy/sXN/Y AagA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697234016; x=1697838816; 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=Od4FbCMx9lJ460sPk7oYrt4TWBuYZhGb1a/0XqnNICA=; b=Gj3vZufgcSSQ4ZCNvH/mJNvQOsIT+tp24zU+1l/FAnUu33KaK/uoB0ZFIIu1wT+xxC UoVdWD/yFAw3Xu3BrbPis3y4k77C3GVCJ1NX2tB05YYH5sEI1Q2XEKCwV3mSb6SAEplp v+1naTHB4AadKistGNLiffXyo4H7rKtPRWrQwc/SSnufIoh8+ZIrMk2fs9p7Q/SA9BNh Rt0DcdV9KVEdimKaLyBx4QujbgSibPb9jeQfyU0kkOTAZIyFzULi2jV25L7BH6uDIh8+ UXphkkAIpNDVnjt1ZUDzw3BL80s4Tnk5hWlgKTdWoscECAv02xMyCBbIChRdvr7H+E5/ W8Nw== X-Gm-Message-State: AOJu0YxCKWXT2iA749+Ou5WwWRxkK1YPE3SP83ZNgE3DZ9wXGIEXdAiD O4K0y5LJZ9rrFbVV8c7dGfA3PUgXToVs+E8f/bM= X-Google-Smtp-Source: AGHT+IES+34oEbq+EOWBPc+urGrLIS7LDAbor5Ur6Hai9jfQZaK34SojOqlthD41llQtsa94jtTXVA== X-Received: by 2002:a05:6358:2496:b0:142:fd2b:d165 with SMTP id m22-20020a056358249600b00142fd2bd165mr31045955rwc.13.1697234016307; Fri, 13 Oct 2023 14:53:36 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:36 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 19/27] oeqa/selftest/context.py: check git command return values Date: Fri, 13 Oct 2023 11:52:43 -1000 Message-Id: <776053f4af19e9c2de7ce725e6ec94312028fa7f.1697233866.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 ; Fri, 13 Oct 2023 21:53:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189096 From: Mikko Rapeli Don't ignore return values from the git command lines. If something goes wrong, fail the test right away. Signed-off-by: Mikko Rapeli Signed-off-by: Richard Purdie (cherry picked from commit dfc178a70d6fa60e89d4716f05d68e2c72c6ecd3) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/context.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index c98763735f..39325f4b72 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -97,7 +97,7 @@ class OESelftestTestContext(OETestContext): oe.path.copytree(builddir + "/cache", newbuilddir + "/cache") oe.path.copytree(selftestdir, newselftestdir) - subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) + subprocess.check_output("git init && git add * && git commit -a -m 'initial'", cwd=newselftestdir, shell=True) # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) From patchwork Fri Oct 13 21:52:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32181 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 EAD24C41513 for ; Fri, 13 Oct 2023 21:53:43 +0000 (UTC) Received: from mail-oo1-f54.google.com (mail-oo1-f54.google.com [209.85.161.54]) by mx.groups.io with SMTP id smtpd.web10.51157.1697234019251164069 for ; Fri, 13 Oct 2023 14:53:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=xMqXln0Z; spf=softfail (domain: sakoman.com, ip: 209.85.161.54, mailfrom: steve@sakoman.com) Received: by mail-oo1-f54.google.com with SMTP id 006d021491bc7-57bca5b9b0aso1370406eaf.3 for ; Fri, 13 Oct 2023 14:53:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697234018; x=1697838818; 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=X56l/nWnxst38DwQgYBqp7w7UkVS3AULmIt9mDpupkI=; b=xMqXln0ZS0fkK4SiDUF8U//wQe5DDoew93Fa3mQopv6OxzwXqu7gKW2hLHankB6alG ia4GYnQodV/QtdOUDR0fnbSUeNkPu7tMIP474QIaCjsnXsTK2zHP38I3wVbji2I5izsD 9t1frGplmWEjr9d+bVvod74Vbik5oEc1H2YiGm5Wrkhy1VjJcVYqpUnA4NEI0xcCKzaS rpI+3LrskUM2RtWghhlwR1qF9UKcbyqiG2fCm9GoOb7Vpi/amRAWh4pKOkKBnj/HJxa3 coKn5kbp1/iZiRp5l6L1M8CqUkSqkiT78+jPTt73nNxu8eFC7dvIgz23DZx1amBmk9Lq jNeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697234018; x=1697838818; 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=X56l/nWnxst38DwQgYBqp7w7UkVS3AULmIt9mDpupkI=; b=uId7EvOPiIuMJzqwfs2n/Pp0E9mO5vIrU5LTHzlTuLIV0dr3eOoD1u6o2xhV5o47wP MrlGVM6kHkLIezF1m5rpxxwmlGvw8d0eqKHGSWERqRURy+bGMpYFEhoOPem6U2DTDR9i JZS8YPs404GP4gUHTRN4ZKu/aIY4o04BuUSc3UpG6NMrZ4ErwZ1bAgmSZzlXYLwN5rIl GXZDJHlL6/EPjnYo1kw1i+APIEX+YdBXm/IdYqH5Q1Z1MY8VNp/bVf+xNeKKXdmqdrHD YXxi+2nPaUgAHN0KD2QW47CoWEtKar7hpYZgDjRt9oe1lAcE0aNwAIlOaDAIq4XaYkzi Qtqg== X-Gm-Message-State: AOJu0Yz9trhIyosRq5K0X+/sd2YBWSXCQQOYzQimvu+5KijDHGpwGuSy dQYcwTOW9/VoQm4SIFJ79m+bSju0Gi+BSea/m/Q= X-Google-Smtp-Source: AGHT+IGYQhXIWasT3zHyW/G8XgmcRy57yMXtO0a4eAM9pBLjx5L9cn+74xCKBFKTvzemU3iAlZjJNQ== X-Received: by 2002:a05:6358:3396:b0:132:d32d:d929 with SMTP id i22-20020a056358339600b00132d32dd929mr30608594rwd.20.1697234018134; Fri, 13 Oct 2023 14:53:38 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:37 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 20/27] igt-gpu-tools: do not write shortened git commit hash into binaries Date: Fri, 13 Oct 2023 11:52:44 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 13 Oct 2023 21:53:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189097 From: Alexander Kanavin Shortened hashes are prone to collisions, and in this case git lengthens the hash to resolve the collision. This in turn breaks reproducibility, depending on whether the colliding hash is present in the history or not. This has been observed here: http://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20230917-br60if6q/packages/diff-html/ Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit a74e1eff93d4de5724481e3298308a6d925a4512) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb index f4799fbc77..6bbc601986 100644 --- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb +++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb @@ -26,7 +26,7 @@ PACKAGE_BEFORE_PN = "${PN}-benchmarks ${PN}-tests" PACKAGECONFIG[chamelium] = "-Dchamelium=enabled,-Dchamelium=disabled,gsl xmlrpc-c" -EXTRA_OEMESON = "-Ddocs=disabled -Drunner=enabled -Dsrcdir=/usr/src/debug/${PN}/${PV}-${PR}/git/" +EXTRA_OEMESON = "-Ddocs=disabled -Drunner=enabled -Dsrcdir=/usr/src/debug/${PN}/${PV}-${PR}/git/ -Dversion_hash=${PV}" COMPATIBLE_HOST = "(x86_64.*|i.86.*|arm.*|aarch64).*-linux" COMPATIBLE_HOST:libc-musl:class-target = "null" SECURITY_LDFLAGS = "${SECURITY_X_LDFLAGS}" From patchwork Fri Oct 13 21:52:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32184 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 DC7FFC41513 for ; Fri, 13 Oct 2023 21:54:03 +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.web11.51183.1697234034489106252 for ; Fri, 13 Oct 2023 14:53:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=NQme4+q+; 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-6b20577ef7bso1044409b3a.3 for ; Fri, 13 Oct 2023 14:53:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697234033; x=1697838833; 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=8Wbqt3LggfGiRqRcioVprhn3U7V4KkgppT8nzCqPqyE=; b=NQme4+q+XC5qgIvq6WA+98icm6hWjsr0/zOmp37rAtbbs3VI8RqCZvEF5FvCNEKOGC RAUemh7A+52MIE/LGOxgUU+IZMxVP9WyFZoP/EfKdJhONz8tJ6Oq90sM9dMcZWxqeq7o o+vRa70ONx1phLU1zWeNDSs5ppv8O7Vv8Ar8fbYmSsjPxQtNknZZDiwceYWpAPWZ3O3+ l4Zs0Eyf3crxjK3dvdUZaqraJmMd4tdVx++zKaSwJmL+rJx2yy91gKyN8rU/Oqy4TdvY NkO6HU3B8FwxmaPrC+gl3g91Wm/MsjuhPHAkLI/cFa/PFgGA0rLyGqYBrw6eeisxSVOg AxfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697234033; x=1697838833; 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=8Wbqt3LggfGiRqRcioVprhn3U7V4KkgppT8nzCqPqyE=; b=jl6GY3WPHIl1ZRrfl7aB6VbwDaksjkPNiVYuNaur0o5dl8TScJ7+rwEcoGp+heGx9q zuplFJnwvvoxGxG+Qw2WTh5LMD38R7Alk/gLAImZb6pB9aFZWewIQ24QFLDZcZWP3L1y Ohxh4RirQck8zOFrYhTdVXBqB1Q97PitAFst+gMufMbX3r+qe9hqrd+G3ro/HR+eDGe5 z4sKTv8PX0waph5lyJPJHFc2oBhaQcdcgIzpUa1KHEcx4Ip7KZls4GGgZXjkMaWLBIFs 5HPlePThFl0q+woth3VZa0jrBY+pPEA68QqA7hMMk5t8+nVMHmZusPyXZ/IPTefxeJiK 5jnw== X-Gm-Message-State: AOJu0Ywsuq9JQBipkcNnZM7noEUYG/Xu/32kq7AZ/CRh3SkZbCYjZLxQ W0prFpg/YnrHglQt7AreYWaqS+T09wlxSTk5sWw= X-Google-Smtp-Source: AGHT+IE6h3hk7MIky/nS+4IVTBwBV1JVg64yyASV25N8qPZWJRnlxhB4SIWIjKvX72tUDxXIan8Ymg== X-Received: by 2002:a05:6a00:2e96:b0:68b:c562:da65 with SMTP id fd22-20020a056a002e9600b0068bc562da65mr30026941pfb.26.1697234033649; Fri, 13 Oct 2023 14:53:53 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:53 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 21/27] ptest: report tests that were killed on timeout Date: Fri, 13 Oct 2023 11:52:45 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 13 Oct 2023 21:54:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189098 From: Alexander Kanavin I'm not sure if this was reported correctly before, but it currently is not. Test that is stuck is an error in itself. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 002e27c9932a83e46be0b03a5232594cfba7212c) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/runtime/cases/ptest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/runtime/cases/ptest.py b/meta/lib/oeqa/runtime/cases/ptest.py index 3ef9022188..454a19430f 100644 --- a/meta/lib/oeqa/runtime/cases/ptest.py +++ b/meta/lib/oeqa/runtime/cases/ptest.py @@ -93,7 +93,7 @@ class PtestRunnerTest(OERuntimeTestCase): failed_tests = {} for section in sections: - if 'exitcode' in sections[section].keys(): + if 'exitcode' in sections[section].keys() or 'timeout' in sections[section].keys(): failed_tests[section] = sections[section]["log"] for section in results: From patchwork Fri Oct 13 21:52:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32188 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 E8D80CDB483 for ; Fri, 13 Oct 2023 21:54:03 +0000 (UTC) Received: from mail-oo1-f46.google.com (mail-oo1-f46.google.com [209.85.161.46]) by mx.groups.io with SMTP id smtpd.web11.51186.1697234038040653800 for ; Fri, 13 Oct 2023 14:53:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Zkw10ZtD; spf=softfail (domain: sakoman.com, ip: 209.85.161.46, mailfrom: steve@sakoman.com) Received: by mail-oo1-f46.google.com with SMTP id 006d021491bc7-57ba5f05395so1435140eaf.1 for ; Fri, 13 Oct 2023 14:53:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697234037; x=1697838837; 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=r7F9vrH+fOKDNSgJk733WlCe5dkcIii11ZubGTWMLGY=; b=Zkw10ZtDkihi/CgVuh2CwNuM2RTf3TuihX50lR6LgYAkcLvG0SmWUxp6a7Hb88QIWO vnB43rkiutXZlif+NeJph/A3SWvDTT32ZynaH/NdtZ18I3veWtSxcG4q67XcweS+U/e8 wwPAFk5EOvey6mnA9FWWVwKGdmX+Z5wwUCnSzEo2MDR2nhBceVZo8nwU5VpqWMsH3zvo WSotqan9A93hCbsDFPwYbTv9vbcDqhkOlO2wTqXuVbICwLfTFYJZfDJicK/qkei9D/Vv F/QDAxIk8m4OJ56PITuwffsMYYX1L9bq0/Bldq4FTlYfELoDGeAoONo5HSWyFsIDHRZX 9xRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697234037; x=1697838837; 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=r7F9vrH+fOKDNSgJk733WlCe5dkcIii11ZubGTWMLGY=; b=p7+deUXpwWAIqUv+dzfb16jTqdmpzK2fuZJV302sEhdLb1N2etXJWkFTiatCDJjq84 BddI25mpbGtgb5WgQQ2iiWrfJPHS2GrapRCevNQM6Mr7L7kxdVJTgNizSnlvlcbhu/J2 W4GwuOjrYdFmEI1MrKBjcgJ12nJvUsOdHWSaCgzVc6UFC2/3KRu8qFdk/Ja7GQq42xmr k246EaQXpVuVkVyaD/tNs4OOnN48vUfJ1++7SKcbKsgWWf++VYRbm0froWdsdQ2I1Z01 HOSK3C3z1ak8ZFak+2W67pFs0b4Cb/oZ81RjhaPMSzVRp82wSriBZ90VdWIsy+OeQR29 vh+g== X-Gm-Message-State: AOJu0YzlzKF1MvNlPw+Q/wlYChxDxvQ/A9JomXs7y11jow4mxWMu6aWo zyYv1ag5zHPTaUSFAva6bWN+j9NMdoMBvRMaFY4= X-Google-Smtp-Source: AGHT+IG93QnEshIXcIGco9/5KdsKg0dBOZ9b2ZJmrjYHRRXQ7DRoesaOHXa8zoWGFLb0lGPjgYy1Xg== X-Received: by 2002:a05:6358:2806:b0:14c:79ec:1b86 with SMTP id k6-20020a056358280600b0014c79ec1b86mr35430120rwb.24.1697234036988; Fri, 13 Oct 2023 14:53:56 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:56 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 22/27] strace: parallelize ptest Date: Fri, 13 Oct 2023 11:52:46 -1000 Message-Id: <30b6692ef4a12958419c94b96e3fc5a50e8a7ad6.1697233866.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 ; Fri, 13 Oct 2023 21:54:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189099 From: Alexander Kanavin strace is one of the slowest tests otherwise (can take 40 minutes or more), and this brings it to under 10 minutes \0/ Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 0c632b418a785494318d9f375a07d879772e8ced) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/strace/strace/run-ptest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/strace/strace/run-ptest b/meta/recipes-devtools/strace/strace/run-ptest index 86daed9220..1224229e8f 100755 --- a/meta/recipes-devtools/strace/strace/run-ptest +++ b/meta/recipes-devtools/strace/strace/run-ptest @@ -3,7 +3,7 @@ set -u export TIMEOUT_DURATION=240 -make -B -C tests -k test-suite.log +make -j4 -B -C tests -k test-suite.log res=$? if [ $res -ne 0 ]; then cat tests/test-suite.log From patchwork Fri Oct 13 21:52:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32186 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 EAD78CDB482 for ; Fri, 13 Oct 2023 21:54:03 +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.web10.51170.1697234039943331824 for ; Fri, 13 Oct 2023 14:54:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=iqrYetxK; 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-6b77ab73c6fso394638b3a.1 for ; Fri, 13 Oct 2023 14:53:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697234039; x=1697838839; 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=zGK2KdGGDdCdX0agAckOccL+TLk6eZUitZsUR2iHdtk=; b=iqrYetxKZXQ6WxMSyT7z1Fb1GSj/8Z2hcfaA30JXt/pmIB045zshDFb5lOGARlP832 9t38L1sPF4jOfhLy3x2SxNVac16BsR5VmKEwSBwhKwIk6+7bOI1QkCU9IHu2kphLb68L 1GMx/+7+aGbhi4XN4ifyccTuAIdP1b0P2wuP4MH1ez/wKFQFRBt+nhWdorAaPw+zfG2k e/xvNxjY+2DGv9WLGKQWtFfA5YsBWpwnxBojbtE7fQ06kOrJx1TaJD3LIfdyncXta8NC E51KEAfSgQcTKk6mqHynV72KoqiKNMKduKTsOmmKcBvAOS2agcD264a1S/GmlIrQ/Obk sm3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697234039; x=1697838839; 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=zGK2KdGGDdCdX0agAckOccL+TLk6eZUitZsUR2iHdtk=; b=Rt0QuLr46wFyIZUrrBhotTHzXeysRmQgYIF6xTvDpXvmYcj7QRri7aNpZQu9JtSDOK +B/Ed/PWy41Tp8fB4z6SeSASeTolOW4vbIhNNAi0aU5Nr7129N8vYFEy+oo3N420no4l VbyKRmRQfblJGtNwzEsTnncNjzEh7n0sjn6DoEq1CLejAsxxNC1PcW9bdle/jxVWOb+A B07NWDx4CbZUaocHqAJe6KRO5jgzHDGorBawNq5AJXX5NwRiK9Y8bqcrLkvTcxp1ODSR dpi3TOwPlbvHHjR05mvJcJKm4TOpHyLSedq8BWwy/zyk3v6eWWTvLZGpjmdMwKphGgdN L2hg== X-Gm-Message-State: AOJu0Yx3iRog+DkxsdMY9Yy+VXfyxHt8icYKmh3PVY2y6TCZlSJPjq/D Tt7XXz2x+MTIwl8DfS3Di9VXhsSTjZ9CXLKwJwc= X-Google-Smtp-Source: AGHT+IEIq9nEQus2avyTzjeZw2IMlZn0ttQJlZ3Nf1ZPwsjOVi4kTiwDR2C28VQZYgmd0VMt9R1X0w== X-Received: by 2002:aa7:9533:0:b0:68c:44ed:fb6 with SMTP id c19-20020aa79533000000b0068c44ed0fb6mr1621040pfp.16.1697234039094; Fri, 13 Oct 2023 14:53:59 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.53.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:53:58 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 23/27] openssl: parallelize tests Date: Fri, 13 Oct 2023 11:52:47 -1000 Message-Id: <3cd99ff32da3bb85d7ee278fec69504a12c1f715.1697233866.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 ; Fri, 13 Oct 2023 21:54:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189100 From: Alexander Kanavin This brings them from 15 minutes to just over 4. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 9eeee78aa94aaa441da012aeb904a0f1cbcd4d91) Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/openssl/openssl/run-ptest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl/run-ptest b/meta/recipes-connectivity/openssl/openssl/run-ptest index 8dff79101f..10c9b49e4a 100644 --- a/meta/recipes-connectivity/openssl/openssl/run-ptest +++ b/meta/recipes-connectivity/openssl/openssl/run-ptest @@ -9,4 +9,4 @@ export TOP=. # OPENSSL_ENGINES is relative from the test binaries export OPENSSL_ENGINES=../engines -perl ./test/run_tests.pl $* | sed -u -r -e '/(.*) \.*.ok/ s/^/PASS: /g' -r -e '/Dubious(.*)/ s/^/FAIL: /g' -e '/(.*) \.*.skipped: (.*)/ s/^/SKIP: /g' +HARNESS_JOBS=4 perl ./test/run_tests.pl $* | sed -u -r -e '/(.*) \.*.ok/ s/^/PASS: /g' -r -e '/Dubious(.*)/ s/^/FAIL: /g' -e '/(.*) \.*.skipped: (.*)/ s/^/SKIP: /g' From patchwork Fri Oct 13 21:52:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32185 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 D5AD1CDB47E for ; Fri, 13 Oct 2023 21:54:03 +0000 (UTC) Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by mx.groups.io with SMTP id smtpd.web10.51173.1697234041906945132 for ; Fri, 13 Oct 2023 14:54:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=h8Ws5Uu/; spf=softfail (domain: sakoman.com, ip: 209.85.167.179, mailfrom: steve@sakoman.com) Received: by mail-oi1-f179.google.com with SMTP id 5614622812f47-3b0dcbf3672so1475612b6e.1 for ; Fri, 13 Oct 2023 14:54:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697234041; x=1697838841; 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=n5s8psKpxD9SflUlz+MQX3qo6c/MPh2wHmStZ3jQMrM=; b=h8Ws5Uu/7n0akpbvrZ4Yg7mRo0+vMeTCNrQ6MO8RjksPv43eSEK0ccVcNZtW+5XxOY 8pPpGJUBVFSnun6SHBU/w/dzYHG+7yXs1xSWIlYSJgHwKYBP5Mnk8t6pyB9JwgmsDu2F L73U7lG2m+Cn2LXH+QXMQqhD3dpPOBzpNW2VFZhI2ELBFD65YmkNV8ypr+h+flqBGiZm TeS74j3AUDo7WLaflXntaBrZ59SuUjHZetD0d1WMs9IXo4IYSbVYrUHj4Vxz6MXcWCk6 +j2Mr61iZ2oIl61DnQURMdQh+ybXuTIy1h4VQJLaIOLSszxF71kcvg+XpeGZcicJBpRr FauA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697234041; x=1697838841; 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=n5s8psKpxD9SflUlz+MQX3qo6c/MPh2wHmStZ3jQMrM=; b=Fnq9agPWml156pabRuJXWTTUnNXnWr9/3g5CflC07JzvTxVJ5ifVx493yUAk/RgGsa FHB131xk/mPtFmFwE8l/c7ptPkrw8ZL0mOcWNP6aFS69lUQf8JZuSznDAIIsXdwFr8DT 6ZzewL/0HzSP8W3uavPnGpj4IufnfXwMZ8GWjqSgJXoUfeB3NQ/1eI6U1ksCm6jVjHG6 ALe7VrD5hAg9YaOddBtehns0xM+AkqOhhwBXfijP+8sUtHzF6NZ7OX1fv50DGBEMkmUT 5bcnnL+tcTRxXuhhiizOdob1tF8zwToA78SvQu7V+ylcFZ7uLU1SeM+9ezCu1JoZsz9I r56w== X-Gm-Message-State: AOJu0Yw86nhcpk+fTYKHaFO9/r2612jOgg3V3jWUplgwPuKIZ3VBvdqB LEHQST1MmR/Qo4PoEXTftLaA/KiDoq5USlr8ixE= X-Google-Smtp-Source: AGHT+IHxSnEuHBJDQ6ybHDfl9MJpsWeCDB03S/f2tWtR3UD44lbMyEqBSBk3eAJBjzKlKYcEkMHnfA== X-Received: by 2002:a05:6808:f92:b0:3a8:f3e7:d691 with SMTP id o18-20020a0568080f9200b003a8f3e7d691mr37144244oiw.37.1697234040953; Fri, 13 Oct 2023 14:54:00 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.54.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:54:00 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 24/27] openssl: ensure all ptest fails are caught Date: Fri, 13 Oct 2023 11:52:48 -1000 Message-Id: <687989f2ee2204643157e04a976d3310018a3bb3.1697233866.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 ; Fri, 13 Oct 2023 21:54:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189101 From: Alexander Kanavin Piping results through sed may mask failures that sed isn't catching. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 2b1b0e9e4d5011e7c2fd1b59fc277a7cfdc41194) Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/openssl/openssl/run-ptest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl/run-ptest b/meta/recipes-connectivity/openssl/openssl/run-ptest index 10c9b49e4a..c89ec5afa1 100644 --- a/meta/recipes-connectivity/openssl/openssl/run-ptest +++ b/meta/recipes-connectivity/openssl/openssl/run-ptest @@ -9,4 +9,4 @@ export TOP=. # OPENSSL_ENGINES is relative from the test binaries export OPENSSL_ENGINES=../engines -HARNESS_JOBS=4 perl ./test/run_tests.pl $* | sed -u -r -e '/(.*) \.*.ok/ s/^/PASS: /g' -r -e '/Dubious(.*)/ s/^/FAIL: /g' -e '/(.*) \.*.skipped: (.*)/ s/^/SKIP: /g' +{ HARNESS_JOBS=4 perl ./test/run_tests.pl $* || echo "FAIL: openssl" ; } | sed -u -r -e '/(.*) \.*.ok/ s/^/PASS: /g' -r -e '/Dubious(.*)/ s/^/FAIL: /g' -e '/(.*) \.*.skipped: (.*)/ s/^/SKIP: /g' From patchwork Fri Oct 13 21:52:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32187 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 01941C46CA1 for ; Fri, 13 Oct 2023 21:54:04 +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.web10.51175.1697234043755422420 for ; Fri, 13 Oct 2023 14:54:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=hk36qMkB; 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-692c02adeefso1981679b3a.3 for ; Fri, 13 Oct 2023 14:54:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697234043; x=1697838843; 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=z9JhuVumAqX5PMDApghmQ5DljK4nwy/Z8YjoJ0p7NJ4=; b=hk36qMkB9o87VYDSbByefJOWKw0h8tvRyR8F3IZMrEebS0WiTHNHJuG73wrLM6AvHC 2jr5TuQY09HckSGibowrulWIblOzGFGyB+X8hUn/trJ3LzXQllkzq36AoYwwxgRQ863l rpiKapbr4seuWLkrBxCbtjpIJFWwe0i8r6q2w/NTQWacHYORorP70AVjKyYCS/6baEg7 uWudj/+FCizz3cXRW7eg30CbvYeTXSZXrrQd+VGoVcG1DXftJkUaBPfQMW7mx8mzYDKU o9fSY5ssH//BQFHuQHZ828KkfQsxdbN1KUe6pqfInB8n2JchgM9LG3OUiLfXY/hEYwu/ OxSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697234043; x=1697838843; 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=z9JhuVumAqX5PMDApghmQ5DljK4nwy/Z8YjoJ0p7NJ4=; b=GpmG0ygexoOBNYnJ41jvO2j6qf2c/OlPmzCNV5IFuz9Llh9tPp4ANvxJfsuz/g/b7z NcbER+q14K/kwSMviwjUSnfBHkBC60Sq7Vx/gVn1EP3KmoaMRO8GZt6fF2Rk9dlmaEzp /9TG3ijnBN2Bs4qD1Cy6HkLxRh9NXfODUJHJNQIEDKceNVE9BpVLBXyXiX3QJffpeKFm GSqcEH3SMWfJVrYLy9im4Yaf5MXdL2P5cAE3Hh2g2+ddO/NVZ8SgcpA0J8yIcbwWPZG9 3H7OvbAHPJCrRNL60pggvfgZVp+uK3QfamUw6pa5jNeLaZZNEygWo5UheXPhm24KYE99 BSZg== X-Gm-Message-State: AOJu0Yzk9XJllQpfVPga7XzZut+mlQsY1xloqG/nYct731egGhjiRl3W P/RSzo1stuymUIqE9RFi316zW0xYdQRPVe1y/oc= X-Google-Smtp-Source: AGHT+IGbiy6Z3j9LiDmC+VBkOkamhDKZeuukdoSYQBgHlgDTAYuouByBeuky4v4IiBNiZPYFjN69rA== X-Received: by 2002:a05:6a00:a26:b0:68f:c215:a825 with SMTP id p38-20020a056a000a2600b0068fc215a825mr27551297pfh.12.1697234042878; Fri, 13 Oct 2023 14:54:02 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.54.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:54:02 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 25/27] libsoup-2.4: Only specify --cross-file when building for target Date: Fri, 13 Oct 2023 11:52:49 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 13 Oct 2023 21:54:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189102 From: Peter Kjellerstedt The soup.cross file is only created when building for target so only tell meson to read it when it exists. This allows libsoup-2.4-native to be built again. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie (cherry picked from commit 4acbd2269931b500846d56885c3304d244e514f8) Signed-off-by: Steve Sakoman --- meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb index 5abeced30b..a605857c60 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb @@ -40,7 +40,7 @@ do_write_config:append:class-target() { ntlm_auth = '${bindir}/ntlm_auth' EOF } -EXTRA_OEMESON += "--cross-file ${WORKDIR}/soup.cross" +EXTRA_OEMESON:append:class-target = " --cross-file ${WORKDIR}/soup.cross" EXTRA_OEMESON += "-Dvapi=disabled -Dtls_check=false" From patchwork Fri Oct 13 21:52:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32190 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 0040AC46CA1 for ; Fri, 13 Oct 2023 21:54:13 +0000 (UTC) Received: from mail-oo1-f50.google.com (mail-oo1-f50.google.com [209.85.161.50]) by mx.groups.io with SMTP id smtpd.web11.51192.1697234045902729438 for ; Fri, 13 Oct 2023 14:54:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=OWOVO6R9; spf=softfail (domain: sakoman.com, ip: 209.85.161.50, mailfrom: steve@sakoman.com) Received: by mail-oo1-f50.google.com with SMTP id 006d021491bc7-57b9231e91dso1424127eaf.2 for ; Fri, 13 Oct 2023 14:54:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697234045; x=1697838845; 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=bMIU1tGiPzWI68vui9IuulIpBhdqmef9uTzPXGiGWCE=; b=OWOVO6R9wlIV2RccXOacBLt7y1crURhf+OV+wO4SiMEC8CMET7q+vSSHe64X8JJ0Wz SnjP8yKzRKA+t5iiF0gAOjRLoxOsO1o7lx5HxsggsKsiab6UrQYthE6huH/xd4czVeA/ 6V67Y3+7l06SBr8H91Sthwuj4VNKFp+41LgiWndDHdVDbpaFkoLT5nJZxldE18deVPn+ zVnCDG38bQtdvc7Fu7VNiPgI3g98onO8U0Ea3VGJetyR/Y1z3L5hVKpp92tUqhfgagaJ qvjJTUzx+A6eiDJDL+fBB2I7rr/1OtfmDBzBA6uKlesflmRLwpf+kBu8C/TBvSDiaKiX goOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697234045; x=1697838845; 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=bMIU1tGiPzWI68vui9IuulIpBhdqmef9uTzPXGiGWCE=; b=DHrYmhOFrcM7zhQH/mNdh3py9eD9jAqvaDCJOpwdAcwnIbBfmskzkXb0Tw17gTzyDA GAKbyefpX7PMojm0gHNInyi7wa5ZU4J37P/ZBFJVYSHYz3Fw05c6L7Hj3t2KeNxM2+lg 17gxU6e+pSgxTt5Pv9eMWunViXPRQBjk1bcPfDq/aWC8Efx9lY5XRWYIs3yU3D5TcBwo Yk26Nxw51qCESk1ZATshrUnoJmLBoQSBkKLhtO5HBEyPcn1Edl1g5DTHSFxCr3+iKYmL 7y6zB/L4FPYoAr9LcBXkbBTovWTJUeQDK777jsE5W4huz/liJwjjVJyWfODCXMPZ8zo0 hmGg== X-Gm-Message-State: AOJu0YxmnejkThnEbQ9GcmsImri5SUqG4yMpoDQsWUYvK7H+Oo7DPgvO JYeNN+Ll2YTrtNJmkYmUAHA/FxdX7IFfv4C3hM4= X-Google-Smtp-Source: AGHT+IEqudJkZgm5isQ7AZU18wGBezig8EW3vJtTGaAeoR7yRqxhJdCmrzHJ/8nJwSQtoENYqk701g== X-Received: by 2002:a05:6358:98a8:b0:140:f00a:ee2c with SMTP id q40-20020a05635898a800b00140f00aee2cmr35824216rwa.11.1697234044755; Fri, 13 Oct 2023 14:54:04 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.54.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:54:04 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 26/27] oeqa/selftest/wic: Improve assertTrue calls Date: Fri, 13 Oct 2023 11:52:50 -1000 Message-Id: <52a2455ba7d91d404fc2c4568c805cf1fbe2b2ad.1697233866.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 ; Fri, 13 Oct 2023 21:54:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189103 From: Richard Purdie assertTrue is a problematic call use in test cases since when it fails, you just get an unhelpful "False is not True" message. Replace some uses with assertIn/assertNotIn which will give more helpful results and for the rest, add msg entries which given more helpful debugging. For example, this patch would help debugging of #15176. Signed-off-by: Richard Purdie (cherry picked from commit 35d4c39e0df1a304f557471151a03d1e4b0f30c7) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/wic.py | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index b26b649c3a..760b1c67ce 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py @@ -729,7 +729,7 @@ part /etc --source rootfs --fstype=ext4 --change-directory=etc wicout = glob(os.path.join(self.resultdir, "wictestdisk-*.direct")) self.assertEqual(1, len(wicout)) size = os.path.getsize(wicout[0]) - self.assertTrue(size > extraspace) + self.assertTrue(size > extraspace, msg="Extra space not present (%s vs %s)" % (size, extraspace)) class Wic2(WicTestCase): @@ -756,7 +756,7 @@ class Wic2(WicTestCase): basename = bb_vars['IMAGE_BASENAME'] self.assertEqual(basename, image) path = os.path.join(imgdatadir, basename) + '.env' - self.assertTrue(os.path.isfile(path)) + self.assertTrue(os.path.isfile(path), msg="File %s wasn't generated as expected" % path) wicvars = set(bb_vars['WICVARS'].split()) # filter out optional variables @@ -769,7 +769,7 @@ class Wic2(WicTestCase): # test if variables used by wic present in the .env file for var in wicvars: self.assertTrue(var in content, "%s is not in .env file" % var) - self.assertTrue(content[var]) + self.assertTrue(content[var], "%s doesn't have a value (%s)" % (var, content[var])) def test_image_vars_dir_short(self): """Test image vars directory selection -v option""" @@ -816,8 +816,8 @@ class Wic2(WicTestCase): # pointing to existing files for suffix in ('wic', 'manifest'): path = prefix + suffix - self.assertTrue(os.path.islink(path)) - self.assertTrue(os.path.isfile(os.path.realpath(path))) + self.assertTrue(os.path.islink(path), msg="Link %s wasn't generated as expected" % path) + self.assertTrue(os.path.isfile(os.path.realpath(path)), msg="File linked to by %s wasn't generated as expected" % path) # TODO this should work on aarch64 @skipIfNotArch(['i586', 'i686', 'x86_64']) @@ -1087,7 +1087,7 @@ class Wic2(WicTestCase): self.remove_config(config) bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'IMAGE_LINK_NAME'], image) image_path = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], '%s.wic' % bb_vars['IMAGE_LINK_NAME']) - self.assertTrue(os.path.exists(image_path)) + self.assertTrue(os.path.exists(image_path), msg="Image file %s wasn't generated as expected" % image_path) sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') @@ -1328,11 +1328,11 @@ class Wic2(WicTestCase): orig_sizes = [int(line.split()[3]) for line in orig.output.split('\n')[1:]] exp_sizes = [int(line.split()[3]) for line in exp.output.split('\n')[1:]] self.assertEqual(orig_sizes[0], exp_sizes[0]) # first partition is not resized - self.assertTrue(orig_sizes[1] < exp_sizes[1]) + self.assertTrue(orig_sizes[1] < exp_sizes[1], msg="Parition size wasn't enlarged (%s vs %s)" % (orig_sizes[1], exp_sizes[1])) # Check if all free space is partitioned result = runCmd("%s/usr/sbin/sfdisk -F %s" % (sysroot, new_image_path)) - self.assertTrue("0 B, 0 bytes, 0 sectors" in result.output) + self.assertIn("0 B, 0 bytes, 0 sectors", result.output) os.rename(image_path, image_path + '.bak') os.rename(new_image_path, image_path) @@ -1390,7 +1390,7 @@ class ModifyTests(WicTestCase): # check if file is there result = runCmd("wic ls %s:1/ -n %s" % (images[0], sysroot)) self.assertEqual(7, len(result.output.split('\n'))) - self.assertTrue(os.path.basename(testfile.name) in result.output) + self.assertIn(os.path.basename(testfile.name), result.output) # prepare directory testdir = os.path.join(self.resultdir, 'wic-test-cp-dir') @@ -1404,13 +1404,13 @@ class ModifyTests(WicTestCase): # check if directory is there result = runCmd("wic ls %s:1/ -n %s" % (images[0], sysroot)) self.assertEqual(8, len(result.output.split('\n'))) - self.assertTrue(os.path.basename(testdir) in result.output) + self.assertIn(os.path.basename(testdir), result.output) # copy the file from the partition and check if it success dest = '%s-cp' % testfile.name runCmd("wic cp %s:1/%s %s -n %s" % (images[0], os.path.basename(testfile.name), dest, sysroot)) - self.assertTrue(os.path.exists(dest)) + self.assertTrue(os.path.exists(dest), msg="File %s wasn't generated as expected" % dest) def test_wic_rm(self): @@ -1454,7 +1454,7 @@ class ModifyTests(WicTestCase): # list directory content of the second ext4 partition result = runCmd("wic ls %s:2/ -n %s" % (images[0], sysroot)) self.assertTrue(set(['bin', 'home', 'proc', 'usr', 'var', 'dev', 'lib', 'sbin']).issubset( - set(line.split()[-1] for line in result.output.split('\n') if line))) + set(line.split()[-1] for line in result.output.split('\n') if line)), msg="Expected directories not present %s" % result.output) def test_wic_cp_ext(self): """Test copy files and directories to the ext partition.""" @@ -1469,7 +1469,7 @@ class ModifyTests(WicTestCase): # list directory content of the ext4 partition result = runCmd("wic ls %s:2/ -n %s" % (images[0], sysroot)) dirs = set(line.split()[-1] for line in result.output.split('\n') if line) - self.assertTrue(set(['bin', 'home', 'proc', 'usr', 'var', 'dev', 'lib', 'sbin']).issubset(dirs)) + self.assertTrue(set(['bin', 'home', 'proc', 'usr', 'var', 'dev', 'lib', 'sbin']).issubset(dirs), msg="Expected directories not present %s" % dirs) with NamedTemporaryFile("w", suffix=".wic-cp") as testfile: testfile.write("test") @@ -1484,12 +1484,12 @@ class ModifyTests(WicTestCase): # check if the file to copy is in the partition result = runCmd("wic ls %s:2/etc/ -n %s" % (images[0], sysroot)) - self.assertTrue('fstab' in [line.split()[-1] for line in result.output.split('\n') if line]) + self.assertIn('fstab', [line.split()[-1] for line in result.output.split('\n') if line]) # copy file from the partition, replace the temporary file content with it and # check for the file size to validate the copy runCmd("wic cp %s:2/etc/fstab %s -n %s" % (images[0], testfile.name, sysroot)) - self.assertTrue(os.stat(testfile.name).st_size > 0) + self.assertTrue(os.stat(testfile.name).st_size > 0, msg="Filesize not as expected %s" % os.stat(testfile.name).st_size) def test_wic_rm_ext(self): @@ -1504,18 +1504,18 @@ class ModifyTests(WicTestCase): # list directory content of the /etc directory on ext4 partition result = runCmd("wic ls %s:2/etc/ -n %s" % (images[0], sysroot)) - self.assertTrue('fstab' in [line.split()[-1] for line in result.output.split('\n') if line]) + self.assertIn('fstab', [line.split()[-1] for line in result.output.split('\n') if line]) # remove file runCmd("wic rm %s:2/etc/fstab -n %s" % (images[0], sysroot)) # check if it's removed result = runCmd("wic ls %s:2/etc/ -n %s" % (images[0], sysroot)) - self.assertTrue('fstab' not in [line.split()[-1] for line in result.output.split('\n') if line]) + self.assertNotIn('fstab', [line.split()[-1] for line in result.output.split('\n') if line]) # remove non-empty directory runCmd("wic rm -r %s:2/etc/ -n %s" % (images[0], sysroot)) # check if it's removed result = runCmd("wic ls %s:2/ -n %s" % (images[0], sysroot)) - self.assertTrue('etc' not in [line.split()[-1] for line in result.output.split('\n') if line]) + self.assertNotIn('etc', [line.split()[-1] for line in result.output.split('\n') if line]) From patchwork Fri Oct 13 21:52:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32189 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 003CCCDB47E for ; Fri, 13 Oct 2023 21:54:13 +0000 (UTC) Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com [209.85.210.53]) by mx.groups.io with SMTP id smtpd.web10.51178.1697234048208970884 for ; Fri, 13 Oct 2023 14:54:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=uJ9T3J50; spf=softfail (domain: sakoman.com, ip: 209.85.210.53, mailfrom: steve@sakoman.com) Received: by mail-ot1-f53.google.com with SMTP id 46e09a7af769-6c4e38483d2so1716102a34.1 for ; Fri, 13 Oct 2023 14:54:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697234047; x=1697838847; 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=dyz7TvUVx8YnpXSZCPXvMiRZFolbWLIbgy0fGBCb+FM=; b=uJ9T3J50WnHYq2efbjLVlzhamds/F/qn+x3X52tOAVcU1R83vZsjrvrptBuvq+vDsz 9bVfKGDIhOxAGjetnTbc6wdMktFTWC52GwGTwBbBHsj4l/AV8aDrnWtsjIkx43VDk1X2 nfvoaQjL/YDVZP91D833JwEYPGzNahvKihvPyrqaJbYlmNqUE4SIxvgjl2txem1nsrSZ oqmZCjQko3Q1gU1Fqa1veEMLWTgMEaECIBjAIK0N2dpdp2w1bPZ9Eib3u1e3pLG0En8r 3JS62vl20vVljSB4TvefWXI2Wx8ABriBLJJtXLfzE+eKMrNg2E3ZHUA3RUBugQ+xJXoZ 8kDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697234047; x=1697838847; 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=dyz7TvUVx8YnpXSZCPXvMiRZFolbWLIbgy0fGBCb+FM=; b=w3DLW122/ZBxNakiYCfJXvV7mogksASbYBjTEzbxONnpBCNcFsHj/lgYqepmmQU6AR vHz30Zmw5Nkvx+SGUPYQ57iiRHRyOG5Qbg7PWKH2EQeAsvwhBZam6YIcPSEgdhLm2n0W hl3+kmmweybvGXTohHN0MAbrevGLcdPtAHOaZKzQKJcnVdJalgsW66nCv64iP4xnCzFb S1nLDeNmqgyUZI72TouOOVHGYfAYLoAf5yyyPO/Ap5Uq1BSDYtRMmE66m7g4n/xDSkUW bRLEVLu9QvidNdYbOgjHaoapUXu4JAqNkLDnddpwIwGPbtZr7oR2fqU3DYpOnfPa/+vy kwRw== X-Gm-Message-State: AOJu0YxCjxw5LCxx7kBeDE8Cx+5vcnO4cjkHopABfBs9Di//GbI86mo9 TwuDQJk8dAjjx1w54IyaRSYoxPJbVbHDvYANoXs= X-Google-Smtp-Source: AGHT+IEpKqpxmKOVMhSw75jcXgbS6hjjh10TsPuthkXOBnspQX9I+Q6333St2Lsl5RdIJQrRFkvV4A== X-Received: by 2002:a9d:6a50:0:b0:6c4:f91d:2d9c with SMTP id h16-20020a9d6a50000000b006c4f91d2d9cmr30253208otn.23.1697234047201; Fri, 13 Oct 2023 14:54:07 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u22-20020a62ed16000000b00690fe1c928csm14307334pfh.147.2023.10.13.14.54.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:54:06 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 27/27] gdb: fix RDEPENDS for PACKAGECONFIG[tui] Date: Fri, 13 Oct 2023 11:52:51 -1000 Message-Id: <266944eb216912b7b2a935360aa51cd79847a071.1697233866.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 ; Fri, 13 Oct 2023 21:54:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189104 From: Stefan Tauner TUI mode needs terminfo at runtime, which is required to be explicitly stated in the respective PACKAGECONFIG variable. Without this change /etc/terminfo/ might be missing, which leads to a runtime error when trying to use tui, e.g.: (gdb) tui enable Cannot enable the TUI: error opening terminal [TERM=xterm-256color] Signed-off-by: Stefan Tauner Signed-off-by: Richard Purdie (cherry picked from commit 5f17bc03a0c2d894e43c3c835fa38a24b1d5df64) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/gdb/gdb-common.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc index 925b0c2f80..0f392357fe 100644 --- a/meta/recipes-devtools/gdb/gdb-common.inc +++ b/meta/recipes-devtools/gdb/gdb-common.inc @@ -35,8 +35,7 @@ PACKAGECONFIG ??= "readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline" PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python3,python3 python3-codecs" PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace" -# ncurses is already a hard DEPENDS, but would be added here if it weren't -PACKAGECONFIG[tui] = "--enable-tui,--disable-tui" +PACKAGECONFIG[tui] = "--enable-tui,--disable-tui,,ncurses-terminfo-base" PACKAGECONFIG[xz] = "--with-lzma --with-liblzma-prefix=${STAGING_DIR_HOST},--without-lzma,xz" PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, elfutils"