From patchwork Sun Jun 25 21:22:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26367 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 8AB0EEB64DC for ; Sun, 25 Jun 2023 21:22:47 +0000 (UTC) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.groups.io with SMTP id smtpd.web11.20165.1687728166804383773 for ; Sun, 25 Jun 2023 14:22:47 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=jr3xZ8Li; spf=pass (domain: gmail.com, ip: 209.85.221.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-31114b46d62so3209862f8f.3 for ; Sun, 25 Jun 2023 14:22:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728165; x=1690320165; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=G47PTVe4sVv0+eCCLfw4gJ+y1vl14tTAzDnxOjjWoIY=; b=jr3xZ8LiG0sDzVy4XLgLK3kF7z2lJOCwX+g7kLoyFCaAm8gKjRGSejh7VMT1sNbKxW kSZ8NVvCGX616bQczPDbjP5lAaftuvQ8XDS12LKNq3xV9BROWR9czsntBNSjE5eRHptH PahMoZLSu7wm7MtvJ2Eoys/lHeGlwf2tOLnyPm9wjKl4v5CHlTrvcZek8JN4dloc74R5 nymqYITbIWSWrOi/ucmuYN7lVh+9MmyE0If8G6XVwIM+8IChisg4UHrYwsTwAS+92Sml MyuCmh0uj0SZtmi5p7+u1DvbUOMcGmpFHjAQua/u44EgJ3ymHUH65ckpGxZxLg+GL5jZ wxEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728165; x=1690320165; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=G47PTVe4sVv0+eCCLfw4gJ+y1vl14tTAzDnxOjjWoIY=; b=FGnjd4a8aXLnrx8eoSXbaoj7+TuOpWJ/mn0nMhGlNRs/xVDlC6iqXh+s2LeZBR1gTQ B90nTup4c7GSInecc/BPyDEbo0jE2J8FbNB9hNji/3mwgFrYPd3n8QvtQ+N1UxhQFB4u dW/9KuXnNXpSkocmNza5KsUopGggTeDy4N35c7W5SqHjP9U3qsSsPOR6kpQoTyBIwjJy uyu8zCe1IAmlDvN9cjyZoOdWrYX/6Fvr6CXWV2JpeHcw0ypnumKBefdd4PD3ptfcmu8e 1liHBYxhoHNgfwD8E+LP62Hg+NFoz+7W33ZW6D0oJgW7KkPEGu4Kj4dsB9aTPGSXZbQy x4Jg== X-Gm-Message-State: AC+VfDzc/pxzUjqMtCbpljvK+3dKr5X55CGDk0fp+CIGDVoOssowQcJ2 1BEIa/vRSZMxzfUPtYrEc6IOKnrF8QZbaw== X-Google-Smtp-Source: ACHHUZ7Q7FioaIoHMJG9fImcYLBZOHa+42avKutP6tsOsr5pY6yLoT8gY9bYF67OJUECnEy0BCnTug== X-Received: by 2002:a5d:4741:0:b0:306:30ea:a060 with SMTP id o1-20020a5d4741000000b0030630eaa060mr23757850wrs.51.1687728164980; Sun, 25 Jun 2023 14:22:44 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:44 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 01/21] libxcrypt: upgrade 4.4.34 -> 4.4.35 Date: Sun, 25 Jun 2023 23:22:21 +0200 Message-Id: <20230625212241.915739-1-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 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 ; Sun, 25 Jun 2023 21:22:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183376 Signed-off-by: Alexander Kanavin --- .../{libxcrypt-compat_4.4.34.bb => libxcrypt-compat_4.4.35.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- .../libxcrypt/{libxcrypt_4.4.34.bb => libxcrypt_4.4.35.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.34.bb => libxcrypt-compat_4.4.35.bb} (100%) rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.34.bb => libxcrypt_4.4.35.bb} (100%) diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.34.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.35.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.34.bb rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.35.bb diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index 4d145cf3ccd..2e4db283bf2 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https" -SRCREV = "e80cfde51bb4fe4bcf27585810e0b4ea3d1e4d7d" +SRCREV = "321222c91c4060362b1085b3ca7c29867812ac0a" SRCBRANCH ?= "master" SRC_URI += "file://fix_cflags_handling.patch" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.34.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.35.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.34.bb rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.35.bb From patchwork Sun Jun 25 21:22:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26369 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 684CBEB64DC for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.groups.io with SMTP id smtpd.web10.20341.1687728167241705869 for ; Sun, 25 Jun 2023 14:22:47 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=E2w95/PA; spf=pass (domain: gmail.com, ip: 209.85.221.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-3113675d582so2165041f8f.3 for ; Sun, 25 Jun 2023 14:22:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728165; x=1690320165; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aXuKZ2WxVUqDWhb6D+NBdP4VnUYM1bc0Jh0JsuqDRcI=; b=E2w95/PAcxFxocd8dMqaclPYYZO/PkJ3mqwO+X0lWcB2DQRBZlyqc6svcUTwuoNdEP 4JIPCWJ+8jbJdMcMrn3FtDxknkTC5WMiYdG2AKs07aq/sEt9LbExG338cXUsrOglP5Z6 yn6LM2xdOMsFEE4WYLZ93LND4u2XcHMPYtYAg0fn7hVn0GJBBMy30qHMxYxmIEqDhqbS YA/g3v4v76misCF07k0HMEr1NpEyIbzv4/nry5wUs+MOvyxeMlX6EgC+CGEVcILrGK2s UKlYoobWc03hco1SeyNeX6oOV9D+SI8mf+lg3/ONSwyUKHe28QUg5ZvIdplzmDVg8054 ljUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728165; x=1690320165; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aXuKZ2WxVUqDWhb6D+NBdP4VnUYM1bc0Jh0JsuqDRcI=; b=OU+0cjMBEnbHfhEWmzUs90r7P4aUmKqnPfAYzOFtegOhik8CkH9VMvTa2YaSRJMfFD h41NzZOaJTz5tkDp3benrA+uimlswkzLnYmxaGNAY9HEhqtClnpCEvBribTdHVV13VkH jo7J09fcfx1YYAu6Hk04SDYYeXZM1x2g/pMvdvPvL3QNNMxgOQIALlDyioZk+MTwSflO tVnHYjrlmavbOfVjI2Mmzp1N6YP7tsxwHqVmmZeIjh1ubpilME9sK/7BQeaJWom1vBrB iO+p3/4aq1/qpLi1IQI0bGTGN6ZbWDZv+SvD5YsrWs+oA5yvl8suQpUunFjbH9mCxUtz 86XQ== X-Gm-Message-State: AC+VfDzDDy51s055GCpoNiF9SZDuMBQAP3VBZR9R3+e2m8PY9QmfqUY7 LpL1D9uhFdpQci8hAK1mBYCo9yjctYabSw== X-Google-Smtp-Source: ACHHUZ4AMt1Me6x4LKyKU4N+ZzkUVjwNT1BWDlkOQiAHZdaTkiCfBAcLolgJ2S2n0P31qcyQgHWq4w== X-Received: by 2002:a5d:608f:0:b0:313:f157:7d56 with SMTP id w15-20020a5d608f000000b00313f1577d56mr489498wrt.30.1687728165487; Sun, 25 Jun 2023 14:22:45 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:45 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 02/21] libxml2: update 2.10.4 -> 2.11.4 Date: Sun, 25 Jun 2023 23:22:22 +0200 Message-Id: <20230625212241.915739-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183377 Drop backports. Drop libxml-64bit.patch (no longer necessary). Signed-off-by: Alexander Kanavin --- .../libxml/libxml2/fix-tests.patch | 222 ------------------ .../libxml/libxml2/install-tests.patch | 17 +- .../libxml/libxml2/libxml-64bit.patch | 28 --- .../libxml2/libxml-m4-use-pkgconfig.patch | 212 ----------------- .../{libxml2_2.10.4.bb => libxml2_2.11.4.bb} | 5 +- 5 files changed, 8 insertions(+), 476 deletions(-) delete mode 100644 meta/recipes-core/libxml/libxml2/fix-tests.patch delete mode 100644 meta/recipes-core/libxml/libxml2/libxml-64bit.patch delete mode 100644 meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch rename meta/recipes-core/libxml/{libxml2_2.10.4.bb => libxml2_2.11.4.bb} (95%) diff --git a/meta/recipes-core/libxml/libxml2/fix-tests.patch b/meta/recipes-core/libxml/libxml2/fix-tests.patch deleted file mode 100644 index 80678efcfee..00000000000 --- a/meta/recipes-core/libxml/libxml2/fix-tests.patch +++ /dev/null @@ -1,222 +0,0 @@ -Backport the following patches to fix the reader2 and runsuite test cases: - -b92768cd tests: Enable "runsuite" test -0ac8c15e python/tests/reader2: use absolute paths everywhere -b9ba5e1d python/tests/reader2: always exit(1) if a test fails - -Upstream-Status: Backport -Signed-off-by: Ross Burton - -diff --git a/python/tests/reader2.py b/python/tests/reader2.py -index 65cecd47..6e6353b4 100755 ---- a/python/tests/reader2.py -+++ b/python/tests/reader2.py -@@ -6,7 +6,6 @@ - import sys - import glob - import os --import string - import libxml2 - try: - import StringIO -@@ -20,103 +19,104 @@ libxml2.debugMemory(1) - - err = "" - basedir = os.path.dirname(os.path.realpath(__file__)) --dir_prefix = os.path.join(basedir, "../../test/valid/") -+dir_prefix = os.path.realpath(os.path.join(basedir, "..", "..", "test", "valid")) -+ - # This dictionary reflects the contents of the files - # ../../test/valid/*.xml.err that are not empty, except that - # the file paths in the messages start with ../../test/ - - expect = { - '766956': --"""../../test/valid/dtds/766956.dtd:2: parser error : PEReference: expecting ';' -+"""{0}/dtds/766956.dtd:2: parser error : PEReference: expecting ';' - %ä%ent; - ^ --../../test/valid/dtds/766956.dtd:2: parser error : Content error in the external subset -+{0}/dtds/766956.dtd:2: parser error : Content error in the external subset - %ä%ent; - ^ - Entity: line 1: - value - ^ --""", -+""".format(dir_prefix), - '781333': --"""../../test/valid/781333.xml:4: element a: validity error : Element a content does not follow the DTD, expecting ( ..., got -+"""{0}/781333.xml:4: element a: validity error : Element a content does not follow the DTD, expecting ( ..., got - - ^ --../../test/valid/781333.xml:5: element a: validity error : Element a content does not follow the DTD, Expecting more child -+{0}/781333.xml:5: element a: validity error : Element a content does not follow the DTD, Expecting more child - - ^ --""", -+""".format(dir_prefix), - 'cond_sect2': --"""../../test/valid/dtds/cond_sect2.dtd:15: parser error : All markup of the conditional section is not in the same entity -+"""{0}/dtds/cond_sect2.dtd:15: parser error : All markup of the conditional section is not in the same entity - %ent; - ^ - Entity: line 1: - ]]> - ^ --../../test/valid/dtds/cond_sect2.dtd:17: parser error : Content error in the external subset -+{0}/dtds/cond_sect2.dtd:17: parser error : Content error in the external subset - - ^ --""", -+""".format(dir_prefix), - 'rss': --"""../../test/valid/rss.xml:177: element rss: validity error : Element rss does not carry attribute version -+"""{0}/rss.xml:177: element rss: validity error : Element rss does not carry attribute version - - ^ --""", -+""".format(dir_prefix), - 't8': --"""../../test/valid/t8.xml:6: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration -+"""{0}/t8.xml:6: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration - - %defroot; %defmiddle; %deftest; - ^ - Entity: line 1: - <!ELEMENT root (middle) > - ^ --../../test/valid/t8.xml:6: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration -+{0}/t8.xml:6: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration - - %defroot; %defmiddle; %deftest; - ^ - Entity: line 1: - <!ELEMENT middle (test) > - ^ --../../test/valid/t8.xml:6: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration -+{0}/t8.xml:6: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration - - %defroot; %defmiddle; %deftest; - ^ - Entity: line 1: - <!ELEMENT test (#PCDATA) > - ^ --""", -+""".format(dir_prefix), - 't8a': --"""../../test/valid/t8a.xml:6: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration -+"""{0}/t8a.xml:6: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration - - %defroot;%defmiddle;%deftest; - ^ - Entity: line 1: - <!ELEMENT root (middle) > - ^ --../../test/valid/t8a.xml:6: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration -+{0}/t8a.xml:6: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration - - %defroot;%defmiddle;%deftest; - ^ - Entity: line 1: - <!ELEMENT middle (test) > - ^ --../../test/valid/t8a.xml:6: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration -+{0}/t8a.xml:6: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration - - %defroot;%defmiddle;%deftest; - ^ - Entity: line 1: - <!ELEMENT test (#PCDATA) > - ^ --""", -+""".format(dir_prefix), - 'xlink': --"""../../test/valid/xlink.xml:450: element termdef: validity error : ID dt-arc already defined -+"""{0}/xlink.xml:450: element termdef: validity error : ID dt-arc already defined -

