GNU bug report logs - #43823
[PATCH 0/3] Knot: Enable DoH; build Info manual; work on aarch64-linux

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 43823 in the body.
You can then email your comments to 43823 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: Simon South <simon <at> simonsouth.net>
To: guix-patches <at> gnu.org
Cc: me <at> tobias.gr, simon <at> simonsouth.net
Subject: [PATCH 0/3] Knot: Enable DoH; build Info manual; work on aarch64-linux
Date: Mon,  5 Oct 2020 20:25:28 -0400

These changes to the Knot package complement work done today by
Tobias[0] by silencing the remaining warnings from configure while
adding a bit of new functionality. The patches

- Enable DNS-over-HTTPS support in the kdig utility, by adding the
  nghttp2 library as a native input;

- Cause the Info manual to be built and included in the output; and

- Fix a test[1] that prevented the package from building on
  aarch64-linux systems.

[0] Now that everyone's finished building commit 2eb0585.
[1] See https://gitlab.nic.cz/knot/knot-dns/-/issues/693

--
Simon South
simon <at> simonsouth.net


Simon South (3):
  gnu: knot: Enable DNS-over-HTTPS support in kdig.
  gnu: knot: Build the Info manual.
  gnu: knot: Fix test failure on aarch64-linux.

 gnu/packages/dns.scm                          | 16 ++++++++++++--
 ...est_net_shortwrite-ensure-connection.patch | 21 +++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch

-- 
2.28.0

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

From: Simon South <simon <at> simonsouth.net>
To: 43823 <at> debbugs.gnu.org
Cc: me <at> tobias.gr, simon <at> simonsouth.net
Subject: [PATCH 1/3] gnu: knot: Enable DNS-over-HTTPS support in kdig.
Date: Mon,  5 Oct 2020 20:27:46 -0400

This also silences a configure warning regarding the missing
"libnghttp2" library.

* gnu/packages/dns.scm (knot)[inputs]: Add nghttp2:lib.
---
 gnu/packages/dns.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 0cb8df94df..d791c45f69 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -862,6 +862,7 @@ Extensions} (DNSSEC).")
        ("libcap-ng" ,libcap-ng)
        ("libedit" ,libedit)
        ("libidn" ,libidn)
+       ("libnghttp2" ,nghttp2 "lib")
        ("liburcu" ,liburcu)
        ("lmdb" ,lmdb)
        ("ncurses" ,ncurses)
-- 
2.28.0

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

From: Simon South <simon <at> simonsouth.net>
To: 43823 <at> debbugs.gnu.org
Cc: me <at> tobias.gr, simon <at> simonsouth.net
Subject: [PATCH 2/3] gnu: knot: Build the Info manual.
Date: Mon,  5 Oct 2020 20:27:47 -0400

This also silences a configure warning about the "sphinx-build"
command being unavailable.

* gnu/packages/dns.scm (knot)[arguments]: Add "build-info" and
"install-info" phases.
[native-inputs]: Add texinfo and python-sphinx.
---
 gnu/packages/dns.scm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index d791c45f69..0eab03fbbd 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -69,6 +69,7 @@
   #:use-module (gnu packages shells)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages swig)
+  #:use-module (gnu packages texinfo)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
@@ -841,6 +842,9 @@ Extensions} (DNSSEC).")
              ;; This is needed even when using ‘make config_dir=... install’.
              (substitute* "src/Makefile.in" (("\\$\\(INSTALL\\) -d") "true"))
              #t))
