From patchwork Tue May 9 11:12:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 49892 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 D251827BBEC; Tue, 9 May 2023 12:13:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,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 1A9D827BBEA for ; Tue, 9 May 2023 12:13:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwLHH-0005aR-1l; Tue, 09 May 2023 07:13:07 -0400 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 1pwLHE-0005Yl-4n for guix-patches@gnu.org; Tue, 09 May 2023 07:13:04 -0400 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 1pwLHC-0004mE-H6 for guix-patches@gnu.org; Tue, 09 May 2023 07:13:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pwLHB-0008U5-PP for guix-patches@gnu.org; Tue, 09 May 2023 07:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63388] [PATCH] gnu: guile-gnutls: Update to 3.7.12. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 May 2023 11:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63388 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63388@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168363076732588 (code B ref -1); Tue, 09 May 2023 11:13:01 +0000 Received: (at submit) by debbugs.gnu.org; 9 May 2023 11:12:47 +0000 Received: from localhost ([127.0.0.1]:42534 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwLGv-0008TX-CX for submit@debbugs.gnu.org; Tue, 09 May 2023 07:12:46 -0400 Received: from lists.gnu.org ([209.51.188.17]:56108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwLGq-0008TH-Br for submit@debbugs.gnu.org; Tue, 09 May 2023 07:12:43 -0400 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 1pwLGn-0005BO-2e for guix-patches@gnu.org; Tue, 09 May 2023 07:12:37 -0400 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwLGi-0004jF-85 for guix-patches@gnu.org; Tue, 09 May 2023 07:12:34 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 89C0B27BBEA for ; Tue, 9 May 2023 12:12:30 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id dfcea39a for ; Tue, 9 May 2023 11:12:29 +0000 (UTC) From: Christopher Baines Date: Tue, 9 May 2023 12:12:29 +0100 Message-Id: <0c21dcb0fb324299bbfafe8c6f67dc1d9db4b84c.1683630749.git.mail@cbaines.net> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 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: , 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 (guile-gnutls): Update to 3.7.12. [source]: Switch to a tarball, to avoid a circular dependency if guile-gnutls is used in git-download. [arguments]: Remove phase changes for building from Git. [native-inputs]: Remove autoconf and automake as they're now unnecessary. --- gnu/packages/tls.scm | 43 +++++++++++-------------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) base-commit: 649ce7b433171a47e8a2819b849bfa88c736d0e9 diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 6d7cff41b0..095de98d21 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -319,18 +319,18 @@ (define-public guile-gnutls ;; This package supersedes the Guile bindings that came with GnuTLS until ;; version 3.7.8 included. (name "guile-gnutls") - (version "3.7.11") + (version "3.7.12") (home-page "https://gitlab.com/gnutls/guile/") (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) + (method url-fetch) + (uri + (string-append + "https://gitlab.com/gnutls/guile/uploads/" + "3fe12c208bdc6155c5116cf5eac7a2ad" + "/guile-gnutls-" version ".tar.gz")) (sha256 (base32 - "06d7v3i0d9ayp7zqk1rsy4z0wfpq69n0r54f1xrppb9gn7q9iva6")) - (file-name (git-file-name name version)) - (patches (search-patches "gnutls-cross.patch")))) + "0dp3zsbnwgb4q4p8n6i5vnlwq52v5hp8f5c44ngyag89fcaz2fjx")))) (build-system gnu-build-system) (arguments (list @@ -343,34 +343,13 @@ (define-public guile-gnutls (string-append "--with-guile-site-ccache-dir=" "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache") (string-append "--with-guile-extension-dir=" - "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions")) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-more-shebangs - (lambda _ - (substitute* "autogen.sh" - (("\\$gnulib_tool \\$gnulib_tool_options") - "sh $gnulib_tool $gnulib_tool_options")) - (substitute* "configure.ac" - (("build-aux/git-version-gen") - "sh build-aux/git-version-gen")) - (for-each patch-shebang - '("autopull.sh" "autogen.sh")))) - (replace 'bootstrap - (lambda _ - (invoke "bash" "./bootstrap" "--no-git")))))) + "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions")))) (native-inputs - (list autoconf - automake - libtool + (list libtool pkg-config texinfo gnutls - guile-3.0 ;XXX: 'guile-snarf' invokes the native 'cpp' - (gnulib-checkout - #:version "2022-12-06" - #:commit "440b528b1d81dd31b2a2e4dde20d5c837c147811" - #:hash (base32 "15mq43abbnkbamchc9lynrvrd5ql8qacgyx2ph4kkngxf1bz3pqy")))) + guile-3.0)) ;XXX: 'guile-snarf' invokes the native 'cpp' (inputs (list gnutls guile-3.0))