From patchwork Wed Nov 1 14:25:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 33357 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 1164AC25B56 for ; Wed, 1 Nov 2023 14:25:17 +0000 (UTC) Received: from a27-193.smtp-out.us-west-2.amazonses.com (a27-193.smtp-out.us-west-2.amazonses.com [54.240.27.193]) by mx.groups.io with SMTP id smtpd.web10.8643.1698848703154130801 for ; Wed, 01 Nov 2023 07:25:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=Ruu7bpG4; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=C+8QwSoK; spf=pass (domain: automation.yoctoproject.org, ip: 54.240.27.193, mailfrom: 0101018b8b45fef8-3e70b771-d7bb-45eb-a657-fcd9daf97ffc-000000@automation.yoctoproject.org) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1698848702; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=nudQumJ5l9gqxrGS8BEhmlf22kcZ4Dlr1WnZ7WWQohI=; b=Ruu7bpG4B+8iRRuF+OtOOHpvLEkYunmsAngHFIq1FeGDLi8SMcIne+GcWBlBNVZq 6BqeuHJyQxp5yFqWhDsbadpA8+T+GOe7OJhTeqMs2tgZHaJf/C9qFthvxhVKIStoFkD pPS6u1CGh24o5XMh74OZwfkcSGYSxwaNwmHXADR8= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1698848702; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=nudQumJ5l9gqxrGS8BEhmlf22kcZ4Dlr1WnZ7WWQohI=; b=C+8QwSoKNkVOL7XBRTaGCTt6uEGnAF1m6wU7bdOuDR2r+jkgFBzmdNYRXnEGW7WU G38LCiJdYb17Su2NSzbRJIWbsNznykqlpDyq+vt8GAa/izxGUUumDTKe8yfsbOapyAb Fc0nyKSFhpucZliKi3Vyb0w8DdqJRnt3CDZCXOug= MIME-Version: 1.0 From: auh@yoctoproject.org To: Anuj Mittal Cc: openembedded-core@lists.openembedded.org Subject: [AUH] glib-networking: upgrading to 2.78.0 SUCCEEDED Message-ID: <0101018b8b45fef8-3e70b771-d7bb-45eb-a657-fcd9daf97ffc-000000@us-west-2.amazonses.com> Date: Wed, 1 Nov 2023 14:25:02 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2023.11.01-54.240.27.193 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 ; Wed, 01 Nov 2023 14:25:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189924 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *glib-networking* to *2.78.0* has Succeeded. Next steps: - apply the patch: git am 0001-glib-networking-upgrade-2.76.1-2.78.0.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 1cd62125d692733ff2e8f9001dcb2e4e21469c7f Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Wed, 1 Nov 2023 06:13:54 +0000 Subject: [PATCH] glib-networking: upgrade 2.76.1 -> 2.78.0 --- ...sable-PKCS-11-tests-if-not-available.patch | 113 ------------------ ...ng_2.76.1.bb => glib-networking_2.78.0.bb} | 6 +- 2 files changed, 1 insertion(+), 118 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} (89%) 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 7b003588c8..0000000000 --- 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_2.76.1.bb b/meta/recipes-core/glib-networking/glib-networking_2.78.0.bb similarity index 89% 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 3687123141..106972d5d4 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 @@ -30,10 +30,6 @@ PACKAGECONFIG[gnomeproxy] = "-Dgnome_proxy=enabled,-Dgnome_proxy=disabled,gsetti GNOMEBASEBUILDCLASS = "meson" 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 \ ${datadir}/dbus-1/services/ \