+         (add-after 'build 'build-info
+           (lambda _
+             (invoke "make" "info")))
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
@@ -848,13 +852,18 @@ Extensions} (DNSSEC).")
                     (etc (string-append doc "/examples/etc")))
                (invoke "make"
                        (string-append "config_dir=" etc)
-                       "install")))))))
+                       "install"))))
+         (add-after 'install 'install-info
+           (lambda _
+             (invoke "make" "install-info"))))))
     (native-inputs
      `(("autoconf" ,autoconf)
        ("automake" ,automake)
        ("libtool" ,libtool)
+       ("makeinfo" ,texinfo)
        ("pkg-config" ,pkg-config)
-       ("ragel" ,ragel)))
+       ("ragel" ,ragel)
+       ("sphinx-build" ,python-sphinx)))
     (inputs
      `(("fstrm" ,fstrm)
        ("gnutls" ,gnutls)
-- 
2.28.0

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

From: Simon South <simon <at> simonsouth.net>
To: 43823 <at> debbugs.gnu.org
Cc: me <at> tobias.gr, simon <at> simonsouth.net
Subject: [PATCH 3/3] gnu: knot: Fix test failure on aarch64-linux.
Date: Mon,  5 Oct 2020 20:27:48 -0400

* gnu/packages/dns.scm (knot)[source]: Apply patch from upstream that
helps ensure the "test_net_shortwrite" test suite can complete
regardless of platform or configuration.
* gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch:
New file.
---
 gnu/packages/dns.scm                          |  2 ++
 ...est_net_shortwrite-ensure-connection.patch | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 0eab03fbbd..40739b2dfa 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -815,6 +815,8 @@ Extensions} (DNSSEC).")
        (file-name (git-file-name name version))
        (sha256
         (base32 "0fkvip7n5ihjfwnnivdc3jf44y8p85ifglvq7b0anxvj9cg1m78f"))
+       (patches
+        (search-patches "knot-test_net_shortwrite-ensure-connection.patch"))
        (modules '((guix build utils)))
        (snippet
         '(begin
diff --git a/gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch b/gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch
new file mode 100644
index 0000000000..63b949e576
--- /dev/null
+++ b/gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch
@@ -0,0 +1,21 @@
+commit 4144d1e9b73ce18d919d980e803e935ba4e7c109
+Author: Simon South <simon <at> simonsouth.net>
+Date:   Tue Sep 29 14:53:30 2020 -0400
+
+    test_net_shortwrite: ensure connection can succeed
+    
+    closes #693
+
+diff --git a/tests/contrib/test_net_shortwrite.c b/tests/contrib/test_net_shortwrite.c
+index 8c8cf92ec..69bab7155 100644
+--- a/tests/contrib/test_net_shortwrite.c
++++ b/tests/contrib/test_net_shortwrite.c
+@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
+ 	int server = net_bound_socket(SOCK_STREAM, &addr, 0);
+ 	ok(server >= 0, "server: bind socket");
+ 
+-	r = listen(server, 0);
++	r = listen(server, 1);
+ 	ok(r == 0, "server: start listening");
+ 
+ 	struct sockaddr *sa = (struct sockaddr *)&addr;
-- 
2.28.0

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

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: Simon South <simon <at> simonsouth.net>
Cc: guix-patches <at> gnu.org
Subject: Re: [PATCH 0/3] Knot: Enable DoH; build Info manual; work on
 aarch64-linux
Date: Tue, 06 Oct 2020 03:08:46 +0200

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

Simon,

Simon South 写道：
> These changes to the Knot package complement work done today by
> Tobias[0] by silencing the remaining warnings from configure 
> while
> adding a bit of new functionality. The patches

Neatness!  Thank you.

I would like to take another stab at enabling the new XDP support 
and sneak it into your series before pushing the lot.  Everyone's 
built quite enough knots for a while.

Kind regards,

T G-R

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

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

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: Simon South <simon <at> simonsouth.net>
Cc: 43823 <at> debbugs.gnu.org
Subject: Re: [PATCH 2/3] gnu: knot: Build the Info manual.
Date: Tue, 06 Oct 2020 03:10:17 +0200

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

Simon,

Simon South 写道：
> This also silences a configure warning about the "sphinx-build"
> command being unavailable.

./configure is a noisy boy; not every ‘warning’ warrants action. 
A GNU info manual is definitely nice to have though!

> +       ("makeinfo" ,texinfo)
>         ("pkg-config" ,pkg-config)
> -       ("ragel" ,ragel)))
> +       ("ragel" ,ragel)
> +       ("sphinx-build" ,python-sphinx)))

It's a subjective line but I'd prefer the labels match the package 
here.  Nitpick, can be fixed up in post.

Otherwise LGTM,

T G-R

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

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

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: Simon South <simon <at> simonsouth.net>
Cc: 43823 <at> debbugs.gnu.org
Subject: Re: [PATCH 1/3] gnu: knot: Enable DNS-over-HTTPS support in kdig.
Date: Tue, 06 Oct 2020 03:11:13 +0200

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

Simon South 写道：
> @@ -862,6 +862,7 @@ Extensions} (DNSSEC).")
>         ("libcap-ng" ,libcap-ng)
>         ("libedit" ,libedit)
>         ("libidn" ,libidn)
> +       ("libnghttp2" ,nghttp2 "lib")

LGTM.

Kind regards,

T G-R

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

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

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: Simon South <simon <at> simonsouth.net>
Cc: 43823 <at> debbugs.gnu.org
Subject: Re: [PATCH 3/3] gnu: knot: Fix test failure on aarch64-linux.
Date: Tue, 06 Oct 2020 03:15:20 +0200

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

Simon,

Simon South 写道：
> * gnu/packages/dns.scm (knot)[source]: Apply patch from upstream 
> that
> helps ensure the "test_net_shortwrite" test suite can complete
> regardless of platform or configuration.

[...]

