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: 57448 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 50BC627BBE2; Sat, 9 Dec 2023 19:40:18 +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=unavailable 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 057F027BBE9 for ; Sat, 9 Dec 2023 19:40:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rC3B0-0002VC-P0; Sat, 09 Dec 2023 14:39:50 -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 1rC3B0-0002V3-2K for guix-patches@gnu.org; Sat, 09 Dec 2023 14:39:50 -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 1rC3Az-0001F6-R0 for guix-patches@gnu.org; Sat, 09 Dec 2023 14:39:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rC3BC-0004AS-9R for guix-patches@gnu.org; Sat, 09 Dec 2023 14:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67473] [PATCH gnome-team v6 02/14] gnu: glib-networking: Update to 2.76.1. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Dec 2023 19:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67473 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: rg@raghavgururajan.name, Liliana Marie Prikler , 67473@debbugs.gnu.org Received: via spool by 67473-submit@debbugs.gnu.org id=B67473.170215079415986 (code B ref 67473); Sat, 09 Dec 2023 19:40:02 +0000 Received: (at 67473) by debbugs.gnu.org; 9 Dec 2023 19:39:54 +0000 Received: from localhost ([127.0.0.1]:48953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC3B4-00049l-CJ for submit@debbugs.gnu.org; Sat, 09 Dec 2023 14:39:54 -0500 Received: from planete-kraus.eu ([89.234.140.182]:37142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC3B1-00049W-9W for 67473@debbugs.gnu.org; Sat, 09 Dec 2023 14:39:52 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 5f751df9; Sat, 9 Dec 2023 19:39:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniB; bh=bL27dHqhLyKJzQphAhWPDsNrxW0=; b=E cpW6hIf8TyjfKkXVFJdb2THX5pN9/060n9eZMRLF53qI45NGLe6N+I/KI2ouW/fs OANCzoMJwSAe2nBh+6iudgEgzeGyhAtFURlZ0tZ0lod6P56VHt8/Jkm51vg8T3FF 9DRchN+3e/RA15IglJbs9qThqy0CbKvAYkIXxYGDPTONfBYyhJWUJ7TPfoNTWZAr TUglwSIXK5g9tZEIYtlnD+qn0QZtgUee1na/47ncMVsWJFgdcqqZpFDV5XHFyKQu TCG2H7filUO1iQzCS0nQpY1wzBDCdsbYfBGcH31s8AfHXwZqqsmtkORb0O5SqVXd PDVLaVhzWaN1fuA9Uff3Q== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 81f19ef4 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 9 Dec 2023 19:39:35 +0000 (UTC) Message-ID: <180dee4ba7f31096ef76b82e007f5e4326459606.1702150667.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Tue, 14 Nov 2023 12:35:10 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 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 diff --git a/gnu/local.mk b/gnu/local.mk index 93477f830b..977bcbb597 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1291,7 +1291,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 c6437ce450..d2d95905df 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4812,7 +4812,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/" @@ -4820,12 +4820,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,