GNU bug report logs - #40654
[PATCH core-updates] gnu: gnutls: Enable p11-kit.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 40654 in the body.
You can then email your comments to 40654 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: gnutls: Enable p11-kit.
Date: Thu, 16 Apr 2020 09:34:09 +0100

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-kit 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 specify
              ;; 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="
                             "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions")
 
-             ;; FIXME: Temporarily disable p11-kit support since it is not
-             ;; 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")
+                   '())))
 
        #: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)
-- 
2.26.0

Message #8 received at 40654 <at> debbugs.gnu.org (full text, mbox):

From: Jakub Kądziołka <kuba <at> kadziolka.net>
To: Christopher Baines <mail <at> cbaines.net>
Cc: 40654 <at> debbugs.gnu.org, control <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: gnutls: Enable p11-kit.
Date: Thu, 16 Apr 2020 14:16:27 +0200

[Message part 1 (text/plain, inline)]

retitle 40654 [PATCH core-updates] gnu: gnutls: Enable p11-kit.
thanks

On Thu, Apr 16, 2020 at 09:34:09AM +0100, Christopher Baines wrote:
> 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-kit on
> mips64el.
> [inputs]: Include the p11-kit for all systems except mips64el.

Chris,

not sure if you noticed, but even though `guix refresh --list-dependent
gnutls' lists only 2 packages, this change will trigger a
core-updates-worthy rebuild due to the graft currently used for gnutls.

I was under the impression that, as a convention, we mark such patches
with [PATCH core-updates] in the subject, which made me uncertain as to
whether you realized that this will rebuild the world. (Though, now that
I think of it, testing this has probably required a significant amount
of time...)

Have a nice day!

Jakub Kądziołka

[signature.asc (application/pgp-signature, inline)]

Message #13 received at 40654 <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Jakub Kądziołka <kuba <at> kadziolka.net>
Cc: 40654 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: gnutls: Enable p11-kit.
Date: Thu, 16 Apr 2020 18:37:59 +0100

[Message part 1 (text/plain, inline)]

Jakub Kądziołka <kuba <at> kadziolka.net> writes:

> On Thu, Apr 16, 2020 at 09:34:09AM +0100, Christopher Baines wrote:
>> 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-kit on
>> mips64el.
>> [inputs]: Include the p11-kit for all systems except mips64el.
>
> Chris,
>
> not sure if you noticed, but even though `guix refresh --list-dependent
> gnutls' lists only 2 packages, this change will trigger a
> core-updates-worthy rebuild due to the graft currently used for gnutls.

Yeah, I noticed. This is a change I made when working on the QEMU
smartcard support for GNOME Boxes [1], and I sent it as a separate patch
as it does need handling differently.

1: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40631

> I was under the impression that, as a convention, we mark such patches
> with [PATCH core-updates] in the subject, which made me uncertain as to
> whether you realized that this will rebuild the world. (Though, now that
> I think of it, testing this has probably required a significant amount
> of time...)

I simply didn't know about that convention, thanks for letting me know
:)

Chris

[signature.asc (application/pgp-signature, inline)]

Message #18 received at 40654-done <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: 40654-done <at> debbugs.gnu.org
Subject: Re: [bug#40654] [PATCH] gnu: gnutls: Enable p11-kit.
Date: Wed, 21 Oct 2020 21:50:54 +0100

[Message part 1 (text/plain, inline)]

Christopher Baines <mail <at> cbaines.net> 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-kit 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 specify
>               ;; 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="
>                              "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions")
>  
> -             ;; FIXME: Temporarily disable p11-kit support since it is not
> -             ;; 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")
> +                   '())))
>  
>         #: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.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.