An +Date: Mon, 5 Dec 2022 17:02:32 +0000 +Subject: [PATCH] add yocto-specific install-ptest target + Add a target to install the test suite. Upstream-Status: Inappropriate Signed-off-by: Ross Burton -From c7809dc6947324ea506a0c2bf132ecd37156f211 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Mon, 5 Dec 2022 17:02:32 +0000 -Subject: [PATCH] add yocto-specific install-ptest target - --- Makefile.am | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Makefile.am b/Makefile.am -index 316109b1..15e100be 100644 +index 5bc4018..57d27af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,6 +26,16 @@ check_PROGRAMS = \ @@ -32,7 +32,4 @@ index 316109b1..15e100be 100644 + bin_PROGRAMS = xmllint xmlcatalog - nodist_bin_SCRIPTS = xml2-config --- -2.34.1 - + bin_SCRIPTS = xml2-config diff --git a/meta/recipes-core/libxml/libxml2/libxml-64bit.patch b/meta/recipes-core/libxml/libxml2/libxml-64bit.patch deleted file mode 100644 index fd8e469dd31..00000000000 --- a/meta/recipes-core/libxml/libxml2/libxml-64bit.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 056b14345b1abd76a761ab14538f1bc21302781a Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Sat, 11 May 2019 20:26:51 +0800 -Subject: [PATCH] libxml 64bit - -Upstream-Status: Backport [from debian: bugs.debian.org/439843] -Signed-off-by: Hongxu Jia ---- - libxml.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/libxml.h b/libxml.h -index 64e30f7..4e80d90 100644 ---- a/libxml.h -+++ b/libxml.h -@@ -15,6 +15,9 @@ - #ifndef _LARGEFILE_SOURCE - #define _LARGEFILE_SOURCE - #endif -+#ifndef _LARGEFILE64_SOURCE -+#define _LARGEFILE64_SOURCE -+#endif - #ifndef _FILE_OFFSET_BITS - #define _FILE_OFFSET_BITS 64 - #endif --- -2.7.4 - diff --git a/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch b/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch deleted file mode 100644 index 639c80bd6ce..00000000000 --- a/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch +++ /dev/null @@ -1,212 +0,0 @@ -Change the AM_PATH_XML2 macros to use pkg-config instead of xml2-config. - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/-/commit/d598d8af0913b6e3d4e61ffa62397a275b669dca] -Signed-off-by: Ross Burton - - libxml.m4 | 189 ++---------------------------------------------------- - 1 file changed, 5 insertions(+), 184 deletions(-) - -diff --git a/libxml.m4 b/libxml.m4 -index fc7790c..1c53585 100644 ---- a/libxml.m4 -+++ b/libxml.m4 -@@ -1,191 +1,12 @@ --# Configure paths for LIBXML2 --# Simon Josefsson 2020-02-12 --# Fix autoconf 2.70+ warnings --# Mike Hommey 2004-06-19 --# use CPPFLAGS instead of CFLAGS --# Toshio Kuratomi 2001-04-21 --# Adapted from: --# Configure paths for GLIB --# Owen Taylor 97-11-3 -- - dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) - dnl Test for XML, and define XML_CPPFLAGS and XML_LIBS - dnl --AC_DEFUN([AM_PATH_XML2],[ --AC_ARG_WITH(xml-prefix, -- [ --with-xml-prefix=PFX Prefix where libxml is installed (optional)], -- xml_config_prefix="$withval", xml_config_prefix="") --AC_ARG_WITH(xml-exec-prefix, -- [ --with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional)], -- xml_config_exec_prefix="$withval", xml_config_exec_prefix="") --AC_ARG_ENABLE(xmltest, -- [ --disable-xmltest Do not try to compile and run a test LIBXML program],, -- enable_xmltest=yes) -- -- if test x$xml_config_exec_prefix != x ; then -- xml_config_args="$xml_config_args" -- if test x${XML2_CONFIG+set} != xset ; then -- XML2_CONFIG=$xml_config_exec_prefix/bin/xml2-config -- fi -- fi -- if test x$xml_config_prefix != x ; then -- xml_config_args="$xml_config_args --prefix=$xml_config_prefix" -- if test x${XML2_CONFIG+set} != xset ; then -- XML2_CONFIG=$xml_config_prefix/bin/xml2-config -- fi -- fi -- -- AC_PATH_PROG(XML2_CONFIG, xml2-config, no) -- min_xml_version=ifelse([$1], ,2.0.0,[$1]) -- AC_MSG_CHECKING(for libxml - version >= $min_xml_version) -- no_xml="" -- if test "$XML2_CONFIG" = "no" ; then -- no_xml=yes -- else -- XML_CPPFLAGS=`$XML2_CONFIG $xml_config_args --cflags` -- XML_LIBS=`$XML2_CONFIG $xml_config_args --libs` -- xml_config_major_version=`$XML2_CONFIG $xml_config_args --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -- xml_config_minor_version=`$XML2_CONFIG $xml_config_args --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -- xml_config_micro_version=`$XML2_CONFIG $xml_config_args --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -- if test "x$enable_xmltest" = "xyes" ; then -- ac_save_CPPFLAGS="$CPPFLAGS" -- ac_save_LIBS="$LIBS" -- CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS" -- LIBS="$XML_LIBS $LIBS" --dnl --dnl Now check if the installed libxml is sufficiently new. --dnl (Also sanity checks the results of xml2-config to some extent) --dnl -- rm -f conf.xmltest -- AC_RUN_IFELSE( -- [AC_LANG_SOURCE([[ --#include --#include --#include --#include -- --int --main() --{ -- int xml_major_version, xml_minor_version, xml_micro_version; -- int major, minor, micro; -- char *tmp_version; -- -- system("touch conf.xmltest"); -- -- /* Capture xml2-config output via autoconf/configure variables */ -- /* HP/UX 9 (%@#!) writes to sscanf strings */ -- tmp_version = (char *)strdup("$min_xml_version"); -- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -- printf("%s, bad version string from xml2-config\n", "$min_xml_version"); -- exit(1); -- } -- free(tmp_version); -- -- /* Capture the version information from the header files */ -- tmp_version = (char *)strdup(LIBXML_DOTTED_VERSION); -- if (sscanf(tmp_version, "%d.%d.%d", &xml_major_version, &xml_minor_version, &xml_micro_version) != 3) { -- printf("%s, bad version string from libxml includes\n", "LIBXML_DOTTED_VERSION"); -- exit(1); -- } -- free(tmp_version); -- -- /* Compare xml2-config output to the libxml headers */ -- if ((xml_major_version != $xml_config_major_version) || -- (xml_minor_version != $xml_config_minor_version) || -- (xml_micro_version != $xml_config_micro_version)) -- { -- printf("*** libxml header files (version %d.%d.%d) do not match\n", -- xml_major_version, xml_minor_version, xml_micro_version); -- printf("*** xml2-config (version %d.%d.%d)\n", -- $xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version); -- return 1; -- } --/* Compare the headers to the library to make sure we match */ -- /* Less than ideal -- doesn't provide us with return value feedback, -- * only exits if there's a serious mismatch between header and library. -- */ -- LIBXML_TEST_VERSION; -- -- /* Test that the library is greater than our minimum version */ -- if ((xml_major_version > major) || -- ((xml_major_version == major) && (xml_minor_version > minor)) || -- ((xml_major_version == major) && (xml_minor_version == minor) && -- (xml_micro_version >= micro))) -- { -- return 0; -- } -- else -- { -- printf("\n*** An old version of libxml (%d.%d.%d) was found.\n", -- xml_major_version, xml_minor_version, xml_micro_version); -- printf("*** You need a version of libxml newer than %d.%d.%d.\n", -- major, minor, micro); -- printf("***\n"); -- printf("*** If you have already installed a sufficiently new version, this error\n"); -- printf("*** probably means that the wrong copy of the xml2-config shell script is\n"); -- printf("*** being found. The easiest way to fix this is to remove the old version\n"); -- printf("*** of LIBXML, but you can also set the XML2_CONFIG environment to point to the\n"); -- printf("*** correct copy of xml2-config. (In this case, you will have to\n"); -- printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); -- printf("*** so that the correct libraries are found at run-time))\n"); -- } -- return 1; --} --]])],, no_xml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -- CPPFLAGS="$ac_save_CPPFLAGS" -- LIBS="$ac_save_LIBS" -- fi -- fi -+AC_DEFUN([AM_PATH_XML2],[ -+ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) - -- if test "x$no_xml" = x ; then -- AC_MSG_RESULT(yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)) -- ifelse([$2], , :, [$2]) -- else -- AC_MSG_RESULT(no) -- if test "$XML2_CONFIG" = "no" ; then -- echo "*** The xml2-config script installed by LIBXML could not be found" -- echo "*** If libxml was installed in PREFIX, make sure PREFIX/bin is in" -- echo "*** your path, or set the XML2_CONFIG environment variable to the" -- echo "*** full path to xml2-config." -- else -- if test -f conf.xmltest ; then -- : -- else -- echo "*** Could not run libxml test program, checking why..." -- CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS" -- LIBS="$LIBS $XML_LIBS" -- AC_LINK_IFELSE( -- [AC_LANG_PROGRAM([[ --#include --#include --]], [[ LIBXML_TEST_VERSION; return 0;]])], -- [ echo "*** The test program compiled, but did not run. This usually means" -- echo "*** that the run-time linker is not finding LIBXML or finding the wrong" -- echo "*** version of LIBXML. If it is not finding LIBXML, you'll need to set your" -- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -- echo "*** to the installed location Also, make sure you have run ldconfig if that" -- echo "*** is required on your system" -- echo "***" -- echo "*** If you have an old version installed, it is best to remove it, although" -- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], -- [ echo "*** The test program failed to compile or link. See the file config.log for the" -- echo "*** exact error that occurred. This usually means LIBXML was incorrectly installed" -- echo "*** or that you have moved LIBXML since it was installed. In the latter case, you" -- echo "*** may want to edit the xml2-config script: $XML2_CONFIG" ]) -- CPPFLAGS="$ac_save_CPPFLAGS" -- LIBS="$ac_save_LIBS" -- fi -- fi -+ verdep=ifelse([$1], [], [], [">= $1"]) -+ PKG_CHECK_MODULES(XML, [libxml-2.0 $verdep], [$2], [$3]) - -- XML_CPPFLAGS="" -- XML_LIBS="" -- ifelse([$3], , :, [$3]) -- fi -+ XML_CPPFLAGS=$XML_CFLAGS - AC_SUBST(XML_CPPFLAGS) -- AC_SUBST(XML_LIBS) -- rm -f conf.xmltest - ]) --- -2.34.1 - diff --git a/meta/recipes-core/libxml/libxml2_2.10.4.bb b/meta/recipes-core/libxml/libxml2_2.11.4.bb similarity index 95% rename from meta/recipes-core/libxml/libxml2_2.10.4.bb rename to meta/recipes-core/libxml/libxml2_2.11.4.bb index 4f3b17093e4..713d0baf6cc 100644 --- a/meta/recipes-core/libxml/libxml2_2.10.4.bb +++ b/meta/recipes-core/libxml/libxml2_2.11.4.bb @@ -15,13 +15,10 @@ inherit gnomebase SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testtar \ file://run-ptest \ - file://libxml-64bit.patch \ - file://fix-tests.patch \ file://install-tests.patch \ - file://libxml-m4-use-pkgconfig.patch \ " -SRC_URI[archive.sha256sum] = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45" +SRC_URI[archive.sha256sum] = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7" SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273" BINCONFIG = "${bindir}/xml2-config" From patchwork Sun Jun 25 21:22:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26386 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 C8BF4C05051 for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.groups.io with SMTP id smtpd.web10.20342.1687728167778180618 for ; Sun, 25 Jun 2023 14:22:48 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=C/sXlHWU; spf=pass (domain: gmail.com, ip: 209.85.128.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-3f9b4bf99c2so34609685e9.3 for ; Sun, 25 Jun 2023 14:22:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728166; x=1690320166; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=G+6NGK1IcrnS1KY53NA2hE1ahivDT10iB93yi1XxgQ0=; b=C/sXlHWUGEGOOf3yTOjVnDjPYnlHEafHnvGGSlFm97yV0MqrMPy1XtDJIgj/tcl/Md G4Ye/+0xYfEI8elDudru6kvz7b8WOJ3hPJPQc3e1bHsRQXUwkhpc2tpuVVsViYmsmP6N 3paOzhHDsPWqDYccGqgJD2WPn+m/9zUUvzjmotAHdrQdaVRyTWwOjt1SUREejzeyfKgF PYBGuJ/Gf32v6U+pIj8ahxYDu47yvcEEYf42S+svg4O4DcV0ZKoYt+IF4w5bSYaHKbpq Is3kLlIS6sQ+o5AfMUwdQar9dkgB9u4giFMG3mG3VtXpHBm1QNcOjz4QXnoTvTuKSSU5 JxGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728166; x=1690320166; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G+6NGK1IcrnS1KY53NA2hE1ahivDT10iB93yi1XxgQ0=; b=KOsaWhADYC4uZVq/dkEWsPz/1fLU63CubANzfvvw/ORJed551Hyyx2oWPdPb1ET/yz si5bm8hqKmzLYlXbtw6nMlraU0K/DN38GjGvbNBPuLRQpFfvmkUy0v1ThxFufzKii+na sbRit9l72SDuJJziinjcjcYZ6UCe42/1hQuoewa1xr5yNM/rQIZQfsJRlztO2ObP6hpj MYUAKUeiNVtJ/iZSAJqAekULHrw4s8Z6/dRQ5fOtJiCV03NSJzXe9X14Vdf7TnI2OzTo E0Zartdc42Lj56JCEP7PcoHepOZ9jSLfofP32mlPlgw/csmHTm1LUvzTsYzY9SpX3gRA FHJA== X-Gm-Message-State: AC+VfDyKkZOVuRxlxL8n2LWtTMbHtNZCVRuBdwI05jB1niMQTjB52CdE 67hGbNC5VcCdUHUlmR4y9eeUMa9Su+BqIA== X-Google-Smtp-Source: ACHHUZ6jd9WrPutLT0d3D5brE6cxgUirQIW7WoTtqzvWiuRMX6w8AyUrrNCz0MdvWrDQxRyjHxbeCw== X-Received: by 2002:a7b:ca51:0:b0:3fa:7421:2c66 with SMTP id m17-20020a7bca51000000b003fa74212c66mr7982677wml.16.1687728166030; Sun, 25 Jun 2023 14:22:46 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:45 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 03/21] ovmf: update 202302 -> 202305 Date: Sun, 25 Jun 2023 23:22:23 +0200 Message-Id: <20230625212241.915739-3-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183378 Signed-off-by: Alexander Kanavin --- ...ovmf-update-path-to-native-BaseTools.patch | 8 ++-- ...ile-adjust-to-build-in-under-bitbake.patch | 48 +++++++++---------- ...-map.patch => 0003-debug-prefix-map.patch} | 22 ++++----- ...oducible.patch => 0004-reproducible.patch} | 42 ++++++++-------- meta/recipes-core/ovmf/ovmf_git.bb | 8 ++-- 5 files changed, 63 insertions(+), 65 deletions(-) rename meta/recipes-core/ovmf/ovmf/{0005-debug-prefix-map.patch => 0003-debug-prefix-map.patch} (86%) rename meta/recipes-core/ovmf/ovmf/{0006-reproducible.patch => 0004-reproducible.patch} (88%) diff --git a/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch b/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch index 0c3df4fc44a..490d9e8046e 100644 --- a/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch +++ b/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch @@ -1,7 +1,7 @@ -From 1125f5a02c2f327aeffe2d6b66a9d816ad2eeec0 Mon Sep 17 00:00:00 2001 +From d8df6b6433351763e1db791dd84d432983d2b249 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Thu, 9 Jun 2016 02:23:01 -0700 -Subject: [PATCH 1/6] ovmf: update path to native BaseTools +Subject: [PATCH 1/4] ovmf: update path to native BaseTools BaseTools is a set of utilities to build EDK-based firmware. These utilities are used during the build process. Thus, they need to be built natively. @@ -16,7 +16,7 @@ Upstream-Status: Inappropriate [oe-core cross compile specific] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh -index 91b1442ade..1858dae31a 100755 +index b0334fb76e..094f86f096 100755 --- a/OvmfPkg/build.sh +++ b/OvmfPkg/build.sh @@ -24,7 +24,7 @@ then @@ -29,5 +29,5 @@ index 91b1442ade..1858dae31a 100755 source edksetup.sh BaseTools else -- -2.32.0 +2.30.2 diff --git a/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch index 2293d7e938c..efabc8febc9 100644 --- a/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch +++ b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch @@ -1,7 +1,7 @@ -From 19d4c7f9812062a683b3ba60b35aac0461190456 Mon Sep 17 00:00:00 2001 +From 7675a67b8bb207de38ff5a9dc416e8b1028eb8ce Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Fri, 26 Jul 2019 17:34:26 -0400 -Subject: [PATCH 2/6] BaseTools: makefile: adjust to build in under bitbake +Subject: [PATCH 2/4] BaseTools: makefile: adjust to build in under bitbake Prepend the build flags with those of bitbake. This is to build using the bitbake native sysroot include and library directories. @@ -14,58 +14,56 @@ to fight against how upstream wants to configure the build. Signed-off-by: Ricardo Neri Upstream-Status: Inappropriate [needs to be converted to in-recipe fixups] --- - BaseTools/Source/C/Makefiles/header.makefile | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) + BaseTools/Source/C/Makefiles/header.makefile | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile -index 0df728f327..1299d47c87 100644 +index 1bf003523b..28757aed63 100644 --- a/BaseTools/Source/C/Makefiles/header.makefile +++ b/BaseTools/Source/C/Makefiles/header.makefile -@@ -75,35 +75,36 @@ $(error Bad HOST_ARCH) +@@ -82,35 +82,34 @@ $(error Bad HOST_ARCH) endif INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) --BUILD_CPPFLAGS = $(INCLUDE) -+BUILD_CPPFLAGS += $(INCLUDE) +-CPPFLAGS = $(INCLUDE) ++CPPFLAGS += $(INCLUDE) # keep EXTRA_OPTFLAGS last BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS) ifeq ($(DARWIN),Darwin) # assume clang or clang compatible flags on OS X --BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \ -+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \ +-CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \ ++CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \ -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g else - ifeq ($(CXX), llvm) --BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ -+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ + ifneq ($(CLANG),) +-CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ ++CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ -fno-delete-null-pointer-checks -Wall -Werror \ -Wno-deprecated-declarations -Wno-self-assign \ -Wno-unused-result -nostdlib -g else --BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ -+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ +-CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ ++CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ -fno-delete-null-pointer-checks -Wall -Werror \ -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \ -Wno-unused-result -nostdlib -g endif endif - ifeq ($(CXX), llvm) --BUILD_LFLAGS = --BUILD_CXXFLAGS = -Wno-deprecated-register -Wno-unused-result -+BUILD_LFLAGS = $(LDFLAGS) -+BUILD_CXXFLAGS += -Wno-deprecated-register -Wno-unused-result + ifneq ($(CLANG),) +-LDFLAGS = +-CXXFLAGS = -Wno-deprecated-register -Wno-unused-result -std=c++14 ++CXXFLAGS += -Wno-deprecated-register -Wno-unused-result -std=c++14 else --BUILD_LFLAGS = --BUILD_CXXFLAGS = -Wno-unused-result -+BUILD_LFLAGS = $(LDFLAGS) -+BUILD_CXXFLAGS += -Wno-unused-result +-LDFLAGS = +-CXXFLAGS = -Wno-unused-result ++CXXFLAGS += -Wno-unused-result endif + ifeq ($(HOST_ARCH), IA32) # # Snow Leopard is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults -- -2.32.0 +2.30.2 diff --git a/meta/recipes-core/ovmf/ovmf/0005-debug-prefix-map.patch b/meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch similarity index 86% rename from meta/recipes-core/ovmf/ovmf/0005-debug-prefix-map.patch rename to meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch index 7adc45465c0..c0c763c1cf8 100644 --- a/meta/recipes-core/ovmf/ovmf/0005-debug-prefix-map.patch +++ b/meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch @@ -1,7 +1,7 @@ -From cf6361f27cd6318622fd58ab6c0a9407cc633b1e Mon Sep 17 00:00:00 2001 +From 03e536b20d0b72cf078052f6748de8df3836625c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 14 Jun 2021 19:56:28 +0200 -Subject: [PATCH] debug prefix map +Subject: [PATCH 3/4] debug prefix map We want to pass ${DEBUG_PREFIX_MAP} to gcc commands and also pass in --debug-prefix-map to nasm (we carry a patch to nasm for this). The @@ -22,10 +22,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template -index 471eb67c0c..a16fb5c9f1 100755 +index 503a6687c1..10ac38ef9e 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template -@@ -1849,7 +1849,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_N +@@ -739,7 +739,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink="$(DEBUG_DIR)/$(MODULE_ *_*_*_DTCPP_PATH = DEF(DTCPP_BIN) *_*_*_DTC_PATH = DEF(DTC_BIN) @@ -34,7 +34,7 @@ index 471eb67c0c..a16fb5c9f1 100755 DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -fno-pic -fno-pie DEFINE GCC_LOONGARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mabi=lp64d -fno-asynchronous-unwind-tables -fno-plt -Wno-address -fno-short-enums -fsigned-char -ffunction-sections -fdata-sections DEFINE GCC_ARM_CC_XIPFLAGS = -mno-unaligned-access -@@ -1869,8 +1869,8 @@ DEFINE GCC_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_DLINK_FLAGS) -Wl,--entry,Refere +@@ -759,8 +759,8 @@ DEFINE GCC_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_DLINK_FLAGS) -Wl,--entry,Refere DEFINE GCC_AARCH64_ASLDLINK_FLAGS = DEF(GCC_AARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS) DEFINE GCC_LOONGARCH64_ASLDLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) DEFINE GCC_IA32_X64_DLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map @@ -45,7 +45,7 @@ index 471eb67c0c..a16fb5c9f1 100755 DEFINE GCC_VFRPP_FLAGS = -x c -E -P -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h DEFINE GCC_ASLPP_FLAGS = -x c -E -include AutoGen.h DEFINE GCC_ASLCC_FLAGS = -x c -@@ -2022,7 +2022,7 @@ DEFINE GCC5_LOONGARCH64_PP_FLAGS = -mabi=lp64d -march=loongarch64 DEF( +@@ -913,7 +913,7 @@ DEFINE GCC5_LOONGARCH64_PP_FLAGS = -mabi=lp64d -march=loongarch64 DEF( *_GCC48_IA32_DLINK2_FLAGS = DEF(GCC48_IA32_DLINK2_FLAGS) *_GCC48_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) *_GCC48_IA32_OBJCOPY_FLAGS = @@ -54,7 +54,7 @@ index 471eb67c0c..a16fb5c9f1 100755 DEBUG_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set-variable -@@ -2050,7 +2050,7 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set +@@ -941,7 +941,7 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set *_GCC48_X64_DLINK2_FLAGS = DEF(GCC48_X64_DLINK2_FLAGS) *_GCC48_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) *_GCC48_X64_OBJCOPY_FLAGS = @@ -63,7 +63,7 @@ index 471eb67c0c..a16fb5c9f1 100755 DEBUG_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) RELEASE_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) -Wno-unused-but-set-variable -@@ -2159,7 +2159,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s +@@ -1050,7 +1050,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s *_GCC49_IA32_DLINK2_FLAGS = DEF(GCC49_IA32_DLINK2_FLAGS) *_GCC49_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) *_GCC49_IA32_OBJCOPY_FLAGS = @@ -72,7 +72,7 @@ index 471eb67c0c..a16fb5c9f1 100755 DEBUG_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable -@@ -2187,7 +2187,7 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set +@@ -1078,7 +1078,7 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set *_GCC49_X64_DLINK2_FLAGS = DEF(GCC49_X64_DLINK2_FLAGS) *_GCC49_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) *_GCC49_X64_OBJCOPY_FLAGS = @@ -81,7 +81,7 @@ index 471eb67c0c..a16fb5c9f1 100755 DEBUG_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) RELEASE_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable -@@ -2302,7 +2302,7 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 +@@ -1337,7 +1337,7 @@ RELEASE_GCCNOLTO_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 *_GCC5_IA32_DLINK2_FLAGS = DEF(GCC5_IA32_DLINK2_FLAGS) -no-pie *_GCC5_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) *_GCC5_IA32_OBJCOPY_FLAGS = @@ -90,7 +90,7 @@ index 471eb67c0c..a16fb5c9f1 100755 DEBUG_GCC5_IA32_CC_FLAGS = DEF(GCC5_IA32_CC_FLAGS) -flto DEBUG_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,-m,elf_i386,--oformat=elf32-i386 -@@ -2334,7 +2334,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, +@@ -1369,7 +1369,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, *_GCC5_X64_DLINK2_FLAGS = DEF(GCC5_X64_DLINK2_FLAGS) *_GCC5_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) *_GCC5_X64_OBJCOPY_FLAGS = diff --git a/meta/recipes-core/ovmf/ovmf/0006-reproducible.patch b/meta/recipes-core/ovmf/ovmf/0004-reproducible.patch similarity index 88% rename from meta/recipes-core/ovmf/ovmf/0006-reproducible.patch rename to meta/recipes-core/ovmf/ovmf/0004-reproducible.patch index 846f4080128..c3fdc3d8634 100644 --- a/meta/recipes-core/ovmf/ovmf/0006-reproducible.patch +++ b/meta/recipes-core/ovmf/ovmf/0004-reproducible.patch @@ -1,7 +1,7 @@ -From 27ed9962f5cb3afcc44d6c96c53277132a999712 Mon Sep 17 00:00:00 2001 +From c59850367a190d70dec43e0a66f399a4d8a5ffed Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 14 Jun 2021 19:57:30 +0200 -Subject: [PATCH 6/6] reproducible +Subject: [PATCH 4/4] reproducible This patch fixes various things which make the build more reproducible. Some changes here only change intermediate artefacts but that means when you have two build trees @@ -35,10 +35,10 @@ Signed-off-by: Alexander Kanavin 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c -index d097db8632..a87ae6f3d0 100644 +index 9c17c90b16..fcc7864141 100644 --- a/BaseTools/Source/C/GenFw/Elf64Convert.c +++ b/BaseTools/Source/C/GenFw/Elf64Convert.c -@@ -14,6 +14,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent +@@ -15,6 +15,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #ifndef __GNUC__ #include #include @@ -47,35 +47,35 @@ index d097db8632..a87ae6f3d0 100644 #endif #include #include -@@ -769,7 +771,7 @@ ScanSections64 ( +@@ -990,7 +992,7 @@ ScanSections64 ( } mCoffOffset = mDebugOffset + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY) + sizeof(EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY) + - strlen(mInImageName) + 1; + strlen(basename(mInImageName)) + 1; - mCoffOffset = CoffAlign(mCoffOffset); - if (SectionCount == 0) { -@@ -1608,7 +1610,7 @@ WriteDebug64 ( - EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *Dir; - EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY *Nb10; + // + // Add more space in the .debug data region for the DllCharacteristicsEx +@@ -2261,7 +2263,7 @@ WriteDebug64 ( + EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY *Nb10; + EFI_IMAGE_DEBUG_EX_DLLCHARACTERISTICS_ENTRY *DllEntry; - Len = strlen(mInImageName) + 1; + Len = strlen(basename(mInImageName)) + 1; - Dir = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY*)(mCoffFile + mDebugOffset); - Dir->Type = EFI_IMAGE_DEBUG_TYPE_CODEVIEW; -@@ -1618,7 +1620,7 @@ WriteDebug64 ( + NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset); + DataDir = &NtHdr->Pe32Plus.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]; +@@ -2294,7 +2296,7 @@ WriteDebug64 ( Nb10 = (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY*)(Dir + 1); Nb10->Signature = CODEVIEW_SIGNATURE_NB10; - strcpy ((char *)(Nb10 + 1), mInImageName); + strcpy ((char *)(Nb10 + 1), basename(mInImageName)); + } - - NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset); + STATIC diff --git a/BaseTools/Source/Python/AutoGen/BuildEngine.py b/BaseTools/Source/Python/AutoGen/BuildEngine.py -index 722fead75a..8f1c236970 100644 +index 752a1a1f6a..02054cccf8 100644 --- a/BaseTools/Source/Python/AutoGen/BuildEngine.py +++ b/BaseTools/Source/Python/AutoGen/BuildEngine.py @@ -70,6 +70,9 @@ class TargetDescBlock(object): @@ -89,7 +89,7 @@ index 722fead75a..8f1c236970 100644 if Input not in self.Inputs: self.Inputs.append(Input) diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py -index 961b2ab1c3..23c1592025 100755 +index daec9c6d54..0e8cc20efe 100755 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -575,7 +575,7 @@ cleanlib: @@ -153,10 +153,10 @@ index 961b2ab1c3..23c1592025 100755 if T.GenFileListMacro and T.FileListMacro not in self.FileListMacros: self.FileListMacros[T.FileListMacro] = [] diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py -index d70b0d7ae8..25dca9a6df 100755 +index d05410b329..99b3f64aba 100755 --- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py -@@ -1484,6 +1484,9 @@ class ModuleAutoGen(AutoGen): +@@ -1474,6 +1474,9 @@ class ModuleAutoGen(AutoGen): for File in Files: if File.lower().endswith('.pdb'): AsBuiltInfDict['binary_item'].append('DISPOSABLE|' + File) @@ -166,7 +166,7 @@ index d70b0d7ae8..25dca9a6df 100755 HeaderComments = self.Module.HeaderComments StartPos = 0 for Index in range(len(HeaderComments)): -@@ -1759,7 +1762,7 @@ class ModuleAutoGen(AutoGen): +@@ -1749,7 +1752,7 @@ class ModuleAutoGen(AutoGen): if os.path.exists (self.TimeStampPath): os.remove (self.TimeStampPath) @@ -176,5 +176,5 @@ index d70b0d7ae8..25dca9a6df 100755 # Ignore generating makefile when it is a binary module if self.IsBinaryModule: -- -2.32.0 +2.30.2 diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index bd92c5d43d7..761c2654530 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb @@ -22,12 +22,12 @@ BUILD_CFLAGS += "-Wno-error=stringop-overflow" SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ file://0001-ovmf-update-path-to-native-BaseTools.patch \ file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ - file://0005-debug-prefix-map.patch \ - file://0006-reproducible.patch \ + file://0003-debug-prefix-map.patch \ + file://0004-reproducible.patch \ " -PV = "edk2-stable202302" -SRCREV = "f80f052277c88a67c55e107b550f504eeea947d3" +PV = "edk2-stable202305" +SRCREV = "ba91d0292e593df8528b66f99c1b0b14fadc8e16" UPSTREAM_CHECK_GITTAGREGEX = "(?Pedk2-stable.*)" inherit deploy From patchwork Sun Jun 25 21:22:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26375 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 7B0A1C001B1 for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.groups.io with SMTP id smtpd.web10.20343.1687728168350364996 for ; Sun, 25 Jun 2023 14:22:48 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=e2ufiA4L; spf=pass (domain: gmail.com, ip: 209.85.221.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-3113675d582so2165044f8f.3 for ; Sun, 25 Jun 2023 14:22:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728166; x=1690320166; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=a1AhblZEXTjZ4d7drEpEizY9cC7nHk4N4ohTcvKuwLY=; b=e2ufiA4LDwQQbMNGYa/hbqB2LCWk2NnUnXCnq779wxQ3jry1DYb3z5ke5p9/ZAHfni hlxOCMSV/0v6BZwHcm6jYIrhASE9E+/zS0fmJFYlgL/fXf/FfU/AywSeMy6yIhrGubVq e0KbMNJAGBg6tiAqUvThT2naalHWaWzn+DiVlIsj8eHPqUSLJ3jzSHAlfM7OxBtv0UAi +hxpHrJGuJiGuOqcRTtWaqAI3sGmztRPUK/7k+MGZjDOwmxdCVkTy+dPM8jERcPx8EtZ bA9rSOC6CcvqWsNSNESlmGoqzeZZDy4K6XnIUh0pM4Kns6nugOmPQd/2vLrLJ76gCyc4 G2Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728166; x=1690320166; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a1AhblZEXTjZ4d7drEpEizY9cC7nHk4N4ohTcvKuwLY=; b=h6w/kjMTxo3UBO0W6VLvpEwd8eWRLdtG3qUV4fMvVYcLaWqJknuXbYt//dbTCHD5ns yWf6hWrQl4ak/RzwRguuzuZGTcrBv/NTvibLHkPtWxd6E/JwJrS9gMR9vYKH2hSAzB7B M0mAe1r1UCw81VcA+ZKcL2lhal0XO814b9EKJ0fb8vUemNyTTJC4TLo/P3NAz9IdaKIG L/xyXzlNFFLcs+ovhP9NN21LfCF4OQikCn2jlhoXl3qqjHcGYdma0521u/bAicG6h/cN LzSa6TUcfa2xAPaPxCLAqUODCUxihJJQt+gri2A7RLa325j8qFQ0F0cBGzpsM0dGzdBJ AK+w== X-Gm-Message-State: AC+VfDzL/MmJJfMPrAGilpM+9Dbr/FDsmqPwK/8fW5jUNBB3cxQT5UCR RKcbgPixZpXtIC28fSnsFoduqrK+lFWpIA== X-Google-Smtp-Source: ACHHUZ4JocbVlHUlhE4TDfTo7KqsvPKuktbIcgsjEsa0OoIgbnyedWC3tUiGzJMaZlCKTqza3BdAUw== X-Received: by 2002:a5d:618b:0:b0:313:f366:2c69 with SMTP id j11-20020a5d618b000000b00313f3662c69mr64623wru.46.1687728166561; Sun, 25 Jun 2023 14:22:46 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:46 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 04/21] lua: update 5.4.4 -> 5.4.6 Date: Sun, 25 Jun 2023 23:22:24 +0200 Message-Id: <20230625212241.915739-4-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183379 License-Update: formatting Signed-off-by: Alexander Kanavin --- .../lua/lua/CVE-2022-28805.patch | 26 -------- .../lua/lua/CVE-2022-33099.patch | 61 ------------------- .../lua/{lua_5.4.4.bb => lua_5.4.6.bb} | 6 +- 3 files changed, 2 insertions(+), 91 deletions(-) delete mode 100644 meta/recipes-devtools/lua/lua/CVE-2022-28805.patch delete mode 100644 meta/recipes-devtools/lua/lua/CVE-2022-33099.patch rename meta/recipes-devtools/lua/{lua_5.4.4.bb => lua_5.4.6.bb} (89%) diff --git a/meta/recipes-devtools/lua/lua/CVE-2022-28805.patch b/meta/recipes-devtools/lua/lua/CVE-2022-28805.patch deleted file mode 100644 index 3680c715a70..00000000000 --- a/meta/recipes-devtools/lua/lua/CVE-2022-28805.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1f3c6f4534c6411313361697d98d1145a1f030fa Mon Sep 17 00:00:00 2001 -From: Roberto Ierusalimschy -Date: Tue, 15 Feb 2022 12:28:46 -0300 -Subject: [PATCH] Bug: Lua can generate wrong code when _ENV is - -CVE: CVE-2022-28805 - -Upstream-Status: Backport [https://github.com/lua/lua/commit/1f3c6f4534c6411313361697d98d1145a1f030fa] - -Signed-off-by: Steve Sakoman ---- - src/lparser.c | 1 + - 1 files changed, 1 insertions(+) - -diff --git a/src/lparser.c b/src/lparser.c -index 3abe3d751..a5cd55257 100644 ---- a/src/lparser.c -+++ b/src/lparser.c -@@ -468,6 +468,7 @@ static void singlevar (LexState *ls, expdesc *var) { - expdesc key; - singlevaraux(fs, ls->envn, var, 1); /* get environment variable */ - lua_assert(var->k != VVOID); /* this one must exist */ -+ luaK_exp2anyregup(fs, var); /* but could be a constant */ - codestring(&key, varname); /* key is variable name */ - luaK_indexed(fs, var, &key); /* env[varname] */ - } diff --git a/meta/recipes-devtools/lua/lua/CVE-2022-33099.patch b/meta/recipes-devtools/lua/lua/CVE-2022-33099.patch deleted file mode 100644 index fe7b6065c2a..00000000000 --- a/meta/recipes-devtools/lua/lua/CVE-2022-33099.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 42d40581dd919fb134c07027ca1ce0844c670daf Mon Sep 17 00:00:00 2001 -From: Roberto Ierusalimschy -Date: Fri, 20 May 2022 13:14:33 -0300 -Subject: [PATCH] Save stack space while handling errors - -Because error handling (luaG_errormsg) uses slots from EXTRA_STACK, -and some errors can recur (e.g., string overflow while creating an -error message in 'luaG_runerror', or a C-stack overflow before calling -the message handler), the code should use stack slots with parsimony. - -This commit fixes the bug "Lua-stack overflow when C stack overflows -while handling an error". - -CVE: CVE-2022-33099 - -Upstream-Status: Backport [https://github.com/lua/lua/commit/42d40581dd919fb134c07027ca1ce0844c670daf] - -Signed-off-by: Khem Raj ---- - ldebug.c | 5 ++++- - lvm.c | 6 ++++-- - 2 files changed, 8 insertions(+), 3 deletions(-) - ---- a/src/ldebug.c -+++ b/src/ldebug.c -@@ -824,8 +824,11 @@ l_noret luaG_runerror (lua_State *L, con - va_start(argp, fmt); - msg = luaO_pushvfstring(L, fmt, argp); /* format message */ - va_end(argp); -- if (isLua(ci)) /* if Lua function, add source:line information */ -+ if (isLua(ci)) { /* if Lua function, add source:line information */ - luaG_addinfo(L, msg, ci_func(ci)->p->source, getcurrentline(ci)); -+ setobjs2s(L, L->top - 2, L->top - 1); /* remove 'msg' from the stack */ -+ L->top--; -+ } - luaG_errormsg(L); - } - ---- a/src/lvm.c -+++ b/src/lvm.c -@@ -656,8 +656,10 @@ void luaV_concat (lua_State *L, int tota - /* collect total length and number of strings */ - for (n = 1; n < total && tostring(L, s2v(top - n - 1)); n++) { - size_t l = vslen(s2v(top - n - 1)); -- if (l_unlikely(l >= (MAX_SIZE/sizeof(char)) - tl)) -+ if (l_unlikely(l >= (MAX_SIZE/sizeof(char)) - tl)) { -+ L->top = top - total; /* pop strings to avoid wasting stack */ - luaG_runerror(L, "string length overflow"); -+ } - tl += l; - } - if (tl <= LUAI_MAXSHORTLEN) { /* is result a short string? */ -@@ -672,7 +674,7 @@ void luaV_concat (lua_State *L, int tota - setsvalue2s(L, top - n, ts); /* create result */ - } - total -= n-1; /* got 'n' strings to create 1 new */ -- L->top -= n-1; /* popped 'n' strings and pushed one */ -+ L->top = top - (n - 1); /* popped 'n' strings and pushed one */ - } while (total > 1); /* repeat until only 1 result left */ - } - diff --git a/meta/recipes-devtools/lua/lua_5.4.4.bb b/meta/recipes-devtools/lua/lua_5.4.6.bb similarity index 89% rename from meta/recipes-devtools/lua/lua_5.4.4.bb rename to meta/recipes-devtools/lua/lua_5.4.6.bb index 26ec35f997a..eabfc895754 100644 --- a/meta/recipes-devtools/lua/lua_5.4.4.bb +++ b/meta/recipes-devtools/lua/lua_5.4.6.bb @@ -1,20 +1,18 @@ SUMMARY = "Lua is a powerful light-weight programming language designed \ for extending applications." LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://doc/readme.html;beginline=307;endline=330;md5=79c3f6b19ad05efe24c1681f025026bb" +LIC_FILES_CHKSUM = "file://doc/readme.html;beginline=303;endline=324;md5=e05449eb28c092473f854670c6e8375a" HOMEPAGE = "http://www.lua.org/" SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz;name=tarballsrc \ file://lua.pc.in \ - file://CVE-2022-28805.patch \ - file://CVE-2022-33099.patch \ ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'http://www.lua.org/tests/lua-${PV_testsuites}-tests.tar.gz;name=tarballtest file://run-ptest ', '', d)} \ " # if no test suite matches PV release of Lua exactly, download the suite for the closest Lua release. PV_testsuites = "5.4.4" -SRC_URI[tarballsrc.sha256sum] = "164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61" +SRC_URI[tarballsrc.sha256sum] = "7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88" SRC_URI[tarballtest.sha256sum] = "04d28355cd67a2299dfe5708b55a0ff221ccb1a3907a3113cc103ccc05ac6aad" inherit pkgconfig binconfig ptest From patchwork Sun Jun 25 21:22:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26383 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 C6A90C04FE0 for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.groups.io with SMTP id smtpd.web11.20166.1687728168874783904 for ; Sun, 25 Jun 2023 14:22:49 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=cbGaOUhS; spf=pass (domain: gmail.com, ip: 209.85.128.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-3fa8cd4a113so4192785e9.2 for ; Sun, 25 Jun 2023 14:22:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728167; x=1690320167; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NWenz+mCZ1ME2sfma5lptLtCURexvr1fvMRWaiul4eQ=; b=cbGaOUhS1toJlkt6Fw66Yg7VUq4IGjNXoQtX3VVjTlC5dazI8BohESlGs/dbmbEzcG U9gW0/cFauP+WpNyf92G9QUgUBxRwOITjxQ3Rs3o42VB6cdpct3LnZr7TL0Rfr11G3L/ in9avMaS3s+HCrEAVQm/ZfatEhQD5aXk/3DUn8IiuANRivIpLMoAHCCs7csw3gzFRLuX FC0oQOdzTHpEM1wYn9CMcA1iPg0W5Ip3xCeX8qlXVGqBEVbYoKNrkO+JMnRqGPstjEo7 bKGmAxgOzvwBC/AS08WxWqgYCLjLhkh5N6B1TYwwnfHtP88W4rkWc/MBK9VuG+ZunjvQ MHsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728167; x=1690320167; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NWenz+mCZ1ME2sfma5lptLtCURexvr1fvMRWaiul4eQ=; b=gT4Y8+/trT7LTiLZjYewJ5wwGcH8Kj9l8FbjHD7+uR09EFb6QFxubyPo5GDbDEG92a 9do6LDAskSKAff8t0qCWIocxapxKtneNIJ0HTqCBCFOjndQQ3I16N+tHXJSEF/ef+Frm urG1YjVfRqnCxCOlmsaJIDqlN0Vn9tJmWkhDo8aXaabRCeGQ6o+A1qCAiHF8I+B29Bp/ YJb0fsGaTBQMnDdYGi0nCoTc199JJCpApzUyGnw5JHDo/pzxAzfwhUu6AEHSuTRRG5Je Hz+G7uNixbySZIHisIPOJglG+IahJk+W5INJr7jKaqO6YDfF1hlcJM7/0eQx8vLZmrLf T5CA== X-Gm-Message-State: AC+VfDyacxBYYrXcdJX6YTvDIG+rDzjHwN/ysXrvvj3694tNXg3dlIHt b7PzaVPUKTtxDYmzKPILjeebeYQE/tXAeg== X-Google-Smtp-Source: ACHHUZ4NB8VP98zgnu+Em4EyWvPYvG4bY3YSzpclouyPrr2jDTklxCIrgSD9np2ay8l0VeBRtug1/A== X-Received: by 2002:a7b:cb88:0:b0:3fa:86d0:7d9c with SMTP id m8-20020a7bcb88000000b003fa86d07d9cmr2348327wmi.7.1687728167021; Sun, 25 Jun 2023 14:22:47 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:46 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 05/21] cargo.bbclass: set up cargo environment in common do_compile Date: Sun, 25 Jun 2023 23:22:25 +0200 Message-Id: <20230625212241.915739-5-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183380 cargo_do_compile runs only if the recipe is built using cargo as the top level tool. Some recipes hide usage of cargo inside setuptools (or autoconf) and use do_compile definitions specific to those, and so the environment isn't properly set up. This was exposed by latest versions of python3-cryptography. Signed-off-by: Alexander Kanavin --- meta/classes-recipe/cargo.bbclass | 1 - meta/classes-recipe/cargo_common.bbclass | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/classes-recipe/cargo.bbclass b/meta/classes-recipe/cargo.bbclass index 7a8cc1e7518..3ef0bbbb44e 100644 --- a/meta/classes-recipe/cargo.bbclass +++ b/meta/classes-recipe/cargo.bbclass @@ -55,7 +55,6 @@ oe_cargo_build () { do_compile[progress] = "outof:\s+(\d+)/(\d+)" cargo_do_compile () { - oe_cargo_fix_env oe_cargo_build } diff --git a/meta/classes-recipe/cargo_common.bbclass b/meta/classes-recipe/cargo_common.bbclass index 82ab25b59c5..1ca0be471ce 100644 --- a/meta/classes-recipe/cargo_common.bbclass +++ b/meta/classes-recipe/cargo_common.bbclass @@ -149,6 +149,10 @@ python cargo_common_do_patch_paths() { } do_configure[postfuncs] += "cargo_common_do_patch_paths" +do_compile:prepend () { + oe_cargo_fix_env +} + oe_cargo_fix_env () { export CC="${RUST_TARGET_CC}" export CXX="${RUST_TARGET_CXX}" From patchwork Sun Jun 25 21:22:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26382 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 B7430C04FE1 for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web11.20167.1687728169496867383 for ; Sun, 25 Jun 2023 14:22:49 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=RRy+PUIq; spf=pass (domain: gmail.com, ip: 209.85.221.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-307d58b3efbso2120276f8f.0 for ; Sun, 25 Jun 2023 14:22:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728168; x=1690320168; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=h9pmaS/HTvzf0OGm9eUX0oepe+AZ5qywU8jrUsbxsus=; b=RRy+PUIqDCcS7B9YwnEY2XivvrrvEh2tbhi2+kIb3N2WZN7A5uBFe2uuHY0K3Z+fF2 2cWrqq4YYwcEE/6YZCkoCCVOE+T7FAdQNHHS5XOL5KCuQwHFfUVnMxpBJN0yzZomHYca hRIK3uqbo/lFQK9SWrcX2seO5Ib10TpuMgh7VskaNyhoCm/O2/uFyq2W1iKHChFgGLqu vwKTepVruuSXPcMU29ciwjXKgmMx/9kkKYOUBemQIKHPsQrMVySWakxvTJ7XYROFsT69 u/4Ho/yQSOSxm7MD3pZADM2bDQrqJ56lNIDvdUhxEoUQnbrJ8mBkl3PmOEJEUszlPPDl +qmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728168; x=1690320168; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h9pmaS/HTvzf0OGm9eUX0oepe+AZ5qywU8jrUsbxsus=; b=Hs/azRg4InxvKpFH+7X597NT1f4fcF+3grIcw5t/ipYR8xzqi3G57lwQuTm0BSxgwa 889Ri7x+eJ2d6bCDo3z3iCkLfJscZR/20ybNXRe7mjcn6a3cbSWYfqtE65+2F8aguQQ9 jEzdQR3psQvslRTzLcrbBSDQRMRBDwH+59R8AJc/kO5+hRPBCAdyuqvBhsFHP3g6tyRV Cg/u7r/IjMjqKGrnjctbh2wg+PscS39HM4Zg/wX0g+n8v5LQjm9vlNoBE1+d7qTQe+0z HmgMgjmQUM2kZx6pt6QHQK2WNg33rl6snB5NO7AhtMlIke0bsEa9D6BHKbupYOmgkIDr ovSw== X-Gm-Message-State: AC+VfDxa8DZfPeTywfMvanyxLPSjyot2RmsnfUKlr06wbdxCmXSvPFT1 nf9wTONTP0xtJZ2EmNrRdiuu6lRfXCt3nQ== X-Google-Smtp-Source: ACHHUZ52yxBdOcnxK07LbO3pVCf73apair5K3YVtRjw8QbV3Gpmjz+y2F/D1/ya//FU5h9hKAclHgQ== X-Received: by 2002:a5d:4442:0:b0:309:32d1:59d8 with SMTP id x2-20020a5d4442000000b0030932d159d8mr16774424wrr.64.1687728167566; Sun, 25 Jun 2023 14:22:47 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:47 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 06/21] rust-common.bbclass: move musl-specific linking fix from rust-source.inc Date: Sun, 25 Jun 2023 23:22:26 +0200 Message-Id: <20230625212241.915739-6-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183381 This needs to be done for any item that is linked under rustc, and not just rust itself. Latest python-cryptography exposes the issue. Signed-off-by: Alexander Kanavin --- meta/classes-recipe/rust-common.bbclass | 4 ++++ meta/recipes-devtools/rust/rust-source.inc | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/meta/classes-recipe/rust-common.bbclass b/meta/classes-recipe/rust-common.bbclass index e0cedd7aa26..878272721cb 100644 --- a/meta/classes-recipe/rust-common.bbclass +++ b/meta/classes-recipe/rust-common.bbclass @@ -158,6 +158,10 @@ WRAPPER_TARGET_CXX = "${CXX}" WRAPPER_TARGET_CCLD = "${CCLD}" WRAPPER_TARGET_LDFLAGS = "${LDFLAGS}" WRAPPER_TARGET_EXTRALD = "" +# see recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch +# we need to link with ssp_nonshared on musl to avoid "undefined reference to `__stack_chk_fail_local'" +# when building MACHINE=qemux86 for musl +WRAPPER_TARGET_EXTRALD:libc-musl = "-lssp_nonshared" WRAPPER_TARGET_AR = "${AR}" # compiler is used by gcc-rs diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index fbe2492fb4f..a0a788f3601 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -16,8 +16,3 @@ export TARGET_VENDOR UPSTREAM_CHECK_URI = "https://forge.rust-lang.org/infra/other-installation-methods.html" UPSTREAM_CHECK_REGEX = "rustc-(?P\d+(\.\d+)+)-src" - -# see recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch -# we need to link with ssp_nonshared on musl to avoid "undefined reference to `__stack_chk_fail_local'" -# when building MACHINE=qemux86 for musl -WRAPPER_TARGET_EXTRALD:libc-musl = "-lssp_nonshared" From patchwork Sun Jun 25 21:22:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26384 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 B4424C04A94 for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.groups.io with SMTP id smtpd.web11.20168.1687728169809708121 for ; Sun, 25 Jun 2023 14:22:50 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=EUauXs5G; spf=pass (domain: gmail.com, ip: 209.85.128.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-3fa93d61d48so5562045e9.0 for ; Sun, 25 Jun 2023 14:22:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728168; x=1690320168; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MdkgFfYjxbaFOUTqXfHvOafZ5N3rV+bg9oHDEbVbVcs=; b=EUauXs5G9zp0PkGS0xAk0XpT3h4tufM5vtevZ2Wez+GPhSvp55E0ioJrYDlXqkZqX8 Wjddv1MLZzGUyb9r67PMTRpDnEWgbKHuB5Lueu8L2gMQ7x3WE2JxNjzohGF6+FaUZxue lP9uE29p/NQ8R7JTsMPkrpqVAVkitOEbR9r0fNdlhM9AUYvOD6bOiH7HCiJ3PNyTPL8p Yn/VX5QTyeCGWjHO4UvYEg/BOMvniROApz1CSXIRAcCTXaDUmE0OgufRVVUvPX/IxXKv rOQkYQDFis7tq1bZszvy5WmL7N0W6tUKUwZ2AoNOLPv24H6hCdKoK5rP4yed3Z/wtAs6 uBYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728168; x=1690320168; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MdkgFfYjxbaFOUTqXfHvOafZ5N3rV+bg9oHDEbVbVcs=; b=UVBTz34iIuMMeCSgcra8CVIBtLFDzCtSKxtGqr1uEowXyarrXOyQWVDQECiyolZ1yV CdJ6KWLtAUI911iOoLkmtYxFnTHRmeT3MfQXb1Z5sjEUtt8GdE720O9TM8tO19LU0FC4 un9h2r78HoY2kHWNby9+EDBY2uA60fQfX0CGvFViIQOEJMXDxiMLsQ4bUvz+2rM0Z4xU KHSlmnh6yqL6IEldKQtjw+fS2Nz5CsD450Jf6SbaeVb7K2A1dZLE9GztMRyw1/+nGSnl 3zs2x7GG7QoAVUiSXTMfBGl4gIGIFwjkBcMJoDOaG+qIRm+3lTY8yyMn2MYRkQvjDUqJ dSvw== X-Gm-Message-State: AC+VfDzrHURRqDcrymHnh5Zf4qVgAEe0LTKRVNV41YryIz9V38UA17VH wgoIpqcUdiEGeodZHTiIV99B/MbSeLfwjg== X-Google-Smtp-Source: ACHHUZ4vyfvSPjHyVdJIYFzGovaP/LkGH8lehi9Uvrh8+Pmsg+Mmy8VdWP2sfaa3faRjwxhbv5pJAw== X-Received: by 2002:a7b:c8c2:0:b0:3f9:c27a:d176 with SMTP id f2-20020a7bc8c2000000b003f9c27ad176mr10093832wml.6.1687728168103; Sun, 25 Jun 2023 14:22:48 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:47 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 07/21] python3-cryptography: update 39.0.2 -> 41.0.1 Date: Sun, 25 Jun 2023 23:22:27 +0200 Message-Id: <20230625212241.915739-7-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183382 Drop 0002-Cargo.toml-edition-2018-2021.patch (issue fixed upstream) License-Update: PSF licensed code removed as of https://github.com/pyca/cryptography/commit/5e6476a4c6e094926a983dcf5cbe9488c30aeb53 Signed-off-by: Alexander Kanavin --- .../python/python3-cryptography-crates.inc | 182 ++++++++---------- ...i-substitute-include-path-from-targe.patch | 29 +++ ...toml-remove-benchmark-disable-option.patch | 25 ++- .../0002-Cargo.toml-edition-2018-2021.patch | 28 --- ....0.2.bb => python3-cryptography_41.0.1.bb} | 20 +- 5 files changed, 131 insertions(+), 153 deletions(-) create mode 100644 meta/recipes-devtools/python/python3-cryptography/0001-cryptography-cffi-substitute-include-path-from-targe.patch delete mode 100644 meta/recipes-devtools/python/python3-cryptography/0002-Cargo.toml-edition-2018-2021.patch rename meta/recipes-devtools/python/{python3-cryptography_39.0.2.bb => python3-cryptography_41.0.1.bb} (74%) diff --git a/meta/recipes-devtools/python/python3-cryptography-crates.inc b/meta/recipes-devtools/python/python3-cryptography-crates.inc index 410c9f40428..3b16e323992 100644 --- a/meta/recipes-devtools/python/python3-cryptography-crates.inc +++ b/meta/recipes-devtools/python/python3-cryptography-crates.inc @@ -4,135 +4,109 @@ SRC_URI += " \ crate://crates.io/Inflector/0.11.4 \ crate://crates.io/aliasable/0.1.3 \ - crate://crates.io/android_system_properties/0.1.5 \ - crate://crates.io/asn1/0.13.0 \ - crate://crates.io/asn1_derive/0.13.0 \ + crate://crates.io/asn1/0.15.2 \ + crate://crates.io/asn1_derive/0.15.2 \ crate://crates.io/autocfg/1.1.0 \ crate://crates.io/base64/0.13.1 \ crate://crates.io/bitflags/1.3.2 \ - crate://crates.io/bumpalo/3.10.0 \ - crate://crates.io/cc/1.0.78 \ + crate://crates.io/cc/1.0.79 \ crate://crates.io/cfg-if/1.0.0 \ - crate://crates.io/chrono/0.4.23 \ - crate://crates.io/codespan-reporting/0.11.1 \ - crate://crates.io/core-foundation-sys/0.8.3 \ - crate://crates.io/cxx/1.0.85 \ - crate://crates.io/cxx-build/1.0.85 \ - crate://crates.io/cxxbridge-flags/1.0.85 \ - crate://crates.io/cxxbridge-macro/1.0.85 \ - crate://crates.io/iana-time-zone/0.1.53 \ - crate://crates.io/iana-time-zone-haiku/0.1.1 \ - crate://crates.io/indoc/0.3.6 \ - crate://crates.io/indoc-impl/0.3.6 \ - crate://crates.io/instant/0.1.12 \ - crate://crates.io/js-sys/0.3.60 \ - crate://crates.io/libc/0.2.139 \ - crate://crates.io/link-cplusplus/1.0.8 \ + crate://crates.io/foreign-types/0.3.2 \ + crate://crates.io/foreign-types-shared/0.1.1 \ + crate://crates.io/indoc/1.0.9 \ + crate://crates.io/libc/0.2.144 \ crate://crates.io/lock_api/0.4.9 \ - crate://crates.io/log/0.4.17 \ - crate://crates.io/num-integer/0.1.45 \ - crate://crates.io/num-traits/0.2.15 \ - crate://crates.io/once_cell/1.14.0 \ - crate://crates.io/ouroboros/0.15.5 \ - crate://crates.io/ouroboros_macro/0.15.5 \ - crate://crates.io/parking_lot/0.11.2 \ - crate://crates.io/parking_lot_core/0.8.6 \ - crate://crates.io/paste/0.1.18 \ - crate://crates.io/paste-impl/0.1.18 \ - crate://crates.io/pem/1.1.0 \ + crate://crates.io/memoffset/0.8.0 \ + crate://crates.io/once_cell/1.17.2 \ + crate://crates.io/openssl/0.10.54 \ + crate://crates.io/openssl-macros/0.1.1 \ + crate://crates.io/openssl-sys/0.9.88 \ + crate://crates.io/ouroboros/0.15.6 \ + crate://crates.io/ouroboros_macro/0.15.6 \ + crate://crates.io/parking_lot/0.12.1 \ + crate://crates.io/parking_lot_core/0.9.7 \ + crate://crates.io/pem/1.1.1 \ + crate://crates.io/pkg-config/0.3.27 \ crate://crates.io/proc-macro-error/1.0.4 \ crate://crates.io/proc-macro-error-attr/1.0.4 \ - crate://crates.io/proc-macro-hack/0.5.20+deprecated \ - crate://crates.io/proc-macro2/1.0.49 \ - crate://crates.io/pyo3/0.15.2 \ - crate://crates.io/pyo3-build-config/0.15.2 \ - crate://crates.io/pyo3-macros/0.15.2 \ - crate://crates.io/pyo3-macros-backend/0.15.2 \ - crate://crates.io/quote/1.0.23 \ + crate://crates.io/proc-macro2/1.0.59 \ + crate://crates.io/pyo3/0.18.3 \ + crate://crates.io/pyo3-build-config/0.18.3 \ + crate://crates.io/pyo3-ffi/0.18.3 \ + crate://crates.io/pyo3-macros/0.18.3 \ + crate://crates.io/pyo3-macros-backend/0.18.3 \ + crate://crates.io/quote/1.0.28 \ crate://crates.io/redox_syscall/0.2.16 \ crate://crates.io/scopeguard/1.1.0 \ - crate://crates.io/scratch/1.0.3 \ crate://crates.io/smallvec/1.10.0 \ - crate://crates.io/syn/1.0.107 \ - crate://crates.io/termcolor/1.1.3 \ - crate://crates.io/unicode-ident/1.0.6 \ - crate://crates.io/unicode-width/0.1.10 \ + crate://crates.io/syn/1.0.109 \ + crate://crates.io/syn/2.0.18 \ + crate://crates.io/target-lexicon/0.12.7 \ + crate://crates.io/unicode-ident/1.0.9 \ crate://crates.io/unindent/0.1.11 \ + crate://crates.io/vcpkg/0.2.15 \ crate://crates.io/version_check/0.9.4 \ - crate://crates.io/wasm-bindgen/0.2.83 \ - crate://crates.io/wasm-bindgen-backend/0.2.83 \ - crate://crates.io/wasm-bindgen-macro/0.2.83 \ - crate://crates.io/wasm-bindgen-macro-support/0.2.83 \ - crate://crates.io/wasm-bindgen-shared/0.2.83 \ - crate://crates.io/winapi/0.3.9 \ - crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ - crate://crates.io/winapi-util/0.1.5 \ - crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ + crate://crates.io/windows-sys/0.45.0 \ + crate://crates.io/windows-targets/0.42.2 \ + crate://crates.io/windows_aarch64_gnullvm/0.42.2 \ + crate://crates.io/windows_aarch64_msvc/0.42.2 \ + crate://crates.io/windows_i686_gnu/0.42.2 \ + crate://crates.io/windows_i686_msvc/0.42.2 \ + crate://crates.io/windows_x86_64_gnu/0.42.2 \ + crate://crates.io/windows_x86_64_gnullvm/0.42.2 \ + crate://crates.io/windows_x86_64_msvc/0.42.2 \ " SRC_URI[Inflector-0.11.4.sha256sum] = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" SRC_URI[aliasable-0.1.3.sha256sum] = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" -SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -SRC_URI[asn1-0.13.0.sha256sum] = "2affba5e62ee09eeba078f01a00c4aed45ac4287e091298eccbb0d4802efbdc5" -SRC_URI[asn1_derive-0.13.0.sha256sum] = "bfab79c195875e5aef2bd20b4c8ed8d43ef9610bcffefbbcf66f88f555cc78af" +SRC_URI[asn1-0.15.2.sha256sum] = "28c19b9324de5b815b6487e0f8098312791b09de0dbf3d5c2db1fe2d95bab973" +SRC_URI[asn1_derive-0.15.2.sha256sum] = "a045c3ccad89f244a86bd1e6cf1a7bf645296e7692698b056399b6efd4639407" SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" SRC_URI[base64-0.13.1.sha256sum] = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -SRC_URI[bumpalo-3.10.0.sha256sum] = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" -SRC_URI[cc-1.0.78.sha256sum] = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +SRC_URI[cc-1.0.79.sha256sum] = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -SRC_URI[chrono-0.4.23.sha256sum] = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" -SRC_URI[codespan-reporting-0.11.1.sha256sum] = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -SRC_URI[core-foundation-sys-0.8.3.sha256sum] = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" -SRC_URI[cxx-1.0.85.sha256sum] = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd" -SRC_URI[cxx-build-1.0.85.sha256sum] = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0" -SRC_URI[cxxbridge-flags-1.0.85.sha256sum] = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59" -SRC_URI[cxxbridge-macro-1.0.85.sha256sum] = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6" -SRC_URI[iana-time-zone-0.1.53.sha256sum] = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" -SRC_URI[iana-time-zone-haiku-0.1.1.sha256sum] = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -SRC_URI[indoc-0.3.6.sha256sum] = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" -SRC_URI[indoc-impl-0.3.6.sha256sum] = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" -SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -SRC_URI[js-sys-0.3.60.sha256sum] = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" -SRC_URI[libc-0.2.139.sha256sum] = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" -SRC_URI[link-cplusplus-1.0.8.sha256sum] = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +SRC_URI[foreign-types-0.3.2.sha256sum] = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +SRC_URI[foreign-types-shared-0.1.1.sha256sum] = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +SRC_URI[indoc-1.0.9.sha256sum] = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" +SRC_URI[libc-0.2.144.sha256sum] = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" SRC_URI[lock_api-0.4.9.sha256sum] = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -SRC_URI[log-0.4.17.sha256sum] = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -SRC_URI[num-integer-0.1.45.sha256sum] = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -SRC_URI[num-traits-0.2.15.sha256sum] = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -SRC_URI[once_cell-1.14.0.sha256sum] = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" -SRC_URI[ouroboros-0.15.5.sha256sum] = "dfbb50b356159620db6ac971c6d5c9ab788c9cc38a6f49619fca2a27acb062ca" -SRC_URI[ouroboros_macro-0.15.5.sha256sum] = "4a0d9d1a6191c4f391f87219d1ea42b23f09ee84d64763cd05ee6ea88d9f384d" -SRC_URI[parking_lot-0.11.2.sha256sum] = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -SRC_URI[parking_lot_core-0.8.6.sha256sum] = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -SRC_URI[paste-0.1.18.sha256sum] = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -SRC_URI[paste-impl-0.1.18.sha256sum] = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -SRC_URI[pem-1.1.0.sha256sum] = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +SRC_URI[memoffset-0.8.0.sha256sum] = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +SRC_URI[once_cell-1.17.2.sha256sum] = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" +SRC_URI[openssl-0.10.54.sha256sum] = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019" +SRC_URI[openssl-macros-0.1.1.sha256sum] = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +SRC_URI[openssl-sys-0.9.88.sha256sum] = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617" +SRC_URI[ouroboros-0.15.6.sha256sum] = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db" +SRC_URI[ouroboros_macro-0.15.6.sha256sum] = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" +SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +SRC_URI[parking_lot_core-0.9.7.sha256sum] = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +SRC_URI[pem-1.1.1.sha256sum] = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +SRC_URI[pkg-config-0.3.27.sha256sum] = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" SRC_URI[proc-macro-error-1.0.4.sha256sum] = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" SRC_URI[proc-macro-error-attr-1.0.4.sha256sum] = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -SRC_URI[proc-macro-hack-0.5.20+deprecated.sha256sum] = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" -SRC_URI[proc-macro2-1.0.49.sha256sum] = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" -SRC_URI[pyo3-0.15.2.sha256sum] = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752" -SRC_URI[pyo3-build-config-0.15.2.sha256sum] = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410" -SRC_URI[pyo3-macros-0.15.2.sha256sum] = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a" -SRC_URI[pyo3-macros-backend-0.15.2.sha256sum] = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095" -SRC_URI[quote-1.0.23.sha256sum] = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +SRC_URI[proc-macro2-1.0.59.sha256sum] = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" +SRC_URI[pyo3-0.18.3.sha256sum] = "e3b1ac5b3731ba34fdaa9785f8d74d17448cd18f30cf19e0c7e7b1fdb5272109" +SRC_URI[pyo3-build-config-0.18.3.sha256sum] = "9cb946f5ac61bb61a5014924910d936ebd2b23b705f7a4a3c40b05c720b079a3" +SRC_URI[pyo3-ffi-0.18.3.sha256sum] = "fd4d7c5337821916ea2a1d21d1092e8443cf34879e53a0ac653fbb98f44ff65c" +SRC_URI[pyo3-macros-0.18.3.sha256sum] = "a9d39c55dab3fc5a4b25bbd1ac10a2da452c4aca13bb450f22818a002e29648d" +SRC_URI[pyo3-macros-backend-0.18.3.sha256sum] = "97daff08a4c48320587b5224cc98d609e3c27b6d437315bd40b605c98eeb5918" +SRC_URI[quote-1.0.28.sha256sum] = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" SRC_URI[scopeguard-1.1.0.sha256sum] = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -SRC_URI[scratch-1.0.3.sha256sum] = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" SRC_URI[smallvec-1.10.0.sha256sum] = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" -SRC_URI[syn-1.0.107.sha256sum] = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" -SRC_URI[termcolor-1.1.3.sha256sum] = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -SRC_URI[unicode-ident-1.0.6.sha256sum] = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" -SRC_URI[unicode-width-0.1.10.sha256sum] = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +SRC_URI[syn-2.0.18.sha256sum] = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +SRC_URI[target-lexicon-0.12.7.sha256sum] = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +SRC_URI[unicode-ident-1.0.9.sha256sum] = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" SRC_URI[unindent-0.1.11.sha256sum] = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" +SRC_URI[vcpkg-0.2.15.sha256sum] = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -SRC_URI[wasm-bindgen-0.2.83.sha256sum] = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" -SRC_URI[wasm-bindgen-backend-0.2.83.sha256sum] = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" -SRC_URI[wasm-bindgen-macro-0.2.83.sha256sum] = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" -SRC_URI[wasm-bindgen-macro-support-0.2.83.sha256sum] = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" -SRC_URI[wasm-bindgen-shared-0.2.83.sha256sum] = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" -SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +SRC_URI[windows-sys-0.45.0.sha256sum] = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +SRC_URI[windows-targets-0.42.2.sha256sum] = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +SRC_URI[windows_aarch64_gnullvm-0.42.2.sha256sum] = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +SRC_URI[windows_aarch64_msvc-0.42.2.sha256sum] = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +SRC_URI[windows_i686_gnu-0.42.2.sha256sum] = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +SRC_URI[windows_i686_msvc-0.42.2.sha256sum] = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +SRC_URI[windows_x86_64_gnu-0.42.2.sha256sum] = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +SRC_URI[windows_x86_64_gnullvm-0.42.2.sha256sum] = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +SRC_URI[windows_x86_64_msvc-0.42.2.sha256sum] = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" diff --git a/meta/recipes-devtools/python/python3-cryptography/0001-cryptography-cffi-substitute-include-path-from-targe.patch b/meta/recipes-devtools/python/python3-cryptography/0001-cryptography-cffi-substitute-include-path-from-targe.patch new file mode 100644 index 00000000000..1a60abada79 --- /dev/null +++ b/meta/recipes-devtools/python/python3-cryptography/0001-cryptography-cffi-substitute-include-path-from-targe.patch @@ -0,0 +1,29 @@ +From 04aac6c88152088778c6551dfa86b2fc446dc61c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 19 Jun 2023 13:27:28 +0200 +Subject: [PATCH] cryptography-cffi: substitute include path from target + sysroot + +Upstream-Status: Accepted [https://github.com/pyca/cryptography/pull/9105] + +Signed-off-by: Alexander Kanavin +--- + src/rust/cryptography-cffi/build.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/rust/cryptography-cffi/build.rs b/src/rust/cryptography-cffi/build.rs +index 4a40990..08abb95 100644 +--- a/src/rust/cryptography-cffi/build.rs ++++ b/src/rust/cryptography-cffi/build.rs +@@ -48,7 +48,7 @@ fn main() { + println!("cargo:rustc-cfg=python_implementation=\"{}\"", python_impl); + let python_include = run_python_script( + &python, +- "import sysconfig; print(sysconfig.get_path('include'), end='')", ++ "import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'), end='')", + ) + .unwrap(); + let openssl_include = +-- +2.30.2 + diff --git a/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch b/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch index 481f5952465..69cf451d576 100644 --- a/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch +++ b/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch @@ -1,4 +1,4 @@ -From ce972ea92d724f232323a9a6265a8b44d913d4d8 Mon Sep 17 00:00:00 2001 +From b7dd3ce1d75d1e6255e1aca82aa7f401d4246a75 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Tue, 17 May 2022 17:22:48 +0800 Subject: [PATCH] pyproject.toml: remove --benchmark-disable option @@ -18,23 +18,28 @@ Fixes: Upstream-Status: Inappropriate [OE specific] Signed-off-by: Mingli Yu + --- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index 4d58129..b011fca 100644 +index b2e511f..4a285af 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -15,7 +15,7 @@ line-length = 79 - target-version = ["py36"] +@@ -85,7 +85,7 @@ line-length = 79 + target-version = ["py37"] [tool.pytest.ini_options] -addopts = "-r s --capture=no --strict-markers --benchmark-disable" +addopts = "-r s --capture=no --strict-markers" + console_output_style = "progress-even-when-capture-no" markers = [ "skip_fips: this test is not executed in FIPS mode", - "supported: parametrized test requiring only_if and skip_message", --- -2.25.1 - +@@ -151,4 +151,4 @@ git-only = [ + "ci-constraints-requirements.txt", + ".gitattributes", + ".gitignore", +-] +\ No newline at end of file ++] diff --git a/meta/recipes-devtools/python/python3-cryptography/0002-Cargo.toml-edition-2018-2021.patch b/meta/recipes-devtools/python/python3-cryptography/0002-Cargo.toml-edition-2018-2021.patch deleted file mode 100644 index 366e3a4d39a..00000000000 --- a/meta/recipes-devtools/python/python3-cryptography/0002-Cargo.toml-edition-2018-2021.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4b73298b214a5b69ea6edf3c2e21dd82b2b29708 Mon Sep 17 00:00:00 2001 -From: Tim Orling -Date: Fri, 14 Jan 2022 22:34:59 -0800 -Subject: [PATCH 2/2] Cargo.toml: edition 2018 -> 2021 - -Upstream-Status: Pending - -Signed-off-by: Tim Orling ---- - src/rust/Cargo.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml -index 174eaa80..7ad053d9 100644 ---- a/src/rust/Cargo.toml -+++ b/src/rust/Cargo.toml -@@ -2,7 +2,7 @@ - name = "cryptography-rust" - version = "0.1.0" - authors = ["The cryptography developers "] --edition = "2018" -+edition = "2021" - publish = false - - [dependencies] --- -2.30.2 - diff --git a/meta/recipes-devtools/python/python3-cryptography_39.0.2.bb b/meta/recipes-devtools/python/python3-cryptography_41.0.1.bb similarity index 74% rename from meta/recipes-devtools/python/python3-cryptography_39.0.2.bb rename to meta/recipes-devtools/python/python3-cryptography_41.0.1.bb index 449e3ba1bcc..fc4f70246be 100644 --- a/meta/recipes-devtools/python/python3-cryptography_39.0.2.bb +++ b/meta/recipes-devtools/python/python3-cryptography_41.0.1.bb @@ -1,26 +1,24 @@ SUMMARY = "Provides cryptographic recipes and primitives to python developers" HOMEPAGE = "https://cryptography.io/" SECTION = "devel/python" -LICENSE = "( Apache-2.0 | BSD-3-Clause ) & PSF-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=bf405a8056a6647e7d077b0e7bc36aba \ +LICENSE = "Apache-2.0 | BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ file://LICENSE.APACHE;md5=4e168cce331e5c827d4c2b68a6200e1b \ file://LICENSE.BSD;md5=5ae30ba4123bc4f2fa49aa0b0dce887b \ - file://LICENSE.PSF;md5=43c37d21e1dbad10cddcd150ba2c0595 \ " LDSHARED += "-pthread" -SRC_URI[sha256sum] = "bc5b871e977c8ee5a1bbc42fa8d19bcc08baf0c51cbf1586b0e87a2694dde42f" +SRC_URI[sha256sum] = "d34579085401d3f49762d2f7d6634d6b6c2ae1242202e860f4d26b046e3a1006" -SRC_URI += "\ - file://0002-Cargo.toml-edition-2018-2021.patch \ - file://0001-pyproject.toml-remove-benchmark-disable-option.patch \ - file://check-memfree.py \ - file://run-ptest \ -" +SRC_URI += "file://0001-pyproject.toml-remove-benchmark-disable-option.patch \ + file://0001-cryptography-cffi-substitute-include-path-from-targe.patch \ + file://check-memfree.py \ + file://run-ptest \ + " require ${BPN}-crates.inc -inherit pypi python_setuptools3_rust cargo-update-recipe-crates +inherit pypi python_setuptools3_rust cargo-update-recipe-crates pkgconfig DEPENDS += " \ ${PYTHON_PN}-cffi-native \ From patchwork Sun Jun 25 21:22:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26379 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 B51E9C04FDF for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.groups.io with SMTP id smtpd.web11.20169.1687728170352170252 for ; Sun, 25 Jun 2023 14:22:50 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=Yfx7Gja9; spf=pass (domain: gmail.com, ip: 209.85.221.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-313e68e99c7so2042555f8f.1 for ; Sun, 25 Jun 2023 14:22:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728169; x=1690320169; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=K3JilZImgzySQtGi7GGLueknd6YwXE6hF/euxQVdmow=; b=Yfx7Gja9AzC5DgtpA9RtzSgfn/ONhGzFdAqtQ9twEMCtYJayByn+WqdE3dGIKLEAvx 4WCmYsPBlas4Se1Cf9mzqwFONbCHB7iT1Mavdev5trRZKMEb/0BGkPlHXKhGmdOzZ3/p r8kDhJouVdXzkEjzdahXD/u2DSYLW/2CoQP4kLyR3rvRmHjynAzEx7PD3pCZvIwwZukI /vZ2Gk5Bkc3OvAh0jAPfMx/7AuHyDyzXEyc3AhkatIAngcaK033cS1Z6B07XkdXOphlV 3m0cbM9lR2/hk6SglwA7pJBzsyn7gd+lM5oL9UsiihPhUiTDsQCZOJE39ffD6ygj315q ysfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728169; x=1690320169; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=K3JilZImgzySQtGi7GGLueknd6YwXE6hF/euxQVdmow=; b=BO7Duh9lFzUw7QYYsfOmf+CIvwxEAeaA0vvAP1GQsIS/BibpIJN32GZoFaiq2RYwaB s8BSDvBzNx7emUcoI9J32lwD0LYYrTRV/Pk2Tx2Loh3z0Qf5v2DgHejJnme0hTSWg7/X /5xkHCJ4/6IPB/+YYAJdjR7Zqt+rqgUXx7U+5xP/TZnq0+6Zs3oaos1/NjL4LS13RZ49 IR/rORajIYQonXy6jHkHkX666ZkwvHH4GI4bV5Aq6xTZgg4Rr0TkWv3VswxcblU8pO32 YapZwwaK82FrV9MIrmriroZLKq7i8vivyw8qBuf8WDQ0IpFviTP5922CcZ1RgU5f+Lm8 f0IA== X-Gm-Message-State: AC+VfDyB90NpCrCUBEwWUxsFQxdl7GSs/snpJPWegtzDTStgNmFmw1ie gc/hYRFU1V2HGuXxXMB8LwtumJXYV8gYLQ== X-Google-Smtp-Source: ACHHUZ4o+Dyj+P4iEijW5/81f4MbxktndOXRlH7XOMyHelvpBC7dTy33JKKFgu6acfgKUF3tUlIljQ== X-Received: by 2002:a05:6000:42:b0:313:e2c4:7bd1 with SMTP id k2-20020a056000004200b00313e2c47bd1mr4333350wrx.42.1687728168652; Sun, 25 Jun 2023 14:22:48 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:48 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 08/21] python3-cryptography-vectors: update 39.0.2 -> 41.0.1 Date: Sun, 25 Jun 2023 23:22:28 +0200 Message-Id: <20230625212241.915739-8-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183383 Convert to python_setuptools_build_meta. Signed-off-by: Alexander Kanavin --- ...ctors_39.0.2.bb => python3-cryptography-vectors_41.0.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/python/{python3-cryptography-vectors_39.0.2.bb => python3-cryptography-vectors_41.0.1.bb} (86%) diff --git a/meta/recipes-devtools/python/python3-cryptography-vectors_39.0.2.bb b/meta/recipes-devtools/python/python3-cryptography-vectors_41.0.1.bb similarity index 86% rename from meta/recipes-devtools/python/python3-cryptography-vectors_39.0.2.bb rename to meta/recipes-devtools/python/python3-cryptography-vectors_41.0.1.bb index 795e27f75b4..016620e7104 100644 --- a/meta/recipes-devtools/python/python3-cryptography-vectors_39.0.2.bb +++ b/meta/recipes-devtools/python/python3-cryptography-vectors_41.0.1.bb @@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ # NOTE: Make sure to keep this recipe at the same version as python3-cryptography # Upgrade both recipes at the same time -SRC_URI[sha256sum] = "a68f106f7a4322cf1e7ed51e3fc6d5c1e0b11d337ed918ec879e8afe0c2a5220" +SRC_URI[sha256sum] = "23b08c39777ec7b2774a11f945d1746301b1e88ecff2e5326d7f50ea0f42d580" PYPI_PACKAGE = "cryptography_vectors" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta DEPENDS += " \ ${PYTHON_PN}-cryptography \ From patchwork Sun Jun 25 21:22:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26376 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 A4D7EC00528 for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.groups.io with SMTP id smtpd.web10.20344.1687728170823153697 for ; Sun, 25 Jun 2023 14:22:51 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=dC3r7OWt; spf=pass (domain: gmail.com, ip: 209.85.221.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-31114b46d62so3209924f8f.3 for ; Sun, 25 Jun 2023 14:22:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728169; x=1690320169; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MguguT3XA05K7vBNi/uBTv7XqLGUY1TQvFijwo70q5U=; b=dC3r7OWtmJOYmjqXosdqdmz2dcHiomS4ifM7db62MRMD6Kr3j0zBV4TJnz9d9JUrel yztgN6PoDlLowpBi2Xnu70op/fmGpE6LmTRDXEUczAi+ZztQ+xfP///qWxSzvsXCiTsG 0uW6YAUL/nzS3hg901R/H/FKa3j3mMRvgP1UFd1sP5eO0gsMgh/LfaE/Z8NLsLqiusM9 6o6ENofz8A4IbeqABohMqORBxqZklFDXHF2tnsIpRmnSnwTfacKDPPJayf4G7XebAtNx dokFI3rWaeFtqPYKtWG2RKQQI4ccws6E/bepxzqpcKGaOST12/ttdIMAtm0Zq6rcPLcl HIzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728169; x=1690320169; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MguguT3XA05K7vBNi/uBTv7XqLGUY1TQvFijwo70q5U=; b=foNKvO7ebmpo9iyY7oHJrC71O++kHBhzL9fMC3UV9lpZjv4WWgMHJkFSVP63XYMiSP Jg8rmbGtmsWXx7TaGkBEF0Fc7gawDJBlPIFDpB9rVU+NRojHU/YU+l2/O4MPIYbZBjTj Jj4dQEnCytMQqiIPa7sq5jg7+2aOcrcNwSBpzI537EB/8vdbFwlpmnnb1E+1YQFLfN9C C42Idhu75ksORjoFY28VyXnO6yji9oS2s1N2jVsXjE9wXnYnhoiQcapDfR+IVzcSpLea WC+GezYbdbgjfnSeZbl7BRYuP9jJf5XVrZy0wLOZBj9JZd1+xzUvEO3qOjQPv6tROaht nHHg== X-Gm-Message-State: AC+VfDz0ZUUNW3GLmw4ba+kyjBCqkrmvajitWkWuBGS4ypm+2uR2ISmc WhaeXDHANOI4u+2yN6NEq0TcU7tkUHdVoQ== X-Google-Smtp-Source: ACHHUZ5JbslaYfb65scFCp0x9Y42jksNydLFqPHk8hqa55aTUCM0LZ7dG+uzUifgMpAw4MMjGi2D+A== X-Received: by 2002:adf:e7d0:0:b0:30a:ec6c:913 with SMTP id e16-20020adfe7d0000000b0030aec6c0913mr26378615wrn.10.1687728169165; Sun, 25 Jun 2023 14:22:49 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:48 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 09/21] python3: update 3.11.3 -> 3.11.4 Date: Sun, 25 Jun 2023 23:22:29 +0200 Message-Id: <20230625212241.915739-9-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183384 Signed-off-by: Alexander Kanavin --- ...1-Don-t-search-system-for-headers-libraries.patch | 2 +- ...y-handle-stdin-I-O-errors-same-way-as-maste.patch | 12 ++++++------ ...nfig.py-use-prefix-value-from-build-configu.patch | 2 +- .../12-distutils-prefix-is-inside-staging-area.patch | 2 +- meta/recipes-devtools/python/python3/makerace.patch | 8 ++++---- .../python/{python3_3.11.3.bb => python3_3.11.4.bb} | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) rename meta/recipes-devtools/python/{python3_3.11.3.bb => python3_3.11.4.bb} (99%) diff --git a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch index c9253832cfb..222a567dd56 100644 --- a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch +++ b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch @@ -1,4 +1,4 @@ -From 6cb667f37beacd832cb409e5244b3c90dfad32f7 Mon Sep 17 00:00:00 2001 +From aa8f1709c54557d2b51a9a37d15ccc3de62e90cb Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman Date: Wed, 4 Mar 2020 00:06:42 +0000 Subject: [PATCH] Don't search system for headers/libraries diff --git a/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch b/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch index df5179e8770..07c6aef9b97 100644 --- a/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch +++ b/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch @@ -1,4 +1,4 @@ -From 86061629f4a179e740a17e53dd2c98ab47af2fe2 Mon Sep 17 00:00:00 2001 +From 7b0a14e7320078ac891d415cab9b7568e3f52ad8 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 16 Sep 2021 16:35:37 +0200 Subject: [PATCH] Lib/pty.py: handle stdin I/O errors same way as master I/O @@ -30,18 +30,18 @@ Signed-off-by: Alexander Kanavin 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Lib/pty.py b/Lib/pty.py -index 8d8ce40..35439c6 100644 +index fefb63a..4cef056 100644 --- a/Lib/pty.py +++ b/Lib/pty.py -@@ -154,7 +154,10 @@ def _copy(master_fd, master_read=_read, stdin_read=_read): - os.write(STDOUT_FILENO, data) +@@ -184,7 +184,10 @@ def _copy(master_fd, master_read=_read, stdin_read=_read): + i_buf = i_buf[n:] - if STDIN_FILENO in rfds: + if stdin_avail and STDIN_FILENO in rfds: - data = stdin_read(STDIN_FILENO) + try: + data = stdin_read(STDIN_FILENO) + except OSError: + data = b"" if not data: - fds.remove(STDIN_FILENO) + stdin_avail = False else: diff --git a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch index d5b7ce2b95b..a0f3d729924 100644 --- a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch +++ b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch @@ -1,4 +1,4 @@ -From 4ed481f4928c361970e78f27c4d9be8700af176b Mon Sep 17 00:00:00 2001 +From 512c617bd00b74b30a80dd56a12391de46e2b6cf Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 10 Sep 2021 12:28:31 +0200 Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch index 5ee4e4f126f..bbdd8b586e9 100644 --- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +++ b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch @@ -1,4 +1,4 @@ -From 4c39252c71d8bca81fdc43753c83a59f8668c619 Mon Sep 17 00:00:00 2001 +From 843574d5a5b0818e83e20f8c0389d567bd4733fb Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 14 May 2013 15:00:26 -0700 Subject: [PATCH] python3: Add target and native recipes diff --git a/meta/recipes-devtools/python/python3/makerace.patch b/meta/recipes-devtools/python/python3/makerace.patch index 979fc9dc364..c71c1e15dec 100644 --- a/meta/recipes-devtools/python/python3/makerace.patch +++ b/meta/recipes-devtools/python/python3/makerace.patch @@ -1,4 +1,4 @@ -From 4f52aaf2a548b3356c6f1369c62b11335dc27464 Mon Sep 17 00:00:00 2001 +From dde5cb74f55b6dd39d25cff639d16940d9dad505 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 13 Jul 2021 23:19:29 +0100 Subject: [PATCH] python3: Fix make race @@ -18,11 +18,11 @@ Signed-off-by: Richard Purdie 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 7558f0c..8cec819 100644 +index c6d7e85..205af6c 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2005,7 +2005,7 @@ TESTSUBDIRS= ctypes/test \ - unittest/test unittest/test/testmock +@@ -2045,7 +2045,7 @@ TESTSUBDIRS= ctypes/test \ + unittest/test/testmock TEST_MODULES=@TEST_MODULES@ -libinstall: all $(srcdir)/Modules/xxmodule.c diff --git a/meta/recipes-devtools/python/python3_3.11.3.bb b/meta/recipes-devtools/python/python3_3.11.4.bb similarity index 99% rename from meta/recipes-devtools/python/python3_3.11.3.bb rename to meta/recipes-devtools/python/python3_3.11.4.bb index c7974849b60..6b074c48cf2 100644 --- a/meta/recipes-devtools/python/python3_3.11.3.bb +++ b/meta/recipes-devtools/python/python3_3.11.4.bb @@ -39,7 +39,7 @@ SRC_URI:append:class-native = " \ file://12-distutils-prefix-is-inside-staging-area.patch \ file://0001-Don-t-search-system-for-headers-libraries.patch \ " -SRC_URI[sha256sum] = "8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e" +SRC_URI[sha256sum] = "2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P\d+(\.\d+)+).tar" From patchwork Sun Jun 25 21:22:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26381 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 A644EC04E69 for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.groups.io with SMTP id smtpd.web10.20345.1687728171421582741 for ; Sun, 25 Jun 2023 14:22:51 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=VBAEWdiZ; spf=pass (domain: gmail.com, ip: 209.85.128.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-3fa7cd95dacso32906045e9.3 for ; Sun, 25 Jun 2023 14:22:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728170; x=1690320170; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0LaB4iIcYWFXa3BxqleE2dSixh617amAsAFwYEkJ1Q8=; b=VBAEWdiZ+5mZgl/5LUkY+XWJIgXRkd9vM/q/VZccyMtnODrPqQKyg/v5fwmNcuUskB PbIfUbORbhByGv6kQHnYhviPl5/FzLey3Mvf5T2MXD8r4+FRkyuLEwyDKM4egEdifubt 3UbjC0mwjpGHLADA5N7/5ynd3TEy51KPBEdue0T5A6c0na5qBoenWA2oQ62DP25H9z2E oYnQ/kltt7SPAbo5Z8qT0EfrRVqahSdxUwTB3od33fXifsgVvBdQLAux9jvgoabJY/6P r8nFLCSytOAw+ZTsaKHMK3KpdYGajLb9I+VzC4vFJvTLhGwEjKo0BnqMRrjy0T/xG0W/ X0/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728170; x=1690320170; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0LaB4iIcYWFXa3BxqleE2dSixh617amAsAFwYEkJ1Q8=; b=QIGwvpNe+t96dBrUhr4Vy1PDMxo4rpaxB5+6xuTNwIcZY1PoDoBuhbMoiOOEcoBgA4 RvYdg9O+XSAW8z9BKy/e1HOJK4Oq7MwFBvePID+QS5JJYCH1JjP30QkxEvrMPJ+pTq/b +h4NHbkODgra3gjxeUYGsFR6BNTSokbyITysUBmwh3XMEGN6JmyI2/4FSFhwdDGHZ6AH sMTo9K5WFbOgdBwpzbbeUx0G86WSLX4rsjZiwLYqh6P0Yo9yuSwMXLT2sugU5yGz/09O fXqtzi7XLp32Rtg+WjgKJdLn3z2Jr2niDJyYimq2Fh4vy7tzeQ0fVawR1OvTz6MuqwBP NQXA== X-Gm-Message-State: AC+VfDwuaA9vNvZgnd+wio5lyAK9Sxeh008kHJsFOtJTIzlz6vkoqQb2 nFnSo1viiK5NtNSuYo9LJ9EY3tZ+QoyruQ== X-Google-Smtp-Source: ACHHUZ4/75Ly1wJ3Z1quegZrTjMA8xnWaAYCMiQ8iRbUp+CivbJOUZvBaPoscltv1xzaaRvQe2whdQ== X-Received: by 2002:a7b:cd97:0:b0:3f9:c1b:83c3 with SMTP id y23-20020a7bcd97000000b003f90c1b83c3mr17877716wmj.2.1687728169665; Sun, 25 Jun 2023 14:22:49 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:49 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 10/21] diffutils: update 3.9 -> 3.10 Date: Sun, 25 Jun 2023 23:22:30 +0200 Message-Id: <20230625212241.915739-10-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183385 Remove the comment addition from the patch body, as it increases likelyhood of rebase conflicts, and repeats what the commit says. Signed-off-by: Alexander Kanavin --- ...001-Skip-strip-trailing-cr-test-case.patch | 19 +++++++------------ .../{diffutils_3.9.bb => diffutils_3.10.bb} | 2 +- 2 files changed, 8 insertions(+), 13 deletions(-) rename meta/recipes-extended/diffutils/{diffutils_3.9.bb => diffutils_3.10.bb} (93%) diff --git a/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch b/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch index 8b88c308f21..32793233f9f 100644 --- a/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch +++ b/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch @@ -1,4 +1,4 @@ -From 027229d25392b22d7280c0abbc3efde4f467d167 Mon Sep 17 00:00:00 2001 +From f31395c931bc633206eccfcfaaaa5d15021a3e86 Mon Sep 17 00:00:00 2001 From: Peiran Hong Date: Thu, 5 Sep 2019 15:42:22 -0400 Subject: [PATCH] Skip strip-trailing-cr test case @@ -12,23 +12,18 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Peiran Hong --- - tests/Makefile.am | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + tests/Makefile.am | 1 - + 1 file changed, 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am -index d98df82..757ea52 100644 +index 79bacfb..4adb4d7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -21,9 +21,11 @@ TESTS = \ +@@ -22,7 +22,6 @@ TESTS = \ stdin \ strcoll-0-names \ filename-quoting \ - strip-trailing-cr \ timezone \ - colors -+# Skipping this test since it requires valgrind -+# and thus is too heavy for diffutils package -+# strip-trailing-cr - - XFAIL_TESTS = large-subopt - + colors \ + y2038-vs-32bit diff --git a/meta/recipes-extended/diffutils/diffutils_3.9.bb b/meta/recipes-extended/diffutils/diffutils_3.10.bb similarity index 93% rename from meta/recipes-extended/diffutils/diffutils_3.9.bb rename to meta/recipes-extended/diffutils/diffutils_3.10.bb index 2bb9e6f32d8..08e83056127 100644 --- a/meta/recipes-extended/diffutils/diffutils_3.9.bb +++ b/meta/recipes-extended/diffutils/diffutils_3.10.bb @@ -8,7 +8,7 @@ SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ file://0001-Skip-strip-trailing-cr-test-case.patch \ " -SRC_URI[sha256sum] = "d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1" +SRC_URI[sha256sum] = "90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e" EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix" From patchwork Sun Jun 25 21:22:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26377 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 A52E5C04A6A for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.groups.io with SMTP id smtpd.web10.20346.1687728171782894703 for ; Sun, 25 Jun 2023 14:22:52 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=Lf0jzvyq; spf=pass (domain: gmail.com, ip: 209.85.221.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-313e742a787so848372f8f.1 for ; Sun, 25 Jun 2023 14:22:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728170; x=1690320170; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dGY+AmJgaTseULnmU4znRBmL+reOi84rfNDi98GyGh4=; b=Lf0jzvyqL1T34A0uk2+Qvwtgwn5DnbSeZa79gW5TAOtn0oTRdiiHJDewSyml/swTTb rrYVkso9rcPzUkDlXi6A3VK98/qNgCUs6ZkCMrFPdWNcB/y8v/V5JLgWoyTLEwu/jTds k4iup71LZ6dx1x85s0zDB5B7/Aba+nscEM7BVzkFY2ZWjQSQjEEZIzOu9xdmCNgGkoKz /hJvu0NjQDeYekC7yxIgBt+iDsWTA4EeLvvtv5Bq1HHesEGI8tJKJvoGQZKiOraXwW5S 2SZ7MINe8zRBAkSQtVN/JdrNHgp8L3erBxBDcX1UIJbO73D6M4XTNnI23irOEkCDo+5m k3tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728170; x=1690320170; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dGY+AmJgaTseULnmU4znRBmL+reOi84rfNDi98GyGh4=; b=LMxb1rGwYO0ZC3H/YnpeskvMUwHEHLNwpTYPmZMLCgvgNhSGAjtvhn+rK8bimJYL0h 0H1BjbS7K1sVxFcgk2dN3IEXR2tjHPuC95MOiwy0S5AA2n8EA310WTzw/BlgTPYqkOTk 1u5XwsYIZqccI1z5QPLMDm2oqlYtj0t5hBwaHHDEKLK/UI/amr8KhoPlvlf1MjWMoNrO jOLfShBPorze1RiBCKDPkYe2inslJ9Qq5Rk7lw2Vr9lqsbOxqzPyp/X95XK8dsJduZCy gzH/6zB5IHxvZ7OKBBTVhXY3AlGlEvt2GpkO57hijga8iwDhwAdFE4Nqd1kmNHFa0RaR WwlQ== X-Gm-Message-State: AC+VfDxiVNztG/ACqOoYLgX2ML5BeUmTGVOJiwi9whY2N5iC1ix8eq27 +EIalpdRPs4DLEqsWn85l0PmNiSncIjJ7A== X-Google-Smtp-Source: ACHHUZ6G6IK9Btu1QGS8rhRmCsclVPgx/Z79HWsc58btSLYx7L9UuleRA6mo8W72HCvB7Gi56EHwow== X-Received: by 2002:a5d:6a0b:0:b0:313:f000:5de6 with SMTP id m11-20020a5d6a0b000000b00313f0005de6mr1381719wru.16.1687728170136; Sun, 25 Jun 2023 14:22:50 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:49 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 11/21] shadow: remove dependency on pam-plugin-lastlog Date: Sun, 25 Jun 2023 23:22:31 +0200 Message-Id: <20230625212241.915739-11-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183386 This item has been deprecated in pam 1.5.3 and is no longer built by default: https://github.com/linux-pam/linux-pam/blob/master/NEWS Signed-off-by: Alexander Kanavin --- meta/recipes-extended/shadow/files/pam.d/login | 4 ---- meta/recipes-extended/shadow/shadow.inc | 3 --- 2 files changed, 7 deletions(-) diff --git a/meta/recipes-extended/shadow/files/pam.d/login b/meta/recipes-extended/shadow/files/pam.d/login index b340058539e..d39e09b1eae 100644 --- a/meta/recipes-extended/shadow/files/pam.d/login +++ b/meta/recipes-extended/shadow/files/pam.d/login @@ -57,10 +57,6 @@ auth optional pam_group.so # (Replaces the use of /etc/limits in old login) session required pam_limits.so -# Prints the last login info upon succesful login -# (Replaces the `LASTLOG_ENAB' option from login.defs) -session optional pam_lastlog.so - # Prints the motd upon succesful login # (Replaces the `MOTD_FILE' option in login.defs) session optional pam_motd.so diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index cf05a3af93c..83e1a847693 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -65,14 +65,11 @@ PAM_PLUGINS = "libpam-runtime \ pam-plugin-env \ pam-plugin-group \ pam-plugin-limits \ - pam-plugin-lastlog \ pam-plugin-motd \ pam-plugin-mail \ pam-plugin-shells \ pam-plugin-rootok" -PAM_PLUGINS:remove:libc-musl = "pam-plugin-lastlog" - PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" PACKAGECONFIG:class-native ??= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" From patchwork Sun Jun 25 21:22:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26378 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 91669C001E0 for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.groups.io with SMTP id smtpd.web10.20347.1687728172338286395 for ; Sun, 25 Jun 2023 14:22:52 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=Fw35M0Lz; spf=pass (domain: gmail.com, ip: 209.85.221.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-31109cd8d8cso3085891f8f.2 for ; Sun, 25 Jun 2023 14:22:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728171; x=1690320171; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1cN0MKEm3TIdYHUHbaRWndy0+w/TaqKkzxmkHxyjKPU=; b=Fw35M0Lz9tM9h6yIO5fL1EnBnjJ6OYtjyV5sFyFnK1fBIs2XcMnTMIWRcO774tlsG6 nWVByUYeJbBp1W5tsTSSOqharHtQk/8vDA5b4mqXqiF+6GgOR7e2A7A+s8RaW0Cr7B1q 9EAMj6uHoPXO8wPODjH2LC2ap+Cv7ezecfa5aEoz9p/V/88T357SxKg3WLtTvqFmkRmC FC0cODn49ajbzcVokd6pWjqs09Oj3rm20maV5jKJxdl1944bPonnXpyHwNH4GRj3kg7b qwYNtg+cVL5kEVRf0nxRur9GRV3NysfDE5qKI441zzKGOrs96l7jtMvTmjgF8VKqwcgv g43Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728171; x=1690320171; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1cN0MKEm3TIdYHUHbaRWndy0+w/TaqKkzxmkHxyjKPU=; b=CrxNEVWPHtDcupiDe+GVQ97OlzbrRTUAZR4+r2m+iXBaNhGf9B2UCQ7R0550+nOKlW dyiTx5yw8XepSR/aNKEJFGhcwQzGLb29JzEiSUAdzQMlAdvw7yqUS2XWV2+IBDISAw5t elyGL5l8qOw3Sej+NIAgDJR5nngzAI5ktr+WnXedR5WxJilptWH3tTfJh6F6sWlu2Xrj UnrmZfa4Er4kqDZHPZCiNFa7jBKxtsqiSLwyYT+KqKIzksnwHoqYB0NF0seX4sJugY8l u2O6X/WQW1TK6liMaUzXF6h/HcVo9me15NBsKstG+aQKGYbjTV3mVay2WhJo1L9hRmJE xlyw== X-Gm-Message-State: AC+VfDyM8ihEJu8Qw2MosYOj2tSbN+9/TdYfFGp/xaeUBlB/iaw8oPS6 0oxsfKtbzS9ZBKIyj9UMf52x7Pco3Vgz9A== X-Google-Smtp-Source: ACHHUZ7A4FnlnggHSh57nJGFU0rTvus0IBohRt9w8o5KknYiUSdn04GNwENwVPw2mGAdrAToZlVVig== X-Received: by 2002:a5d:522b:0:b0:313:ebf3:850e with SMTP id i11-20020a5d522b000000b00313ebf3850emr2163585wra.37.1687728170608; Sun, 25 Jun 2023 14:22:50 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:50 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 12/21] libpam: update 1.5.2 -> 1.5.3 Date: Sun, 25 Jun 2023 23:22:32 +0200 Message-Id: <20230625212241.915739-12-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183387 Signed-off-by: Alexander Kanavin --- ...rely-on-all-filesystems-providing-a-.patch | 108 --------- ...-xtests.sh-check-whether-files-exist.patch | 65 ------ .../pam/libpam/CVE-2022-28321-0002.patch | 205 ------------------ .../pam/{libpam_1.5.2.bb => libpam_1.5.3.bb} | 5 +- 4 files changed, 1 insertion(+), 382 deletions(-) delete mode 100644 meta/recipes-extended/pam/libpam/0001-pam_motd-do-not-rely-on-all-filesystems-providing-a-.patch delete mode 100644 meta/recipes-extended/pam/libpam/0001-run-xtests.sh-check-whether-files-exist.patch delete mode 100644 meta/recipes-extended/pam/libpam/CVE-2022-28321-0002.patch rename meta/recipes-extended/pam/{libpam_1.5.2.bb => libpam_1.5.3.bb} (95%) diff --git a/meta/recipes-extended/pam/libpam/0001-pam_motd-do-not-rely-on-all-filesystems-providing-a-.patch b/meta/recipes-extended/pam/libpam/0001-pam_motd-do-not-rely-on-all-filesystems-providing-a-.patch deleted file mode 100644 index 94dcb04f0aa..00000000000 --- a/meta/recipes-extended/pam/libpam/0001-pam_motd-do-not-rely-on-all-filesystems-providing-a-.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 42404548721c653317c911c83d885e2fc7fbca70 Mon Sep 17 00:00:00 2001 -From: Per Jessen -Date: Fri, 22 Apr 2022 18:15:36 +0200 -Subject: [PATCH] pam_motd: do not rely on all filesystems providing a filetype - -When using scandir() to look for MOTD files to display, we wrongly -relied on all filesystems providing a filetype. This is a fix to divert -to lstat() when we have no filetype. To maintain MT safety, it isn't -possible to use lstat() in the scandir() filter function, so all of the -filtering has been moved to an additional loop after scanning all the -motd dirs. -Also, remove superfluous alphasort from scandir(), we are doing -a qsort() later. - -Resolves: https://github.com/linux-pam/linux-pam/issues/455 - -Upstream-Status: Backport [https://github.com/linux-pam/linux-pam/commit/42404548721c653317c911c83d885e2fc7fbca70] - -Signed-off-by: Per Jessen -Signed-off-by: Zhixiong Chi ---- - modules/pam_motd/pam_motd.c | 49 ++++++++++++++++++++++++++++++------- - 1 file changed, 40 insertions(+), 9 deletions(-) - -diff --git a/modules/pam_motd/pam_motd.c b/modules/pam_motd/pam_motd.c -index 6ac8cba2..5ca486e4 100644 ---- a/modules/pam_motd/pam_motd.c -+++ b/modules/pam_motd/pam_motd.c -@@ -166,11 +166,6 @@ static int compare_strings(const void *a, const void *b) - } - } - --static int filter_dirents(const struct dirent *d) --{ -- return (d->d_type == DT_REG || d->d_type == DT_LNK); --} -- - static void try_to_display_directories_with_overrides(pam_handle_t *pamh, - char **motd_dir_path_split, unsigned int num_motd_dirs, int report_missing) - { -@@ -199,8 +194,7 @@ static void try_to_display_directories_with_overrides(pam_handle_t *pamh, - - for (i = 0; i < num_motd_dirs; i++) { - int rv; -- rv = scandir(motd_dir_path_split[i], &(dirscans[i]), -- filter_dirents, alphasort); -+ rv = scandir(motd_dir_path_split[i], &(dirscans[i]), NULL, NULL); - if (rv < 0) { - if (errno != ENOENT || report_missing) { - pam_syslog(pamh, LOG_ERR, "error scanning directory %s: %m", -@@ -215,6 +209,41 @@ static void try_to_display_directories_with_overrides(pam_handle_t *pamh, - if (dirscans_size_total == 0) - goto out; - -+ /* filter out unwanted names, directories, and complement data with lstat() */ -+ for (i = 0; i < num_motd_dirs; i++) { -+ struct dirent **d = dirscans[i]; -+ for (unsigned int j = 0; j < dirscans_sizes[i]; j++) { -+ int rc; -+ char *fullpath; -+ struct stat s; -+ -+ switch(d[j]->d_type) { /* the filetype determines how to proceed */ -+ case DT_REG: /* regular files and */ -+ case DT_LNK: /* symlinks */ -+ continue; /* are good. */ -+ case DT_UNKNOWN: /* for file systems that do not provide */ -+ /* a filetype, we use lstat() */ -+ if (join_dir_strings(&fullpath, motd_dir_path_split[i], -+ d[j]->d_name) <= 0) -+ break; -+ rc = lstat(fullpath, &s); -+ _pam_drop(fullpath); /* free the memory alloc'ed by join_dir_strings */ -+ if (rc != 0) /* if the lstat() somehow failed */ -+ break; -+ -+ if (S_ISREG(s.st_mode) || /* regular files and */ -+ S_ISLNK(s.st_mode)) continue; /* symlinks are good */ -+ break; -+ case DT_DIR: /* We don't want directories */ -+ default: /* nor anything else */ -+ break; -+ } -+ _pam_drop(d[j]); /* free memory */ -+ d[j] = NULL; /* indicate this one was dropped */ -+ dirscans_size_total--; -+ } -+ } -+ - /* Allocate space for all file names found in the directories, including duplicates. */ - if ((dirnames_all = calloc(dirscans_size_total, sizeof(*dirnames_all))) == NULL) { - pam_syslog(pamh, LOG_CRIT, "failed to allocate dirname array"); -@@ -225,8 +254,10 @@ static void try_to_display_directories_with_overrides(pam_handle_t *pamh, - unsigned int j; - - for (j = 0; j < dirscans_sizes[i]; j++) { -- dirnames_all[i_dirnames] = dirscans[i][j]->d_name; -- i_dirnames++; -+ if (NULL != dirscans[i][j]) { -+ dirnames_all[i_dirnames] = dirscans[i][j]->d_name; -+ i_dirnames++; -+ } - } - } - --- -2.39.0 - diff --git a/meta/recipes-extended/pam/libpam/0001-run-xtests.sh-check-whether-files-exist.patch b/meta/recipes-extended/pam/libpam/0001-run-xtests.sh-check-whether-files-exist.patch deleted file mode 100644 index 40040a873a6..00000000000 --- a/meta/recipes-extended/pam/libpam/0001-run-xtests.sh-check-whether-files-exist.patch +++ /dev/null @@ -1,65 +0,0 @@ -From e8e8ccfd57e0274b431bc5717bf37c488285b07b Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Wed, 27 Oct 2021 10:30:46 +0800 -Subject: [PATCH] run-xtests.sh: check whether files exist - -Fixes: - # ./run-xtests.sh . tst-pam_access1 - mv: cannot stat '/etc/security/opasswd': No such file or directory - PASS: tst-pam_access1 - mv: cannot stat '/etc/security/opasswd-pam-xtests': No such file or directory - ================== - 1 tests passed - 0 tests not run - ================== - -Upstream-Status: Backport [https://github.com/linux-pam/linux-pam/commit/e8e8ccfd57e0274b431bc5717bf37c488285b07b] - -Signed-off-by: Mingli Yu ---- - xtests/run-xtests.sh | 20 +++++++++++++------- - 1 file changed, 13 insertions(+), 7 deletions(-) - -diff --git a/xtests/run-xtests.sh b/xtests/run-xtests.sh -index 14f585d9..ff9a4dc1 100755 ---- a/xtests/run-xtests.sh -+++ b/xtests/run-xtests.sh -@@ -18,10 +18,12 @@ all=0 - - mkdir -p /etc/security - for config in access.conf group.conf time.conf limits.conf ; do -- cp /etc/security/$config /etc/security/$config-pam-xtests -+ [ -f "/etc/security/$config" ] && -+ mv /etc/security/$config /etc/security/$config-pam-xtests - install -m 644 "${SRCDIR}"/$config /etc/security/$config - done --mv /etc/security/opasswd /etc/security/opasswd-pam-xtests -+[ -f /etc/security/opasswd ] && -+ mv /etc/security/opasswd /etc/security/opasswd-pam-xtests - - for testname in $XTESTS ; do - for cfg in "${SRCDIR}"/$testname*.pamd ; do -@@ -47,11 +49,15 @@ for testname in $XTESTS ; do - all=`expr $all + 1` - rm -f /etc/pam.d/$testname* - done --mv /etc/security/access.conf-pam-xtests /etc/security/access.conf --mv /etc/security/group.conf-pam-xtests /etc/security/group.conf --mv /etc/security/time.conf-pam-xtests /etc/security/time.conf --mv /etc/security/limits.conf-pam-xtests /etc/security/limits.conf --mv /etc/security/opasswd-pam-xtests /etc/security/opasswd -+ -+for config in access.conf group.conf time.conf limits.conf opasswd ; do -+ if [ -f "/etc/security/$config-pam-xtests" ]; then -+ mv /etc/security/$config-pam-xtests /etc/security/$config -+ else -+ rm -f /etc/security/$config -+ fi -+done -+ - if test "$failed" -ne 0; then - echo "===================" - echo "$failed of $all tests failed" --- -2.32.0 - diff --git a/meta/recipes-extended/pam/libpam/CVE-2022-28321-0002.patch b/meta/recipes-extended/pam/libpam/CVE-2022-28321-0002.patch deleted file mode 100644 index e7bf03f9f7b..00000000000 --- a/meta/recipes-extended/pam/libpam/CVE-2022-28321-0002.patch +++ /dev/null @@ -1,205 +0,0 @@ -From 23393bef92c1e768eda329813d7af55481c6ca9f Mon Sep 17 00:00:00 2001 -From: Thorsten Kukuk -Date: Thu, 24 Feb 2022 10:37:32 +0100 -Subject: [PATCH 2/2] pam_access: handle hostnames in access.conf - -According to the manual page, the following entry is valid but does not -work: --:root:ALL EXCEPT localhost - -See https://bugzilla.suse.com/show_bug.cgi?id=1019866 - -Patched is based on PR#226 from Josef Moellers - -Upstream-Status: Backport -CVE: CVE-2022-28321 - -Reference to upstream patch: -[https://github.com/linux-pam/linux-pam/commit/23393bef92c1e768eda329813d7af55481c6ca9f] - -Signed-off-by: Stefan Ghinea ---- - modules/pam_access/pam_access.c | 95 ++++++++++++++++++++++++++------- - 1 file changed, 76 insertions(+), 19 deletions(-) - -diff --git a/modules/pam_access/pam_access.c b/modules/pam_access/pam_access.c -index 277192b..bca424f 100644 ---- a/modules/pam_access/pam_access.c -+++ b/modules/pam_access/pam_access.c -@@ -637,7 +637,7 @@ remote_match (pam_handle_t *pamh, char *tok, struct login_info *item) - if ((str_len = strlen(string)) > tok_len - && strcasecmp(tok, string + str_len - tok_len) == 0) - return YES; -- } else if (tok[tok_len - 1] == '.') { -+ } else if (tok[tok_len - 1] == '.') { /* internet network numbers (end with ".") */ - struct addrinfo hint; - - memset (&hint, '\0', sizeof (hint)); -@@ -678,7 +678,7 @@ remote_match (pam_handle_t *pamh, char *tok, struct login_info *item) - return NO; - } - -- /* Assume network/netmask with an IP of a host. */ -+ /* Assume network/netmask, IP address or hostname. */ - return network_netmask_match(pamh, tok, string, item); - } - -@@ -696,7 +696,7 @@ string_match (pam_handle_t *pamh, const char *tok, const char *string, - /* - * If the token has the magic value "ALL" the match always succeeds. - * Otherwise, return YES if the token fully matches the string. -- * "NONE" token matches NULL string. -+ * "NONE" token matches NULL string. - */ - - if (strcasecmp(tok, "ALL") == 0) { /* all: always matches */ -@@ -714,7 +714,8 @@ string_match (pam_handle_t *pamh, const char *tok, const char *string, - - /* network_netmask_match - match a string against one token - * where string is a hostname or ip (v4,v6) address and tok -- * represents either a single ip (v4,v6) address or a network/netmask -+ * represents either a hostname, a single ip (v4,v6) address -+ * or a network/netmask - */ - static int - network_netmask_match (pam_handle_t *pamh, -@@ -723,10 +724,12 @@ network_netmask_match (pam_handle_t *pamh, - char *netmask_ptr; - char netmask_string[MAXHOSTNAMELEN + 1]; - int addr_type; -+ struct addrinfo *ai = NULL; - - if (item->debug) -- pam_syslog (pamh, LOG_DEBUG, -+ pam_syslog (pamh, LOG_DEBUG, - "network_netmask_match: tok=%s, item=%s", tok, string); -+ - /* OK, check if tok is of type addr/mask */ - if ((netmask_ptr = strchr(tok, '/')) != NULL) - { -@@ -760,54 +763,108 @@ network_netmask_match (pam_handle_t *pamh, - netmask_ptr = number_to_netmask(netmask, addr_type, - netmask_string, MAXHOSTNAMELEN); - } -- } -+ -+ /* -+ * Construct an addrinfo list from the IP address. -+ * This should not fail as the input is a correct IP address... -+ */ -+ if (getaddrinfo (tok, NULL, NULL, &ai) != 0) -+ { -+ return NO; -+ } -+ } - else -- /* NO, then check if it is only an addr */ -- if (isipaddr(tok, NULL, NULL) != YES) -+ { -+ /* -+ * It is either an IP address or a hostname. -+ * Let getaddrinfo sort everything out -+ */ -+ if (getaddrinfo (tok, NULL, NULL, &ai) != 0) - { -+ pam_syslog(pamh, LOG_ERR, "cannot resolve hostname \"%s\"", tok); -+ - return NO; - } -+ netmask_ptr = NULL; -+ } - - if (isipaddr(string, NULL, NULL) != YES) - { -- /* Assume network/netmask with a name of a host. */ - struct addrinfo hint; - -+ /* Assume network/netmask with a name of a host. */ - memset (&hint, '\0', sizeof (hint)); - hint.ai_flags = AI_CANONNAME; - hint.ai_family = AF_UNSPEC; - - if (item->gai_rv != 0) -+ { -+ freeaddrinfo(ai); - return NO; -+ } - else if (!item->res && - (item->gai_rv = getaddrinfo (string, NULL, &hint, &item->res)) != 0) -+ { -+ freeaddrinfo(ai); - return NO; -+ } - else - { - struct addrinfo *runp = item->res; -+ struct addrinfo *runp1; - - while (runp != NULL) - { - char buf[INET6_ADDRSTRLEN]; - -- DIAG_PUSH_IGNORE_CAST_ALIGN; -- inet_ntop (runp->ai_family, -- runp->ai_family == AF_INET -- ? (void *) &((struct sockaddr_in *) runp->ai_addr)->sin_addr -- : (void *) &((struct sockaddr_in6 *) runp->ai_addr)->sin6_addr, -- buf, sizeof (buf)); -- DIAG_POP_IGNORE_CAST_ALIGN; -+ if (getnameinfo (runp->ai_addr, runp->ai_addrlen, buf, sizeof (buf), NULL, 0, NI_NUMERICHOST) != 0) -+ { -+ freeaddrinfo(ai); -+ return NO; -+ } - -- if (are_addresses_equal(buf, tok, netmask_ptr)) -+ for (runp1 = ai; runp1 != NULL; runp1 = runp1->ai_next) - { -- return YES; -+ char buf1[INET6_ADDRSTRLEN]; -+ -+ if (runp->ai_family != runp1->ai_family) -+ continue; -+ -+ if (getnameinfo (runp1->ai_addr, runp1->ai_addrlen, buf1, sizeof (buf1), NULL, 0, NI_NUMERICHOST) != 0) -+ { -+ freeaddrinfo(ai); -+ return NO; -+ } -+ -+ if (are_addresses_equal (buf, buf1, netmask_ptr)) -+ { -+ freeaddrinfo(ai); -+ return YES; -+ } - } - runp = runp->ai_next; - } - } - } - else -- return (are_addresses_equal(string, tok, netmask_ptr)); -+ { -+ struct addrinfo *runp1; -+ -+ for (runp1 = ai; runp1 != NULL; runp1 = runp1->ai_next) -+ { -+ char buf1[INET6_ADDRSTRLEN]; -+ -+ (void) getnameinfo (runp1->ai_addr, runp1->ai_addrlen, buf1, sizeof (buf1), NULL, 0, NI_NUMERICHOST); -+ -+ if (are_addresses_equal(string, buf1, netmask_ptr)) -+ { -+ freeaddrinfo(ai); -+ return YES; -+ } -+ } -+ } -+ -+ freeaddrinfo(ai); - - return NO; - } --- -2.37.3 - diff --git a/meta/recipes-extended/pam/libpam_1.5.2.bb b/meta/recipes-extended/pam/libpam_1.5.3.bb similarity index 95% rename from meta/recipes-extended/pam/libpam_1.5.2.bb rename to meta/recipes-extended/pam/libpam_1.5.3.bb index bec47ab8360..c8f1e164593 100644 --- a/meta/recipes-extended/pam/libpam_1.5.2.bb +++ b/meta/recipes-extended/pam/libpam_1.5.3.bb @@ -21,14 +21,11 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/Linux-PAM-${PV}.tar.xz \ file://pam.d/common-session-noninteractive \ file://pam.d/other \ file://libpam-xtests.patch \ - file://0001-run-xtests.sh-check-whether-files-exist.patch \ file://run-ptest \ file://pam-volatiles.conf \ - file://CVE-2022-28321-0002.patch \ - file://0001-pam_motd-do-not-rely-on-all-filesystems-providing-a-.patch \ " -SRC_URI[sha256sum] = "e4ec7131a91da44512574268f493c6d8ca105c87091691b8e9b56ca685d4f94d" +SRC_URI[sha256sum] = "7ac4b50feee004a9fa88f1dfd2d2fa738a82896763050cd773b3c54b0a818283" DEPENDS = "bison-native flex-native cracklib libxml2-native virtual/crypt" From patchwork Sun Jun 25 21:22:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26387 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 969C6C001DF for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.groups.io with SMTP id smtpd.web10.20348.1687728173174844304 for ; Sun, 25 Jun 2023 14:22:53 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=N+lRG9kt; spf=pass (domain: gmail.com, ip: 209.85.221.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-313f18f5295so402041f8f.3 for ; Sun, 25 Jun 2023 14:22:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728171; x=1690320171; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2DbkW3IZSQ4Qoczwy14wVg1rXybmiBfph5lczZI62Uc=; b=N+lRG9ktShiqCyp53DIKa5xXZeSaw5r9zHBWgwZeFVkfBvWSanPRBZtSUxgi/4AGwD bJSdT47CBRl6rEsA+1+G9sM9Wfsf4/02gWZsJ2Arf8YQ01PZAFV+t21HhiA9YZdOntA2 dW9TAfbvw9kLN5P/3fnFWEaVqlvhZcdavrsPa1xhYj+o/aYdPJijTmP54EsRYvbzLjQt rE7ZNjOuJ4Xsduoa2FN+KAEhIoddxW5rbKs4WEtOiZSiXxhF809rNip+M+o42JZPGc40 dkk9p8Nw8tUUsj2/3WJBB8HR6bHGXcAdQtqIcRM5CAtflVs1nFasHbmo+a0hpurKxMe/ vJcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728171; x=1690320171; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2DbkW3IZSQ4Qoczwy14wVg1rXybmiBfph5lczZI62Uc=; b=RtquW0jn0tgu/1RzOMLb2yl8l5GtsFsKT69FWZBHhQfrfJJhiv/fy9HiDgMC2Ok+94 Y6izdIVhejBOCL5pZKkbCkPP2jc+4gquwwB8TbaTHQjVc/kViMVJquGtMTBZjR7M8Tex vUgIXzzgTftEm8MPad+aL84AwLEqG1JLaJFPuNMfMllWEt7AVkL8PXE/HkHR0fdJhgt3 xmO4PF9teWxuHJmcKkivpHaXdEn6/x0Y45JHTneiQeyhEH+bJuwK4r08DBabOc8ecTP+ d+vdspECuRQJ6+oEq/Kx0rcP30I1EPzyv4zzNNn/c0kOctUoyXPlOADNSGhK4QJAVG81 wqhg== X-Gm-Message-State: AC+VfDwmaEmuwNfOgiNeigwQu3pUak/UI2jfrCqT49xiVn6k79fiY0Qy JajVJ5S09JS5J7epcFHcAXNWmgbqi58D+g== X-Google-Smtp-Source: ACHHUZ6Ms3NhzDRxCxZyWLbT5B3XECwv7K68MGZaQ4f0k2eFs6am9PSpdN+Be3US8YhUmiYFNWQvrg== X-Received: by 2002:a05:6000:c6:b0:313:f18d:1f2c with SMTP id q6-20020a05600000c600b00313f18d1f2cmr759774wrx.38.1687728171182; Sun, 25 Jun 2023 14:22:51 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:50 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 13/21] librsvg: update 2.56.0 -> 2.56.1 Date: Sun, 25 Jun 2023 23:22:33 +0200 Message-Id: <20230625212241.915739-13-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183388 Drop 0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch as upstream fixed the issue. Signed-off-by: Alexander Kanavin --- meta/recipes-gnome/librsvg/librsvg-crates.inc | 374 ++++++++++-------- ...lib.rs-do-not-probe-into-harcoded-li.patch | 42 -- .../{librsvg_2.56.0.bb => librsvg_2.56.1.bb} | 3 +- 3 files changed, 203 insertions(+), 216 deletions(-) delete mode 100644 meta/recipes-gnome/librsvg/librsvg/0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch rename meta/recipes-gnome/librsvg/{librsvg_2.56.0.bb => librsvg_2.56.1.bb} (93%) diff --git a/meta/recipes-gnome/librsvg/librsvg-crates.inc b/meta/recipes-gnome/librsvg/librsvg-crates.inc index d73d1ae6932..8d790c32f83 100644 --- a/meta/recipes-gnome/librsvg/librsvg-crates.inc +++ b/meta/recipes-gnome/librsvg/librsvg-crates.inc @@ -3,13 +3,18 @@ # from Cargo.lock SRC_URI += " \ crate://crates.io/adler/1.0.2 \ - crate://crates.io/aho-corasick/0.7.20 \ + crate://crates.io/aho-corasick/1.0.1 \ + crate://crates.io/android-tzdata/0.1.1 \ crate://crates.io/android_system_properties/0.1.5 \ crate://crates.io/anes/0.1.6 \ - crate://crates.io/anstyle/0.3.4 \ - crate://crates.io/anyhow/1.0.69 \ + crate://crates.io/anstream/0.3.2 \ + crate://crates.io/anstyle/1.0.0 \ + crate://crates.io/anstyle-parse/0.2.0 \ + crate://crates.io/anstyle-query/1.0.0 \ + crate://crates.io/anstyle-wincon/1.0.1 \ + crate://crates.io/anyhow/1.0.71 \ crate://crates.io/approx/0.5.1 \ - crate://crates.io/assert_cmd/2.0.10 \ + crate://crates.io/assert_cmd/2.0.11 \ crate://crates.io/atty/0.2.14 \ crate://crates.io/autocfg/1.1.0 \ crate://crates.io/base-x/0.2.11 \ @@ -17,44 +22,41 @@ SRC_URI += " \ crate://crates.io/bit-vec/0.6.3 \ crate://crates.io/bitflags/1.3.2 \ crate://crates.io/block/0.1.6 \ - crate://crates.io/bstr/1.3.0 \ - crate://crates.io/bumpalo/3.12.0 \ + crate://crates.io/bstr/1.5.0 \ + crate://crates.io/bumpalo/3.13.0 \ crate://crates.io/bytemuck/1.13.1 \ crate://crates.io/byteorder/1.4.3 \ crate://crates.io/cairo-rs/0.17.0 \ crate://crates.io/cairo-sys-rs/0.17.0 \ crate://crates.io/cast/0.3.0 \ crate://crates.io/cc/1.0.79 \ - crate://crates.io/cfg-expr/0.11.0 \ + crate://crates.io/cfg-expr/0.15.1 \ crate://crates.io/cfg-if/1.0.0 \ - crate://crates.io/chrono/0.4.24 \ - crate://crates.io/ciborium/0.2.0 \ - crate://crates.io/ciborium-io/0.2.0 \ - crate://crates.io/ciborium-ll/0.2.0 \ - crate://crates.io/clap/3.2.23 \ - crate://crates.io/clap/4.1.9 \ - crate://crates.io/clap_complete/4.1.5 \ - crate://crates.io/clap_derive/4.1.9 \ + crate://crates.io/chrono/0.4.25 \ + crate://crates.io/ciborium/0.2.1 \ + crate://crates.io/ciborium-io/0.2.1 \ + crate://crates.io/ciborium-ll/0.2.1 \ + crate://crates.io/clap/3.2.25 \ + crate://crates.io/clap/4.3.0 \ + crate://crates.io/clap_builder/4.3.0 \ + crate://crates.io/clap_complete/4.3.0 \ + crate://crates.io/clap_derive/4.3.0 \ crate://crates.io/clap_lex/0.2.4 \ - crate://crates.io/clap_lex/0.3.3 \ - crate://crates.io/codespan-reporting/0.11.1 \ + crate://crates.io/clap_lex/0.5.0 \ + crate://crates.io/colorchoice/1.0.0 \ crate://crates.io/const-cstr/0.3.0 \ crate://crates.io/const_fn/0.4.9 \ crate://crates.io/convert_case/0.4.0 \ - crate://crates.io/core-foundation-sys/0.8.3 \ + crate://crates.io/core-foundation-sys/0.8.4 \ crate://crates.io/crc32fast/1.3.2 \ crate://crates.io/criterion/0.4.0 \ crate://crates.io/criterion-plot/0.5.0 \ - crate://crates.io/crossbeam-channel/0.5.7 \ + crate://crates.io/crossbeam-channel/0.5.8 \ crate://crates.io/crossbeam-deque/0.8.3 \ crate://crates.io/crossbeam-epoch/0.9.14 \ crate://crates.io/crossbeam-utils/0.8.15 \ crate://crates.io/cssparser/0.29.6 \ crate://crates.io/cssparser-macros/0.6.0 \ - crate://crates.io/cxx/1.0.92 \ - crate://crates.io/cxx-build/1.0.92 \ - crate://crates.io/cxxbridge-flags/1.0.92 \ - crate://crates.io/cxxbridge-macro/1.0.92 \ crate://crates.io/data-url/0.2.0 \ crate://crates.io/derive_more/0.99.17 \ crate://crates.io/difflib/0.4.0 \ @@ -71,30 +73,32 @@ SRC_URI += " \ crate://crates.io/encoding-index-singlebyte/1.20141219.5 \ crate://crates.io/encoding-index-tradchinese/1.20141219.5 \ crate://crates.io/encoding_index_tests/0.1.4 \ - crate://crates.io/errno/0.2.8 \ + crate://crates.io/encoding_rs/0.8.32 \ + crate://crates.io/errno/0.3.1 \ crate://crates.io/errno-dragonfly/0.1.2 \ crate://crates.io/fastrand/1.9.0 \ - crate://crates.io/flate2/1.0.25 \ + crate://crates.io/fdeflate/0.3.0 \ + crate://crates.io/flate2/1.0.26 \ crate://crates.io/float-cmp/0.9.0 \ crate://crates.io/fnv/1.0.7 \ crate://crates.io/form_urlencoded/1.1.0 \ crate://crates.io/futf/0.1.5 \ - crate://crates.io/futures-channel/0.3.27 \ - crate://crates.io/futures-core/0.3.27 \ - crate://crates.io/futures-executor/0.3.27 \ - crate://crates.io/futures-io/0.3.27 \ - crate://crates.io/futures-macro/0.3.27 \ - crate://crates.io/futures-task/0.3.27 \ - crate://crates.io/futures-util/0.3.27 \ + crate://crates.io/futures-channel/0.3.28 \ + crate://crates.io/futures-core/0.3.28 \ + crate://crates.io/futures-executor/0.3.28 \ + crate://crates.io/futures-io/0.3.28 \ + crate://crates.io/futures-macro/0.3.28 \ + crate://crates.io/futures-task/0.3.28 \ + crate://crates.io/futures-util/0.3.28 \ crate://crates.io/fxhash/0.2.1 \ crate://crates.io/gdk-pixbuf/0.17.0 \ crate://crates.io/gdk-pixbuf-sys/0.17.0 \ crate://crates.io/getrandom/0.1.16 \ - crate://crates.io/getrandom/0.2.8 \ - crate://crates.io/gio/0.17.4 \ + crate://crates.io/getrandom/0.2.9 \ + crate://crates.io/gio/0.17.9 \ crate://crates.io/gio-sys/0.17.4 \ - crate://crates.io/glib/0.17.5 \ - crate://crates.io/glib-macros/0.17.5 \ + crate://crates.io/glib/0.17.9 \ + crate://crates.io/glib-macros/0.17.9 \ crate://crates.io/glib-sys/0.17.4 \ crate://crates.io/gobject-sys/0.17.4 \ crate://crates.io/half/1.8.2 \ @@ -103,36 +107,35 @@ SRC_URI += " \ crate://crates.io/hermit-abi/0.1.19 \ crate://crates.io/hermit-abi/0.2.6 \ crate://crates.io/hermit-abi/0.3.1 \ - crate://crates.io/iana-time-zone/0.1.53 \ - crate://crates.io/iana-time-zone-haiku/0.1.1 \ + crate://crates.io/iana-time-zone/0.1.56 \ + crate://crates.io/iana-time-zone-haiku/0.1.2 \ crate://crates.io/idna/0.3.0 \ - crate://crates.io/indexmap/1.9.2 \ + crate://crates.io/indexmap/1.9.3 \ crate://crates.io/instant/0.1.12 \ - crate://crates.io/io-lifetimes/1.0.7 \ - crate://crates.io/is-terminal/0.4.4 \ + crate://crates.io/io-lifetimes/1.0.11 \ + crate://crates.io/is-terminal/0.4.7 \ crate://crates.io/itertools/0.10.5 \ crate://crates.io/itoa/1.0.6 \ - crate://crates.io/js-sys/0.3.61 \ + crate://crates.io/js-sys/0.3.63 \ crate://crates.io/language-tags/0.3.2 \ crate://crates.io/lazy_static/1.4.0 \ - crate://crates.io/libc/0.2.140 \ + crate://crates.io/libc/0.2.144 \ crate://crates.io/libloading/0.7.4 \ - crate://crates.io/libm/0.2.6 \ - crate://crates.io/link-cplusplus/1.0.8 \ + crate://crates.io/libm/0.2.7 \ crate://crates.io/linked-hash-map/0.5.6 \ - crate://crates.io/linux-raw-sys/0.1.4 \ + crate://crates.io/linux-raw-sys/0.3.8 \ crate://crates.io/locale_config/0.3.0 \ crate://crates.io/lock_api/0.4.9 \ - crate://crates.io/log/0.4.17 \ + crate://crates.io/log/0.4.18 \ crate://crates.io/lopdf/0.29.0 \ crate://crates.io/mac/0.1.1 \ crate://crates.io/malloc_buf/0.0.6 \ crate://crates.io/markup5ever/0.11.0 \ crate://crates.io/matches/0.1.10 \ - crate://crates.io/matrixmultiply/0.3.2 \ + crate://crates.io/matrixmultiply/0.3.7 \ crate://crates.io/memchr/2.5.0 \ crate://crates.io/memoffset/0.8.0 \ - crate://crates.io/miniz_oxide/0.6.2 \ + crate://crates.io/miniz_oxide/0.7.1 \ crate://crates.io/nalgebra/0.32.2 \ crate://crates.io/nalgebra-macros/0.2.0 \ crate://crates.io/new_debug_unreachable/1.0.4 \ @@ -146,9 +149,9 @@ SRC_URI += " \ crate://crates.io/objc/0.2.7 \ crate://crates.io/objc-foundation/0.1.1 \ crate://crates.io/objc_id/0.1.1 \ - crate://crates.io/once_cell/1.17.1 \ + crate://crates.io/once_cell/1.17.2 \ crate://crates.io/oorandom/11.1.3 \ - crate://crates.io/os_str_bytes/6.4.1 \ + crate://crates.io/os_str_bytes/6.5.0 \ crate://crates.io/pango/0.17.4 \ crate://crates.io/pango-sys/0.17.0 \ crate://crates.io/pangocairo/0.17.0 \ @@ -168,27 +171,26 @@ SRC_URI += " \ crate://crates.io/phf_shared/0.10.0 \ crate://crates.io/pin-project-lite/0.2.9 \ crate://crates.io/pin-utils/0.1.0 \ - crate://crates.io/pkg-config/0.3.26 \ + crate://crates.io/pkg-config/0.3.27 \ crate://crates.io/plotters/0.3.4 \ crate://crates.io/plotters-backend/0.3.4 \ crate://crates.io/plotters-svg/0.3.3 \ - crate://crates.io/png/0.17.7 \ + crate://crates.io/png/0.17.8 \ crate://crates.io/pom/3.2.0 \ crate://crates.io/ppv-lite86/0.2.17 \ crate://crates.io/precomputed-hash/0.1.1 \ crate://crates.io/predicates/2.1.5 \ - crate://crates.io/predicates/3.0.1 \ + crate://crates.io/predicates/3.0.3 \ crate://crates.io/predicates-core/1.0.6 \ crate://crates.io/predicates-tree/1.0.9 \ crate://crates.io/proc-macro-crate/1.3.1 \ crate://crates.io/proc-macro-error/1.0.4 \ crate://crates.io/proc-macro-error-attr/1.0.4 \ crate://crates.io/proc-macro-hack/0.5.20+deprecated \ - crate://crates.io/proc-macro2/1.0.52 \ - crate://crates.io/proptest/1.1.0 \ + crate://crates.io/proc-macro2/1.0.59 \ + crate://crates.io/proptest/1.2.0 \ crate://crates.io/quick-error/1.2.3 \ - crate://crates.io/quick-error/2.0.1 \ - crate://crates.io/quote/1.0.26 \ + crate://crates.io/quote/1.0.28 \ crate://crates.io/rand/0.7.3 \ crate://crates.io/rand/0.8.5 \ crate://crates.io/rand_chacha/0.2.2 \ @@ -203,30 +205,33 @@ SRC_URI += " \ crate://crates.io/rayon-core/1.11.0 \ crate://crates.io/rctree/0.5.0 \ crate://crates.io/redox_syscall/0.2.16 \ - crate://crates.io/regex/1.7.1 \ + crate://crates.io/redox_syscall/0.3.5 \ + crate://crates.io/regex/1.8.3 \ crate://crates.io/regex-automata/0.1.10 \ - crate://crates.io/regex-syntax/0.6.28 \ + crate://crates.io/regex-syntax/0.6.29 \ + crate://crates.io/regex-syntax/0.7.2 \ crate://crates.io/rgb/0.8.36 \ crate://crates.io/rustc_version/0.2.3 \ crate://crates.io/rustc_version/0.4.0 \ - crate://crates.io/rustix/0.36.9 \ + crate://crates.io/rustix/0.37.19 \ crate://crates.io/rusty-fork/0.3.0 \ crate://crates.io/ryu/1.0.13 \ crate://crates.io/safe_arch/0.6.0 \ crate://crates.io/same-file/1.0.6 \ crate://crates.io/scopeguard/1.1.0 \ - crate://crates.io/scratch/1.0.5 \ crate://crates.io/selectors/0.24.0 \ crate://crates.io/semver/0.9.0 \ crate://crates.io/semver/1.0.17 \ crate://crates.io/semver-parser/0.7.0 \ - crate://crates.io/serde/1.0.156 \ - crate://crates.io/serde_derive/1.0.156 \ - crate://crates.io/serde_json/1.0.94 \ + crate://crates.io/serde/1.0.163 \ + crate://crates.io/serde_derive/1.0.163 \ + crate://crates.io/serde_json/1.0.96 \ + crate://crates.io/serde_spanned/0.6.2 \ crate://crates.io/servo_arc/0.2.0 \ crate://crates.io/sha1/0.6.1 \ crate://crates.io/sha1_smol/1.0.0 \ - crate://crates.io/simba/0.8.0 \ + crate://crates.io/simba/0.8.1 \ + crate://crates.io/simd-adler32/0.3.5 \ crate://crates.io/siphasher/0.3.10 \ crate://crates.io/slab/0.4.8 \ crate://crates.io/smallvec/1.10.0 \ @@ -240,72 +245,87 @@ SRC_URI += " \ crate://crates.io/string_cache_codegen/0.5.2 \ crate://crates.io/strsim/0.10.0 \ crate://crates.io/syn/1.0.109 \ - crate://crates.io/system-deps/6.0.3 \ - crate://crates.io/tempfile/3.4.0 \ + crate://crates.io/syn/2.0.18 \ + crate://crates.io/system-deps/6.1.0 \ + crate://crates.io/target-lexicon/0.12.7 \ + crate://crates.io/tempfile/3.5.0 \ crate://crates.io/tendril/0.4.3 \ - crate://crates.io/termcolor/1.2.0 \ crate://crates.io/termtree/0.4.1 \ crate://crates.io/textwrap/0.16.0 \ - crate://crates.io/thiserror/1.0.39 \ - crate://crates.io/thiserror-impl/1.0.39 \ + crate://crates.io/thiserror/1.0.40 \ + crate://crates.io/thiserror-impl/1.0.40 \ crate://crates.io/time/0.2.27 \ crate://crates.io/time-macros/0.1.1 \ crate://crates.io/time-macros-impl/0.1.2 \ crate://crates.io/tinytemplate/1.2.1 \ crate://crates.io/tinyvec/1.6.0 \ crate://crates.io/tinyvec_macros/0.1.1 \ - crate://crates.io/toml/0.5.11 \ - crate://crates.io/toml_datetime/0.6.1 \ - crate://crates.io/toml_edit/0.19.7 \ + crate://crates.io/toml/0.7.4 \ + crate://crates.io/toml_datetime/0.6.2 \ + crate://crates.io/toml_edit/0.19.10 \ crate://crates.io/typenum/1.16.0 \ crate://crates.io/unarray/0.1.4 \ - crate://crates.io/unicode-bidi/0.3.11 \ - crate://crates.io/unicode-ident/1.0.8 \ + crate://crates.io/unicode-bidi/0.3.13 \ + crate://crates.io/unicode-ident/1.0.9 \ crate://crates.io/unicode-normalization/0.1.22 \ - crate://crates.io/unicode-width/0.1.10 \ crate://crates.io/url/2.3.1 \ crate://crates.io/utf-8/0.7.6 \ + crate://crates.io/utf8parse/0.2.1 \ crate://crates.io/version-compare/0.1.1 \ crate://crates.io/version_check/0.9.4 \ crate://crates.io/wait-timeout/0.2.0 \ crate://crates.io/walkdir/2.3.3 \ crate://crates.io/wasi/0.9.0+wasi-snapshot-preview1 \ crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ - crate://crates.io/wasm-bindgen/0.2.84 \ - crate://crates.io/wasm-bindgen-backend/0.2.84 \ - crate://crates.io/wasm-bindgen-macro/0.2.84 \ - crate://crates.io/wasm-bindgen-macro-support/0.2.84 \ - crate://crates.io/wasm-bindgen-shared/0.2.84 \ - crate://crates.io/web-sys/0.3.61 \ + crate://crates.io/wasm-bindgen/0.2.86 \ + crate://crates.io/wasm-bindgen-backend/0.2.86 \ + crate://crates.io/wasm-bindgen-macro/0.2.86 \ + crate://crates.io/wasm-bindgen-macro-support/0.2.86 \ + crate://crates.io/wasm-bindgen-shared/0.2.86 \ + crate://crates.io/web-sys/0.3.63 \ crate://crates.io/weezl/0.1.7 \ - crate://crates.io/wide/0.7.8 \ + crate://crates.io/wide/0.7.9 \ crate://crates.io/winapi/0.3.9 \ crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ crate://crates.io/winapi-util/0.1.5 \ crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ - crate://crates.io/windows-sys/0.42.0 \ + crate://crates.io/windows/0.48.0 \ crate://crates.io/windows-sys/0.45.0 \ + crate://crates.io/windows-sys/0.48.0 \ crate://crates.io/windows-targets/0.42.2 \ + crate://crates.io/windows-targets/0.48.0 \ crate://crates.io/windows_aarch64_gnullvm/0.42.2 \ + crate://crates.io/windows_aarch64_gnullvm/0.48.0 \ crate://crates.io/windows_aarch64_msvc/0.42.2 \ + crate://crates.io/windows_aarch64_msvc/0.48.0 \ crate://crates.io/windows_i686_gnu/0.42.2 \ + crate://crates.io/windows_i686_gnu/0.48.0 \ crate://crates.io/windows_i686_msvc/0.42.2 \ + crate://crates.io/windows_i686_msvc/0.48.0 \ crate://crates.io/windows_x86_64_gnu/0.42.2 \ + crate://crates.io/windows_x86_64_gnu/0.48.0 \ crate://crates.io/windows_x86_64_gnullvm/0.42.2 \ + crate://crates.io/windows_x86_64_gnullvm/0.48.0 \ crate://crates.io/windows_x86_64_msvc/0.42.2 \ - crate://crates.io/winnow/0.3.6 \ + crate://crates.io/windows_x86_64_msvc/0.48.0 \ + crate://crates.io/winnow/0.4.6 \ crate://crates.io/xml5ever/0.17.0 \ crate://crates.io/yeslogic-fontconfig-sys/4.0.1 \ " SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -SRC_URI[aho-corasick-0.7.20.sha256sum] = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +SRC_URI[aho-corasick-1.0.1.sha256sum] = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +SRC_URI[android-tzdata-0.1.1.sha256sum] = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" SRC_URI[anes-0.1.6.sha256sum] = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" -SRC_URI[anstyle-0.3.4.sha256sum] = "1ba0b55c2201aa802adb684e7963ce2c3191675629e7df899774331e3ac747cf" -SRC_URI[anyhow-1.0.69.sha256sum] = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +SRC_URI[anstream-0.3.2.sha256sum] = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +SRC_URI[anstyle-1.0.0.sha256sum] = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +SRC_URI[anstyle-parse-0.2.0.sha256sum] = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +SRC_URI[anstyle-query-1.0.0.sha256sum] = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +SRC_URI[anstyle-wincon-1.0.1.sha256sum] = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +SRC_URI[anyhow-1.0.71.sha256sum] = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" SRC_URI[approx-0.5.1.sha256sum] = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -SRC_URI[assert_cmd-2.0.10.sha256sum] = "ec0b2340f55d9661d76793b2bfc2eb0e62689bd79d067a95707ea762afd5e9dd" +SRC_URI[assert_cmd-2.0.11.sha256sum] = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" SRC_URI[base-x-0.2.11.sha256sum] = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" @@ -313,44 +333,41 @@ SRC_URI[bit-set-0.5.3.sha256sum] = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0 SRC_URI[bit-vec-0.6.3.sha256sum] = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" SRC_URI[block-0.1.6.sha256sum] = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" -SRC_URI[bstr-1.3.0.sha256sum] = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" -SRC_URI[bumpalo-3.12.0.sha256sum] = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +SRC_URI[bstr-1.5.0.sha256sum] = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +SRC_URI[bumpalo-3.13.0.sha256sum] = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" SRC_URI[bytemuck-1.13.1.sha256sum] = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" SRC_URI[byteorder-1.4.3.sha256sum] = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" SRC_URI[cairo-rs-0.17.0.sha256sum] = "a8af54f5d48af1226928adc1f57edd22f5df1349e7da1fc96ae15cf43db0e871" SRC_URI[cairo-sys-rs-0.17.0.sha256sum] = "f55382a01d30e5e53f185eee269124f5e21ab526595b872751278dfbb463594e" SRC_URI[cast-0.3.0.sha256sum] = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" SRC_URI[cc-1.0.79.sha256sum] = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" -SRC_URI[cfg-expr-0.11.0.sha256sum] = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" +SRC_URI[cfg-expr-0.15.1.sha256sum] = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9" SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -SRC_URI[chrono-0.4.24.sha256sum] = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" -SRC_URI[ciborium-0.2.0.sha256sum] = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" -SRC_URI[ciborium-io-0.2.0.sha256sum] = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" -SRC_URI[ciborium-ll-0.2.0.sha256sum] = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" -SRC_URI[clap-3.2.23.sha256sum] = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" -SRC_URI[clap-4.1.9.sha256sum] = "9a9d6ada83c1edcce028902ea27dd929069c70df4c7600b131b4d9a1ad2879cc" -SRC_URI[clap_complete-4.1.5.sha256sum] = "37686beaba5ac9f3ab01ee3172f792fc6ffdd685bfb9e63cfef02c0571a4e8e1" -SRC_URI[clap_derive-4.1.9.sha256sum] = "fddf67631444a3a3e3e5ac51c36a5e01335302de677bd78759eaa90ab1f46644" +SRC_URI[chrono-0.4.25.sha256sum] = "fdbc37d37da9e5bce8173f3a41b71d9bf3c674deebbaceacd0ebdabde76efb03" +SRC_URI[ciborium-0.2.1.sha256sum] = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +SRC_URI[ciborium-io-0.2.1.sha256sum] = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" +SRC_URI[ciborium-ll-0.2.1.sha256sum] = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +SRC_URI[clap-3.2.25.sha256sum] = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +SRC_URI[clap-4.3.0.sha256sum] = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +SRC_URI[clap_builder-4.3.0.sha256sum] = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +SRC_URI[clap_complete-4.3.0.sha256sum] = "a04ddfaacc3bc9e6ea67d024575fafc2a813027cf374b8f24f7bc233c6b6be12" +SRC_URI[clap_derive-4.3.0.sha256sum] = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" SRC_URI[clap_lex-0.2.4.sha256sum] = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -SRC_URI[clap_lex-0.3.3.sha256sum] = "033f6b7a4acb1f358c742aaca805c939ee73b4c6209ae4318ec7aca81c42e646" -SRC_URI[codespan-reporting-0.11.1.sha256sum] = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +SRC_URI[clap_lex-0.5.0.sha256sum] = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +SRC_URI[colorchoice-1.0.0.sha256sum] = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" SRC_URI[const-cstr-0.3.0.sha256sum] = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6" SRC_URI[const_fn-0.4.9.sha256sum] = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" SRC_URI[convert_case-0.4.0.sha256sum] = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" -SRC_URI[core-foundation-sys-0.8.3.sha256sum] = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +SRC_URI[core-foundation-sys-0.8.4.sha256sum] = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" SRC_URI[crc32fast-1.3.2.sha256sum] = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" SRC_URI[criterion-0.4.0.sha256sum] = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" SRC_URI[criterion-plot-0.5.0.sha256sum] = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -SRC_URI[crossbeam-channel-0.5.7.sha256sum] = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" +SRC_URI[crossbeam-channel-0.5.8.sha256sum] = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" SRC_URI[crossbeam-deque-0.8.3.sha256sum] = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" SRC_URI[crossbeam-epoch-0.9.14.sha256sum] = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" SRC_URI[crossbeam-utils-0.8.15.sha256sum] = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" SRC_URI[cssparser-0.29.6.sha256sum] = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa" SRC_URI[cssparser-macros-0.6.0.sha256sum] = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" -SRC_URI[cxx-1.0.92.sha256sum] = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72" -SRC_URI[cxx-build-1.0.92.sha256sum] = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613" -SRC_URI[cxxbridge-flags-1.0.92.sha256sum] = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97" -SRC_URI[cxxbridge-macro-1.0.92.sha256sum] = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56" SRC_URI[data-url-0.2.0.sha256sum] = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" SRC_URI[derive_more-0.99.17.sha256sum] = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" SRC_URI[difflib-0.4.0.sha256sum] = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" @@ -367,30 +384,32 @@ SRC_URI[encoding-index-simpchinese-1.20141219.5.sha256sum] = "d87a7194909b9118fc SRC_URI[encoding-index-singlebyte-1.20141219.5.sha256sum] = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" SRC_URI[encoding-index-tradchinese-1.20141219.5.sha256sum] = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" SRC_URI[encoding_index_tests-0.1.4.sha256sum] = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" -SRC_URI[errno-0.2.8.sha256sum] = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +SRC_URI[encoding_rs-0.8.32.sha256sum] = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +SRC_URI[errno-0.3.1.sha256sum] = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" SRC_URI[errno-dragonfly-0.1.2.sha256sum] = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" SRC_URI[fastrand-1.9.0.sha256sum] = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -SRC_URI[flate2-1.0.25.sha256sum] = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +SRC_URI[fdeflate-0.3.0.sha256sum] = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +SRC_URI[flate2-1.0.26.sha256sum] = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" SRC_URI[float-cmp-0.9.0.sha256sum] = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" SRC_URI[form_urlencoded-1.1.0.sha256sum] = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" SRC_URI[futf-0.1.5.sha256sum] = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -SRC_URI[futures-channel-0.3.27.sha256sum] = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" -SRC_URI[futures-core-0.3.27.sha256sum] = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" -SRC_URI[futures-executor-0.3.27.sha256sum] = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" -SRC_URI[futures-io-0.3.27.sha256sum] = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" -SRC_URI[futures-macro-0.3.27.sha256sum] = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" -SRC_URI[futures-task-0.3.27.sha256sum] = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" -SRC_URI[futures-util-0.3.27.sha256sum] = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" +SRC_URI[futures-channel-0.3.28.sha256sum] = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +SRC_URI[futures-core-0.3.28.sha256sum] = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +SRC_URI[futures-executor-0.3.28.sha256sum] = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +SRC_URI[futures-io-0.3.28.sha256sum] = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +SRC_URI[futures-macro-0.3.28.sha256sum] = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +SRC_URI[futures-task-0.3.28.sha256sum] = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +SRC_URI[futures-util-0.3.28.sha256sum] = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" SRC_URI[fxhash-0.2.1.sha256sum] = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" SRC_URI[gdk-pixbuf-0.17.0.sha256sum] = "b023fbe0c6b407bd3d9805d107d9800da3829dc5a676653210f1d5f16d7f59bf" SRC_URI[gdk-pixbuf-sys-0.17.0.sha256sum] = "7b41bd2b44ed49d99277d3925652a163038bd5ed943ec9809338ffb2f4391e3b" SRC_URI[getrandom-0.1.16.sha256sum] = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -SRC_URI[getrandom-0.2.8.sha256sum] = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -SRC_URI[gio-0.17.4.sha256sum] = "2261a3b4e922ec676d1c27ac466218c38cf5dcb49a759129e54bb5046e442125" +SRC_URI[getrandom-0.2.9.sha256sum] = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +SRC_URI[gio-0.17.9.sha256sum] = "d14522e56c6bcb6f7a3aebc25cbcfb06776af4c0c25232b601b4383252d7cb92" SRC_URI[gio-sys-0.17.4.sha256sum] = "6b1d43b0d7968b48455244ecafe41192871257f5740aa6b095eb19db78e362a5" -SRC_URI[glib-0.17.5.sha256sum] = "cfb53061756195d76969292c2d2e329e01259276524a9bae6c9b73af62854773" -SRC_URI[glib-macros-0.17.5.sha256sum] = "454924cafe58d9174dc32972261fe271d6cd3c10f5e9ff505522a28dcf601a40" +SRC_URI[glib-0.17.9.sha256sum] = "a7f1de7cbde31ea4f0a919453a2dcece5d54d5b70e08f8ad254dc4840f5f09b6" +SRC_URI[glib-macros-0.17.9.sha256sum] = "0a7206c5c03851ef126ea1444990e81fdd6765fb799d5bc694e4897ca01bb97f" SRC_URI[glib-sys-0.17.4.sha256sum] = "49f00ad0a1bf548e61adfff15d83430941d9e1bb620e334f779edd1c745680a5" SRC_URI[gobject-sys-0.17.4.sha256sum] = "15e75b0000a64632b2d8ca3cf856af9308e3a970844f6e9659bd197f026793d0" SRC_URI[half-1.8.2.sha256sum] = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" @@ -399,36 +418,35 @@ SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbc SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" SRC_URI[hermit-abi-0.2.6.sha256sum] = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" SRC_URI[hermit-abi-0.3.1.sha256sum] = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" -SRC_URI[iana-time-zone-0.1.53.sha256sum] = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" -SRC_URI[iana-time-zone-haiku-0.1.1.sha256sum] = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +SRC_URI[iana-time-zone-0.1.56.sha256sum] = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" SRC_URI[idna-0.3.0.sha256sum] = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -SRC_URI[indexmap-1.9.2.sha256sum] = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +SRC_URI[indexmap-1.9.3.sha256sum] = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -SRC_URI[io-lifetimes-1.0.7.sha256sum] = "76e86b86ae312accbf05ade23ce76b625e0e47a255712b7414037385a1c05380" -SRC_URI[is-terminal-0.4.4.sha256sum] = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" +SRC_URI[io-lifetimes-1.0.11.sha256sum] = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +SRC_URI[is-terminal-0.4.7.sha256sum] = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" SRC_URI[itertools-0.10.5.sha256sum] = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" SRC_URI[itoa-1.0.6.sha256sum] = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" -SRC_URI[js-sys-0.3.61.sha256sum] = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +SRC_URI[js-sys-0.3.63.sha256sum] = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" SRC_URI[language-tags-0.3.2.sha256sum] = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -SRC_URI[libc-0.2.140.sha256sum] = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +SRC_URI[libc-0.2.144.sha256sum] = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" SRC_URI[libloading-0.7.4.sha256sum] = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -SRC_URI[libm-0.2.6.sha256sum] = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" -SRC_URI[link-cplusplus-1.0.8.sha256sum] = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +SRC_URI[libm-0.2.7.sha256sum] = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" SRC_URI[linked-hash-map-0.5.6.sha256sum] = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" -SRC_URI[linux-raw-sys-0.1.4.sha256sum] = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +SRC_URI[linux-raw-sys-0.3.8.sha256sum] = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" SRC_URI[locale_config-0.3.0.sha256sum] = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" SRC_URI[lock_api-0.4.9.sha256sum] = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -SRC_URI[log-0.4.17.sha256sum] = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +SRC_URI[log-0.4.18.sha256sum] = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" SRC_URI[lopdf-0.29.0.sha256sum] = "de0f69c40d6dbc68ebac4bf5aec3d9978e094e22e29fcabd045acd9cec74a9dc" SRC_URI[mac-0.1.1.sha256sum] = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" SRC_URI[malloc_buf-0.0.6.sha256sum] = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" SRC_URI[markup5ever-0.11.0.sha256sum] = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" SRC_URI[matches-0.1.10.sha256sum] = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" -SRC_URI[matrixmultiply-0.3.2.sha256sum] = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84" +SRC_URI[matrixmultiply-0.3.7.sha256sum] = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" SRC_URI[memchr-2.5.0.sha256sum] = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" SRC_URI[memoffset-0.8.0.sha256sum] = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -SRC_URI[miniz_oxide-0.6.2.sha256sum] = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +SRC_URI[miniz_oxide-0.7.1.sha256sum] = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" SRC_URI[nalgebra-0.32.2.sha256sum] = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511" SRC_URI[nalgebra-macros-0.2.0.sha256sum] = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766" SRC_URI[new_debug_unreachable-1.0.4.sha256sum] = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" @@ -442,9 +460,9 @@ SRC_URI[num_cpus-1.15.0.sha256sum] = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff7 SRC_URI[objc-0.2.7.sha256sum] = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" SRC_URI[objc-foundation-0.1.1.sha256sum] = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" SRC_URI[objc_id-0.1.1.sha256sum] = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -SRC_URI[once_cell-1.17.1.sha256sum] = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +SRC_URI[once_cell-1.17.2.sha256sum] = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" SRC_URI[oorandom-11.1.3.sha256sum] = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -SRC_URI[os_str_bytes-6.4.1.sha256sum] = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +SRC_URI[os_str_bytes-6.5.0.sha256sum] = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" SRC_URI[pango-0.17.4.sha256sum] = "52c280b82a881e4208afb3359a8e7fde27a1b272280981f1f34610bed5770d37" SRC_URI[pango-sys-0.17.0.sha256sum] = "4293d0f0b5525eb5c24734d30b0ed02cd02aa734f216883f376b54de49625de8" SRC_URI[pangocairo-0.17.0.sha256sum] = "2feeb7ea7874507f83f5e7ba869c54e321959431c8fbd70d4b735c8b15d90506" @@ -464,27 +482,26 @@ SRC_URI[phf_shared-0.8.0.sha256sum] = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d SRC_URI[phf_shared-0.10.0.sha256sum] = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" SRC_URI[pin-project-lite-0.2.9.sha256sum] = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -SRC_URI[pkg-config-0.3.26.sha256sum] = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +SRC_URI[pkg-config-0.3.27.sha256sum] = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" SRC_URI[plotters-0.3.4.sha256sum] = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" SRC_URI[plotters-backend-0.3.4.sha256sum] = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" SRC_URI[plotters-svg-0.3.3.sha256sum] = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" -SRC_URI[png-0.17.7.sha256sum] = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" +SRC_URI[png-0.17.8.sha256sum] = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" SRC_URI[pom-3.2.0.sha256sum] = "07e2192780e9f8e282049ff9bffcaa28171e1cb0844f49ed5374e518ae6024ec" SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" SRC_URI[precomputed-hash-0.1.1.sha256sum] = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" SRC_URI[predicates-2.1.5.sha256sum] = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" -SRC_URI[predicates-3.0.1.sha256sum] = "1ba7d6ead3e3966038f68caa9fc1f860185d95a793180bbcfe0d0da47b3961ed" +SRC_URI[predicates-3.0.3.sha256sum] = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" SRC_URI[predicates-core-1.0.6.sha256sum] = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" SRC_URI[predicates-tree-1.0.9.sha256sum] = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" SRC_URI[proc-macro-crate-1.3.1.sha256sum] = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" SRC_URI[proc-macro-error-1.0.4.sha256sum] = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" SRC_URI[proc-macro-error-attr-1.0.4.sha256sum] = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" SRC_URI[proc-macro-hack-0.5.20+deprecated.sha256sum] = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" -SRC_URI[proc-macro2-1.0.52.sha256sum] = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" -SRC_URI[proptest-1.1.0.sha256sum] = "29f1b898011ce9595050a68e60f90bad083ff2987a695a42357134c8381fba70" +SRC_URI[proc-macro2-1.0.59.sha256sum] = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" +SRC_URI[proptest-1.2.0.sha256sum] = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" SRC_URI[quick-error-1.2.3.sha256sum] = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -SRC_URI[quick-error-2.0.1.sha256sum] = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" -SRC_URI[quote-1.0.26.sha256sum] = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +SRC_URI[quote-1.0.28.sha256sum] = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" SRC_URI[rand-0.7.3.sha256sum] = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" SRC_URI[rand_chacha-0.2.2.sha256sum] = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" @@ -499,30 +516,33 @@ SRC_URI[rayon-1.7.0.sha256sum] = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a SRC_URI[rayon-core-1.11.0.sha256sum] = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" SRC_URI[rctree-0.5.0.sha256sum] = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -SRC_URI[regex-1.7.1.sha256sum] = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +SRC_URI[redox_syscall-0.3.5.sha256sum] = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +SRC_URI[regex-1.8.3.sha256sum] = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" SRC_URI[regex-automata-0.1.10.sha256sum] = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -SRC_URI[regex-syntax-0.6.28.sha256sum] = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +SRC_URI[regex-syntax-0.6.29.sha256sum] = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +SRC_URI[regex-syntax-0.7.2.sha256sum] = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" SRC_URI[rgb-0.8.36.sha256sum] = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" SRC_URI[rustc_version-0.2.3.sha256sum] = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -SRC_URI[rustix-0.36.9.sha256sum] = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +SRC_URI[rustix-0.37.19.sha256sum] = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" SRC_URI[rusty-fork-0.3.0.sha256sum] = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" SRC_URI[ryu-1.0.13.sha256sum] = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" SRC_URI[safe_arch-0.6.0.sha256sum] = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529" SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" SRC_URI[scopeguard-1.1.0.sha256sum] = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -SRC_URI[scratch-1.0.5.sha256sum] = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" SRC_URI[selectors-0.24.0.sha256sum] = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416" SRC_URI[semver-0.9.0.sha256sum] = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" SRC_URI[semver-1.0.17.sha256sum] = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" SRC_URI[semver-parser-0.7.0.sha256sum] = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -SRC_URI[serde-1.0.156.sha256sum] = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4" -SRC_URI[serde_derive-1.0.156.sha256sum] = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d" -SRC_URI[serde_json-1.0.94.sha256sum] = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +SRC_URI[serde-1.0.163.sha256sum] = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +SRC_URI[serde_derive-1.0.163.sha256sum] = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +SRC_URI[serde_json-1.0.96.sha256sum] = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +SRC_URI[serde_spanned-0.6.2.sha256sum] = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" SRC_URI[servo_arc-0.2.0.sha256sum] = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741" SRC_URI[sha1-0.6.1.sha256sum] = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" SRC_URI[sha1_smol-1.0.0.sha256sum] = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" -SRC_URI[simba-0.8.0.sha256sum] = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4" +SRC_URI[simba-0.8.1.sha256sum] = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" +SRC_URI[simd-adler32-0.3.5.sha256sum] = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" SRC_URI[siphasher-0.3.10.sha256sum] = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" SRC_URI[slab-0.4.8.sha256sum] = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" SRC_URI[smallvec-1.10.0.sha256sum] = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" @@ -536,59 +556,69 @@ SRC_URI[string_cache-0.8.7.sha256sum] = "f91138e76242f575eb1d3b38b4f1362f10d3a43 SRC_URI[string_cache_codegen-0.5.2.sha256sum] = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -SRC_URI[system-deps-6.0.3.sha256sum] = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" -SRC_URI[tempfile-3.4.0.sha256sum] = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +SRC_URI[syn-2.0.18.sha256sum] = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +SRC_URI[system-deps-6.1.0.sha256sum] = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" +SRC_URI[target-lexicon-0.12.7.sha256sum] = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +SRC_URI[tempfile-3.5.0.sha256sum] = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" SRC_URI[tendril-0.4.3.sha256sum] = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -SRC_URI[termcolor-1.2.0.sha256sum] = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" SRC_URI[termtree-0.4.1.sha256sum] = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" SRC_URI[textwrap-0.16.0.sha256sum] = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" -SRC_URI[thiserror-1.0.39.sha256sum] = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" -SRC_URI[thiserror-impl-1.0.39.sha256sum] = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" +SRC_URI[thiserror-1.0.40.sha256sum] = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +SRC_URI[thiserror-impl-1.0.40.sha256sum] = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" SRC_URI[time-0.2.27.sha256sum] = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" SRC_URI[time-macros-0.1.1.sha256sum] = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" SRC_URI[time-macros-impl-0.1.2.sha256sum] = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" SRC_URI[tinytemplate-1.2.1.sha256sum] = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" SRC_URI[tinyvec-1.6.0.sha256sum] = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" SRC_URI[tinyvec_macros-0.1.1.sha256sum] = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -SRC_URI[toml-0.5.11.sha256sum] = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -SRC_URI[toml_datetime-0.6.1.sha256sum] = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" -SRC_URI[toml_edit-0.19.7.sha256sum] = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" +SRC_URI[toml-0.7.4.sha256sum] = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +SRC_URI[toml_datetime-0.6.2.sha256sum] = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +SRC_URI[toml_edit-0.19.10.sha256sum] = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" SRC_URI[typenum-1.16.0.sha256sum] = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" SRC_URI[unarray-0.1.4.sha256sum] = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" -SRC_URI[unicode-bidi-0.3.11.sha256sum] = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c" -SRC_URI[unicode-ident-1.0.8.sha256sum] = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +SRC_URI[unicode-bidi-0.3.13.sha256sum] = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +SRC_URI[unicode-ident-1.0.9.sha256sum] = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" SRC_URI[unicode-normalization-0.1.22.sha256sum] = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -SRC_URI[unicode-width-0.1.10.sha256sum] = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" SRC_URI[url-2.3.1.sha256sum] = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" SRC_URI[utf-8-0.7.6.sha256sum] = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +SRC_URI[utf8parse-0.2.1.sha256sum] = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" SRC_URI[version-compare-0.1.1.sha256sum] = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" SRC_URI[wait-timeout-0.2.0.sha256sum] = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" SRC_URI[walkdir-2.3.3.sha256sum] = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" SRC_URI[wasi-0.9.0+wasi-snapshot-preview1.sha256sum] = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -SRC_URI[wasm-bindgen-0.2.84.sha256sum] = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -SRC_URI[wasm-bindgen-backend-0.2.84.sha256sum] = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -SRC_URI[wasm-bindgen-macro-0.2.84.sha256sum] = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -SRC_URI[wasm-bindgen-macro-support-0.2.84.sha256sum] = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -SRC_URI[wasm-bindgen-shared-0.2.84.sha256sum] = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" -SRC_URI[web-sys-0.3.61.sha256sum] = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +SRC_URI[wasm-bindgen-0.2.86.sha256sum] = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +SRC_URI[wasm-bindgen-backend-0.2.86.sha256sum] = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +SRC_URI[wasm-bindgen-macro-0.2.86.sha256sum] = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +SRC_URI[wasm-bindgen-macro-support-0.2.86.sha256sum] = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +SRC_URI[wasm-bindgen-shared-0.2.86.sha256sum] = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +SRC_URI[web-sys-0.3.63.sha256sum] = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" SRC_URI[weezl-0.1.7.sha256sum] = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" -SRC_URI[wide-0.7.8.sha256sum] = "b689b6c49d6549434bf944e6b0f39238cf63693cb7a147e9d887507fffa3b223" +SRC_URI[wide-0.7.9.sha256sum] = "5cd0496a71f3cc6bc4bf0ed91346426a5099e93d89807e663162dc5a1069ff65" SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -SRC_URI[windows-sys-0.42.0.sha256sum] = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +SRC_URI[windows-0.48.0.sha256sum] = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" SRC_URI[windows-sys-0.45.0.sha256sum] = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" SRC_URI[windows-targets-0.42.2.sha256sum] = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +SRC_URI[windows-targets-0.48.0.sha256sum] = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" SRC_URI[windows_aarch64_gnullvm-0.42.2.sha256sum] = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +SRC_URI[windows_aarch64_gnullvm-0.48.0.sha256sum] = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" SRC_URI[windows_aarch64_msvc-0.42.2.sha256sum] = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +SRC_URI[windows_aarch64_msvc-0.48.0.sha256sum] = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" SRC_URI[windows_i686_gnu-0.42.2.sha256sum] = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +SRC_URI[windows_i686_gnu-0.48.0.sha256sum] = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" SRC_URI[windows_i686_msvc-0.42.2.sha256sum] = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +SRC_URI[windows_i686_msvc-0.48.0.sha256sum] = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" SRC_URI[windows_x86_64_gnu-0.42.2.sha256sum] = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +SRC_URI[windows_x86_64_gnu-0.48.0.sha256sum] = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" SRC_URI[windows_x86_64_gnullvm-0.42.2.sha256sum] = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +SRC_URI[windows_x86_64_gnullvm-0.48.0.sha256sum] = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" SRC_URI[windows_x86_64_msvc-0.42.2.sha256sum] = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" -SRC_URI[winnow-0.3.6.sha256sum] = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966" +SRC_URI[windows_x86_64_msvc-0.48.0.sha256sum] = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +SRC_URI[winnow-0.4.6.sha256sum] = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" SRC_URI[xml5ever-0.17.0.sha256sum] = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650" SRC_URI[yeslogic-fontconfig-sys-4.0.1.sha256sum] = "ec657fd32bbcbeaef5c7bc8e10b3db95b143fab8db0a50079773dbf936fd4f73" diff --git a/meta/recipes-gnome/librsvg/librsvg/0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch b/meta/recipes-gnome/librsvg/librsvg/0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch deleted file mode 100644 index 15d5abecc6e..00000000000 --- a/meta/recipes-gnome/librsvg/librsvg/0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c0b0ef51b3c997a1c20ef9381ba2201ed477f609 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 21 Sep 2021 16:54:23 +0200 -Subject: [PATCH] system-deps/src/lib.rs: do not probe into harcoded list of - targets - -Oe-core defines custom targets, and this probe fails. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin - ---- - system-deps-6.0.3/src/lib.rs | 16 +--------------- - 2 files changed, 2 insertions(+), 16 deletions(-) - -diff --git a/system-deps-6.0.3/src/lib.rs b/system-deps-6.0.3/src/lib.rs -index 45ab1ce..f87d1ec 100644 ---- a/system-deps-6.0.3/src/lib.rs -+++ b/system-deps-6.0.3/src/lib.rs -@@ -800,21 +800,7 @@ impl Config { - } - - fn check_cfg(&self, cfg: &cfg_expr::Expression) -> Result { -- use cfg_expr::{targets::get_builtin_target_by_triple, Predicate}; -- -- let target = self -- .env -- .get("TARGET") -- .expect("no TARGET env variable defined"); -- let target = get_builtin_target_by_triple(&target) -- .unwrap_or_else(|| panic!("Invalid TARGET: {}", target)); -- -- let res = cfg.eval(|pred| match pred { -- Predicate::Target(tp) => Some(tp.matches(target)), -- _ => None, -- }); -- -- res.ok_or_else(|| Error::UnsupportedCfg(cfg.original().to_string())) -+ Ok(true) - } - } - diff --git a/meta/recipes-gnome/librsvg/librsvg_2.56.0.bb b/meta/recipes-gnome/librsvg/librsvg_2.56.1.bb similarity index 93% rename from meta/recipes-gnome/librsvg/librsvg_2.56.0.bb rename to meta/recipes-gnome/librsvg/librsvg_2.56.1.bb index 1a5d8a6b040..5649ed7d177 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.56.0.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.56.1.bb @@ -19,10 +19,9 @@ inherit cargo_common gnomebase pixbufcache upstream-version-is-even gobject-intr require ${BPN}-crates.inc SRC_URI += "file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch \ - file://0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch;patchdir=${CARGO_VENDORING_DIRECTORY} \ " -SRC_URI[archive.sha256sum] = "194b5097d9cd107495f49c291cf0da65ec2b4bb55e5628369751a3f44ba222b3" +SRC_URI[archive.sha256sum] = "1685aeacae9a441dcb12c0c3ec63706172a2f52705dafbefb8e7311d4d5e430b" # librsvg is still autotools-based, but is calling cargo from its automake-driven makefiles # so we cannot use cargo class directly, but still need bits and pieces from it From patchwork Sun Jun 25 21:22:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26374 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 8FDBAC001DE for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.groups.io with SMTP id smtpd.web11.20170.1687728173450718955 for ; Sun, 25 Jun 2023 14:22:53 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=iDzx+sPA; spf=pass (domain: gmail.com, ip: 209.85.128.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-3f9c88ac077so34253825e9.1 for ; Sun, 25 Jun 2023 14:22:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728172; x=1690320172; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7gK5FTDBpgRigRbs7IP1HMWCIEbsNjzZQlBGsb+gHCQ=; b=iDzx+sPAERMFAuppwQemGylicWKMTWHuyckGYyQIIuyYdAQiKOGxwJrV/1LO2eqj7q JidvjFUwObe61tk9SStADRNRr6qMGKvZ8WQIKrVB+UcI5csoqHOxR2MqCp9SIgwJJRZK YV5EHQ6ZH30ixGVa/Qkd7SS/r62g1qqD/Pa65MYDWMcG8aLjOmL8XluJASYU02mFeRfV aqA1gH3+fKGE2Gabkw1yOZNdc8uQLRZi6UkzZm96mnObOUfiIxi9piuNWVzpvPu7w2Is ujs82ezQIG1Xpm9af2WefV6OiNC8Xlag1BXctN4fgT3fkTUz7Rhw/4X97JXzl5jnp00R XQXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728172; x=1690320172; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7gK5FTDBpgRigRbs7IP1HMWCIEbsNjzZQlBGsb+gHCQ=; b=Mxr6mJE56gWahrQyePjPT4rXsJMEy9haPLkUVvpMLixjTsKdEKfIppdBalnhNlDp/F 6bqN8eEGspHbVUok5VUcA2BhQLj8Oitn1T91E7P++HeHdLNXry07FkSDmryZEofDUoP1 29eHJ+0U2g4UxHUQlEdX8Twggyxz6qpjgeJII7EBFAG1Wg9Hev9kSFUAfcU8P6aDccH0 ChNUxTusFDLN6GCWbzIq/+oKLkW/vajx866AnO04a8AxSq3f+/7V9VIVTZMgCckb28pe wGfgt0rh+tJ7a8NEcvYyEHGFAH0SW+ZoAZZjTgaYvrZ5mxy3B625mBoVH7KOkPriMpG0 n01A== X-Gm-Message-State: AC+VfDyze89Gmq629TpUv+11FTuogXonjnLKc0aPnhMOac2NYJ+wme5r 68bPsVgZDri+zNUMLy6vQ8BFHnI6pr0MMA== X-Google-Smtp-Source: ACHHUZ6v6xs3QQ5ruOMIIN6NbMdB6wX1QfmVHycGc7pVDkpjkOKmN/ix9bPDA9RXykdzBnIW/KpTGw== X-Received: by 2002:a05:600c:2205:b0:3fa:8866:14af with SMTP id z5-20020a05600c220500b003fa886614afmr2844839wml.14.1687728171692; Sun, 25 Jun 2023 14:22:51 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:51 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 14/21] vulkan-validation-layers: update 1.3.243 -> 1.3.250 Date: Sun, 25 Jun 2023 23:22:34 +0200 Message-Id: <20230625212241.915739-14-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183389 Backport a patch to unbreak cross-builds. Signed-off-by: Alexander Kanavin --- ...ts.txt-append-to-CMAKE_FIND_ROOT_PAT.patch | 28 +++++++++++++++++++ ... => vulkan-validation-layers_1.3.250.0.bb} | 6 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-graphics/vulkan/vulkan-validation-layers/0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch rename meta/recipes-graphics/vulkan/{vulkan-validation-layers_1.3.243.0.bb => vulkan-validation-layers_1.3.250.0.bb} (90%) diff --git a/meta/recipes-graphics/vulkan/vulkan-validation-layers/0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch b/meta/recipes-graphics/vulkan/vulkan-validation-layers/0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch new file mode 100644 index 00000000000..4db686fe2fe --- /dev/null +++ b/meta/recipes-graphics/vulkan/vulkan-validation-layers/0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch @@ -0,0 +1,28 @@ +From ea7b9e6fc0b3f45d6032ce624bed85bbde5ec0bf Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 21 Jun 2023 20:03:03 +0200 +Subject: [PATCH] scripts/CMakeLists.txt: append to CMAKE_FIND_ROOT_PATH + instead of replacing it + +Resetting CMAKE_FIND_ROOT_PATH in particular breaks builds in Yocto +(which is a major cross compiling framework). + +Upstream-Status: Backport [https://github.com/KhronosGroup/Vulkan-ValidationLayers/commit/e1b11dc7856765cf45a283ac805ea5066c81cd9b] +Signed-off-by: Alexander Kanavin +--- + scripts/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index 94c8528c8..cd86c54eb 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -124,7 +124,7 @@ if (MIMALLOC_INSTALL_DIR) + endif() + + if (CMAKE_CROSSCOMPILING) +- set(CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE) ++ set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} ${CMAKE_PREFIX_PATH} PARENT_SCOPE) + else() + set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE) + endif() diff --git a/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.243.0.bb b/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.250.0.bb similarity index 90% rename from meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.243.0.bb rename to meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.250.0.bb index bfb4b370b83..62c6343c45e 100644 --- a/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.243.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.250.0.bb @@ -8,8 +8,10 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8df9e8826734226d08cb412babfa599c" -SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.3.243;protocol=https" -SRCREV = "4ac0fd8e6cb3d49105d707d9ec07f0f3aa0943d6" +SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.3.250;protocol=https \ + file://0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch \ + " +SRCREV = "1541e00a63cd125f15d231d5a8059ebe66503b25" S = "${WORKDIR}/git" From patchwork Sun Jun 25 21:22:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26373 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 7E9BEC001DD for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.groups.io with SMTP id smtpd.web10.20349.1687728173944501753 for ; Sun, 25 Jun 2023 14:22:54 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=C47S1Lnp; spf=pass (domain: gmail.com, ip: 209.85.221.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-3090d3e9c92so3977388f8f.2 for ; Sun, 25 Jun 2023 14:22:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728172; x=1690320172; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KzLM7AAesm8qV9XUrldLSEgj5V2PgNTvD/8oOWxVMT8=; b=C47S1LnpQwgHWRrnJBiKZxNneg/lBGrk6EkVDfV4wdhZxqWb0hg4rIScBjgQryRdLg 0AwrYtqJlUGQZDED4Zkc/zIdF3p11LrDxRcmPv1lf997xGdwThBThVf1I4TJFWN1N1tq iBS1kPqQrEC//Hlzk/2rMYptjDnNDOsFpbP8uhUL15nyCeMBKWqSE6OACm95ZLIRwDHi DzprUXWnKguGNHicqol5UUGLgxheYq65HjbYShPH+fON9Ob1XuTTzkZvcgWE8ND+kVkp R1EcOWRJwDhjQsmpUuzcOWMXTngRYvWeLV0qzoOqXXsYP96SWJKyBM1DKuu4nUG7WzWN rJ9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728172; x=1690320172; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KzLM7AAesm8qV9XUrldLSEgj5V2PgNTvD/8oOWxVMT8=; b=XP2udV92KBBLkmax/SrxHvgiPuf4g8mk1IUouudz57rbq2ghuFY22tZpHFRgnGq3nk m+4wxNNBT5/84gZndYg87WK25LO26GHFwdUhLujBo3HE8UDRmeHOhR47ALkYVkwVtYri 4iOu66y/cm1YrZ9Bqk+UMkCUKkabozPM/6pdVOqtLGHvOKCpP1XmlfXIRpUbS4649bqc 8LSKu09ohsECpVyNWc+4CJDVUJT7LEDx3J5dOm3rZQ3UHTTaoGhM6QjUxukvXM6fLmfS qCG4jqnSRaMzTBv2fhZ65PA2Pky/EBhX1luFYhDCoE7DHqZrDpkyd6TdUY9376WLUyBG cNaw== X-Gm-Message-State: AC+VfDwRxoSZ4R6h6/U/7Zm4hdIktZObU+ngCjQg5pgL4I+3sT9kucQx 1Jvt6ip7yJ/IUgB07CMYLcb9veBACA0Utw== X-Google-Smtp-Source: ACHHUZ7KLO1lBQAgv8ybn9QUTqqet4kbFaW4bG6FkjyyuDTUYl0NEPqWKvMh6jXkW/JZ3z5pO0tmTw== X-Received: by 2002:adf:f847:0:b0:311:1a9c:5e03 with SMTP id d7-20020adff847000000b003111a9c5e03mr28518347wrq.51.1687728172373; Sun, 25 Jun 2023 14:22:52 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:52 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 15/21] xcb-util-cursor: add a recipe from meta-oe Date: Sun, 25 Jun 2023 23:22:35 +0200 Message-Id: <20230625212241.915739-15-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183390 This is a requirement of weston 12.x when xwayland is enabled. Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/maintainers.inc | 1 + .../recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 meta/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 9bb5c5205c2..322657ffc62 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -847,6 +847,7 @@ RECIPE_MAINTAINER:pn-x264 = "Anuj Mittal " RECIPE_MAINTAINER:pn-xauth = "Unassigned " RECIPE_MAINTAINER:pn-xcb-proto = "Unassigned " RECIPE_MAINTAINER:pn-xcb-util = "Unassigned " +RECIPE_MAINTAINER:pn-xcb-util-cursor = "Unassigned " RECIPE_MAINTAINER:pn-xcb-util-image = "Unassigned " RECIPE_MAINTAINER:pn-xcb-util-keysyms = "Unassigned " RECIPE_MAINTAINER:pn-xcb-util-renderutil = "Unassigned " diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb b/meta/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb new file mode 100644 index 00000000000..047697845c3 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb @@ -0,0 +1,10 @@ +require recipes-graphics/xorg-lib/xcb-util.inc + +SUMMARY = "XCB port of libXcursor" + +DEPENDS += "xcb-util xcb-util-renderutil xcb-util-image" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=ce469b61c70ff8d7cce0547476891974" + +SRC_URI[sha256sum] = "28dcfe90bcab7b3561abe0dd58eb6832aa9cc77cfe42fcdfa4ebe20d605231fb" From patchwork Sun Jun 25 21:22:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26380 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 C0E8AC04FE2 for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.groups.io with SMTP id smtpd.web11.20171.1687728174440314128 for ; Sun, 25 Jun 2023 14:22:54 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=SXeFkgWd; spf=pass (domain: gmail.com, ip: 209.85.128.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-3f9c88ac077so34253965e9.1 for ; Sun, 25 Jun 2023 14:22:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728173; x=1690320173; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=skiqdFk3d/C9IU4J5IBijMw2bNNLxGRZO/Hb7gnDavM=; b=SXeFkgWdXDkCDXEB40s1mnL3krzP26wQSD4nSGo6L0BQqHt2Xqkg2rMUzPFvgHjsot dvHOt3h1enM6ySnLcyHtT83TqvO2VpZZ5T645eWgVzGFOZiI+UaKnOZcSjn4Hi1nwRGW ZeLOPegSvFbsD5WZ+IbiC90o3dMasMTFI59pBE323NXiSxOqQ5p5oR8JBfI7F08dyZ+2 wXtn/eaoj6WCTVsFTI9jcY/iHQuTyXFqmtHGLxkWsYcIYxuQQNAw3uBaoaNVRkBguW35 KBOUyjhNNIr53clWG65FdwZEW3CDimy8t38DHD+Gmx2UvSaX+tchZa3azmdt4foI0jHd NpnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728173; x=1690320173; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=skiqdFk3d/C9IU4J5IBijMw2bNNLxGRZO/Hb7gnDavM=; b=CU3UI2YLM8bQPek6OXbL0CUEmKWO5iwLEbndTEZeGmsju2HNxnJKXURSwFDIUyAu2I 3SKrD0JVWWHz3DRLVVevcAUWMhAl+M0pwKJ8ifSb87+tGSTRo4g2Bgy9sELYI6i6plkG wxLGFXRNSqkYF5d8kXcL+3S6ALbQukWhRGalkjdAuhwz7ipAZcrbeJ4R8Lzp9kIakA1D KoINyhTy26z6n9KjZNH4v116uApNyg7tjz2dyL6ZHW8vRLJJfQ1GkY7iQHKSXlr3Ang2 noLYDMECD7i9ZZc/VvTXB+CwR7nUowWnGkSyO1Hn+CBwiWaFxsB26cWoI3Q3W7WUtAXW 7i+w== X-Gm-Message-State: AC+VfDycTfgZSm+d6fqOYBS9qqMHW3oYDiuQWv6qurtqvovsCXY3eZDE mzDM2m6dG0Eu15w23oQiB1qjPAItzBRaWA== X-Google-Smtp-Source: ACHHUZ4+F6gKTLH/6xrluu5iVwXqfmQUaz8X/gyaTK5XRcfXQzG0cPQCywaAEnOITiBvk3TsicFBiA== X-Received: by 2002:a5d:644d:0:b0:311:1db3:92fc with SMTP id d13-20020a5d644d000000b003111db392fcmr22840954wrw.14.1687728172862; Sun, 25 Jun 2023 14:22:52 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:52 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 16/21] weston: update 11.0.1 -> 12.0.1 Date: Sun, 25 Jun 2023 23:22:36 +0200 Message-Id: <20230625212241.915739-16-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183391 Default to launcher-seatd always, as launcher-logind option has been deprecated. xcb-util-cursor is an additional dependency of xwayland support. Signed-off-by: Alexander Kanavin --- .../{weston_11.0.1.bb => weston_12.0.1.bb} | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) rename meta/recipes-graphics/wayland/{weston_11.0.1.bb => weston_12.0.1.bb} (89%) diff --git a/meta/recipes-graphics/wayland/weston_11.0.1.bb b/meta/recipes-graphics/wayland/weston_12.0.1.bb similarity index 89% rename from meta/recipes-graphics/wayland/weston_11.0.1.bb rename to meta/recipes-graphics/wayland/weston_12.0.1.bb index 0838791a6bf..d9eae1ff62f 100644 --- a/meta/recipes-graphics/wayland/weston_11.0.1.bb +++ b/meta/recipes-graphics/wayland/weston_12.0.1.bb @@ -6,14 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \ " -SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/uploads/f5648c818fba5432edc3ea63c4db4813/${BPN}-${PV}.tar.xz \ +SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ file://weston.png \ file://weston.desktop \ file://xwayland.weston-start \ file://systemd-notify.weston-start \ " -SRC_URI[sha256sum] = "a413f68c252957fc3191c3650823ec356ae8c124ccc0cb440da5cdc4e2cb9e57" +SRC_URI[sha256sum] = "b18591eab278bc191720f6c09158040b795e7118af1d5ddca6acd9a8e2039535" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" UPSTREAM_CHECK_REGEX = "weston-(?P\d+\.\d+\.(?!9\d+)\d+)" @@ -37,7 +37,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayla ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ - ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'sysvinit', 'launcher-libseat', '', d)} \ + launcher-libseat \ image-jpeg \ screenshare \ shell-desktop \ @@ -71,9 +71,9 @@ PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=fals # Weston with webp support PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp" # Weston with systemd-login support -PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus" +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd dbus" # Weston with Xwayland support (requires X11 and Wayland) -PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xwayland" +PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xcb-util-cursor xwayland" # colord CMS support PACKAGECONFIG[colord] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord" # Clients support @@ -94,6 +94,13 @@ PACKAGECONFIG[shell-kiosk] = "-Dshell-kiosk=true,-Dshell-kiosk=false" PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" # support libseat based launch PACKAGECONFIG[launcher-libseat] = "-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd" +# deprecated and superseded by libseat launcher +PACKAGECONFIG[launcher-logind] = "-Ddeprecated-launcher-logind=true,-Ddeprecated-launcher-logind=false," +# screencasting via PipeWire +PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false,pipewire" +# VNC remote screensharing +PACKAGECONFIG[vnc] = "-Dbackend-vnc=true,-Dbackend-vnc=false,neatvnc" + do_install:append() { # Weston doesn't need the .la files to load modules, so wipe them From patchwork Sun Jun 25 21:22:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26370 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 6F37EC001DC for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.web10.20351.1687728175064042798 for ; Sun, 25 Jun 2023 14:22:55 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=W5xH2kDZ; spf=pass (domain: gmail.com, ip: 209.85.128.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-3fa9850bfd9so1093255e9.0 for ; Sun, 25 Jun 2023 14:22:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728173; x=1690320173; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2D3hvLDkvLBmFTfV3pNdwHBlWJshbGXxM+5Ra3pjh/w=; b=W5xH2kDZMwY/qlMofS4/4VW1pVMswKVmYdrNFN1Ti/MArvxK4YJZulQXwvFHaWI1+w Wmd6bjaNrmQ4fzLy2/luJdcWqpjJXfrOBo8480AytHOZx5PXMbj+8AZ4HEX17JhkA6V7 V/hjvMIzdOrZ52QqZsTcqnc1XB7Tq+fznFWp6bz0upHWniUPW275Br/AB7ovkHMHzTGu pgc/soRE6sljPN6rN7+9vlTQjqDcRwgoUItPLUB3nYbE135vTKoLB14dWGWknfUZuGeE jKOVOsbLT24I/8WNIV8uGJtqtHWUKSaeZ/CNK/yS+bDpDvM9OfIzBYqnoZPob9g+JGVP J5Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728173; x=1690320173; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2D3hvLDkvLBmFTfV3pNdwHBlWJshbGXxM+5Ra3pjh/w=; b=BnDlYK94igE103F35lZ5lon7V5TNWNzd2PNFK4dcgM9LpdjLDquulBZs3zCGg94ajy nc2OXjEu35Ks4DK5Dv2/9Vi+IKefY4imz6syI2pVvPeZ4yeBqeKjGqvGq7Z2kNQmcIhK tVTaSdeoTrOXOFQahSguDJXYwpUeCtnC5UZZHdbgllqaA+RnFHjYRBXuWKzsliHkZ0qb YgEwrpMF310JUk+9bFVgdzJQWnDTI6D1E0yDr99zYpCvubv09miJAeM8k9ZD0rLpqa0P LoIQcqT+Aufz0Pl8G1WL2jogypg6Ewjn3uBbMWcjd0nny6sFTuYH5LtgHJhdOzJB/FMQ PMoQ== X-Gm-Message-State: AC+VfDwsHcj0qLYgZRIv/93e3db81QLXupSkK5Ya6AWimtk7rNNB8Hj9 gsFP2ADlzOOz2PmNpxYsTfNy4p5NWndFxA== X-Google-Smtp-Source: ACHHUZ569dfmhOc0kSBHzvelVfxf6r3SEZNvVALP4kNsbXwUmcT51qA/MZF/b27S1bpMuekXu5AzfA== X-Received: by 2002:a7b:c7ca:0:b0:3fa:77ed:9894 with SMTP id z10-20020a7bc7ca000000b003fa77ed9894mr6334509wmk.7.1687728173496; Sun, 25 Jun 2023 14:22:53 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:53 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 17/21] libdmx: update 1.1.4 -> 1.1.5 Date: Sun, 25 Jun 2023 23:22:37 +0200 Message-Id: <20230625212241.915739-17-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183392 Upstream has migrated to tar.xz from tar.bz2, so default works now. Signed-off-by: Alexander Kanavin --- .../xorg-lib/{libdmx_1.1.4.bb => libdmx_1.1.5.bb} | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) rename meta/recipes-graphics/xorg-lib/{libdmx_1.1.4.bb => libdmx_1.1.5.bb} (77%) diff --git a/meta/recipes-graphics/xorg-lib/libdmx_1.1.4.bb b/meta/recipes-graphics/xorg-lib/libdmx_1.1.5.bb similarity index 77% rename from meta/recipes-graphics/xorg-lib/libdmx_1.1.4.bb rename to meta/recipes-graphics/xorg-lib/libdmx_1.1.5.bb index 3634d532082..96015ad882c 100644 --- a/meta/recipes-graphics/xorg-lib/libdmx_1.1.4.bb +++ b/meta/recipes-graphics/xorg-lib/libdmx_1.1.5.bb @@ -15,7 +15,4 @@ DEPENDS += "libxext xorgproto" PE = "1" -XORG_EXT = "tar.bz2" - -SRC_URI[md5sum] = "d2f1f0ec68ac3932dd7f1d9aa0a7a11c" -SRC_URI[sha256sum] = "253f90005d134fa7a209fbcbc5a3024335367c930adf0f3203e754cf32747243" +SRC_URI[sha256sum] = "35a4e26a8b0b2b4fe36441dca463645c3fa52d282ac3520501a38ea942cbf74f" From patchwork Sun Jun 25 21:22:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26371 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 6F3B7C3DA40 for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.web10.20353.1687728175579467189 for ; Sun, 25 Jun 2023 14:22:55 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=J0GqFncG; spf=pass (domain: gmail.com, ip: 209.85.221.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-307d58b3efbso2120320f8f.0 for ; Sun, 25 Jun 2023 14:22:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728174; x=1690320174; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tL/HnOAkbpGDnH1nCHJTEA0C2LTfD40qQdS10fxbK8E=; b=J0GqFncG0PfaJT0vi0k4047NpI3psbs+UpKd733XTZfez6ZVPaoniEI1zr166BYbtc Y9puD7VgnZpLwozP9kJUfbENJsGexvF/6a39eZsoYMuIU97kWqeHknexaU4nzs+EJ7VS wRVvsYt5eTu/n2YfB47OiHZMK2Jy3k0L5wbSIY+n7WK2cAUqmCEzH3ayrM8fwu8OuMwl 0HslpYqNkQOLJ1B2U1LytgcUkphUlTIZ4OxruNHSr8M4bHhsBjx0OL3wH6bnb+m80kII eXFfztiKVWl1VslmhWtvtkVIpNpV2gdt7pFLOSVwkdsLhMehLN8DGy+a9I+bMqC/0r7w 480w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728174; x=1690320174; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tL/HnOAkbpGDnH1nCHJTEA0C2LTfD40qQdS10fxbK8E=; b=JDOqaLhNHhjuE+5R2ENKcGqeaLQMdzSyzu1xklYwvXhxg8Npw2v/80l+/qPLJ/vO0W mFkQgiG3Fcx6avSgpuA81jidPBvH30CYHXXIJUmMiYi7dF3NUsXZ62iQfGfR8khtRtuK +HtzdCfQx7DhkLxaf0Rxdk16XJ8AcvcFS/szSpZMymp2JZ9Q7s+LtSzS6mzS8ajJ9OEo cedIIniP5IQH22KYXkMhQph1ePVW+XEYLNYXpvJgv6duGYXbxIGoaI1hFcrJ2PgjTqFn P70+p1uCFMLo2XgKPreMY+NolZG5mwNs12V8cTNrxhyfYTekNp9rOhHR6P6bPoI4XukU VxVw== X-Gm-Message-State: AC+VfDy04gCZShkZrL5Tl840orKiLDhMDqpPn/WQdIKLSjDu+I9tYPH0 YgGpSKudSvfq3szRSWBwYq5T8UR3bHsluQ== X-Google-Smtp-Source: ACHHUZ65prcD3IZhg4cGVZ1zFzv154QnH2iKo4DxodLs0ti+j6mX/3mc63dJ4SYeYPBo7gJcXxoBcA== X-Received: by 2002:adf:f60c:0:b0:313:edaa:2508 with SMTP id t12-20020adff60c000000b00313edaa2508mr1549284wrp.18.1687728174015; Sun, 25 Jun 2023 14:22:54 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:53 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 18/21] xtrans: update 1.4.0 -> 1.5.0 Date: Sun, 25 Jun 2023 23:22:38 +0200 Message-Id: <20230625212241.915739-18-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183393 License-update: removal of 'all rights reserved' sentences. MIT & MIT was an outcome of mass-cleanup of licenses, so it can be just MIT. tar.bz2 has been replaced with .tar.xz which is the default. Signed-off-by: Alexander Kanavin --- .../xorg-lib/{xtrans_1.4.0.bb => xtrans_1.5.0.bb} | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) rename meta/recipes-graphics/xorg-lib/{xtrans_1.4.0.bb => xtrans_1.5.0.bb} (70%) diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.4.0.bb b/meta/recipes-graphics/xorg-lib/xtrans_1.5.0.bb similarity index 70% rename from meta/recipes-graphics/xorg-lib/xtrans_1.4.0.bb rename to meta/recipes-graphics/xorg-lib/xtrans_1.5.0.bb index cd5aedb59df..781382e5169 100644 --- a/meta/recipes-graphics/xorg-lib/xtrans_1.4.0.bb +++ b/meta/recipes-graphics/xorg-lib/xtrans_1.5.0.bb @@ -9,10 +9,8 @@ except in the X Transport Interface code." require xorg-lib-common.inc -LICENSE = "MIT & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=49347921d4d5268021a999f250edc9ca" - -XORG_EXT = "tar.bz2" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=bc875e1c864f4f62b29f7d8651f627fa" SRC_URI += "file://multilibfix.patch" @@ -24,5 +22,4 @@ inherit gettext BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "ce2fb8100c6647ee81451ebe388b17ad" -SRC_URI[sha256sum] = "377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773" +SRC_URI[sha256sum] = "1ba4b703696bfddbf40bacf25bce4e3efb2a0088878f017a50e9884b0c8fb1bd" From patchwork Sun Jun 25 21:22:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26372 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 619F4C0015E for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web10.20354.1687728176031003696 for ; Sun, 25 Jun 2023 14:22:56 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=pcG7VoY1; spf=pass (domain: gmail.com, ip: 209.85.221.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-3094910b150so3199367f8f.0 for ; Sun, 25 Jun 2023 14:22:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728174; x=1690320174; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dEkCwwabmnqnKbt0Tq3ss+JES3VVrKPlsNqH53Ud2DA=; b=pcG7VoY1EBNmKgZxkYTr0b8r5h7bMBji+dAqSCGHif5a6BLbZ0QeIur0gxFuOSgkb5 J6dkxN5w/hubjtiunB8EmOnohril0Sjdt0D1FeYdZqO3f7jPacsy+uf4L9csWH1KFvBy gBJ647SlgwST9BFWfhu88/t16KfcRigb/T1nEUL1hhPWYLqtSf3Yzx8ZRNU86LuRi1Oe kqIAjWbf+eMcl0+j2gdWAG3Ts2lSHpfr3wlxZjc6Qg+rAkpWps+nr5Ymw1CQZkkj/fj5 xUU678L8zW4oBDeX2IaIEFQ0T5tWw6hYp6igIZMKij5sMYE6AiBa+JhQ035+NRqM6zDj I5Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728174; x=1690320174; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dEkCwwabmnqnKbt0Tq3ss+JES3VVrKPlsNqH53Ud2DA=; b=dQX8vHJilhD/L58uf3txTIrUj5Fj9hL7M2b8PZGHNdYaTUXVXIqpoUHeX7GtdvHu3Q kSXSBqcnq/2YIyE38HdhdseWhbKHu/XFHt0BViHNmM8+42R/RnvEbTt1LwIxeG5JMBSt 6DRIw1aRNBdfpDbemF5aCAJgr7ufiV0ivL1zSallC/wIZmnKh43uRLr49WVnuFtPa7Ee /gNByUg8vqVGi7rsB7XJ8q8g6Kg/AgD4htP1WpI1vzBNygfPL1sRvC4KeLLoZAPO5D7w VAwYyDMfqLCBzDZQCsvGsxfkU0QIfa32kX0cFcQ2CM3xh9BuZsfzO1Nv75u9ybc1DJTB 7fLw== X-Gm-Message-State: AC+VfDxJnzCmrLz9qaRxWX3N0hITOfY6jgyt5hB7ijh9E62rtdP7R5QB ADcEEbmhcri0SzjAzDwBLJQCKR7IHAwkHA== X-Google-Smtp-Source: ACHHUZ4tZt3qmn/PkPoFSUpRebGG1dF1PqRoiPwcarIyXGOSwXkoEaAtofwA5tPrkbCVKZBiZcku0Q== X-Received: by 2002:adf:e507:0:b0:30f:bc98:ede1 with SMTP id j7-20020adfe507000000b0030fbc98ede1mr23222512wrm.8.1687728174472; Sun, 25 Jun 2023 14:22:54 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:54 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 19/21] libproxy: fetch from git Date: Sun, 25 Jun 2023 23:22:39 +0200 Message-Id: <20230625212241.915739-19-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183394 Upstream no longer provides tarballs for newer versions. Signed-off-by: Alexander Kanavin --- meta/recipes-support/libproxy/libproxy_0.4.18.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/libproxy/libproxy_0.4.18.bb b/meta/recipes-support/libproxy/libproxy_0.4.18.bb index 01ba2a6fe92..748b1bd2c04 100644 --- a/meta/recipes-support/libproxy/libproxy_0.4.18.bb +++ b/meta/recipes-support/libproxy/libproxy_0.4.18.bb @@ -12,10 +12,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ DEPENDS = "glib-2.0" -SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.xz" -SRC_URI[sha256sum] = "69b5856e9ea42c38ac77e6b8c92ffc86a71d341fef74e77bef85f9cc6c47a4b1" +SRC_URI = "git://github.com/libproxy/libproxy;protocol=https;branch=main" +SRCREV = "caccaf28e3df6ea612d2d4b39f781c4324019fdb" +S = "${WORKDIR}/git" -inherit cmake pkgconfig github-releases +inherit cmake pkgconfig PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gnome', '', d)} gnome3" PACKAGECONFIG[gnome] = "-DWITH_GNOME=yes,-DWITH_GNOME=no,gconf" From patchwork Sun Jun 25 21:22:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26368 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 5F55AEB64DD for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.groups.io with SMTP id smtpd.web10.20355.1687728176502544466 for ; Sun, 25 Jun 2023 14:22:56 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=BASnLPc+; spf=pass (domain: gmail.com, ip: 209.85.221.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-31297125334so2155005f8f.0 for ; Sun, 25 Jun 2023 14:22:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728175; x=1690320175; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=U6Cj5qSZt9DkGepYLDgWFhRzzaY5hOkFopWzOO6OEFI=; b=BASnLPc+HTRJFVZ+EigsqNA+nMjaCsZ4Hz+8qR6JP6F8raYv1s2HCH6rMW94ZW6NTm gq3QRHr5hQ+0fJXO0/MQlGsDG6klBHsNToLlhij9TOFMN7JOeu5iFpCmMW76A87nyyGA hSP6kMQHKXdtk5aNHrGvJr4qMkaGRN4QqzX/I5QeyPaajY+pmetlv5WMED/KE76XW8fA m8hPVFQHBStDbl2KhHA4BAFZLtiwRS55H1s+esiPtWpBJOKkf8aqIDR0LuU/z7YeqJ8K 5EofH/4ixMqPKw/cbr8EsnB6xWp98wRkOdCYXphByd1gZG8flstQcyWmb+h/fRdG9pWx 9Ocg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728175; x=1690320175; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U6Cj5qSZt9DkGepYLDgWFhRzzaY5hOkFopWzOO6OEFI=; b=TMl2jsd0an01YRTVWtPxowUU8uS88Qxa1wp2IethMjxSl4W+4EIKi6nFKrvSZJGjsu R25TTxZrjShagY92Sc1+13kCa7roKfpMA+FRq2d3to5IG3CMI47Uj1GJjA0hhT7Sn1lu S2ZfASmjOYvSeIhYmNTWy2kexRDAUezeiM6xGaq0xnYtwlzaW8Q3kgsXUwKRenMn4ev+ q/vbOlfSuvW6wOcGu7TgxINWoizUl80iHqoW9FqnK9VPy2N8v2mTUoY84bZ4POc8jKke zdyPMBCfI4zjftkTV8M8MZNoGxULuXDixVE39ZeoKI+xs3bA1A98MgvJqZZfsvOMFFMv 2ALA== X-Gm-Message-State: AC+VfDyYK4iVJqplljQLRobvt/yJ3sOxBmN1rCVz1ZF3WzYC7lOvlFCY bilsKsX5CYRg1+u4beEo+grCZNyjYtrQWw== X-Google-Smtp-Source: ACHHUZ6E5j+77soUxaUpyM2r2gZIEEQFujKar1GOilsXK5r5uszDKY4NFW3GOP1o3oAiL+sNbFTSpQ== X-Received: by 2002:a5d:4846:0:b0:30f:bde3:aa6 with SMTP id n6-20020a5d4846000000b0030fbde30aa6mr27851538wrs.15.1687728174943; Sun, 25 Jun 2023 14:22:54 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:54 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 20/21] libproxy: update 0.4.18 -> 0.5.2 Date: Sun, 25 Jun 2023 23:22:40 +0200 Message-Id: <20230625212241.915739-20-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183395 License-update: formatting, years Upstream has completely overhauled the build system (cmake -> meson) and available options. Add the most important ones that require external dependencies; there's plenty more if someone finds them useful. Signed-off-by: Alexander Kanavin --- meta/lib/oeqa/selftest/cases/bblayers.py | 3 +- .../{libproxy_0.4.18.bb => libproxy_0.5.2.bb} | 29 ++++++------------- 2 files changed, 11 insertions(+), 21 deletions(-) rename meta/recipes-support/libproxy/{libproxy_0.4.18.bb => libproxy_0.5.2.bb} (50%) diff --git a/meta/lib/oeqa/selftest/cases/bblayers.py b/meta/lib/oeqa/selftest/cases/bblayers.py index b0489483869..8faa0602348 100644 --- a/meta/lib/oeqa/selftest/cases/bblayers.py +++ b/meta/lib/oeqa/selftest/cases/bblayers.py @@ -85,8 +85,9 @@ class BitbakeLayers(OESelftestTestCase): result = runCmd('bitbake-layers show-recipes -i image') self.assertIn('core-image-minimal', result.output) self.assertNotIn('mtd-utils:', result.output) - result = runCmd('bitbake-layers show-recipes -i cmake,pkgconfig') + result = runCmd('bitbake-layers show-recipes -i meson,pkgconfig') self.assertIn('libproxy:', result.output) + result = runCmd('bitbake-layers show-recipes -i cmake,pkgconfig') self.assertNotIn('mtd-utils:', result.output) # doesn't inherit either self.assertNotIn('wget:', result.output) # doesn't inherit cmake self.assertNotIn('waffle:', result.output) # doesn't inherit pkgconfig diff --git a/meta/recipes-support/libproxy/libproxy_0.4.18.bb b/meta/recipes-support/libproxy/libproxy_0.5.2.bb similarity index 50% rename from meta/recipes-support/libproxy/libproxy_0.4.18.bb rename to meta/recipes-support/libproxy/libproxy_0.5.2.bb index 748b1bd2c04..7faec2d3d68 100644 --- a/meta/recipes-support/libproxy/libproxy_0.4.18.bb +++ b/meta/recipes-support/libproxy/libproxy_0.5.2.bb @@ -8,32 +8,21 @@ BUGTRACKER = "https://github.com/libproxy/libproxy/issues" SECTION = "libs" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0" + file://src/libproxy/proxy.c;beginline=1;endline=20;md5=bb9a177ef1c995311070f34c5638a402 \ + " DEPENDS = "glib-2.0" SRC_URI = "git://github.com/libproxy/libproxy;protocol=https;branch=main" -SRCREV = "caccaf28e3df6ea612d2d4b39f781c4324019fdb" +SRCREV = "e4f467b05c8adf25e5a2d5464914fc7e92bb7990" S = "${WORKDIR}/git" -inherit cmake pkgconfig +inherit meson pkgconfig gobject-introspection vala gi-docgen +GIDOCGEN_MESON_OPTION = 'docs' -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gnome', '', d)} gnome3" -PACKAGECONFIG[gnome] = "-DWITH_GNOME=yes,-DWITH_GNOME=no,gconf" -PACKAGECONFIG[gnome3] = "-DWITH_GNOME3=yes,-DWITH_GNOME3=no" - -EXTRA_OECMAKE += " \ - -DWITH_KDE=no \ - -DWITH_MOZJS=no \ - -DWITH_NM=no \ - -DWITH_PERL=no \ - -DWITH_PYTHON2=no \ - -DWITH_PYTHON3=no \ - -DWITH_WEBKIT=no \ - -DWITH_SYSCONFIG=no \ - -DLIB_INSTALL_DIR=${libdir} \ - -DLIBEXEC_INSTALL_DIR=${libexecdir} \ -" -SECURITY_PIE_CFLAGS:remove = "-fPIE -pie" +PACKAGECONFIG ?= "" +PACKAGECONFIG[curl] = "-Dcurl=true,-Dcurl=false,curl" +PACKAGECONFIG[config-gnome] = "-Dconfig-gnome=true,-Dconfig-gnome=false,gsettings-desktop-schemas" +PACKAGECONFIG[pacrunner-duktape] = "-Dpacrunner-duktape=true,-Dpacrunner-duktape=false,duktape" FILES:${PN} += "${libdir}/${BPN}/${PV}/modules" From patchwork Sun Jun 25 21:22:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26385 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 CF261C0502B for ; Sun, 25 Jun 2023 21:22:57 +0000 (UTC) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.groups.io with SMTP id smtpd.web11.20173.1687728176964885362 for ; Sun, 25 Jun 2023 14:22:57 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=AyfbXdJj; spf=pass (domain: gmail.com, ip: 209.85.221.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-31126037f41so3180983f8f.2 for ; Sun, 25 Jun 2023 14:22:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728175; x=1690320175; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=r5c9D2KNB8yN70lE3u0G6XJDMxeggAOsJixRN9fQd2w=; b=AyfbXdJjkH2FwFfRW+t11O439jdGMrFVq9Pv4YUbWVZrG5mVwubd3CmGRz/jn3p5M5 JeDTufhyUB3gBSG3E0zZluaLlASm2MRm0u5wxaY6quB19oSO15aQvhWllf18t48ntCnc lDJXN/bhwBQqyezVOyVOidab5qf5K+LNIUcLu6iXGSw8FoFqpxF0VZAwSFJ559W9wYHw pE/YEy35IJmd4S7wTW/D738qySVvf6tEeaCu1OtMukdaFGPff/mHrFgjlQGiW+JQWjib iFvGKG88oEGwII4tfvNNmF/c1hXtJdvGEbTlnQeXHH3ZKDKqfLzto86J+Ld/f/QYmpyA dkjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728175; x=1690320175; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r5c9D2KNB8yN70lE3u0G6XJDMxeggAOsJixRN9fQd2w=; b=h7YAgpVb6wv3Kd99aEHl2AcDfm2rq6N3i7dgyvz/PHTq2KjIx7iM7J+z+HtneTWMd9 b+ITU04Pa0pqK3FQKBEs3BO7JnkWPJ/9RL37wMbud7wdFvxfOyA3ZgXGMcr5bYxNPVog z+rCOv4Sx1FNSuwrK09mT4KuNMSWC6vBBylC3WHzM9emqDDr/7Ag7iXOnBYrj6lPMCuk 4WPDs3Tzo7A3jn632X/LrNSdsBL4nCExPXnNNhUQ8s0R2UseXkQysQC3SsAqBPdUF/Sc uGVH5bpewMTKeHJCuHyWIqSBS5Y7FI96Lh56jeS7ZaZ1mM0up7BiyFrX6W/+SZhsHkJC mQDg== X-Gm-Message-State: AC+VfDzzCrE0yiintAGH4CfjS4Oewdw2kkfm6NE5zBlm6UZqSbB7BIbQ NLFIVVm3jnQcdj9doJYKWrsRnf4MhiJvdQ== X-Google-Smtp-Source: ACHHUZ6WCZlNqrXEsZdTw7b2u0xOfBE8+8bc/VoFjc67aEmuaqH25Q3xMJKMU6y3fdNB8RPDRQoVQQ== X-Received: by 2002:a5d:6505:0:b0:30f:d2af:d62b with SMTP id x5-20020a5d6505000000b0030fd2afd62bmr21493408wru.19.1687728175418; Sun, 25 Jun 2023 14:22:55 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q9-20020a056000136900b0030f9c3219aasm5426736wrz.47.2023.06.25.14.22.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:22:55 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 21/21] libssh2: update 1.10.0 -> 1.11.0 Date: Sun, 25 Jun 2023 23:22:41 +0200 Message-Id: <20230625212241.915739-21-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230625212241.915739-1-alex@linutronix.de> References: <20230625212241.915739-1-alex@linutronix.de> 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 ; Sun, 25 Jun 2023 21:22:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183396 License-update: copyright years Enable static libs as some tests need them. Fix up ptests; the set being run is the same. test_simple is statically linked, hence DISABLE_STATIC is overriden. Signed-off-by: Alexander Kanavin --- .../libssh2/libssh2/fix-ssh2-test.patch | 23 ------------------- .../recipes-support/libssh2/libssh2/run-ptest | 2 +- .../{libssh2_1.10.0.bb => libssh2_1.11.0.bb} | 14 ++++++----- 3 files changed, 9 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch rename meta/recipes-support/libssh2/{libssh2_1.10.0.bb => libssh2_1.11.0.bb} (73%) diff --git a/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch b/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch deleted file mode 100644 index ee916c42d43..00000000000 --- a/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch +++ /dev/null @@ -1,23 +0,0 @@ -In 8.8 OpenSSH disabled sha1 rsa-sha keys out of the box, -so we need to re-enable them as a workaround for the test -suite until upstream updates the tests. - -See: https://github.com/libssh2/libssh2/issues/630 - -Upstream-Status: Backport [alternative fixes merged upstream] - -Patch taken from https://github.com/mirror-rpm/libssh2/commit/47f7114f7d0780f3075bad51a71881f45cc933c5 - ---- a/tests/ssh2.sh -+++ b/tests/ssh2.sh -@@ -25,7 +25,8 @@ $SSHD -f /dev/null -h "$srcdir"/etc/host - -o 'Port 4711' \ - -o 'Protocol 2' \ - -o "AuthorizedKeysFile $srcdir/etc/user.pub" \ -- -o 'UsePrivilegeSeparation no' \ -+ -o 'HostKeyAlgorithms +ssh-rsa' \ -+ -o 'PubkeyAcceptedAlgorithms +ssh-rsa' \ - -o 'StrictModes no' \ - -D \ - $libssh2_sshd_params & - diff --git a/meta/recipes-support/libssh2/libssh2/run-ptest b/meta/recipes-support/libssh2/libssh2/run-ptest index 5e7426f79df..0f5526e316d 100644 --- a/meta/recipes-support/libssh2/libssh2/run-ptest +++ b/meta/recipes-support/libssh2/libssh2/run-ptest @@ -2,7 +2,7 @@ ptestdir=$(dirname "$(readlink -f "$0")") cd tests -for test in simple mansyntax.sh ssh2.sh +for test in mansyntax.sh test_simple test_sshd.test do ./../test-driver --test-name $test --log-file ../$test.log --trs-file ../$test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./$test done diff --git a/meta/recipes-support/libssh2/libssh2_1.10.0.bb b/meta/recipes-support/libssh2/libssh2_1.11.0.bb similarity index 73% rename from meta/recipes-support/libssh2/libssh2_1.10.0.bb rename to meta/recipes-support/libssh2/libssh2_1.11.0.bb index d5513373b08..711bf937f52 100644 --- a/meta/recipes-support/libssh2/libssh2_1.10.0.bb +++ b/meta/recipes-support/libssh2/libssh2_1.11.0.bb @@ -5,14 +5,13 @@ SECTION = "libs" DEPENDS = "zlib" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=3e089ad0cf27edf1e7f261dfcd06acc7" +LIC_FILES_CHKSUM = "file://COPYING;md5=24a33237426720395ebb1dd1349ca225" SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ - file://fix-ssh2-test.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51" +SRC_URI[sha256sum] = "3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461" inherit autotools pkgconfig ptest @@ -20,6 +19,7 @@ EXTRA_OECONF += "\ --with-libz \ --with-libz-prefix=${STAGING_LIBDIR} \ " +DISABLE_STATIC = "" # only one of openssl and gcrypt could be set PACKAGECONFIG ??= "openssl" @@ -29,7 +29,7 @@ PACKAGECONFIG[gcrypt] = "--with-crypto=libgcrypt --with-libgcrypt-prefix=${STAGI BBCLASSEXTEND = "native nativesdk" # required for ptest on documentation -RDEPENDS:${PN}-ptest = "man-db openssh util-linux-col" +RDEPENDS:${PN}-ptest = "bash man-db openssh util-linux-col" RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-en-us" do_compile_ptest() { @@ -41,9 +41,11 @@ do_install_ptest() { install -d ${D}${PTEST_PATH}/tests install -m 0755 ${S}/test-driver ${D}${PTEST_PATH}/ cp -rf ${B}/tests/.libs/* ${D}${PTEST_PATH}/tests/ + cp -rf ${B}/tests/test_simple ${D}${PTEST_PATH}/tests/ cp -rf ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/ - cp -rf ${S}/tests/ssh2.sh ${D}${PTEST_PATH}/tests/ - cp -rf ${S}/tests/etc ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/key* ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/openssh_server/ ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/*.test ${D}${PTEST_PATH}/tests/ mkdir -p ${D}${PTEST_PATH}/docs cp -r ${S}/docs/* ${D}${PTEST_PATH}/docs/ }