From patchwork Sat Feb 25 19:00:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 47332 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 D173D16B70; Sat, 25 Feb 2023 19:01:32 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 3E7F616AF4 for ; Sat, 25 Feb 2023 19:01:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVznN-0003mf-1K; Sat, 25 Feb 2023 14:01:21 -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 1pVzn5-0003Jq-9c for guix-patches@gnu.org; Sat, 25 Feb 2023 14:01:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVzn5-0001MU-0f for guix-patches@gnu.org; Sat, 25 Feb 2023 14:01:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVzn4-00086F-St; Sat, 25 Feb 2023 14:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61790] [PATCH core-updates 3/5] gnu: gnutls: Deprecate 'gnutls-latest'. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 19:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61790@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , andreas@enge.fr X-Debbugs-Original-Xcc: andreas@enge.fr Received: via spool by 61790-submit@debbugs.gnu.org id=B61790.167735165331081 (code B ref 61790); Sat, 25 Feb 2023 19:01:02 +0000 Received: (at 61790) by debbugs.gnu.org; 25 Feb 2023 19:00:53 +0000 Received: from localhost ([127.0.0.1]:41527 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzmv-000859-JL for submit@debbugs.gnu.org; Sat, 25 Feb 2023 14:00:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzmo-00084H-Lw for 61790@debbugs.gnu.org; Sat, 25 Feb 2023 14:00:48 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVzmj-0001DQ-Ec; Sat, 25 Feb 2023 14:00:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=apnzWTH5L21LkEd5YcmDmw/Dhzzuw3hSC8YCsSlJlK8=; b=DHQWK/8W77fDONWK9i7D xLqONie3fae69Q/6pg0LXsbekUV64Pv68oqCGD6iV/1s6boRg1AXUhyeBLI3HPFXZB5WlDZlBZi6v Rp+beCcTc355ORg/0YQfPt8qFhqDYsrUOLInfbhMM0f12/dPg7hcxXM1ECD0mOBxKcV8fpbrp0sVh ZBv9XhkEMUdQ4Q63ob7FcER5OmTBjHPTAtzOrw9PAAV4mWnEL2ZZrUDqZ3dyQ68XRYtp0mtw30ojI pP3Lds7DuYyVPujguHs355D/b6fE0aox1t8UAfmzm5/Jsalu3cx+59KYs/psNlH/GfRcrTtKyAKcJ arTnxuB3uCAMEA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVzmi-0005iV-Vc; Sat, 25 Feb 2023 14:00:41 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sat, 25 Feb 2023 20:00:28 +0100 Message-Id: <20230225190030.5289-3-ludo@gnu.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230225190030.5289-1-ludo@gnu.org> References: <20230225190030.5289-1-ludo@gnu.org> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tls.scm (gnutls-latest): Define as a deprecated alias for 'gnutls'. (guile-gnutls)[inputs, native-inputs]: Replace 'gnutls-latest' with 'gnutls'. --- gnu/packages/tls.scm | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 7a85cfe5bc..e5e21b5498 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -40,6 +40,7 @@ (define-module (gnu packages tls) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix deprecation) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -293,20 +294,7 @@ (define-public gnutls (properties '((ftp-server . "ftp.gnutls.org") (ftp-directory . "/gcrypt/gnutls"))))) -(define-public gnutls-latest - (package - (inherit gnutls) - (version "3.7.7") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnupg/gnutls/v" - (version-major+minor version) - "/gnutls-" version ".tar.xz")) - (patches (search-patches "gnutls-skip-trust-store-test.patch" - "gnutls-cross.patch")) - (sha256 - (base32 - "01i1gl15k6qwvxmxx0by1mn9nlmcmym18wdpm7dn9awfsp8474dy")))))) +(define-deprecated/public-alias gnutls-latest gnutls) (define-public gnutls/dane ;; GnuTLS with build libgnutls-dane, implementing DNS-based @@ -363,14 +351,14 @@ (define-public guile-gnutls libtool pkg-config texinfo - gnutls-latest ;XXX: 'guile-snarf' invokes the native 'cpp' - guile-3.0 + gnutls + guile-3.0 ;XXX: 'guile-snarf' invokes the native 'cpp' (gnulib-checkout #:version "2022-12-06" #:commit "440b528b1d81dd31b2a2e4dde20d5c837c147811" #:hash (base32 "15mq43abbnkbamchc9lynrvrd5ql8qacgyx2ph4kkngxf1bz3pqy")))) (inputs - (list gnutls-latest + (list gnutls guile-3.0)) (properties '((release-tag-prefix . "v") (release-tag-version-delimiter . ".")))