From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 0KX1NHyfkF8uBAAA0tVLHw (envelope-from ) for ; Wed, 21 Oct 2020 20:52:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id UBXxMHyfkF8HHAAA1q6Kng (envelope-from ) for ; Wed, 21 Oct 2020 20:52:12 +0000 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 270BC940466 for ; Wed, 21 Oct 2020 20:52:12 +0000 (UTC) Received: from localhost ([::1]:60210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVL5e-0004fT-Vy for larch@yhetil.org; Wed, 21 Oct 2020 16:52:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVL5X-0004fI-2M for guix-patches@gnu.org; Wed, 21 Oct 2020 16:52:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39164) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kVL5W-00065l-Pl for guix-patches@gnu.org; Wed, 21 Oct 2020 16:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kVL5W-0004l7-Ov for guix-patches@gnu.org; Wed, 21 Oct 2020 16:52:02 -0400 Subject: bug#40654: [PATCH] gnu: gnutls: Enable p11-kit. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Wed, 21 Oct 2020 20:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 40654 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40654-done@debbugs.gnu.org Mail-Followup-To: 40654@debbugs.gnu.org, mail@cbaines.net, mail@cbaines.net Received: via spool by 40654-done@debbugs.gnu.org id=D40654.160331346218213 (code D ref 40654); Wed, 21 Oct 2020 20:52:02 +0000 Received: (at 40654-done) by debbugs.gnu.org; 21 Oct 2020 20:51:02 +0000 Received: from localhost ([127.0.0.1]:50708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kVL4Y-0004jf-He for submit@debbugs.gnu.org; Wed, 21 Oct 2020 16:51:02 -0400 Received: from mira.cbaines.net ([212.71.252.8]:51214) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kVL4W-0004jG-Sc for 40654-done@debbugs.gnu.org; Wed, 21 Oct 2020 16:51:01 -0400 Received: from localhost (92.41.179.191.threembb.co.uk [92.41.179.191]) by mira.cbaines.net (Postfix) with ESMTPSA id C232327BBED for <40654-done@debbugs.gnu.org>; Wed, 21 Oct 2020 21:50:59 +0100 (BST) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 3ba41bcc for <40654-done@debbugs.gnu.org>; Wed, 21 Oct 2020 20:50:56 +0000 (UTC) References: <20200416083409.6230-1-mail@cbaines.net> User-agent: mu4e 1.4.13; emacs 27.1 From: Christopher Baines In-reply-to: <20200416083409.6230-1-mail@cbaines.net> Date: Wed, 21 Oct 2020 21:50:54 +0100 Message-ID: <87h7qngv69.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -0.61 X-TUID: m9ijNXSt0QHK --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Christopher Baines writes: > Everywhere except mips64el, where a comment says it doesn't work. I can't= test > as I can't build this on mips64el anyway. > > This change will enable running the tests for libcacard. > > * gnu/packages/tls.scm (gnutls)[arguments]: Only specify --without-p11-ki= t on > mips64el. > [inputs]: Include the p11-kit for all systems except mips64el. > --- > gnu/packages/tls.scm | 20 +++++++++++++++----- > 1 file changed, 15 insertions(+), 5 deletions(-) > > diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm > index 3eb32fc27a..85f159a401 100644 > --- a/gnu/packages/tls.scm > +++ b/gnu/packages/tls.scm > @@ -181,7 +181,7 @@ living in the same process.") > `(; Ensure we don't keep a reference to this buggy software. > #:disallowed-references (,net-tools) > #:configure-flags > - (list > + (cons* > ;; GnuTLS doesn't consult any environment variables to spec= ify > ;; the location of the system-wide trust store. Instead it= has a > ;; configure-time option. Unless specified, its configure = script > @@ -202,9 +202,14 @@ living in the same process.") > (string-append "--with-guile-extension-dir=3D" > "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/= extensions") >=20=20 > - ;; FIXME: Temporarily disable p11-kit support since it is n= ot > - ;; working on mips64el. > - "--without-p11-kit") > + (let ((system ,(or (%current-target-system) > + (%current-system)))) > + (if (string-prefix? "mips64el" system) > + (list > + ;; FIXME: Temporarily disable p11-kit support since = it is > + ;; not working on mips64el. > + "--without-p11-kit") > + '()))) >=20=20 > #:phases (modify-phases %standard-phases > (add-after > @@ -227,7 +232,12 @@ living in the same process.") > ("pkg-config" ,pkg-config) > ("which" ,which))) > (inputs > - `(("guile" ,guile-2.2))) > + `(("guile" ,guile-2.2) > + ,@(let ((system (or (%current-target-system) > + (%current-system)))) > + (if (string-prefix? "mips64el" system) > + '() > + `(("p11-kit" ,p11-kit)))))) > (propagated-inputs > ;; These are all in the 'Requires.private' field of gnutls.pc. > `(("libtasn1" ,libtasn1) I've pushed this to core-updates now as 1c2889b1ce08e1f91193e237e03462dc74c63726. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl+Qny5fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XeSfg/7BHSDQqEEEwDLRqMDye4Fk/cjFWCAd7qa 21Q3pdYiEHd6QbaH7baiSzScHHzT41TLWRIz6hHQtbYDk72OzhQr3idX+//ZYY6P /0TLmvKJUKHLlkm2uGmu9IF2s2+asJcY4WlprBPp/yuedKFqIERXAw6hLUJErNOQ OlfSpwsDLBQeL4/iVR46YBi1q291rjNxHxtKsXyUMI4dWw0mQnFCA+iXHD5m/ecI gnaLJIscpEPoD0/E0R9/F1Fv+TzfyrwyCr02LRRiFpy1E+58BVK/LbeC7kae1Zoi TiJTaJZN03bteQ7mNZE1XQFaxwnnVaASgsWNluXE3RSY1BVCtYCe0Ktxfm9hZOAy o048DiOeVD4F09rXyNCG5TIiTBcu8OdGW3Xd6yvwpaCdSPq5MjACeXnXX6LNlF2v U7CEkn/umqBxTWkLAQtGnyK8NuJ4waZDo4vDy48UcInqXlwUAkoej5sMhn8yDqSD Rtxp4KXxwrcwU5aeDpyZcxbuNrXq6Er89B1uz4oJV4iGYQbj+tD7Z9Z09Pl9pVOw Yk8Xv04rrw02DgBlQzeCflkVlniUeKIfbWFDh3JAT3+bFAGS/8EFu48+6RHMTykI +DN26Hg5xlL5dU3dFfadQhjjKbFNvxBtWigJjm7eDkLn6DJ1ZneRQrQCxEsGysym o0Q17KA9YjY= =R7OM -----END PGP SIGNATURE----- --=-=-=--