From patchwork Tue Nov 14 11:35:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 56441 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 685CB27BBE2; Tue, 14 Nov 2023 11:44:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7E2E927BBEA for ; Tue, 14 Nov 2023 11:44:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r2rpE-0004GI-Ti; Tue, 14 Nov 2023 06:43:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r2rpC-0004FD-QP for guix-patches@gnu.org; Tue, 14 Nov 2023 06:43:22 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r2rpB-0005hL-N4 for guix-patches@gnu.org; Tue, 14 Nov 2023 06:43:22 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r2rpr-0004kX-Oq for guix-patches@gnu.org; Tue, 14 Nov 2023 06:44:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67169] [PATCH] gnu: glib-networking: Update to 2.76.1. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Nov 2023 11:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67169@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169996220318150 (code B ref -1); Tue, 14 Nov 2023 11:44:03 +0000 Received: (at submit) by debbugs.gnu.org; 14 Nov 2023 11:43:23 +0000 Received: from localhost ([127.0.0.1]:60165 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r2rpC-0004ig-PS for submit@debbugs.gnu.org; Tue, 14 Nov 2023 06:43:23 -0500 Received: from lists.gnu.org ([2001:470:142::17]:36764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r2rp1-0004hn-OU for submit@debbugs.gnu.org; Tue, 14 Nov 2023 06:43:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r2roG-0003sK-63 for guix-patches@gnu.org; Tue, 14 Nov 2023 06:42:24 -0500 Received: from planete-kraus.eu ([89.234.140.182]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1r2roD-0005Sl-A4 for guix-patches@gnu.org; Tue, 14 Nov 2023 06:42:23 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 504048ef for ; Tue, 14 Nov 2023 11:42:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:mime-version; s=albinoniA; bh=ce jZr84P0lYXSgxYCh2+GwIgpKw=; b=j7MMFYCJHaSTCWE0GSAiu1t1BnknmsizCc nZX5REmNKQXnqiAVuKzuQ/8CJEBXfSWT+6VEd+Th50OHUAvJsKB6WYA9Jf56oeRY uyLTVrzGAi5KmikLkx/0DOQudyN9AI/rdCII80LO+QgbIpsZN52e1+QiqewPrYpH T3Z1NvL0/a5I7ZH9fsMsC+upzKnhZZqIpW0fnnaqepdLV3Op2n2L1PUIHHcLYHj0 /Mo7c9PPN2dTZuiGpdXihoSomk3tCv8vh7UFxWTlnJ8e5UY3Bt3rGYy7bI/aM2JF 7/evxEanLWe/D6V0FVKFrxUivLDaIVYLSQ6MDdWmrPl7g1WkNmxQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ade3f8dc (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Tue, 14 Nov 2023 11:42:17 +0000 (UTC) Message-ID: Date: Tue, 14 Nov 2023 12:35:10 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 Received-SPF: pass client-ip=89.234.140.182; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (glib-networking): Update to 2.76.1. [patches]: Remove. [native-inputs]: Add glib-bin. * gnu/packages/patches/glib-networking-gnutls-binding.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Unregister it. Change-Id: I1c7249995d07d975ac3d3df8ce1e07ffa4dc240f --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 9 ++++---- .../glib-networking-gnutls-binding.patch | 21 ------------------- 3 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 gnu/packages/patches/glib-networking-gnutls-binding.patch base-commit: 72e886328c14c832b2ed71c400069b63852ee18d diff --git a/gnu/local.mk b/gnu/local.mk index 254804d055..4200ec843d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1284,7 +1284,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/gklib-suitesparse.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ - %D%/packages/patches/glib-networking-gnutls-binding.patch \ %D%/packages/patches/glib-skip-failing-test.patch \ %D%/packages/patches/glibc-2.33-riscv64-miscompilation.patch \ %D%/packages/patches/glibc-CVE-2019-7309.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2958da2cd9..bad6b23a90 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4790,7 +4790,7 @@ (define-public libxklavier (define-public glib-networking (package (name "glib-networking") - (version "2.72.2") + (version "2.76.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/glib-networking/" @@ -4798,12 +4798,11 @@ (define-public glib-networking "glib-networking-" version ".tar.xz")) (sha256 (base32 - "0s42l6dkajciqc99zp6dc9l8yv9g8w7d8mgv97l7h7drgd60hand")) - (patches - (search-patches "glib-networking-gnutls-binding.patch")))) + "0ax4h0abi9yxrpmm1p491qjxc8d2k1kaa9hhzgyixrfxjjcqlsaw")))) (build-system meson-build-system) (native-inputs - (list pkg-config gettext-minimal)) + (list `(,glib "bin") ; for gio-querymodules + pkg-config gettext-minimal)) (inputs (list glib gnutls gsettings-desktop-schemas libproxy)) (home-page "https://wiki.gnome.org/Projects/GLib") diff --git a/gnu/packages/patches/glib-networking-gnutls-binding.patch b/gnu/packages/patches/glib-networking-gnutls-binding.patch deleted file mode 100644 index 91d0743056..0000000000 --- a/gnu/packages/patches/glib-networking-gnutls-binding.patch +++ /dev/null @@ -1,21 +0,0 @@ -Skip failing test in 'test_connection_binding_match_tls_unique' -in 'tls/tests/connection.c' when building glib-networking against -GnuTLS 3.7.2. The failure stems from the fact that -'gnutls_session_channel_binding' returns GNUTLS_E_INVALID_REQUEST -is known upstream: - - https://gitlab.gnome.org/GNOME/glib-networking/-/issues/164 - -diff --git a/tls/tests/connection.c b/tls/tests/connection.c -index 036df04..347c7a4 100644 ---- a/tls/tests/connection.c -+++ b/tls/tests/connection.c -@@ -3037,8 +3037,6 @@ main (int argc, - setup_connection, test_connection_missing_server_identity, teardown_connection); - g_test_add ("/tls/" BACKEND "/connection/peer-certificate-notify", TestConnection, NULL, - setup_connection, test_peer_certificate_notify, teardown_connection); -- g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-unique", TestConnection, NULL, -- setup_connection, test_connection_binding_match_tls_unique, teardown_connection); - g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-server-end-point", TestConnection, NULL, - setup_connection, test_connection_binding_match_tls_server_end_point, teardown_connection); - g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-exporter", TestConnection, NULL,