From patchwork Tue Oct 6 13:56:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 24487 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B402E27BBE9; Tue, 6 Oct 2020 14:58:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9010327BBE8 for ; Tue, 6 Oct 2020 14:58:20 +0100 (BST) Received: from localhost ([::1]:33190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPnTv-0008H5-H0 for patchwork@mira.cbaines.net; Tue, 06 Oct 2020 09:58:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPnTh-0008GC-8K for guix-patches@gnu.org; Tue, 06 Oct 2020 09:58:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42250) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kPnTe-0001MY-EF for guix-patches@gnu.org; Tue, 06 Oct 2020 09:58:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kPnTe-0001aD-CQ for guix-patches@gnu.org; Tue, 06 Oct 2020 09:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43823] [PATCH v2 1/3] gnu: knot: Enable DNS-over-HTTPS support in kdig. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Oct 2020 13:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43823 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43823@debbugs.gnu.org Cc: me@tobias.gr, simon@simonsouth.net Received: via spool by 43823-submit@debbugs.gnu.org id=B43823.16019926395994 (code B ref 43823); Tue, 06 Oct 2020 13:58:02 +0000 Received: (at 43823) by debbugs.gnu.org; 6 Oct 2020 13:57:19 +0000 Received: from localhost ([127.0.0.1]:53785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPnSx-0001Ya-2D for submit@debbugs.gnu.org; Tue, 06 Oct 2020 09:57:19 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:42816) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPnSv-0001YH-G5 for 43823@debbugs.gnu.org; Tue, 06 Oct 2020 09:57:17 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 2E6E0C10A7; Tue, 6 Oct 2020 13:57:12 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo04-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo04-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rQZdaqsmUjCa; Tue, 6 Oct 2020 13:57:12 +0000 (UTC) Received: from mercury.simonsouth.net (unknown [108.162.141.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 1BCB4BFA14; Tue, 6 Oct 2020 13:57:07 +0000 (UTC) From: Simon South Date: Tue, 6 Oct 2020 09:56:43 -0400 Message-Id: X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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) From patchwork Tue Oct 6 13:56:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 24488 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 978DF27BBE9; Tue, 6 Oct 2020 14:58:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4E1D627BBE8 for ; Tue, 6 Oct 2020 14:58:21 +0100 (BST) Received: from localhost ([::1]:33240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPnTw-0008Iy-FB for patchwork@mira.cbaines.net; Tue, 06 Oct 2020 09:58:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPnTi-0008GS-5Z for guix-patches@gnu.org; Tue, 06 Oct 2020 09:58:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42252) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kPnTf-0001Ma-51 for guix-patches@gnu.org; Tue, 06 Oct 2020 09:58:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kPnTf-0001aT-4t for guix-patches@gnu.org; Tue, 06 Oct 2020 09:58:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43823] [PATCH v2 2/3] gnu: knot: Build the Info manual. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Oct 2020 13:58:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43823 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43823@debbugs.gnu.org Cc: me@tobias.gr, simon@simonsouth.net Received: via spool by 43823-submit@debbugs.gnu.org id=B43823.16019926456023 (code B ref 43823); Tue, 06 Oct 2020 13:58:03 +0000 Received: (at 43823) by debbugs.gnu.org; 6 Oct 2020 13:57:25 +0000 Received: from localhost ([127.0.0.1]:53791 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPnT2-0001Z4-Mk for submit@debbugs.gnu.org; Tue, 06 Oct 2020 09:57:24 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:43258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPnT0-0001YN-5T for 43823@debbugs.gnu.org; Tue, 06 Oct 2020 09:57:22 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id D78B4C08E4; Tue, 6 Oct 2020 13:57:16 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo04-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo04-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sb4_G9PoreTY; Tue, 6 Oct 2020 13:57:16 +0000 (UTC) Received: from mercury.simonsouth.net (unknown [108.162.141.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 8E322BFA14; Tue, 6 Oct 2020 13:57:12 +0000 (UTC) From: Simon South Date: Tue, 6 Oct 2020 09:56:44 -0400 Message-Id: X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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) From patchwork Tue Oct 6 13:56:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 24490 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5C1D127BBE9; Tue, 6 Oct 2020 14:59:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D843627BBE8 for ; Tue, 6 Oct 2020 14:59:08 +0100 (BST) Received: from localhost ([::1]:34496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPnUi-0000Tp-3u for patchwork@mira.cbaines.net; Tue, 06 Oct 2020 09:59:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPnTi-0008GV-72 for guix-patches@gnu.org; Tue, 06 Oct 2020 09:58:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42253) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kPnTf-0001Mb-Gw for guix-patches@gnu.org; Tue, 06 Oct 2020 09:58:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kPnTf-0001aa-Gg for guix-patches@gnu.org; Tue, 06 Oct 2020 09:58:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43823] [PATCH v2 3/3] gnu: knot: Fix test failure on aarch64-linux. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Oct 2020 13:58:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43823 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43823@debbugs.gnu.org Cc: me@tobias.gr, simon@simonsouth.net Received: via spool by 43823-submit@debbugs.gnu.org id=B43823.16019926506040 (code B ref 43823); Tue, 06 Oct 2020 13:58:03 +0000 Received: (at 43823) by debbugs.gnu.org; 6 Oct 2020 13:57:30 +0000 Received: from localhost ([127.0.0.1]:53794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPnT8-0001ZM-1c for submit@debbugs.gnu.org; Tue, 06 Oct 2020 09:57:30 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:43632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPnT4-0001Yw-TI for 43823@debbugs.gnu.org; Tue, 06 Oct 2020 09:57:29 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 979C6BFA85; Tue, 6 Oct 2020 13:57:21 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo04-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo04-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id suWcjKg8mBLz; Tue, 6 Oct 2020 13:57:21 +0000 (UTC) Received: from mercury.simonsouth.net (unknown [108.162.141.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 28297BFA14; Tue, 6 Oct 2020 13:57:16 +0000 (UTC) From: Simon South Date: Tue, 6 Oct 2020 09:56:45 -0400 Message-Id: <11f47227ef927f18f0c8d77a26173247360128d9.1601991615.git.simon@simonsouth.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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;