From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 CGmvOQJb+mNh9QAAbAwnHQ (envelope-from ) for ; Sat, 25 Feb 2023 20:01:23 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id CBu8OQJb+mMTWgAA9RJhRA (envelope-from ) for ; Sat, 25 Feb 2023 20:01:22 +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 49A902141 for ; Sat, 25 Feb 2023 20:01:22 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=sc08FieY; 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=1677351682; a=rsa-sha256; cv=none; b=b3hnIq5Ac6yJxm4VQ4+OB82pdfxJUfbGue/whCmSAwe9gGYSajgYwMbbp0d2FhD112ZSSY 7SCarWCqB0quwioD2SfbecEJA2G4yiNxgfbWk0StCSalMIO2X0iOnR9howdl3vzwX8uq0K xd9Rxc2djkBBIZpn81seC/7V7pdXpIYqVb9UGLhQavH9mJrMmH9soOVR3uVHpnO0QrcOpH 2AT5GubyHt96w82wynUDf0F7739ecAvYkKOCrgYXMDx7NWsTn3KVPLsoaPXB/1midUGGwY +htOmhorLdoih0TNlkuPAmQMuss5ZeX5Z7T3MxjoVtz17884P3GQNZgUhAM7xQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=sc08FieY; 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1677351682; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=TRfZIOvflB5u29g4Zbz2ycBxqcXW5QskOct4LXk49tE=; b=JapCknnS0YtK2ni8GtsQsGIg04sY8L5aahAPGSY4639WR7pwkso9XHZmfBUrb5RUQ84htf bYs/vDZFMwBkzlD4hXi18hvED0P1IVuJ1+d33njNptipC6KenvR+pXlTAK+SWmuxfoBzGM +T0OC7lobIgci8AJFQM4cNLCqqDFl43oGNljHjuifvNBC9WHVcre0GQLTL9/o5dFCccgD1 yOzbfXRd6bsySzDeBYhmHd7q+9qwNarMPoXOOB0Wz9QrwiHAuxoMlY0PqqtssmCDX+NvQ2 zwWQiEQSoXePh7nkNFaMllxn+hss2RV04cr7omWa6Vfhz6ql/irDjfH8cVdCVQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVznB-0003Wk-2E; Sat, 25 Feb 2023 14:01:09 -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 1pVzn4-0003J5-SC 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 1pVzn4-0001MP-JU for guix-patches@gnu.org; Sat, 25 Feb 2023 14:01:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVzn4-000865-Fe; Sat, 25 Feb 2023 14:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61790] [PATCH core-updates 2/5] gnu: gnutls: Remove Guile dependency. 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.167735165331073 (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]:41525 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzmv-000856-27 for submit@debbugs.gnu.org; Sat, 25 Feb 2023 14:00:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzmo-00084E-Id 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 1pVzmi-0001D7-Ob; 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=TRfZIOvflB5u29g4Zbz2ycBxqcXW5QskOct4LXk49tE=; b=sc08FieYb1phACPInnQE 77bhvVc+UcCYLhpn8K1Cmbe0yyGMV+Yp5WUdrjZfgDONXd5rAYLDMj0iY0JoN2A8RyLRVIpbX8vZn TsphypBKiD4P3A2yn89ICPkMoMRYbzOJ7RufDAPR5YRfM4vAqa3my++qDmFxGMXwgshlbPNoFT/zi u1VNo1ZY7F0ARVovcHYMi7s76UcLeTl2bqJUeiFZy2fJdM7srOPJRxkEbEGjyTy+PKHZDKhq3r1zq isJF4U7zOv5x5M4qdHm67lP1LmiupG2FfLaEF0R268XsKfATZr7HZ4tILvBO6OTZvDa0UN1NKn0Qu JiQjAduJ+rNwEg==; 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-CT; Sat, 25 Feb 2023 14:00:40 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sat, 25 Feb 2023 20:00:27 +0100 Message-Id: <20230225190030.5289-2-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 Content-Type: text/plain; charset=UTF-8 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: X-Migadu-Queue-Id: 49A902141 X-Spam-Score: -3.88 X-Migadu-Spam-Score: -3.88 X-Migadu-Scanner: scn0.migadu.com 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-Flow: FLOW_IN X-Migadu-Country: US X-TUID: +278cCxNv9If * gnu/packages/tls.scm (gnutls)[arguments]: Remove --with-guile-* configure flags. [native-inputs]: Remove GUILE-3.0. [inputs]: Likewise, and add LIBUNISTRING. (gnutls-latest)[inputs, native-inputs]: Remove. (guile2.2-gnutls): Rewrite as a variant of GUILE-GNUTLS. --- gnu/packages/tls.scm | 42 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 9b2669e095..7a85cfe5bc 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012-2017, 2019-2022 Ludovic Courtès +;;; Copyright © 2012-2017, 2019-2023 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2021 Mark H Weaver ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2013, 2015 Andreas Enge @@ -232,15 +232,6 @@ (define-public gnutls ;; independently. This seems suboptimal. "--with-default-trust-store-dir=/etc/ssl/certs" - ;; Tell the build system that we want Guile bindings installed to - ;; the output instead of Guiles own module directory. - (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") - (let ((system #$(or (%current-target-system) (%current-system)))) (if (string-prefix? "mips64el" system) @@ -276,17 +267,13 @@ (define-public gnutls (native-inputs (append (list pkg-config texinfo which util-linux) ;one test needs 'setsid' - (if (%current-target-system) ;for cross-build - (list guile-3.0) ;to create .go files - '()) (if (hurd-target?) '() (list net-tools iproute ;for 'ss' socat ;several tests rely on it datefudge)))) ;tests rely on 'datefudge' - (inputs - (list guile-3.0)) + (inputs (list libunistring)) (propagated-inputs ;; These are all in the 'Requires.private' field of gnutls.pc. (append (list libtasn1 libidn2 nettle zlib) @@ -319,14 +306,7 @@ (define-public gnutls-latest "gnutls-cross.patch")) (sha256 (base32 - "01i1gl15k6qwvxmxx0by1mn9nlmcmym18wdpm7dn9awfsp8474dy")))) - - ;; Disable Guile bindings: they are now provided by Guile-GnuTLS. - (inputs (modify-inputs (package-inputs gnutls) - (delete "guile") - (append libunistring))) ;GnuTLS depends on it - (native-inputs (modify-inputs (package-native-inputs gnutls) - (delete "guile"))))) + "01i1gl15k6qwvxmxx0by1mn9nlmcmym18wdpm7dn9awfsp8474dy")))))) (define-public gnutls/dane ;; GnuTLS with build libgnutls-dane, implementing DNS-based @@ -338,12 +318,6 @@ (define-public gnutls/dane (inputs (modify-inputs (package-inputs gnutls) (prepend unbound))))) -(define-public guile2.2-gnutls - (package/inherit gnutls - (name "guile2.2-gnutls") - (inputs (modify-inputs (package-inputs gnutls) - (replace "guile" guile-2.2))))) - (define-public guile-gnutls (package ;; This package supersedes the Guile bindings that came with GnuTLS until @@ -407,6 +381,16 @@ (define-public guile-gnutls bindings that were formerly provided as part of GnuTLS.") (license license:lgpl2.1+))) +(define-public guile2.2-gnutls + (package/inherit guile-gnutls + (name "guile2.2-gnutls") + (native-inputs + (modify-inputs (package-native-inputs guile-gnutls) + (replace "guile" guile-2.2))) + (inputs + (modify-inputs (package-inputs guile-gnutls) + (replace "guile" guile-2.2))))) + (define (target->openssl-target target) "Return the value to set CONFIGURE_TARGET_ARCH to when cross-compiling OpenSSL for TARGET." -- 2.39.1