From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id oAu4GWc4aGeLywAAe85BDQ:P1 (envelope-from ) for ; Sun, 22 Dec 2024 16:03:51 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id oAu4GWc4aGeLywAAe85BDQ (envelope-from ) for ; Sun, 22 Dec 2024 17:03:51 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=GKt0oxvr; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=SNgb5a9u; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734883431; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=LZuJHZGODpxPy4xxa0YNdVl85+jI06anh6NZ/43yO4Y=; b=IPFfvoYJRFx9AtIJB+ziPbu4IG9Ewm/X3xvh9o0miSqx2UV81njmtCzMTaNADtdFn2ekSM 6oXyYAuETef4UL9uqp//kXBiLxuizqW1jFQ1pcbxqJvGeO2r9uIrjdeDzlgi9OupovpgZo YIJkkY+dQhKKKPaB/FbPP/LDKAC08IzWhNBYt9T1i2BFZkTMigJgQttOO0s7GQ0FqJbpcN cgzcvp30wkvK4GfsEMSxYEpeWoN76YJgVVCYePaC6f6CLU9h13xlEu+n3J/H3sJRERMVHG JsikczJhMTwxpUuexTt4+gALEh6D58uEUkvKcRQYU6ay4nyGfcSwsO9OA3RK9g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=GKt0oxvr; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=SNgb5a9u; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734883431; a=rsa-sha256; cv=none; b=Hl/DdxxkwPisfohRWsFft4p0TDVGcmFnUG54ZZeskfPtRaeJphNYsq1+O5zelHEI2t+EPu CsAn9inpBKToKun9CwAeNUbr6HyEMsN7r/BGRs10/ecZy1M2jhXwIpvtWZytkr7pXxfiHY OXmgKclfQATA+XqtxqsRP9wiTk2HiFOcqOR/xwY1L6p6jvS3GJyKzMDTQa4iSkWbGxzLKg 1y8APIt+F1g9/NTWnUM2az8gFGsSRkfARBQY52+ex/Y7XeM9ah19H0bGTj+cU4zgdSTkrS G4EObhJ/nmK0y/ztoG5vR9HoO6dLTp/Sb/LrAtZTbh1sVuoIdJoyrzkgZUDTLA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0F3A89FB97 for ; Sun, 22 Dec 2024 17:03:51 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tPOQ5-0005QO-1X; Sun, 22 Dec 2024 11:03:05 -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 1tPOQ2-0005PP-OM for guix-patches@gnu.org; Sun, 22 Dec 2024 11:03:02 -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 1tPOQ2-0008Uq-Fa for guix-patches@gnu.org; Sun, 22 Dec 2024 11:03:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=LZuJHZGODpxPy4xxa0YNdVl85+jI06anh6NZ/43yO4Y=; b=GKt0oxvrHfhQGel93ac1lZc4V0xnNWZeAg2/UPGMMw6LA6qsz5ftSIQCGzQC4IewwEj0Yd1AEBC0kKPMJ7yVuIwwMWEdiHfWtpLdJo11YH/8nPc2U0KsKmB3lOLVVMvfbA5bcOdYmFGL9VjzTpmEWkDhGBqf9vQVtPdzZ4xzd18EjyTAQcXdTeRFvUhO2up8/6m9TQjxnWQGKFJCFPHTyTOtFArxJKxktbCIMg0QZyf6u3IsBSbJZ9pS3Utdfnhi3wt7MjCTSmLCyFqlIVt4LWBH2sCJH3VOQQsCDgyUNn+XJDTqdvhH8WhkosKlnlQOnHTrJqL8RDBbg+ztV7hwrw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tPOQ2-0003eD-A3 for guix-patches@gnu.org; Sun, 22 Dec 2024 11:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75026] [PATCH core-updates 1/7] gnu: gnutls: Update to 3.8.8. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 22 Dec 2024 16:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75026 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75026@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 75026-submit@debbugs.gnu.org id=B75026.173488335713907 (code B ref 75026); Sun, 22 Dec 2024 16:03:02 +0000 Received: (at 75026) by debbugs.gnu.org; 22 Dec 2024 16:02:37 +0000 Received: from localhost ([127.0.0.1]:51569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tPOPd-0003cE-83 for submit@debbugs.gnu.org; Sun, 22 Dec 2024 11:02:37 -0500 Received: from mail-pl1-f181.google.com ([209.85.214.181]:56744) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tPOPa-0003bl-1v for 75026@debbugs.gnu.org; Sun, 22 Dec 2024 11:02:34 -0500 Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2166360285dso31640315ad.1 for <75026@debbugs.gnu.org>; Sun, 22 Dec 2024 08:02:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734883287; x=1735488087; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LZuJHZGODpxPy4xxa0YNdVl85+jI06anh6NZ/43yO4Y=; b=SNgb5a9uCtHkbqRJCByJe/euEnX0dYuM9D0bVYPnCBqURD9qhCJadqNsRpEdWiTEm/ 6yjtw0+t5akgRLQqaRUZ1lvm81jjkZkfOyz5zVPSy3pVBGDBj20qCAVvKojGh/OFGVoE nsRik0K27rOg7scvRVuNK8YJdkZqeOFFwwKkWqeLx7GwKPL+i3ywtj39qtYuPo6a4wKs sqn7ykhZVgSiIWDrOrK6lfScVh8ZlZctnlTtcWxxZVYdjiUO0iyl5GOr5rvdAQ5GcmCK UQWu5fmq5yrXd8bzhr88WkHGXTwgdOEQ8Wz8EOe6ScLG32MhFQU98Cq+/C5RPKf74RWY 9awg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734883287; x=1735488087; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LZuJHZGODpxPy4xxa0YNdVl85+jI06anh6NZ/43yO4Y=; b=trIPn/VgUsoAOw6X/F730M0bQ6ysSeDBMO3wu/C8yhCRonZuQTu7W18AbJKs6PDovZ AGWTi6dGfQ+zJvVTvXG8veJ4cDeoH4yYl1jkjocCTY961ihcyeIedTo+t4tNTWczS/AM tWgc1RSxbWrDK7QsQj1/9W9+BPwkeU4eSwGhZslmOUwC1mxgJdYp2FtyAZlYlKQYSogG DsdFOCkJCsHNFY/bAgNRqSmeSTeNtaM4mNWQV/v4Y64ahGaVe79bFuThT0cpT8eSJ+lT JRW2zkq1IJ/2Phoom2R9MeCGMkgLUgHFATJqSiesvj/bcd0yguw5bF9BeAT2MKUJbGge EMgQ== X-Gm-Message-State: AOJu0YyFxshEKtr/SgpB3EcyUpz9y968b+LCN5E2mfFiYSug8i0iZVm2 pbouK/3Cdml93mpgJqmzoTclAe+UE2VYkRik/ETe/pK3g2AyAT3AVDPqFw== X-Gm-Gg: ASbGncu6FW/oWBmtzuWV2ep1U0tb/EVzMqkmU89h70nxhlmgj7W3gdaiWrOTfzGn8xS khuF8dXBBqWFAFtizP9+bwyRdlWpkjfNAPotwdOQtNhuanJCuX0mRp6v2gBg3xtBdnkHI87xeBh OOO0naSmo5q/KonyN5rZ6vEdOlKtCIw0IbiFo6TrVbKEHhc09NREjMLDo1UtedprbMoilXv3nnw YjLUlfsaZmrcKyIAV83JdHSS2bMS1Vrj2Qm6sI/vw/uUgwZB0BebtMQz0/uUu8xjyEHVnXf7VU= X-Google-Smtp-Source: AGHT+IHrbLZF3Z6w9oq1ZakN9x/pvS3AvgC6wNs1I6eGA2J/mdRDLVgDJMJOCvmqwTZ8lebN7OG75w== X-Received: by 2002:a17:903:947:b0:216:725c:a122 with SMTP id d9443c01a7336-219e6e9e0eamr160034755ad.19.1734883287366; Sun, 22 Dec 2024 08:01:27 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f68e4sm58423495ad.211.2024.12.22.08.01.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Dec 2024 08:01:26 -0800 (PST) From: Maxim Cournoyer Date: Mon, 23 Dec 2024 01:00:59 +0900 Message-ID: <15d3101d6383ecf47a655610199699fb910674ab.1734882716.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.18 X-Spam-Score: -4.18 X-Migadu-Queue-Id: 0F3A89FB97 X-Migadu-Scanner: mx10.migadu.com X-TUID: V0MN76ZbiuXO * gnu/packages/tls.scm (gnutls): Update to 3.8.8. [source]: Delete patches. [arguments]: Mark failing tests via XFAIL_TESTS make flag. * gnu/packages/patches/gnutls-skip-trust-store-test.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. Change-Id: I6519b789896dba00de6a1af7a6f772906ce660c1 --- gnu/local.mk | 1 - .../gnutls-skip-trust-store-test.patch | 15 ----------- gnu/packages/tls.scm | 25 ++++++++++--------- 3 files changed, 13 insertions(+), 28 deletions(-) delete mode 100644 gnu/packages/patches/gnutls-skip-trust-store-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8155a5ae34..a4f2e71134 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1477,7 +1477,6 @@ dist_patch_DATA = \ %D%/packages/patches/gnumach-version.patch \ %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnupg-1-build-with-gcc10.patch \ - %D%/packages/patches/gnutls-skip-trust-store-test.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ diff --git a/gnu/packages/patches/gnutls-skip-trust-store-test.patch b/gnu/packages/patches/gnutls-skip-trust-store-test.patch deleted file mode 100644 index e0536712a5..0000000000 --- a/gnu/packages/patches/gnutls-skip-trust-store-test.patch +++ /dev/null @@ -1,15 +0,0 @@ -Version 3.5.11 added a test to check that the default trust store is readable. -It does not exist in the build environment, so pretend everything is fine. - -diff a/tests/trust-store.c b/tests/trust-store.c ---- a/tests/trust-store.c -+++ b/tests/trust-store.c -@@ -61,7 +61,7 @@ - } else if (ret < 0) { - fail("error loading system trust store: %s\n", gnutls_strerror(ret)); - } else if (ret == 0) { -- fail("no certificates were found in system trust store!\n"); -+ success("no trust store in the Guix build environment!\n"); - } - - gnutls_certificate_free_credentials(x509_cred); diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 5f3bc72f6e..ecdfb5c0e5 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -201,7 +201,7 @@ (define-public p11-kit (define-public gnutls (package (name "gnutls") - (version "3.8.3") + (version "3.8.8") (source (origin (method url-fetch) ;; Note: Releases are no longer on ftp.gnu.org since the @@ -209,10 +209,9 @@ (define-public gnutls (uri (string-append "mirror://gnupg/gnutls/v" (version-major+minor version) "/gnutls-" version ".tar.xz")) - (patches (search-patches "gnutls-skip-trust-store-test.patch")) (sha256 (base32 - "0ghpyhhfa3nsraph6dws50jb3dc8g2cfl7dizdnyrm179fawakzp")))) + "1yyq74lzlnkgwbr269mddi9vqi1j0dcnw8pdh09vb01qb0704kxc")))) (build-system gnu-build-system) (arguments (list #:tests? (not (or (%current-target-system) @@ -242,17 +241,19 @@ (define-public gnutls ;; not working on mips64el. "--without-p11-kit") '()))) - + #:make-flags + #~(list (string-append + "XFAIL_TESTS=" + ;; This test checks that the default trust store is + ;; readable; expect it to fail since the trust store + ;; doesn't exist in the build environment. + "trust-store " + ;; This one fails only inside the build environment, for + ;; reasons unknown (see: + ;; ). + "tls13/compress-cert-neg2 ")) #:phases #~(modify-phases %standard-phases - ;; fastopen.sh fails to connect to the server in the builder - ;; environment (see: - ;; https://gitlab.com/gnutls/gnutls/-/issues/1095). - (add-after 'unpack 'disable-failing-tests - (lambda _ - (substitute* "tests/fastopen.sh" - (("^unset RETCODE") - "exit 77\n")))) ;skip #$@(if (target-ppc32?) ;; https://gitlab.com/gnutls/gnutls/-/issues/1354 ;; Extend the test timeout from the default of 20 * 1000 -- 2.46.0