> +++ 
> b/gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch
> @@ -0,0 +1,21 @@
> +commit 4144d1e9b73ce18d919d980e803e935ba4e7c109
> +Author: Simon South <simon <at> simonsouth.net>

You're upstream?  More neatness.

> +    closes #693

Can we include a Web link to the upstream patch or bug report?

Each new patch file must also be added to dist_patch_DATA in 
gnu/local.mk and the commit message.  Otherwise LGTM.

Kind regards,

T G-R

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

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

From: Simon South <simon <at> simonsouth.net>
To: 43823 <at> debbugs.gnu.org
Cc: me <at> tobias.gr, simon <at> simonsouth.net
Subject: [PATCH v2 1/3] gnu: knot: Enable DNS-over-HTTPS support in kdig.
Date: Tue,  6 Oct 2020 09:56:43 -0400

* gnu/packages/dns.scm (knot)[inputs]: Add nghttp2:lib.
---
 gnu/packages/dns.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 0cb8df94df..d791c45f69 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -862,6 +862,7 @@ Extensions} (DNSSEC).")
        ("libcap-ng" ,libcap-ng)
        ("libedit" ,libedit)
        ("libidn" ,libidn)
+       ("libnghttp2" ,nghttp2 "lib")
        ("liburcu" ,liburcu)
        ("lmdb" ,lmdb)
        ("ncurses" ,ncurses)
-- 
2.28.0

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

From: Simon South <simon <at> simonsouth.net>
To: 43823 <at> debbugs.gnu.org
Cc: me <at> tobias.gr, simon <at> simonsouth.net
Subject: [PATCH v2 0/3] Knot: Enable DoH; build Info Manual;
 work on aarch64-linux
Date: Tue,  6 Oct 2020 09:56:42 -0400

This updated set of patches incorporates feedback from Tobias
Geerinckx-Rice (thank you!) and improves on the original by

- Using input packages' own name as their label;

- Removing mention in the commit descriptions of silencing warnings
  from configure (he's right, it's a bit silly to worry about this);

- Replacing the description in the patch file with something more
  informative that includes a link to the original issue; and

- Registering the patch file in gnu/local.mk.

For convenience, here's my original cover letter:

These changes to the Knot package complement work done today by
Tobias[0] by silencing the remaining warnings from configure while
adding a bit of new functionality. The patches

- Enable DNS-over-HTTPS support in the kdig utility, by adding the
  nghttp2 library as a native [actually regular] input;

- Cause the Info manual to be built and included in the output; and

- Fix a test[1] that prevented the package from building on
  aarch64-linux systems.

[0] Now that everyone's finished building commit 2eb0585.
[1] See https://gitlab.nic.cz/knot/knot-dns/-/issues/693

--
Simon South
simon <at> simonsouth.net


Simon South (3):
  gnu: knot: Enable DNS-over-HTTPS support in kdig.
  gnu: knot: Build the Info manual.
  gnu: knot: Fix test failure on aarch64-linux.

 gnu/local.mk                                  |  1 +
 gnu/packages/dns.scm                          | 16 ++++++++++++++--
 ...est_net_shortwrite-ensure-connection.patch | 19 +++++++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch

-- 
2.28.0

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

From: Simon South <simon <at> simonsouth.net>
To: 43823 <at> debbugs.gnu.org
Cc: me <at> tobias.gr, simon <at> simonsouth.net
Subject: [PATCH v2 2/3] gnu: knot: Build the Info manual.
Date: Tue,  6 Oct 2020 09:56:44 -0400

* gnu/packages/dns.scm (knot)[arguments]: Add "build-info" and
"install-info" phases.
[native-inputs]: Add texinfo and python-sphinx.
---
 gnu/packages/dns.scm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index d791c45f69..b3dd68ccbd 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -69,6 +69,7 @@
   #:use-module (gnu packages shells)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages swig)
+  #:use-module (gnu packages texinfo)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
@@ -841,6 +842,9 @@ Extensions} (DNSSEC).")
              ;; This is needed even when using ‘make config_dir=... install’.
              (substitute* "src/Makefile.in" (("\\$\\(INSTALL\\) -d") "true"))
              #t))
