From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id iDm+Ak01s2NTjQAAbAwnHQ (envelope-from ) for ; Mon, 02 Jan 2023 20:49:33 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id gLkeAk01s2M7yQAAG6o9tA (envelope-from ) for ; Mon, 02 Jan 2023 20:49:33 +0100 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 B3390122EB for ; Mon, 2 Jan 2023 20:49:32 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pCQo2-0003q3-4m; Mon, 02 Jan 2023 14:49:10 -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 1pCQnv-0003pY-Ql for guix-patches@gnu.org; Mon, 02 Jan 2023 14:49:05 -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 1pCQnu-0006Zm-Gy for guix-patches@gnu.org; Mon, 02 Jan 2023 14:49:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pCQnu-0007Sh-Cz for guix-patches@gnu.org; Mon, 02 Jan 2023 14:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60358] [PATCH v12 4/4] gnu: guile-gnutls: Update to 3.7.11. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jan 2023 19:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60358 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60358@debbugs.gnu.org Received: via spool by 60358-submit@debbugs.gnu.org id=B60358.167268888628536 (code B ref 60358); Mon, 02 Jan 2023 19:49:02 +0000 Received: (at 60358) by debbugs.gnu.org; 2 Jan 2023 19:48:06 +0000 Received: from localhost ([127.0.0.1]:44097 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCQmy-0007Q2-8u for submit@debbugs.gnu.org; Mon, 02 Jan 2023 14:48:05 -0500 Received: from planete-kraus.eu ([89.234.140.182]:37364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCQmo-0007Mu-Tb for 60358@debbugs.gnu.org; Mon, 02 Jan 2023 14:47:57 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id eca83a52 for <60358@debbugs.gnu.org>; Mon, 2 Jan 2023 19:47:53 +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 :mime-version; s=dkim; bh=Fq5qJA+G1lA0ELcm2otRK/GEZIs=; b=Z8GXN7 RYmKSsn2369d+SIrDged7BZ6+n1F2JHn9xrn3Hf89S5TmSDvofMzBOizen0SWpAE YlIkFNvNB2kZSIyugPR36/4B6JLsCWzDYWGbc4SEE94uKkdjzN+AWnFTi8floqFA UTh9Aoulc4NU1zOrYnLcyWyd/m9U76vEFfUrg= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id db3dd460 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Mon, 2 Jan 2023 19:47:53 +0000 (UTC) Message-Id: In-Reply-To: References: Date: Wed, 28 Dec 2022 03:20:54 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.46.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: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches From: Vivien Kraus via Guix-patches via 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1672688972; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: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=3lljpI5bTqk9Fgm0MNNRa4lnIPJlZHFp6+aY4NiUbnU=; b=DVqp5SwxKL6SsQharUl/eSpLoLDOS1YODY7c7FTEybpxjSk00PtEWjQtLh2gwlBkSyxMWu PY2KkFAaKwqAH30zgaIU5USQkZ5R3U5W+cQzzulrZXvtAE5CqY1IGZHUgGEd1buKwyeHN6 0U4hNFUJA7TIQiUCJ+kuddMKYuzw+8mM2zGGbPtz+IKYDNPpQYev+lFLjVHO9PrsHa99ub FYI7Vil1xMx/7K9kBckfKn70Qfst6UMYWranlNJ3QoiT86e3V65XhMUUOgMkV2EjM7lRaN zMC5uha54DDA9W/eKpc7qf5MCW7eUeX0XN6oZQ07rshp0h/3yCgzvk1N9tE8qQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b="Z8GXN7 R"; 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=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1672688972; a=rsa-sha256; cv=none; b=coT7n2cGDKksQKOpg3LFwcUg363DbF2Qy4zFkv8+Qc69NZDnpf6Q0I9BdoBTCnBgOjo4Vu WOjQ6q/s0MkL2JYuq8eP8ng9HJkNXNf8oZ+tc56UWgcQfDfpr6pKAKE5MbfFYjprnzg1CB MEY5bZqvjN9WBX+fFo5bOvlfZxNFy7EqUp74hLamyuc8LtlHQmxi7n4m/r8xb9Rh79mV6q +MgvPR1/YrrhwiJwzaYl/xfVYTnG+SYwM+Fnh6WPcUHj/igVDfD80EXaGg4GrPK2PsxWFQ GQ7qb/WsPPA90+/ELU7TADCFVLslGfNrT5qqWrjErdvePq2blnLgZzepedOsBA== X-Spam-Score: 0.95 X-Migadu-Queue-Id: B3390122EB Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b="Z8GXN7 R"; 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=pass (policy=none) header.from=gnu.org X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: 0.95 X-TUID: M8dKzyRJslB0 * gnu/packages/tls.scm (guile-gnutls) [phases]: Patch-shebang autopull.sh and autogen.sh. * gnu/packages/tls.scm (guile-gnutls) [native-inupts]: Add gnulib and git. --- gnu/packages/tls.scm | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a74b423ccf..b8cba06386 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2021 Matthew James Kraai ;;; Copyright © 2021 John Kehayias ;;; Copyright © 2022 Greg Hogan +;;; Copyright © 2022 Vivien Kraus ;;; ;;; This file is part of GNU Guix. ;;; @@ -56,6 +57,7 @@ (define-module (gnu packages tls) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages bash) + #:use-module (gnu packages build-tools) #:use-module (gnu packages check) #:use-module (gnu packages curl) #:use-module (gnu packages dns) @@ -80,6 +82,7 @@ (define-module (gnu packages tls) #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) + #:use-module (gnu packages version-control) #:use-module (gnu packages base) #:use-module (srfi srfi-1)) @@ -381,7 +384,7 @@ (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.9") + (version "3.7.11") (home-page "https://gitlab.com/gnutls/guile/") (source (origin (method git-fetch) @@ -390,21 +393,31 @@ (define-public guile-gnutls (commit (string-append "v" version)))) (sha256 (base32 - "00sfpqjmd263ka51fq4xf7nvaaxyfqsr3r8fj94jgx45q6q6n6wq")) + "06d7v3i0d9ayp7zqk1rsy4z0wfpq69n0r54f1xrppb9gn7q9iva6")) (file-name (git-file-name name version)) (patches (search-patches "gnutls-cross.patch")))) (build-system gnu-build-system) (arguments - '(#:configure-flags - ;; Tell the build system that we want Guile bindings installed to - ;; the output instead of Guiles own module directory. - (list "--disable-static" - (string-append "--with-guile-site-dir=" - "$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)") - (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")))) + (list + #:configure-flags + ;; Tell the build system that we want Guile bindings installed to the + ;; output instead of Guiles own module directory. + #~(list "--disable-static" + (string-append "--with-guile-site-dir=" + "$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)") + (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 _ + (for-each patch-shebang + '("autopull.sh" "autogen.sh")))) + (replace 'bootstrap + (lambda _ + (invoke "bash" "./bootstrap" "--no-git")))))) (native-inputs (list autoconf automake @@ -412,7 +425,11 @@ (define-public guile-gnutls pkg-config texinfo gnutls ;XXX: 'guile-snarf' invokes the native 'cpp' - guile-3.0)) + guile-3.0 + (gnulib-checkout + #:version "2022-12-06" + #:commit "440b528b1d81dd31b2a2e4dde20d5c837c147811" + #:hash (base32 "15mq43abbnkbamchc9lynrvrd5ql8qacgyx2ph4kkngxf1bz3pqy")))) (inputs (list gnutls-latest guile-3.0)) -- 2.38.1