From patchwork Mon Dec 18 14:47:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 36546 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 04AD3C35274 for ; Mon, 18 Dec 2023 14:47:36 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by mx.groups.io with SMTP id smtpd.web11.45511.1702910852353229137 for ; Mon, 18 Dec 2023 06:47:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.com header.s=Intel header.b=bl1y88v1; spf=pass (domain: intel.com, ip: 198.175.65.11, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702910852; x=1734446852; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=1wUVLYeI2y7LGr3VvvRLf1b7+FjTrqNEdMdG6Gfa4s4=; b=bl1y88v1Ba9kemiEJyGofgp1LGekdB5qsq/GwFBS4cGexI+MHFU0R01N 3JQQUoO42dNnCGB2FDjohSaiUCQXnNT+6u37BruBbe0xMcfWRGoPW3P4s aQzFODhFvxfqrEKVIJ+Ck+vbm+kHix5HqVaQojqD56bkkMylxv8p3N9x5 /WHukaalgJ3m+ck9X5vhZM+MK+UUDa//A63/B733xJxevF33EQrWZ3ZSv +VCW/S3B9e17+qKCKzsbq+LUS9sPwhY2QsM1F2qWlWFH1wESCVlIMfKYN OQfJi3jKujsgjnh58+ceCYl0baro913FzmqGykLtjuU/DmTOENOq9A/dv Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10928"; a="2350860" X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="2350860" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2023 06:47:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="23802873" Received: from jsuah-mobl.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.215.240.31]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2023 06:47:31 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/9] sqlite3: upgrade 3.44.0 -> 3.44.2 Date: Mon, 18 Dec 2023 22:47:16 +0800 Message-ID: <20231218144724.7794-1-anuj.mittal@intel.com> X-Mailer: git-send-email 2.43.0 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 ; Mon, 18 Dec 2023 14:47:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192646 Signed-off-by: Anuj Mittal --- .../sqlite/{sqlite3_3.44.0.bb => sqlite3_3.44.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/sqlite/{sqlite3_3.44.0.bb => sqlite3_3.44.2.bb} (78%) diff --git a/meta/recipes-support/sqlite/sqlite3_3.44.0.bb b/meta/recipes-support/sqlite/sqlite3_3.44.2.bb similarity index 78% rename from meta/recipes-support/sqlite/sqlite3_3.44.0.bb rename to meta/recipes-support/sqlite/sqlite3_3.44.2.bb index d4981548890..459884a5581 100644 --- a/meta/recipes-support/sqlite/sqlite3_3.44.0.bb +++ b/meta/recipes-support/sqlite/sqlite3_3.44.2.bb @@ -4,7 +4,7 @@ LICENSE = "PD" LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" SRC_URI = "http://www.sqlite.org/2023/sqlite-autoconf-${SQLITE_PV}.tar.gz" -SRC_URI[sha256sum] = "b9cd386e7cd22af6e0d2a0f06d0404951e1bef109e42ea06cc0450e10cd15550" +SRC_URI[sha256sum] = "1c6719a148bc41cf0f2bbbe3926d7ce3f5ca09d878f1246fcc20767b175bb407" CVE_STATUS[CVE-2023-36191] = "disputed: The error is a bug. It has been fixed upstream. But it is not a vulnerability" From patchwork Mon Dec 18 14:47:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 36547 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 05692C46CCD for ; Mon, 18 Dec 2023 14:47:36 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by mx.groups.io with SMTP id smtpd.web11.45511.1702910852353229137 for ; Mon, 18 Dec 2023 06:47:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.com header.s=Intel header.b=Ki5teQJy; spf=pass (domain: intel.com, ip: 198.175.65.11, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702910853; x=1734446853; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=rDax/4RH56765zMjmLdn/X0VmVrOsomMJeRaYQAEd0M=; b=Ki5teQJyfGDLYEPmhlUNNwkBbjLWG/akiK7Ev/zY+7/ukTfApWbO/COM 1C7qjjyNwsPioiycvD1hGKc5pj3BPx9UKhOBfIu23hGsf6PqqSDEsHR4U 5nH04UCcu/aR+QrVvx5IdG8pmWNZLf7KQeW5YnllaWLti6BsjgzTBRXc8 eO0LgSuGoA1lTx/NDbdUaJFDBxr2sEHnQSw49ncZz79OW1PEMW4kshogm MN8C6Gdnf7G/8Rm7IdQqxNA83eO07ON6zxAD8xWs+kxGn3piLlw/uSvTA qpDbPyZuszIcCh1NKltoSr57lZlwdW9Ll5mgrTCxMIPrTY0u7A45toIV1 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10928"; a="2350866" X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="2350866" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2023 06:47:33 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="23802877" Received: from jsuah-mobl.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.215.240.31]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2023 06:47:33 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/9] base-passwd: upgrade 3.6.2 -> 3.6.3 Date: Mon, 18 Dec 2023 22:47:17 +0800 Message-ID: <20231218144724.7794-2-anuj.mittal@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218144724.7794-1-anuj.mittal@intel.com> References: <20231218144724.7794-1-anuj.mittal@intel.com> 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 ; Mon, 18 Dec 2023 14:47:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192647 Signed-off-by: Anuj Mittal --- .../base-passwd/{base-passwd_3.6.2.bb => base-passwd_3.6.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/base-passwd/{base-passwd_3.6.2.bb => base-passwd_3.6.3.bb} (98%) diff --git a/meta/recipes-core/base-passwd/base-passwd_3.6.2.bb b/meta/recipes-core/base-passwd/base-passwd_3.6.3.bb similarity index 98% rename from meta/recipes-core/base-passwd/base-passwd_3.6.2.bb rename to meta/recipes-core/base-passwd/base-passwd_3.6.3.bb index bb4b49e6ab2..9d7703b1c00 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.6.2.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.6.3.bb @@ -15,7 +15,7 @@ SRC_URI = "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar file://0001-base-passwd-Add-the-sgx-group.patch \ " -SRC_URI[sha256sum] = "06dc78352bf38a8df76ff295e15ab5654cdefe41e62368b15bfcbbab8e4ec2a0" +SRC_URI[sha256sum] = "83575327d8318a419caf2d543341215c046044073d1afec2acc0ac4d8095ff39" # the package is taken from launchpad; that source is static and goes stale # so we check the latest upstream from a directory that does get updated From patchwork Mon Dec 18 14:47:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 36548 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 136B6C46CD4 for ; Mon, 18 Dec 2023 14:47:36 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by mx.groups.io with SMTP id smtpd.web11.45511.1702910852353229137 for ; Mon, 18 Dec 2023 06:47:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.com header.s=Intel header.b=Y8SSthSt; spf=pass (domain: intel.com, ip: 198.175.65.11, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702910856; x=1734446856; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=nYfg2WwXQUdZH+9RgIGBbEgxk/fFUdrvPmBZqunWsOM=; b=Y8SSthStU2Ejr6eyzCcLMO0xNjwdhh3+LjE98b/Nk7391phlfDtnc3iO 6dkeFiAG9/x6akB8JVzPOfwcLZ30TMqjuMyu6+0pkNTExmHQD0s8rY/+E T29pV9MakHHI+YsXd88h+lFNTQyzLT/pj/9uSOfJu3xAZowzmXPHBscD2 cPi5l+iKD+gJN7SgPm0P0NdRNWmwM6cOnXGgvpqPOSzAMpbtkjtxt+Shw NvODNdKcQ+zmzgWz9vgTGsZ8OqZLoftmmByTic4d0TEFybh+Biez+DrKC kGI70k9quQpkaJwj/BZJ79tzdek5Cz7J5hF9ABnKsWyfMld5wkdWeDjCi A==; X-IronPort-AV: E=McAfee;i="6600,9927,10928"; a="2350875" X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="2350875" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2023 06:47:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="23802884" Received: from jsuah-mobl.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.215.240.31]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2023 06:47:34 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/9] bluez5: upgrade 5.70 -> 5.71 Date: Mon, 18 Dec 2023 22:47:18 +0800 Message-ID: <20231218144724.7794-3-anuj.mittal@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218144724.7794-1-anuj.mittal@intel.com> References: <20231218144724.7794-1-anuj.mittal@intel.com> 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 ; Mon, 18 Dec 2023 14:47:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192648 Signed-off-by: Anuj Mittal --- meta/recipes-connectivity/bluez5/bluez5.inc | 2 - .../0001-test-gatt-Fix-hung-issue.patch | 2 +- ...et-for-building-tests-without-runnin.patch | 6 +- ...e_probe-failing-if-SDP-record-is-not.patch | 313 ------------------ ...shared-util.c-include-linux-limits.h.patch | 7 +- .../bluez5/bluez5/CVE-2023-45866.patch | 56 ---- .../bluez5/{bluez5_5.70.bb => bluez5_5.71.bb} | 2 +- 7 files changed, 9 insertions(+), 379 deletions(-) delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/0002-input-Fix-.device_probe-failing-if-SDP-record-is-not.patch delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/CVE-2023-45866.patch rename meta/recipes-connectivity/bluez5/{bluez5_5.70.bb => bluez5_5.71.bb} (94%) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 0bb157e2024..e10158a6e5e 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -55,8 +55,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ file://0001-test-gatt-Fix-hung-issue.patch \ file://0004-src-shared-util.c-include-linux-limits.h.patch \ - file://0002-input-Fix-.device_probe-failing-if-SDP-record-is-not.patch \ - file://CVE-2023-45866.patch \ " S = "${WORKDIR}/bluez-${PV}" diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-test-gatt-Fix-hung-issue.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-test-gatt-Fix-hung-issue.patch index 06ebf1cde69..3546c7c305b 100644 --- a/meta/recipes-connectivity/bluez5/bluez5/0001-test-gatt-Fix-hung-issue.patch +++ b/meta/recipes-connectivity/bluez5/bluez5/0001-test-gatt-Fix-hung-issue.patch @@ -1,4 +1,4 @@ -From 7dcc5f46a31ac4eaa67c0ab3aaae38005db7458f Mon Sep 17 00:00:00 2001 +From e8808a2f5e17d375411c7409eaffb17e72f65022 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Fri, 24 Aug 2018 12:04:03 +0800 Subject: [PATCH] test-gatt: Fix hung issue diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch index 7c47cc1a1ec..be050935515 100644 --- a/meta/recipes-connectivity/bluez5/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch +++ b/meta/recipes-connectivity/bluez5/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch @@ -1,4 +1,4 @@ -From a657fddd13a2e756b0af315301f1c44081e2f668 Mon Sep 17 00:00:00 2001 +From 3724958858b0ee430f37fb83388c3737d2039a3a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 1 Apr 2016 17:07:34 +0300 Subject: [PATCH] tests: add a target for building tests without running them @@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am -index 7041f8e..25966cd 100644 +index e7221bd..9595fd1 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -594,6 +594,9 @@ endif +@@ -710,6 +710,9 @@ endif TESTS = $(unit_tests) AM_TESTS_ENVIRONMENT = MALLOC_CHECK_=3 MALLOC_PERTURB_=69 diff --git a/meta/recipes-connectivity/bluez5/bluez5/0002-input-Fix-.device_probe-failing-if-SDP-record-is-not.patch b/meta/recipes-connectivity/bluez5/bluez5/0002-input-Fix-.device_probe-failing-if-SDP-record-is-not.patch deleted file mode 100644 index d0884338db0..00000000000 --- a/meta/recipes-connectivity/bluez5/bluez5/0002-input-Fix-.device_probe-failing-if-SDP-record-is-not.patch +++ /dev/null @@ -1,313 +0,0 @@ -From 3a9c637010f8dc1ba3e8382abe01065761d4f5bb Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz -Date: Tue, 10 Oct 2023 12:38:29 -0700 -Subject: [PATCH 02/40] input: Fix .device_probe failing if SDP record is not - found - -Due to changes introduced by 67a26abe53bf -("profile: Add probe_on_discover flag") profiles may get probed when -their profile UUID are discovered, rather than resolved, which means -the SDP record may not be available. - -Fixes: https://github.com/bluez/bluez/issues/614 - -Upstream-Status: Backport [https://github.com/bluez/bluez/commit/3a9c637010f8dc1ba3e8382abe01065761d4f5bb] ---- - profiles/input/device.c | 182 +++++++++++++++++++--------------------- - 1 file changed, 84 insertions(+), 98 deletions(-) - -diff --git a/profiles/input/device.c b/profiles/input/device.c -index e2ac6ea60..4a50ea992 100644 ---- a/profiles/input/device.c -+++ b/profiles/input/device.c -@@ -60,7 +60,7 @@ struct input_device { - char *path; - bdaddr_t src; - bdaddr_t dst; -- uint32_t handle; -+ const sdp_record_t *rec; - GIOChannel *ctrl_io; - GIOChannel *intr_io; - guint ctrl_watch; -@@ -754,7 +754,8 @@ static void epox_endian_quirk(unsigned char *data, int size) - } - } - --static int create_hid_dev_name(sdp_record_t *rec, struct hidp_connadd_req *req) -+static int create_hid_dev_name(const sdp_record_t *rec, -+ struct hidp_connadd_req *req) - { - char sdesc[sizeof(req->name) / 2]; - -@@ -776,7 +777,7 @@ static int create_hid_dev_name(sdp_record_t *rec, struct hidp_connadd_req *req) - - /* See HID profile specification v1.0, "7.11.6 HIDDescriptorList" for details - * on the attribute format. */ --static int extract_hid_desc_data(sdp_record_t *rec, -+static int extract_hid_desc_data(const sdp_record_t *rec, - struct hidp_connadd_req *req) - { - sdp_data_t *d; -@@ -817,36 +818,40 @@ invalid_desc: - return -EINVAL; - } - --static int extract_hid_record(sdp_record_t *rec, struct hidp_connadd_req *req) -+static int extract_hid_record(struct input_device *idev, -+ struct hidp_connadd_req *req) - { - sdp_data_t *pdlist; - uint8_t attr_val; - int err; - -- err = create_hid_dev_name(rec, req); -+ if (!idev->rec) -+ return -ENOENT; -+ -+ err = create_hid_dev_name(idev->rec, req); - if (err < 0) - DBG("No valid Service Name or Service Description found"); - -- pdlist = sdp_data_get(rec, SDP_ATTR_HID_PARSER_VERSION); -+ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_PARSER_VERSION); - req->parser = pdlist ? pdlist->val.uint16 : 0x0100; - -- pdlist = sdp_data_get(rec, SDP_ATTR_HID_DEVICE_SUBCLASS); -+ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_DEVICE_SUBCLASS); - req->subclass = pdlist ? pdlist->val.uint8 : 0; - -- pdlist = sdp_data_get(rec, SDP_ATTR_HID_COUNTRY_CODE); -+ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_COUNTRY_CODE); - req->country = pdlist ? pdlist->val.uint8 : 0; - -- pdlist = sdp_data_get(rec, SDP_ATTR_HID_VIRTUAL_CABLE); -+ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_VIRTUAL_CABLE); - attr_val = pdlist ? pdlist->val.uint8 : 0; - if (attr_val) - req->flags |= (1 << HIDP_VIRTUAL_CABLE_UNPLUG); - -- pdlist = sdp_data_get(rec, SDP_ATTR_HID_BOOT_DEVICE); -+ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_BOOT_DEVICE); - attr_val = pdlist ? pdlist->val.uint8 : 0; - if (attr_val) - req->flags |= (1 << HIDP_BOOT_PROTOCOL_MODE); - -- err = extract_hid_desc_data(rec, req); -+ err = extract_hid_desc_data(idev->rec, req); - if (err < 0) - return err; - -@@ -1035,11 +1040,6 @@ static gboolean encrypt_notify(GIOChannel *io, GIOCondition condition, - static int hidp_add_connection(struct input_device *idev) - { - struct hidp_connadd_req *req; -- sdp_record_t *rec; -- char src_addr[18], dst_addr[18]; -- char filename[PATH_MAX]; -- GKeyFile *key_file; -- char handle[11], *str; - GError *gerr = NULL; - int err; - -@@ -1049,33 +1049,7 @@ static int hidp_add_connection(struct input_device *idev) - req->flags = 0; - req->idle_to = idle_timeout; - -- ba2str(&idev->src, src_addr); -- ba2str(&idev->dst, dst_addr); -- -- snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s", src_addr, -- dst_addr); -- sprintf(handle, "0x%8.8X", idev->handle); -- -- key_file = g_key_file_new(); -- if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) { -- error("Unable to load key file from %s: (%s)", filename, -- gerr->message); -- g_clear_error(&gerr); -- } -- str = g_key_file_get_string(key_file, "ServiceRecords", handle, NULL); -- g_key_file_free(key_file); -- -- if (!str) { -- error("Rejected connection from unknown device %s", dst_addr); -- err = -EPERM; -- goto cleanup; -- } -- -- rec = record_from_string(str); -- g_free(str); -- -- err = extract_hid_record(rec, req); -- sdp_record_free(rec); -+ err = extract_hid_record(idev, req); - if (err < 0) { - error("Could not parse HID SDP record: %s (%d)", strerror(-err), - -err); -@@ -1091,7 +1065,7 @@ static int hidp_add_connection(struct input_device *idev) - - /* Make sure the device is bonded if required */ - if (classic_bonded_only && !input_device_bonded(idev)) { -- error("Rejected connection from !bonded device %s", dst_addr); -+ error("Rejected connection from !bonded device %s", idev->path); - goto cleanup; - } - -@@ -1161,6 +1135,68 @@ static int connection_disconnect(struct input_device *idev, uint32_t flags) - return ioctl_disconnect(idev, flags); - } - -+static bool is_device_sdp_disable(const sdp_record_t *rec) -+{ -+ sdp_data_t *data; -+ -+ data = sdp_data_get(rec, SDP_ATTR_HID_SDP_DISABLE); -+ -+ return data && data->val.uint8; -+} -+ -+static enum reconnect_mode_t hid_reconnection_mode(bool reconnect_initiate, -+ bool normally_connectable) -+{ -+ if (!reconnect_initiate && !normally_connectable) -+ return RECONNECT_NONE; -+ else if (!reconnect_initiate && normally_connectable) -+ return RECONNECT_HOST; -+ else if (reconnect_initiate && !normally_connectable) -+ return RECONNECT_DEVICE; -+ else /* (reconnect_initiate && normally_connectable) */ -+ return RECONNECT_ANY; -+} -+ -+static void extract_hid_props(struct input_device *idev, -+ const sdp_record_t *rec) -+{ -+ /* Extract HID connectability */ -+ bool reconnect_initiate, normally_connectable; -+ sdp_data_t *pdlist; -+ -+ /* HIDNormallyConnectable is optional and assumed FALSE if not -+ * present. -+ */ -+ pdlist = sdp_data_get(rec, SDP_ATTR_HID_RECONNECT_INITIATE); -+ reconnect_initiate = pdlist ? pdlist->val.uint8 : TRUE; -+ -+ pdlist = sdp_data_get(rec, SDP_ATTR_HID_NORMALLY_CONNECTABLE); -+ normally_connectable = pdlist ? pdlist->val.uint8 : FALSE; -+ -+ /* Update local values */ -+ idev->reconnect_mode = -+ hid_reconnection_mode(reconnect_initiate, normally_connectable); -+} -+ -+static void input_device_update_rec(struct input_device *idev) -+{ -+ struct btd_profile *p = btd_service_get_profile(idev->service); -+ const sdp_record_t *rec; -+ -+ rec = btd_device_get_record(idev->device, p->remote_uuid); -+ if (!rec || idev->rec == rec) -+ return; -+ -+ idev->rec = rec; -+ idev->disable_sdp = is_device_sdp_disable(rec); -+ -+ /* Initialize device properties */ -+ extract_hid_props(idev, rec); -+ -+ if (idev->disable_sdp) -+ device_set_refresh_discovery(idev->device, false); -+} -+ - static int input_device_connected(struct input_device *idev) - { - int err; -@@ -1168,6 +1204,9 @@ static int input_device_connected(struct input_device *idev) - if (idev->intr_io == NULL || idev->ctrl_io == NULL) - return -ENOTCONN; - -+ /* Attempt to update SDP record if it had changed */ -+ input_device_update_rec(idev); -+ - err = hidp_add_connection(idev); - if (err < 0) - return err; -@@ -1411,74 +1450,21 @@ int input_device_disconnect(struct btd_service *service) - return 0; - } - --static bool is_device_sdp_disable(const sdp_record_t *rec) --{ -- sdp_data_t *data; -- -- data = sdp_data_get(rec, SDP_ATTR_HID_SDP_DISABLE); -- -- return data && data->val.uint8; --} -- --static enum reconnect_mode_t hid_reconnection_mode(bool reconnect_initiate, -- bool normally_connectable) --{ -- if (!reconnect_initiate && !normally_connectable) -- return RECONNECT_NONE; -- else if (!reconnect_initiate && normally_connectable) -- return RECONNECT_HOST; -- else if (reconnect_initiate && !normally_connectable) -- return RECONNECT_DEVICE; -- else /* (reconnect_initiate && normally_connectable) */ -- return RECONNECT_ANY; --} -- --static void extract_hid_props(struct input_device *idev, -- const sdp_record_t *rec) --{ -- /* Extract HID connectability */ -- bool reconnect_initiate, normally_connectable; -- sdp_data_t *pdlist; -- -- /* HIDNormallyConnectable is optional and assumed FALSE -- * if not present. */ -- pdlist = sdp_data_get(rec, SDP_ATTR_HID_RECONNECT_INITIATE); -- reconnect_initiate = pdlist ? pdlist->val.uint8 : TRUE; -- -- pdlist = sdp_data_get(rec, SDP_ATTR_HID_NORMALLY_CONNECTABLE); -- normally_connectable = pdlist ? pdlist->val.uint8 : FALSE; -- -- /* Update local values */ -- idev->reconnect_mode = -- hid_reconnection_mode(reconnect_initiate, normally_connectable); --} -- - static struct input_device *input_device_new(struct btd_service *service) - { - struct btd_device *device = btd_service_get_device(service); -- struct btd_profile *p = btd_service_get_profile(service); - const char *path = device_get_path(device); -- const sdp_record_t *rec = btd_device_get_record(device, p->remote_uuid); - struct btd_adapter *adapter = device_get_adapter(device); - struct input_device *idev; - -- if (!rec) -- return NULL; -- - idev = g_new0(struct input_device, 1); - bacpy(&idev->src, btd_adapter_get_address(adapter)); - bacpy(&idev->dst, device_get_address(device)); - idev->service = btd_service_ref(service); - idev->device = btd_device_ref(device); - idev->path = g_strdup(path); -- idev->handle = rec->handle; -- idev->disable_sdp = is_device_sdp_disable(rec); -- -- /* Initialize device properties */ -- extract_hid_props(idev, rec); - -- if (idev->disable_sdp) -- device_set_refresh_discovery(device, false); -+ input_device_update_rec(idev); - - return idev; - } --- -2.42.0 - diff --git a/meta/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch b/meta/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch index f954f6dab2d..6ef135327d0 100644 --- a/meta/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch +++ b/meta/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch @@ -1,4 +1,4 @@ -From 51584158b9a2e58f3790f8a7387b5cf167eca88b Mon Sep 17 00:00:00 2001 +From ad069fadfcce2cf70f45b1c4a42665448675297e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 12 Dec 2022 13:10:19 +0100 Subject: [PATCH] src/shared/util.c: include linux/limits.h @@ -8,15 +8,16 @@ systems such as those using musl. Upstream-Status: Submitted [to linux-bluetooth@vger.kernel.org,luiz.von.dentz@intel.com,frederic.danis@collabora.com] Signed-off-by: Alexander Kanavin + --- src/shared/util.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/shared/util.c b/src/shared/util.c -index 0a0308c..1f61314 100644 +index 34491f4..412f3ad 100644 --- a/src/shared/util.c +++ b/src/shared/util.c -@@ -22,6 +22,7 @@ +@@ -23,6 +23,7 @@ #include #include #include diff --git a/meta/recipes-connectivity/bluez5/bluez5/CVE-2023-45866.patch b/meta/recipes-connectivity/bluez5/bluez5/CVE-2023-45866.patch deleted file mode 100644 index 5bb31d866aa..00000000000 --- a/meta/recipes-connectivity/bluez5/bluez5/CVE-2023-45866.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 25a471a83e02e1effb15d5a488b3f0085eaeb675 Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz -Date: Tue, 10 Oct 2023 13:03:12 -0700 -Subject: [PATCH] input.conf: Change default of ClassicBondedOnly - -This changes the default of ClassicBondedOnly since defaulting to false -is not inline with HID specification which mandates the of Security Mode -4: - -BLUETOOTH SPECIFICATION Page 84 of 123 -Human Interface Device (HID) Profile: - - 5.4.3.4.2 Security Modes - Bluetooth HID Hosts shall use Security Mode 4 when interoperating with - Bluetooth HID devices that are compliant to the Bluetooth Core - Specification v2.1+EDR[6]. - -Upstream-Status: Backport -[https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/profiles/input?id=25a471a83e02e1effb15d5a488b3f0085eaeb675] - -CVE: CVE-2023-45866 - -Signed-off-by: Archana Polampalli ---- - profiles/input/device.c | 2 +- - profiles/input/input.conf | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/profiles/input/device.c b/profiles/input/device.c -index 4a50ea9..4310dd1 100644 ---- a/profiles/input/device.c -+++ b/profiles/input/device.c -@@ -81,7 +81,7 @@ struct input_device { - - static int idle_timeout = 0; - static bool uhid_enabled = false; --static bool classic_bonded_only = false; -+static bool classic_bonded_only = true; - - void input_set_idle_timeout(int timeout) - { -diff --git a/profiles/input/input.conf b/profiles/input/input.conf -index 4c70bc5..d8645f3 100644 ---- a/profiles/input/input.conf -+++ b/profiles/input/input.conf -@@ -17,7 +17,7 @@ - # platforms may want to make sure that input connections only come from bonded - # device connections. Several older mice have been known for not supporting - # pairing/encryption. --# Defaults to false to maximize device compatibility. -+# Defaults to true for security. - #ClassicBondedOnly=true - - # LE upgrade security --- -2.40.0 diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.70.bb b/meta/recipes-connectivity/bluez5/bluez5_5.71.bb similarity index 94% rename from meta/recipes-connectivity/bluez5/bluez5_5.70.bb rename to meta/recipes-connectivity/bluez5/bluez5_5.71.bb index 2e3b782e6e7..b9bc3dd1b67 100644 --- a/meta/recipes-connectivity/bluez5/bluez5_5.70.bb +++ b/meta/recipes-connectivity/bluez5/bluez5_5.71.bb @@ -1,6 +1,6 @@ require bluez5.inc -SRC_URI[sha256sum] = "37e372e916955e144cb882f888e4be40898f10ae3b7c213ddcdd55ee9c009278" +SRC_URI[sha256sum] = "b828d418c93ced1f55b616fb5482cf01537440bfb34fbda1a564f3ece94735d8" CVE_STATUS[CVE-2020-24490] = "cpe-incorrect: This issue has kernel fixes rather than bluez fixes" From patchwork Mon Dec 18 14:47:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 36550 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 E73FAC46CD3 for ; Mon, 18 Dec 2023 14:47:45 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by mx.groups.io with SMTP id smtpd.web11.45511.1702910852353229137 for ; Mon, 18 Dec 2023 06:47:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.com header.s=Intel header.b=nxavKav/; spf=pass (domain: intel.com, ip: 198.175.65.11, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702910857; x=1734446857; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=grFCzKVfcRej+vMBKDs31ncrRa4EJAEcgg55GR9H8V4=; b=nxavKav/59mM/P91MLDv8lLd0TVXrhOF7XiSEP95P0e7EpDLqMpP3L19 ciJIizVlgx2Bq9xyLB4UU3pic2iZFPQNok0WzUPi6TrZxIcvnZBWhSyCu RULmwl1SSBmWm9Sd+MJW+lFSGr+nn/ytwLtpFKg+MrXXzpWmgSskqwrGa JNp011p7EvFlgqWTvkFJVg/IIY/DAR0rptgkmqRmZBsrMjuCVweabO89o Uh0GWdwvEKibG+FQyGEbxrtqg27Plyudqvic5OgmHGj87z18SozNXOIFN V1gT1nVA/ShV7VvxNydegvHeNzBgB/bK6vZNNUMmynhkO/zqcP6AGr/BX A==; X-IronPort-AV: E=McAfee;i="6600,9927,10928"; a="2350877" X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="2350877" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2023 06:47:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="23802898" Received: from jsuah-mobl.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.215.240.31]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2023 06:47:36 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/9] glib-2.0: upgrade 2.78.1 -> 2.78.3 Date: Mon, 18 Dec 2023 22:47:19 +0800 Message-ID: <20231218144724.7794-4-anuj.mittal@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218144724.7794-1-anuj.mittal@intel.com> References: <20231218144724.7794-1-anuj.mittal@intel.com> 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 ; Mon, 18 Dec 2023 14:47:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192649 Signed-off-by: Anuj Mittal --- ...ot-write-bindir-into-pkg-config-files.patch | 4 ++-- .../0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 3 +-- ...l-gio-querymodules-as-libexec_PROGRAM.patch | 6 +++--- ...ing-about-deprecated-paths-in-schemas.patch | 4 ++-- ...e-correctly-when-building-with-mingw3.patch | 18 +++++++++--------- ...rces.c-comment-out-a-build-host-only-.patch | 6 +++--- ...son-Run-atomics-test-on-clang-as-well.patch | 6 +++--- ...not-enable-pidfd-features-on-native-g.patch | 8 +++----- ...rdcode-python-path-into-various-tools.patch | 6 +++--- .../glib-2.0/glib-2.0/relocate-modules.patch | 2 +- .../{glib-2.0_2.78.1.bb => glib-2.0_2.78.3.bb} | 2 +- 11 files changed, 31 insertions(+), 34 deletions(-) rename meta/recipes-core/glib-2.0/{glib-2.0_2.78.1.bb => glib-2.0_2.78.3.bb} (96%) diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch index 0d44ddf299a..0e5f371cb58 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 9ec4eedeb3f67db0bff09f5d859318d05ff47964 Mon Sep 17 00:00:00 2001 +From cf7df91cc8c3b4811235ef8aec144c5f0cf90bdb Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 15 Feb 2019 11:17:27 +0100 Subject: [PATCH] Do not write $bindir into pkg-config files @@ -16,7 +16,7 @@ Signed-off-by: Alexander Kanavin 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gio/meson.build b/gio/meson.build -index a320c0f..86ce7c4 100644 +index 5f91586..1a95f4f 100644 --- a/gio/meson.build +++ b/gio/meson.build @@ -884,14 +884,14 @@ pkg.generate(libgio, diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch index 16f2d314967..1254466063a 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch @@ -1,4 +1,4 @@ -From c94e669de98a3892c699bd8d0d2b5164b2de747e Mon Sep 17 00:00:00 2001 +From b907a6681c4c24e5d3745538d9fcd471cf1c4c4a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 15 Mar 2014 22:42:29 -0700 Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux @@ -9,7 +9,6 @@ based systems therefore lets set DATADIRNAME to "share". Signed-off-by: Khem Raj Upstream-Status: Pending - --- m4macros/glib-gettext.m4 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch index 597864d9ac4..50d369c24ef 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch @@ -1,4 +1,4 @@ -From 0015db45cd1bfefc04959dffab5dabeead93136f Mon Sep 17 00:00:00 2001 +From 6e2ddcb5465d10618345b12e0b4471ead0f14304 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 22 Mar 2016 15:14:58 +0200 Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM @@ -14,10 +14,10 @@ Upstream-Status: Inappropriate [OE specific] 1 file changed, 1 insertion(+) diff --git a/gio/meson.build b/gio/meson.build -index 2ef60ed..532b086 100644 +index f9fdf6e..5f91586 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -936,6 +936,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu +@@ -1005,6 +1005,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu c_args : gio_c_args, # intl.lib is not compatible with SAFESEH link_args : noseh_link_args, diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch index 6fd93526ced..f810574d973 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch @@ -1,4 +1,4 @@ -From 4f47b8a8d650d185aa61aec2f56a283522a723c4 Mon Sep 17 00:00:00 2001 +From c8c223045821cac97f798cfa63f19853621a8a2a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 12 Jun 2015 17:08:46 +0300 Subject: [PATCH] Remove the warning about deprecated paths in schemas @@ -15,7 +15,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 13 deletions(-) diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c -index 7888120..7acbd5b 100644 +index 04ef404..e791ce2 100644 --- a/gio/glib-compile-schemas.c +++ b/gio/glib-compile-schemas.c @@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state, diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch index 2e1e2313e8b..e1d2fb0e54f 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch @@ -1,4 +1,4 @@ -From ba1728bc27c88597164957d000b70ec4be6edf28 Mon Sep 17 00:00:00 2001 +From bafde4eedc0a22b45e73ee6183b9a11393a1e400 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 13 Feb 2019 15:32:05 +0100 Subject: [PATCH] Set host_machine correctly when building with mingw32 @@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index f644aa2..64a8684 100644 +index 4ef3343..e498e7e 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -29,7 +29,7 @@ endif @@ -25,7 +25,7 @@ index f644aa2..64a8684 100644 common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] endif -@@ -210,7 +210,7 @@ if have_dbus_daemon +@@ -230,7 +230,7 @@ if have_dbus_daemon endif # Test programs buildable on UNIX only @@ -34,7 +34,7 @@ index f644aa2..64a8684 100644 gio_tests += { 'file' : {}, 'gdbus-peer-object-manager' : {}, -@@ -462,7 +462,7 @@ if host_machine.system() != 'windows' +@@ -562,7 +562,7 @@ if host_machine.system() != 'windows' endif # unix # Test programs buildable on Windows only @@ -43,7 +43,7 @@ index f644aa2..64a8684 100644 gio_tests += {'win32-streams' : {}} endif -@@ -532,7 +532,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' +@@ -632,7 +632,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' } endif @@ -53,10 +53,10 @@ index f644aa2..64a8684 100644 'gdbus-example-unix-fd-client' : { 'install' : false, diff --git a/glib/tests/meson.build b/glib/tests/meson.build -index db01b54..6950817 100644 +index d80c86e..5329cda 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build -@@ -188,7 +188,7 @@ if glib_conf.has('HAVE_EVENTFD') +@@ -216,7 +216,7 @@ if glib_conf.has('HAVE_EVENTFD') } endif @@ -66,10 +66,10 @@ index db01b54..6950817 100644 glib_tests += { 'gpoll' : { diff --git a/meson.build b/meson.build -index 43bb468..5f9b59c 100644 +index f7e936e..122f8b5 100644 --- a/meson.build +++ b/meson.build -@@ -43,6 +43,9 @@ else +@@ -54,6 +54,9 @@ else endif host_system = host_machine.system() diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch index d33fdd4d8b7..e4c2f774592 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch @@ -1,4 +1,4 @@ -From 92de6c7eb30b961b24a2dce812d5276487b7d23d Mon Sep 17 00:00:00 2001 +From 3f05b9418c88bbb83c08b57cc5529b006f26fff4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 8 Jan 2020 18:22:46 +0100 Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gio/tests/resources.c b/gio/tests/resources.c -index c44d214..e289a01 100644 +index f567914..b21b616 100644 --- a/gio/tests/resources.c +++ b/gio/tests/resources.c -@@ -993,7 +993,7 @@ main (int argc, +@@ -1068,7 +1068,7 @@ main (int argc, g_test_add_func ("/resource/automatic", test_resource_automatic); /* This only uses automatic resources too, so it tests the constructors and destructors */ g_test_add_func ("/resource/module", test_resource_module); diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch index 44482dd2b7b..071e4a7c4dc 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch @@ -1,4 +1,4 @@ -From 4b97f457b7b44117e27d2a218c4b68e7fe3fe4ce Mon Sep 17 00:00:00 2001 +From 17d718640ae6f953e5eea714c1bd64eeb6e4799f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 12 Oct 2019 17:46:26 -0700 Subject: [PATCH] meson: Run atomics test on clang as well @@ -15,10 +15,10 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index afb6eaa..6aa70f5 100644 +index 122f8b5..f055079 100644 --- a/meson.build +++ b/meson.build -@@ -1692,7 +1692,7 @@ atomicdefine = ''' +@@ -1938,7 +1938,7 @@ atomicdefine = ''' # We know that we can always use real ("lock free") atomic operations with MSVC if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops') have_atomic_lock_free = true diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch index 788f420d118..e03f9a3c843 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch @@ -1,4 +1,4 @@ -From 9aa9574861fad39d0679025e35fe1e188345f685 Mon Sep 17 00:00:00 2001 +From 7865d698b5d392aac3a3d32e9ebd5fea45017d15 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sat, 16 Sep 2023 22:28:27 +0200 Subject: [PATCH] meson.build: do not enable pidfd features on native glib @@ -9,12 +9,13 @@ where these features are not implemented. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin + --- meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 1c36993..bbf97fc 100644 +index f055079..77d78aa 100644 --- a/meson.build +++ b/meson.build @@ -981,7 +981,8 @@ if cc.links('''#include @@ -27,6 +28,3 @@ index 1c36993..bbf97fc 100644 endif # Check for __uint128_t (gcc) by checking for 128-bit division --- -2.30.2 - diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch b/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch index 1c645f3a9ab..4b75167da6a 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch @@ -1,4 +1,4 @@ -From 79ce7e545dd3a93f77d2146d50b6fa061fbceed9 Mon Sep 17 00:00:00 2001 +From 53bcd4b6cd3fe3fe4246914462e6724761eecf51 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 3 Oct 2017 10:45:55 +0300 Subject: [PATCH] Do not hardcode python path into various tools @@ -23,7 +23,7 @@ index 67d3675..4e92a7a 100755 # GDBus - GLib D-Bus Library # diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in -index 7380f24..c8abeaa 100755 +index aa5af43..56e8e2e 100755 --- a/gobject/glib-genmarshal.in +++ b/gobject/glib-genmarshal.in @@ -1,4 +1,4 @@ @@ -33,7 +33,7 @@ index 7380f24..c8abeaa 100755 # pylint: disable=too-many-lines, missing-docstring, invalid-name diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in -index 91ad779..3ebef62 100755 +index 353e53a..8ed6c39 100755 --- a/gobject/glib-mkenums.in +++ b/gobject/glib-mkenums.in @@ -1,4 +1,4 @@ diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index 841fedef8af..95a73298d85 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch @@ -1,4 +1,4 @@ -From b90d13900dd2777c2ab90c5b0be1a872c10a17da Mon Sep 17 00:00:00 2001 +From 03a069cb8066d3e8ef72a43f7b1db5c9625e9cc2 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.78.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb similarity index 96% rename from meta/recipes-core/glib-2.0/glib-2.0_2.78.1.bb rename to meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb index a4902621122..13d4b38e22e 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.78.1.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb @@ -19,7 +19,7 @@ SRC_URI:append:class-native = " file://relocate-modules.patch \ file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ " -SRC_URI[sha256sum] = "915bc3d0f8507d650ead3832e2f8fb670fce59aac4d7754a7dab6f1e6fed78b2" +SRC_URI[sha256sum] = "609801dd373796e515972bf95fc0b2daa44545481ee2f465c4f204d224b2bc21" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. From patchwork Mon Dec 18 14:47:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 36554 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 F39E5C46CD7 for ; Mon, 18 Dec 2023 14:47:45 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by mx.groups.io with SMTP id smtpd.web11.45511.1702910852353229137 for ; Mon, 18 Dec 2023 06:47:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.com header.s=Intel header.b=ddUTwxmg; spf=pass (domain: intel.com, ip: 198.175.65.11, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702910858; x=1734446858; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=tWIGExGo2zb3SgG1tzzHqStCHWJk/CBOfALfa2cFi1A=; b=ddUTwxmgl1R7QMhcUOIxT95b755kDroo1WYpTnsB8UEr5VO0iRPDPxXH skWMwD2F4i9ffnt6k4pmAinBvESJPNF07mZjOIP7+mNQmHNxGhwBvC5QZ GWDQdemJMey85OzdZRn0i/xJVeJr7TX6T+0Z7EhVstIAcVZN8U/F+TLdj btRxUVYSR0gCZSxFLFE9tsQtjINfI5o0OKJaSgqr570iofE07htgFhAyv ufY/jlrerOv8LZkEIC/j1n9S7d5jMbibBfCOTaNXafV6ESBSyeIhX1Mxi g5K18fDzbc1a+Evn9AsMMuJOBCSBDhjqqA085/77paENafjaW314CZA74 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10928"; a="2350882" X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="2350882" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2023 06:47:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="23802903" Received: from jsuah-mobl.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.215.240.31]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2023 06:47:38 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [PATCH 5/9] glib-networking: upgrade 2.76.1 -> 2.78.0 Date: Mon, 18 Dec 2023 22:47:20 +0800 Message-ID: <20231218144724.7794-5-anuj.mittal@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218144724.7794-1-anuj.mittal@intel.com> References: <20231218144724.7794-1-anuj.mittal@intel.com> 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 ; Mon, 18 Dec 2023 14:47:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192650 Signed-off-by: Anuj Mittal --- ...sable-PKCS-11-tests-if-not-available.patch | 113 ------------------ .../glib-networking/eagain.patch | 20 +++- ...ng_2.76.1.bb => glib-networking_2.78.0.bb} | 3 +- 3 files changed, 15 insertions(+), 121 deletions(-) delete mode 100644 meta/recipes-core/glib-networking/glib-networking/0001-tls-tests-disable-PKCS-11-tests-if-not-available.patch rename meta/recipes-core/glib-networking/{glib-networking_2.76.1.bb => glib-networking_2.78.0.bb} (92%) diff --git a/meta/recipes-core/glib-networking/glib-networking/0001-tls-tests-disable-PKCS-11-tests-if-not-available.patch b/meta/recipes-core/glib-networking/glib-networking/0001-tls-tests-disable-PKCS-11-tests-if-not-available.patch deleted file mode 100644 index 7b003588c88..00000000000 --- a/meta/recipes-core/glib-networking/glib-networking/0001-tls-tests-disable-PKCS-11-tests-if-not-available.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 04728a5b73e870b4695c5e7ba42fa41c00471944 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Fri, 12 May 2023 20:19:35 +0100 -Subject: [PATCH] tls/tests: disable PKCS#11 tests if not available - -GnuTLS can be built without PKCS#11, which means the symbols -gnutls_pkcs11_init and gnutls_pkcs11_add_provider are not part of the -library. - -If these symbols don't exist in GnuTLS then we can't add a mock pkcs#11 -provider for testing, and several tests which need the mock provider -will fail. - -Solve this by checking for the symbols at build time and disabling the -provider and tests which need it. - -Upstream-Status: Backport -Signed-off-by: Ross Burton ---- - meson.build | 4 ++++ - tls/tests/certificate.c | 11 +++++++---- - tls/tests/connection.c | 4 +++- - 3 files changed, 14 insertions(+), 5 deletions(-) - -diff --git a/meson.build b/meson.build -index 0fa9027..d2a023a 100644 ---- a/meson.build -+++ b/meson.build -@@ -84,6 +84,10 @@ gnutls_dep = dependency('gnutls', version: '>= 3.7.4', required: get_option('gnu - - if gnutls_dep.found() - backends += ['gnutls'] -+ # test-specific, maybe move to tls/tests -+ if cc.has_function('gnutls_pkcs11_init', prefix: '#include ', dependencies: gnutls_dep) -+ config_h.set10('HAVE_GNUTLS_PKCS11', true) -+ endif - endif - - # *** Checks for OpenSSL *** -diff --git a/tls/tests/certificate.c b/tls/tests/certificate.c -index e820ba1..dd2412b 100644 ---- a/tls/tests/certificate.c -+++ b/tls/tests/certificate.c -@@ -24,6 +24,7 @@ - * Author: Stef Walter - */ - -+#include "config.h" - #include "certificate.h" - - #include -@@ -911,7 +912,7 @@ int - main (int argc, - char *argv[]) - { --#ifdef BACKEND_IS_GNUTLS -+#if defined(BACKEND_IS_GNUTLS) && HAVE_GNUTLS_PKCS11 - char *module_path; - #endif - -@@ -921,7 +922,7 @@ main (int argc, - g_setenv ("GIO_USE_TLS", BACKEND, TRUE); - g_assert_cmpint (g_ascii_strcasecmp (G_OBJECT_TYPE_NAME (g_tls_backend_get_default ()), "GTlsBackend" BACKEND), ==, 0); - --#ifdef BACKEND_IS_GNUTLS -+#if defined(BACKEND_IS_GNUTLS) && HAVE_GNUTLS_PKCS11 - module_path = g_test_build_filename (G_TEST_BUILT, "mock-pkcs11.so", NULL); - g_assert_true (g_file_test (module_path, G_FILE_TEST_EXISTS)); - -@@ -942,12 +943,14 @@ main (int argc, - setup_certificate, test_create_certificate_with_issuer, teardown_certificate); - g_test_add ("/tls/" BACKEND "/certificate/create-with-garbage-input", TestCertificate, NULL, - setup_certificate, test_create_certificate_with_garbage_input, teardown_certificate); -- g_test_add ("/tls/" BACKEND "/certificate/pkcs11", TestCertificate, NULL, -- setup_certificate, test_create_certificate_pkcs11, teardown_certificate); - g_test_add ("/tls/" BACKEND "/certificate/private-key", TestCertificate, NULL, - setup_certificate, test_private_key, teardown_certificate); -+#if HAVE_GNUTLS_PKCS11 -+ g_test_add ("/tls/" BACKEND "/certificate/pkcs11", TestCertificate, NULL, -+ setup_certificate, test_create_certificate_pkcs11, teardown_certificate); - g_test_add ("/tls/" BACKEND "/certificate/private-key-pkcs11", TestCertificate, NULL, - setup_certificate, test_private_key_pkcs11, teardown_certificate); -+#endif - - g_test_add_func ("/tls/" BACKEND "/certificate/create-chain", test_create_certificate_chain); - g_test_add_func ("/tls/" BACKEND "/certificate/create-no-chain", test_create_certificate_no_chain); -diff --git a/tls/tests/connection.c b/tls/tests/connection.c -index 17efe1b..62a7fbb 100644 ---- a/tls/tests/connection.c -+++ b/tls/tests/connection.c -@@ -3376,7 +3376,7 @@ main (int argc, - - g_assert_true (g_ascii_strcasecmp (G_OBJECT_TYPE_NAME (g_tls_backend_get_default ()), "GTlsBackend" BACKEND) == 0); - --#ifdef BACKEND_IS_GNUTLS -+#if defined(BACKEND_IS_GNUTLS) && HAVE_GNUTLS_PKCS11 - module_path = g_test_build_filename (G_TEST_BUILT, "mock-pkcs11.so", NULL); - g_assert_true (g_file_test (module_path, G_FILE_TEST_EXISTS)); - -@@ -3438,8 +3438,10 @@ main (int argc, - setup_connection, test_client_auth_request_fail, teardown_connection); - g_test_add ("/tls/" BACKEND "/connection/client-auth-request-none", TestConnection, NULL, - setup_connection, test_client_auth_request_none, teardown_connection); -+#if HAVE_GNUTLS_PKCS11 - g_test_add ("/tls/" BACKEND "/connection/client-auth-pkcs11", TestConnection, NULL, - setup_connection, test_client_auth_pkcs11_connection, teardown_connection); -+#endif - g_test_add ("/tls/" BACKEND "/connection/no-database", TestConnection, NULL, - setup_connection, test_connection_no_database, teardown_connection); - g_test_add ("/tls/" BACKEND "/connection/failed", TestConnection, NULL, --- -2.34.1 - diff --git a/meta/recipes-core/glib-networking/glib-networking/eagain.patch b/meta/recipes-core/glib-networking/glib-networking/eagain.patch index ee5b6a7beb9..062fc0191bb 100644 --- a/meta/recipes-core/glib-networking/glib-networking/eagain.patch +++ b/meta/recipes-core/glib-networking/glib-networking/eagain.patch @@ -1,4 +1,8 @@ -In autobuilder testing we regularly see glib-networking ptest fail with: +From 025bb39dfdb81dd2852deaefea228b197ef3cd8d Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Sat, 6 May 2023 12:18:50 +0100 +Subject: [PATCH] In autobuilder testing we regularly see glib-networking ptest + fail with: GLib-Net:ERROR:/usr/src/debug/glib-networking/2.74.0-r0/tls/tests/connection.c:1944:simul_read_thread: assertion failed (error == NULL): Resource temporarily unavailable (g-io-error-quark, 27) Bail out! GLib-Net:ERROR:/usr/src/debug/glib-networking/2.74.0-r0/tls/tests/connection.c:1944:simul_read_thread: assertion failed (error == NULL): Resource temporarily unavailable (g-io-error-quark, 27) @@ -12,11 +16,15 @@ Upstream-Status: Pending [testing to see if patch resolves the issue] Signed-off-by: Richard Purdie -Index: glib-networking-2.74.0/tls/tests/connection.c -=================================================================== ---- glib-networking-2.74.0.orig/tls/tests/connection.c -+++ glib-networking-2.74.0/tls/tests/connection.c -@@ -1941,6 +1941,10 @@ simul_read_thread (gpointer user_data) +--- + tls/tests/connection.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tls/tests/connection.c b/tls/tests/connection.c +index 62a7fbb..3447c80 100644 +--- a/tls/tests/connection.c ++++ b/tls/tests/connection.c +@@ -2210,6 +2210,10 @@ simul_read_thread (gpointer user_data) test->buf + test->nread, MIN (TEST_DATA_LENGTH / 2, TEST_DATA_LENGTH - test->nread), NULL, &error); diff --git a/meta/recipes-core/glib-networking/glib-networking_2.76.1.bb b/meta/recipes-core/glib-networking/glib-networking_2.78.0.bb similarity index 92% rename from meta/recipes-core/glib-networking/glib-networking_2.76.1.bb rename to meta/recipes-core/glib-networking/glib-networking_2.78.0.bb index 0f8822e1603..68f9a2ed783 100644 --- a/meta/recipes-core/glib-networking/glib-networking_2.76.1.bb +++ b/meta/recipes-core/glib-networking/glib-networking_2.78.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SECTION = "libs" DEPENDS = "glib-2.0-native glib-2.0" -SRC_URI[archive.sha256sum] = "5c698a9994dde51efdfb1026a56698a221d6250e89dc50ebcddda7b81480a42b" +SRC_URI[archive.sha256sum] = "52fe4ce93f7dc51334b102894599858d23c8a65ac4a1110b30920565d68d3aba" # Upstream note that for the openssl backend, half the tests where this backend don't return # the expected error code or don't work as expected so default to gnutls @@ -31,7 +31,6 @@ inherit gnomebase gettext upstream-version-is-even gio-module-cache ptest-gnome SRC_URI += "file://run-ptest" SRC_URI += "file://eagain.patch" -SRC_URI += "file://0001-tls-tests-disable-PKCS-11-tests-if-not-available.patch" FILES:${PN} += "\ ${libdir}/gio/modules/libgio*.so \ From patchwork Mon Dec 18 14:47:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 36551 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 1BA1EC46CD4 for ; Mon, 18 Dec 2023 14:47:46 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by mx.groups.io with SMTP id smtpd.web11.45511.1702910852353229137 for ; Mon, 18 Dec 2023 06:47:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.com header.s=Intel header.b=a7oKKNKN; spf=pass (domain: intel.com, ip: 198.175.65.11, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702910860; x=1734446860; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=Iig70MMd0fwxhLDdTuFigLCODQIYcP40VUk+izLdMEI=; b=a7oKKNKNY46POhZOeKe89thvHUBr4mF/sf937V7aICVB2Q9dMgEGa0kM uxpAkCxs9Gqty8bm21GE7AwgUpBn1+K3U2+gbkVtlRSVnnAMABdiiQ7CF 9R7WtR1RwM5WGb4bDEXcPNIoKYhpCJb7b3jzvkGDK9rrRJm0VfzhitorR Q/a4Lo8p0avYZFSJqLvIfhYN5n6exa0E6y2r+r2qODxRqC9X9SaDBnAuV /b008rzO7fr+1qnAjPOApkeK/jUUAyu76k9mIQBC9LKULxbtSt1XdD1cH r7QUdGQhM9Sqb7eXL02B4CC1b2GXm0oI/Kqf6l/fyi/lOoIXAv3Er7pxv w==; X-IronPort-AV: E=McAfee;i="6600,9927,10928"; a="2350884" X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="2350884" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2023 06:47:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="23802910" Received: from jsuah-mobl.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.215.240.31]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2023 06:47:39 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [PATCH 6/9] puzzles: upgrade to latest revision Date: Mon, 18 Dec 2023 22:47:21 +0800 Message-ID: <20231218144724.7794-6-anuj.mittal@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218144724.7794-1-anuj.mittal@intel.com> References: <20231218144724.7794-1-anuj.mittal@intel.com> 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 ; Mon, 18 Dec 2023 14:47:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192651 Signed-off-by: Anuj Mittal --- meta/recipes-sato/puzzles/puzzles_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb index d0a9af7cb67..ab4b2394b8b 100644 --- a/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/meta/recipes-sato/puzzles/puzzles_git.bb @@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "git://git.tartarus.org/simon/puzzles.git;branch=main;protocol=https" UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "96d65e852cea8a95001fa70e3ec2996d4ea5e2b4" +SRCREV = "08365fb260ae6e32442dd9f196e65d13facb4b33" PE = "2" PV = "0.0+git" From patchwork Mon Dec 18 14:47:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 36552 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 2976EC46CD8 for ; Mon, 18 Dec 2023 14:47:46 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by mx.groups.io with SMTP id smtpd.web11.45511.1702910852353229137 for ; Mon, 18 Dec 2023 06:47:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.com header.s=Intel header.b=gqsZodVn; spf=pass (domain: intel.com, ip: 198.175.65.11, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702910861; x=1734446861; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=QiUp/oalf/UINuMkCzUtbWfckYVtUqyPe1ZVdAcM92o=; b=gqsZodVngBcJEBq8OOPwHfkS82qOby8+uT9iNJ+6SdnlgjW7vV9VaEaw nY712XjRvLV3qohWOiqfP4x3ofSq214XyV1kWPvQ864k6vTQ1EhhvA0FX 6Hz1cSJTNJQSgUEZnoCeHxhuvnAWptB6iqEcGTT8ak63JcrTkOJKFPBdy snQNEhNtnTy2X6D52t1Y0WnlHZ35kd2NzpBu0etNK34QkpBceZxABABJN 6rTOsHeQMhPbYXcMJ+0e5M3Lzq/bVtHoAH/joRQA+qPcnPYVnoN8beRYv uFCCRPbD9uSoT2AyhoBhzt5VzHw0ma2moGB0D3cYyV/ey19Lf6Els73GO g==; X-IronPort-AV: E=McAfee;i="6600,9927,10928"; a="2350888" X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="2350888" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2023 06:47:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="23802919" Received: from jsuah-mobl.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.215.240.31]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2023 06:47:40 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [PATCH 7/9] stress-ng: upgrade 0.17.01 -> 0.17.03 Date: Mon, 18 Dec 2023 22:47:22 +0800 Message-ID: <20231218144724.7794-7-anuj.mittal@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218144724.7794-1-anuj.mittal@intel.com> References: <20231218144724.7794-1-anuj.mittal@intel.com> 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 ; Mon, 18 Dec 2023 14:47:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192652 Signed-off-by: Anuj Mittal --- .../stress-ng/{stress-ng_0.17.01.bb => stress-ng_0.17.03.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/stress-ng/{stress-ng_0.17.01.bb => stress-ng_0.17.03.bb} (94%) diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.17.01.bb b/meta/recipes-extended/stress-ng/stress-ng_0.17.03.bb similarity index 94% rename from meta/recipes-extended/stress-ng/stress-ng_0.17.01.bb rename to meta/recipes-extended/stress-ng/stress-ng_0.17.03.bb index b6fd96d8578..0da5294f31d 100644 --- a/meta/recipes-extended/stress-ng/stress-ng_0.17.01.bb +++ b/meta/recipes-extended/stress-ng/stress-ng_0.17.03.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ " -SRCREV = "c9669b041eff5905da191974ba0102208a59e04e" +SRCREV = "8c39f5a2d9b199189456f414afd9e536dae69d1b" S = "${WORKDIR}/git" DEPENDS = "coreutils-native libbsd" From patchwork Mon Dec 18 14:47:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 36553 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 F39A5C46CCD for ; Mon, 18 Dec 2023 14:47:45 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by mx.groups.io with SMTP id smtpd.web11.45511.1702910852353229137 for ; Mon, 18 Dec 2023 06:47:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.com header.s=Intel header.b=RzGfgaSW; spf=pass (domain: intel.com, ip: 198.175.65.11, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702910862; x=1734446862; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=6YtbxrNt9TXDT1mNyyBcHMawo1ke99rVlPhQPE/VDz0=; b=RzGfgaSWx0OZDtHoGdngip1VVWnGDKjbrtRUK1C1tXhR3s2TzkrEIRAQ K/Q+ejAWJ/gWWfzQ3O0bKc411ChrO9tWgUZ/pAmu+M8AL7d0HpVC/70kl IjGTDkjawVH7I7gV24ygLBrBXe7qWZtHhWwMvZqINjPctdWqg4qH3dv0n O86qVcOHRqGr/58RJRL7HnY+LbOikZ9pG1Ak8J6QHqgcIyzrthGTcZHc2 5gzs3DwWYYnEGo/FLlbjrMBADovkPV0xncQq1CrqIPNexVV9/ujRkXpjk twe9/zsEh/K8haO3H7Jnts3Fzi8qhXGnw8jrb6Iyy1MFZBSvgYlnTK0JJ g==; X-IronPort-AV: E=McAfee;i="6600,9927,10928"; a="2350892" X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="2350892" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2023 06:47:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="23802923" Received: from jsuah-mobl.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.215.240.31]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2023 06:47:42 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [PATCH 8/9] libusb1: fix upstream version check Date: Mon, 18 Dec 2023 22:47:23 +0800 Message-ID: <20231218144724.7794-8-anuj.mittal@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218144724.7794-1-anuj.mittal@intel.com> References: <20231218144724.7794-1-anuj.mittal@intel.com> 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 ; Mon, 18 Dec 2023 14:47:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192653 Fix regex to not match release candidates. Signed-off-by: Anuj Mittal --- meta/recipes-support/libusb/libusb1_1.0.26.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-support/libusb/libusb1_1.0.26.bb b/meta/recipes-support/libusb/libusb1_1.0.26.bb index 122c3d48b4f..1b93a80f3e7 100644 --- a/meta/recipes-support/libusb/libusb1_1.0.26.bb +++ b/meta/recipes-support/libusb/libusb1_1.0.26.bb @@ -16,6 +16,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libusb-${PV}.tar.bz2 \ " GITHUB_BASE_URI = "https://github.com/libusb/libusb/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P\d+(\.\d+)+)" SRC_URI[sha256sum] = "12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5" From patchwork Mon Dec 18 14:47:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 36549 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 E13F2C35274 for ; Mon, 18 Dec 2023 14:47:45 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by mx.groups.io with SMTP id smtpd.web11.45511.1702910852353229137 for ; Mon, 18 Dec 2023 06:47:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.com header.s=Intel header.b=G5XFeWGo; spf=pass (domain: intel.com, ip: 198.175.65.11, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702910864; x=1734446864; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=AG+12Eec9Zqc3hxHE6fIwe+Wr8tEKEGcneYj2PCsfR0=; b=G5XFeWGoPplBOWzfNHDQY8Cj4RQtbF/PAcBzSFBYzbYyVHv8tJabA2c/ YELSUA2jcda1qqX/9FVkXrLkG1O/+8PCmnZywuymOPAYIMVcT1SgWkR4O LF70DlTdusP/a986MdLxJwp+jt8D+fVyB43YXnVF/ILrG3JH0FuCi6i+7 r2CAfnycQ6pFk4X0UVi0G+sj53IbrlKKXuDPHkYoO28z1GxhHaf5PwmLt JuS/DuYr1ghhyf6tzHWnyhF+ASg+JMp225l3a3IY0yn3cC1ePlOwPtsV8 C9Vyl6hjIyWj3UDjRC6SLRBzGTfEl5CrH9sjtPIqotc+Zjyasyt5WWfW/ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10928"; a="2350899" X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="2350899" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2023 06:47:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="23802925" Received: from jsuah-mobl.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.215.240.31]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2023 06:47:43 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [PATCH 9/9] enchant2: upgrade 2.6.2 -> 2.6.4 Date: Mon, 18 Dec 2023 22:47:24 +0800 Message-ID: <20231218144724.7794-9-anuj.mittal@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218144724.7794-1-anuj.mittal@intel.com> References: <20231218144724.7794-1-anuj.mittal@intel.com> 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 ; Mon, 18 Dec 2023 14:47:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192654 pkgdatadir is a versioned directory by default now so we don't need to pass it to EXTRA_OEMAKE. https://github.com/AbiWord/enchant/commit/6e4a8df5cbf80fd449f1857ac1065d3235f1139f Signed-off-by: Anuj Mittal --- .../enchant/{enchant2_2.6.2.bb => enchant2_2.6.4.bb} | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename meta/recipes-support/enchant/{enchant2_2.6.2.bb => enchant2_2.6.4.bb} (87%) diff --git a/meta/recipes-support/enchant/enchant2_2.6.2.bb b/meta/recipes-support/enchant/enchant2_2.6.4.bb similarity index 87% rename from meta/recipes-support/enchant/enchant2_2.6.2.bb rename to meta/recipes-support/enchant/enchant2_2.6.4.bb index 38d3245d203..431d02ea25a 100644 --- a/meta/recipes-support/enchant/enchant2_2.6.2.bb +++ b/meta/recipes-support/enchant/enchant2_2.6.4.bb @@ -12,14 +12,12 @@ DEPENDS = "glib-2.0 groff-native" inherit autotools pkgconfig github-releases SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/enchant-${PV}.tar.gz" -SRC_URI[sha256sum] = "6686a728e56e760f8dee09a22f0fb53b46ee9dbe7d64cf9e5bb35a658bff7e1d" +SRC_URI[sha256sum] = "833b4d5600dbe9ac867e543aac6a7a40ad145351495ca41223d4499d3ddbbd2c" GITHUB_BASE_URI = "https://github.com/AbiWord/enchant/releases" S = "${WORKDIR}/enchant-${PV}" -EXTRA_OEMAKE = "pkgdatadir=${datadir}/enchant-2" - PACKAGECONFIG ??= "aspell" PACKAGECONFIG[aspell] = "--with-aspell,--without-aspell,aspell,aspell" PACKAGECONFIG[hunspell] = "--with-hunspell,--without-hunspell,hunspell,hunspell"