+         (add-after 'build 'build-info
+           (lambda _
+             (invoke "make" "info")))
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
@@ -848,13 +852,18 @@ Extensions} (DNSSEC).")
                     (etc (string-append doc "/examples/etc")))
                (invoke "make"
                        (string-append "config_dir=" etc)
-                       "install")))))))
+                       "install"))))
+         (add-after 'install 'install-info
+           (lambda _
+             (invoke "make" "install-info"))))))
     (native-inputs
      `(("autoconf" ,autoconf)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
-       ("ragel" ,ragel)))
+       ("python-sphinx" ,python-sphinx)
+       ("ragel" ,ragel)
+       ("texinfo" ,texinfo)))
     (inputs
      `(("fstrm" ,fstrm)
        ("gnutls" ,gnutls)
-- 
2.28.0

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

From: Simon South <simon <at> simonsouth.net>
To: 43823 <at> debbugs.gnu.org
Cc: me <at> tobias.gr, simon <at> simonsouth.net
Subject: [PATCH v2 3/3] gnu: knot: Fix test failure on aarch64-linux.
Date: Tue,  6 Oct 2020 09:56:45 -0400

* gnu/packages/dns.scm (knot)[source]: Apply patch from upstream that
helps ensure the "test_net_shortwrite" test suite can complete
regardless of platform or configuration.
* gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch:
New file.
* gnu/local.mk: Add it.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/dns.scm                          |  2 ++
 ...est_net_shortwrite-ensure-connection.patch | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 59cad38504..83d2d72ab1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1198,6 +1198,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/kpackage-allow-external-paths.patch	\
   %D%/packages/patches/kmplayer-aarch64.patch			\
   %D%/packages/patches/kmplayer-upstream_Fix-build-with-Qt-5.9.patch	\
+  %D%/packages/patches/knot-test_net_shortwrite-ensure-connection.patch	\
   %D%/packages/patches/kobodeluxe-paths.patch			\
   %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch	\
   %D%/packages/patches/kobodeluxe-const-charp-conversion.patch	\
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index b3dd68ccbd..97e919517c 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -815,6 +815,8 @@ Extensions} (DNSSEC).")
        (file-name (git-file-name name version))
        (sha256
         (base32 "0fkvip7n5ihjfwnnivdc3jf44y8p85ifglvq7b0anxvj9cg1m78f"))
+       (patches
+        (search-patches "knot-test_net_shortwrite-ensure-connection.patch"))
        (modules '((guix build utils)))
        (snippet
         '(begin
diff --git a/gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch b/gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch
new file mode 100644
index 0000000000..9e86fbdb58
--- /dev/null
+++ b/gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch
@@ -0,0 +1,19 @@
+This patch duplicates upstream commit 4144d1e, which helps ensure the
+"test_net_shortwrite" test suite can succeed across all platforms by
+deepening the pending-connection queue of the server it creates from 0
+to 1.
+
+See the original report at
+https://gitlab.nic.cz/knot/knot-dns/-/issues/693
+
+--- a/tests/contrib/test_net_shortwrite.c
++++ b/tests/contrib/test_net_shortwrite.c
+@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
+ 	int server = net_bound_socket(SOCK_STREAM, &addr, 0);
+ 	ok(server >= 0, "server: bind socket");
+ 
+-	r = listen(server, 0);
++	r = listen(server, 1);
+ 	ok(r == 0, "server: start listening");
+ 
+ 	struct sockaddr *sa = (struct sockaddr *)&addr;
-- 
2.28.0

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

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: Simon South <simon <at> simonsouth.net>
Cc: 43823-done <at> debbugs.gnu.org
Subject: Re: [PATCH v2 0/3] Knot: Enable DoH; build Info Manual; work on
 aarch64-linux
Date: Tue, 06 Oct 2020 16:41:24 +0200

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

Simon,

Thank you for this series.  I really like the way our Knot package 
looks now.

Pushed to master as 4e869b180a94aa5bf5ae70ca48e0527e8e8db8db 
together with XDP support, and some insignificant changes:

Simon South 写道：
> - Removing mention in the commit descriptions of silencing 
> warnings
>   from configure (he's right, it's a bit silly to worry about 
>   this);

These warnings weren't worth it but it's certainly not silly to 
pay attention to ./configure output.  Good habit.  ./configure 
can't know if we're regressing, after all.

> - Replacing the description in the patch file with something 
> more
>   informative that includes a link to the original issue; and

Thanks.

> - Registering the patch file in gnu/local.mk.

Perfect.  I added ‘(dist_patch_DATA)’ to the commit message.

Closing,

T G-R

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

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

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: Tobias Geerinckx-Rice via Guix-patches <guix-patches <at> gnu.org>
Cc: Simon South <simon <at> simonsouth.net>, 43823-done <at> debbugs.gnu.org
Subject: Re: bug#43823: [PATCH v2 0/3] Knot: Enable DoH; build Info Manual;
 work on aarch64-linux
Date: Tue, 06 Oct 2020 16:49:47 +0200

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

Tobias Geerinckx-Rice via Guix-patches via 写道：
> Pushed to master as 4e869b180a94aa5bf5ae70ca48e0527e8e8db8db 
> together
> with XDP support, and some insignificant changes:

Oh, and of course a copyright line for you in (gnu packages dns).

Kind regards,

T G-R

[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.