From unknown Fri Aug 15 04:03:29 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#44596 <44596@debbugs.gnu.org> To: bug#44596 <44596@debbugs.gnu.org> Subject: Status: [PATCH 0/2] gnu: knot-resolver: Update to 5.2.0; add "doc" output Reply-To: bug#44596 <44596@debbugs.gnu.org> Date: Fri, 15 Aug 2025 11:03:29 +0000 retitle 44596 [PATCH 0/2] gnu: knot-resolver: Update to 5.2.0; add "doc" ou= tput reassign 44596 guix-patches submitter 44596 Simon South severity 44596 normal tag 44596 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 12 11:46:54 2020 Received: (at submit) by debbugs.gnu.org; 12 Nov 2020 16:46:54 +0000 Received: from localhost ([127.0.0.1]:45455 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdFkL-00086k-K4 for submit@debbugs.gnu.org; Thu, 12 Nov 2020 11:46:54 -0500 Received: from lists.gnu.org ([209.51.188.17]:45802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdFkI-00086b-MC for submit@debbugs.gnu.org; Thu, 12 Nov 2020 11:46:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdFkI-0007BM-DV for guix-patches@gnu.org; Thu, 12 Nov 2020 11:46:50 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:46234) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdFkG-0000Gj-8Y for guix-patches@gnu.org; Thu, 12 Nov 2020 11:46:50 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 44AA6A049E; Thu, 12 Nov 2020 16:46:46 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo05-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo05-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aOmIEMd20Raw; Thu, 12 Nov 2020 16:46:46 +0000 (UTC) Received: from jupiter.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 7A8AEA003E; Thu, 12 Nov 2020 16:46:44 +0000 (UTC) From: Simon South To: guix-patches@gnu.org Subject: [PATCH 0/2] gnu: knot-resolver: Update to 5.2.0; add "doc" output Date: Thu, 12 Nov 2020 11:46:35 -0500 Message-Id: X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.68.200.34; envelope-from=simon@simonsouth.net; helo=mailout.easymail.ca X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 11:24:16 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: simon@simonsouth.net X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) These patches - Update Knot Resolver, a resolving DNS server, to 5.2.0. Two inputs are added to support new functionality in this release: - Texinfo, to enable generating the manual in Info format; and - libnghttp2, to enable a new implementation in C of DNS-over-HTTPS. From the Knot Resolver manual: Knot Resolver currently offers two DoH implementations. It is recommended to use this new implementation, which is more reliable, scalable and has fewer dependencies. Make sure to use doh2 kind in net.listen() to select this implementation.[0] - Move the Knot Resolver manual to a separate "doc" output, allowing it to be installed on its own by a user responsible for configuring the service. (This also helps align this package with the one for Knot, its sibling authoritative name server.) [0] https://knot-resolver.readthedocs.io/en/v5.2.0/daemon-bindings-net_tlssrv.html#dns-over-https-doh -- Simon South simon@simonsouth.net Simon South (2): gnu: knot-resolver: Update to 5.2.0. gnu: knot-resolver: Move manual, examples to separate "doc" output gnu/packages/dns.scm | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 12 11:49:04 2020 Received: (at 44596) by debbugs.gnu.org; 12 Nov 2020 16:49:04 +0000 Received: from localhost ([127.0.0.1]:45469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdFmS-0008Ap-3H for submit@debbugs.gnu.org; Thu, 12 Nov 2020 11:49:04 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:45764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdFmQ-0008A6-Bp for 44596@debbugs.gnu.org; Thu, 12 Nov 2020 11:49:03 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id A6E15BF886; Thu, 12 Nov 2020 16:48:56 +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 xbJZp9GjoWuN; Thu, 12 Nov 2020 16:48:56 +0000 (UTC) Received: from jupiter.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 01D50C12C0; Thu, 12 Nov 2020 16:48:54 +0000 (UTC) From: Simon South To: 44596@debbugs.gnu.org Subject: [PATCH 1/2] gnu: knot-resolver: Update to 5.2.0. Date: Thu, 12 Nov 2020 11:48:42 -0500 Message-Id: <2df165db376e6d21f8657ceabc3836ea46255d22.1605198478.git.simon@simonsouth.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 44596 Cc: simon@simonsouth.net X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/dns.scm (knot-resolver): Update to 5.2.0. [native-inputs]: Add texinfo, to enable generating the manual in Info format. [inputs]: Add nghttp2:lib, to enable the new implementation of DNS-over-HTTPS. --- gnu/packages/dns.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 906333bb44..784473d85f 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -937,14 +937,14 @@ synthesis, and on-the-fly re-configuration.") (define-public knot-resolver (package (name "knot-resolver") - (version "5.1.3") + (version "5.2.0") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-resolver/" "knot-resolver-" version ".tar.xz")) (sha256 (base32 - "12s5070nqqf599s1mb6rjas2as481rjf751qk5yrz6p34y885k90")))) + "0cwlipib3x88dr6cijqv2aps13b4ijv524wc85ns07rkldy2c948")))) (build-system meson-build-system) (arguments '(#:configure-flags '("-Ddoc=enabled") @@ -982,7 +982,8 @@ synthesis, and on-the-fly re-configuration.") ("pkg-config" ,pkg-config) ("python-breathe" ,python-breathe) ("python-sphinx" ,python-sphinx) - ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme))) + ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) + ("texinfo" ,texinfo))) (inputs `(("fstrm" ,fstrm) ("gnutls" ,gnutls) @@ -991,7 +992,8 @@ synthesis, and on-the-fly re-configuration.") ("lmdb" ,lmdb) ("luajit" ,luajit) ;; TODO: Add optional lua modules: basexx and psl. - ("lua-bitop" ,lua5.1-bitop))) + ("lua-bitop" ,lua5.1-bitop) + ("nghttp2" ,nghttp2 "lib"))) (home-page "https://www.knot-resolver.cz/") (synopsis "Caching validating DNS resolver") (description -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 12 11:49:06 2020 Received: (at 44596) by debbugs.gnu.org; 12 Nov 2020 16:49:06 +0000 Received: from localhost ([127.0.0.1]:45472 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdFmU-0008B3-Cv for submit@debbugs.gnu.org; Thu, 12 Nov 2020 11:49:06 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:46252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdFmS-0008AL-P1 for 44596@debbugs.gnu.org; Thu, 12 Nov 2020 11:49:04 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 7C7C9BF8FF; Thu, 12 Nov 2020 16:48:59 +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 sfq0PqwjLz7f; Thu, 12 Nov 2020 16:48:59 +0000 (UTC) Received: from jupiter.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 DDD6CBF51A; Thu, 12 Nov 2020 16:48:56 +0000 (UTC) From: Simon South To: 44596@debbugs.gnu.org Subject: [PATCH 2/2] gnu: knot-resolver: Move manual, examples to separate "doc" output Date: Thu, 12 Nov 2020 11:48:43 -0500 Message-Id: <16947e2029bd6bc38008f1019493365c403b0ee2.1605198478.git.simon@simonsouth.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 44596 Cc: simon@simonsouth.net X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/dns.scm (knot-resolver)[outputs]: Add "doc" output. [arguments]: Add "move-doc" phase, which moves the manual (in both its HTML and Info formats) and the example configuration files to the "doc" output. --- gnu/packages/dns.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 784473d85f..6698bbf918 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -946,6 +946,7 @@ synthesis, and on-the-fly re-configuration.") (base32 "0cwlipib3x88dr6cijqv2aps13b4ijv524wc85ns07rkldy2c948")))) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments '(#:configure-flags '("-Ddoc=enabled") #:phases @@ -960,6 +961,20 @@ synthesis, and on-the-fly re-configuration.") (add-after 'build 'build-doc (lambda _ (invoke "ninja" "doc"))) + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + ;; Move the manual and the example configuration files to the + ;; "doc" output. + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share/doc/knot-resolver")) + (for-each + (lambda (dir) + (rename-file (string-append out "/share/" dir) + (string-append doc "/share/" dir))) + '("doc/knot-resolver/examples" + "doc/knot-resolver/html" + "info"))))) (add-after 'install 'wrap-binary (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 13 11:00:16 2020 Received: (at 44596) by debbugs.gnu.org; 13 Nov 2020 16:00:16 +0000 Received: from localhost ([127.0.0.1]:49159 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdbUm-00054A-6G for submit@debbugs.gnu.org; Fri, 13 Nov 2020 11:00:16 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:34872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdbUk-00053u-2q for 44596@debbugs.gnu.org; Fri, 13 Nov 2020 11:00:15 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 4C16DA0629 for <44596@debbugs.gnu.org>; Fri, 13 Nov 2020 16:00:08 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo05-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo05-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5e6Mh-YE9X3o for <44596@debbugs.gnu.org>; Fri, 13 Nov 2020 16:00:08 +0000 (UTC) Received: from jupiter (unknown [108.162.141.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 0E8EBA0611 for <44596@debbugs.gnu.org>; Fri, 13 Nov 2020 16:00:07 +0000 (UTC) From: Simon South To: 44596@debbugs.gnu.org Subject: Re: [PATCH 0/2] gnu: knot-resolver: Update to 5.2.0; add "doc" output References: Date: Fri, 13 Nov 2020 11:00:06 -0500 In-Reply-To: (Simon South's message of "Thu, 12 Nov 2020 11:46:35 -0500") Message-ID: <87blg1tfg9.fsf@simonsouth.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 44596 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Simon South writes: > These patches > > - Update Knot Resolver, a resolving DNS server, to 5.2.0... A bug has been found in this release that affects 32-bit systems[0], so this should perhaps be set aside for the moment. Apparently a patch is already being prepared[1]. [0] https://lists.nic.cz/pipermail/knot-resolver-users/2020/000323.html [1] https://gitlab.nic.cz/knot/knot-resolver/-/merge_requests/1093 -- Simon South simon@simonsouth.net From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 01 09:45:46 2020 Received: (at 44596) by debbugs.gnu.org; 1 Dec 2020 14:45:46 +0000 Received: from localhost ([127.0.0.1]:58321 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kk6uU-0004E5-Ou for submit@debbugs.gnu.org; Tue, 01 Dec 2020 09:45:46 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:56874) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kk6uP-0004Df-1m for 44596@debbugs.gnu.org; Tue, 01 Dec 2020 09:45:40 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 2BAFD20EFC; Tue, 1 Dec 2020 14:45:31 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo06-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo06-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ce8ZOKtzW9On; Tue, 1 Dec 2020 14:45:30 +0000 (UTC) Received: from localhost.localdomain (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 BB62C20E69; Tue, 1 Dec 2020 14:45:28 +0000 (UTC) From: Simon South To: 44596@debbugs.gnu.org Subject: [PATCH v2 0/2] gnu: knot-resolver: Update to 5.2.0; add "doc" output Date: Tue, 1 Dec 2020 09:45:18 -0500 Message-Id: X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 44596 Cc: Simon South X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) I've been waiting to see whether the Knot Resolver team would issue a point release with their fix[0] for the bug discovered in version 5.2.0, but as that doesn't seem to be happening here is an updated patchset that applies the fix directly. The only changes from the initial set are - The addition of a patch with the upstream commit that fixes an issue with the internal map() function on 32-bit platforms, and - Some gentle editing of the commit messages. For convenience, here's my original cover letter: These patches - Update Knot Resolver, a resolving DNS server, to 5.2.0. Two inputs are added to support new functionality in this release: - Texinfo, to enable generating the manual in Info format; and - libnghttp2, to enable a new implementation in C of DNS-over-HTTPS. From the Knot Resolver manual: Knot Resolver currently offers two DoH implementations. It is recommended to use this new implementation, which is more reliable, scalable and has fewer dependencies. Make sure to use doh2 kind in net.listen() to select this implementation.[1] - Move the Knot Resolver manual to a separate "doc" output, allowing it to be installed on its own by a user responsible for configuring the service. (This also helps align this package with the one for Knot, its sibling authoritative name server.) [0] https://gitlab.nic.cz/knot/knot-resolver/-/merge_requests/1093 [1] https://knot-resolver.readthedocs.io/en/v5.2.0/daemon-bindings-net_tlssrv.html#dns-over-https-doh -- Simon South simon@simonsouth.net Simon South (2): gnu: knot-resolver: Update to 5.2.0. gnu: knot-resolver: Move manual, examples to separate "doc" output gnu/local.mk | 1 + gnu/packages/dns.scm | 27 +++- ...t-resolver-fix-map-command-on-32-bit.patch | 146 ++++++++++++++++++ 3 files changed, 170 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/knot-resolver-fix-map-command-on-32-bit.patch -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 01 09:45:46 2020 Received: (at 44596) by debbugs.gnu.org; 1 Dec 2020 14:45:46 +0000 Received: from localhost ([127.0.0.1]:58323 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kk6uY-0004EG-In for submit@debbugs.gnu.org; Tue, 01 Dec 2020 09:45:46 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:57970) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kk6uT-0004Dm-KP for 44596@debbugs.gnu.org; Tue, 01 Dec 2020 09:45:42 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 5BB4720FC9; Tue, 1 Dec 2020 14:45:36 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo06-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo06-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oimsaaCkUvGW; Tue, 1 Dec 2020 14:45:36 +0000 (UTC) Received: from localhost.localdomain (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 A55FD20EA8; Tue, 1 Dec 2020 14:45:33 +0000 (UTC) From: Simon South To: 44596@debbugs.gnu.org Subject: [PATCH v2 2/2] gnu: knot-resolver: Move manual, examples to separate "doc" output Date: Tue, 1 Dec 2020 09:45:20 -0500 Message-Id: X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 44596 Cc: Simon South X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/dns.scm (knot-resolver)[outputs]: Add "doc" output. [arguments]: Add "move-doc" phase, which moves the manual (in both HTML and Info formats) and example configuration files to the "doc" output. --- gnu/packages/dns.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index f0c3d6a602..16313df73f 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -948,6 +948,7 @@ synthesis, and on-the-fly re-configuration.") (patches (search-patches "knot-resolver-fix-map-command-on-32-bit.patch")))) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments '(#:configure-flags '("-Ddoc=enabled") #:phases @@ -962,6 +963,20 @@ synthesis, and on-the-fly re-configuration.") (add-after 'build 'build-doc (lambda _ (invoke "ninja" "doc"))) + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + ;; Move the manual and the example configuration files to the + ;; "doc" output. + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share/doc/knot-resolver")) + (for-each + (lambda (dir) + (rename-file (string-append out "/share/" dir) + (string-append doc "/share/" dir))) + '("doc/knot-resolver/examples" + "doc/knot-resolver/html" + "info"))))) (add-after 'install 'wrap-binary (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 01 09:45:51 2020 Received: (at 44596) by debbugs.gnu.org; 1 Dec 2020 14:45:51 +0000 Received: from localhost ([127.0.0.1]:58325 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kk6uY-0004ER-TZ for submit@debbugs.gnu.org; Tue, 01 Dec 2020 09:45:50 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:57456) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kk6uQ-0004Di-W8 for 44596@debbugs.gnu.org; Tue, 01 Dec 2020 09:45:43 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id B533D21359; Tue, 1 Dec 2020 14:45:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo06-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo06-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GC7cMU7QcG2w; Tue, 1 Dec 2020 14:45:33 +0000 (UTC) Received: from localhost.localdomain (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 AAE0A20EA8; Tue, 1 Dec 2020 14:45:30 +0000 (UTC) From: Simon South To: 44596@debbugs.gnu.org Subject: [PATCH v2 1/2] gnu: knot-resolver: Update to 5.2.0. Date: Tue, 1 Dec 2020 09:45:19 -0500 Message-Id: X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 44596 Cc: Simon South X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/dns.scm (knot-resolver): Update to 5.2.0. [source]: Add patch from upstream commit to fix the internal map() function on 32-bit platforms. [native-inputs]: Add texinfo to enable generating the manual in Info format. [inputs]: Add nghttp2:lib to enable the new DNS-over-HTTPS implementation. * gnu/packages/patches/knot-resolver-fix-map-command-on-32-bit.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/dns.scm | 12 +- ...t-resolver-fix-map-command-on-32-bit.patch | 146 ++++++++++++++++++ 3 files changed, 155 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/knot-resolver-fix-map-command-on-32-bit.patch diff --git a/gnu/local.mk b/gnu/local.mk index 80f87691fe..e8d63c38df 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1221,6 +1221,7 @@ dist_patch_DATA = \ %D%/packages/patches/kmail-Fix-missing-link-libraries.patch \ %D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kmscon-runtime-keymap-switch.patch \ + %D%/packages/patches/knot-resolver-fix-map-command-on-32-bit.patch \ %D%/packages/patches/kpackage-allow-external-paths.patch \ %D%/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch \ %D%/packages/patches/kmplayer-aarch64.patch \ diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 3aa3cf3e8d..f0c3d6a602 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -937,14 +937,16 @@ synthesis, and on-the-fly re-configuration.") (define-public knot-resolver (package (name "knot-resolver") - (version "5.1.3") + (version "5.2.0") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-resolver/" "knot-resolver-" version ".tar.xz")) (sha256 (base32 - "12s5070nqqf599s1mb6rjas2as481rjf751qk5yrz6p34y885k90")))) + "0cwlipib3x88dr6cijqv2aps13b4ijv524wc85ns07rkldy2c948")) + (patches + (search-patches "knot-resolver-fix-map-command-on-32-bit.patch")))) (build-system meson-build-system) (arguments '(#:configure-flags '("-Ddoc=enabled") @@ -982,7 +984,8 @@ synthesis, and on-the-fly re-configuration.") ("pkg-config" ,pkg-config) ("python-breathe" ,python-breathe) ("python-sphinx" ,python-sphinx) - ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme))) + ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) + ("texinfo" ,texinfo))) (inputs `(("fstrm" ,fstrm) ("gnutls" ,gnutls) @@ -991,7 +994,8 @@ synthesis, and on-the-fly re-configuration.") ("lmdb" ,lmdb) ("luajit" ,luajit) ;; TODO: Add optional lua modules: basexx and psl. - ("lua-bitop" ,lua5.1-bitop))) + ("lua-bitop" ,lua5.1-bitop) + ("nghttp2" ,nghttp2 "lib"))) (home-page "https://www.knot-resolver.cz/") (synopsis "Caching validating DNS resolver") (description diff --git a/gnu/packages/patches/knot-resolver-fix-map-command-on-32-bit.patch b/gnu/packages/patches/knot-resolver-fix-map-command-on-32-bit.patch new file mode 100644 index 0000000000..02c0fbcb70 --- /dev/null +++ b/gnu/packages/patches/knot-resolver-fix-map-command-on-32-bit.patch @@ -0,0 +1,146 @@ +commit e01979620025666633250b3e2d545fe59c629f73 +Author: Vladimír Čunát +Date: Fri Nov 13 14:16:32 2020 +0100 + + fix map() command on 32-bit platforms; regressed in 5.2.0 + + LuaJIT FFI was using opendir() (etc.) variants with 32-bit inodes + but the C parts was using them as 64-bit inode variants. + Consequently the `struct dirent` layout didn't match and we were getting + filenames shifted by eight bytes. + + Now the whole dir-listing lua function is written in C. + +diff --git a/.luacheckrc b/.luacheckrc +index 0cf0b884..67bc18f6 100644 +--- a/.luacheckrc ++++ b/.luacheckrc +@@ -20,6 +20,7 @@ new_read_globals = { + 'user', + 'verbose', + 'worker', ++ 'kluautil_list_dir', + -- Sandbox declarations + 'kB', + 'MB', +diff --git a/NEWS b/NEWS +index 2eae3082..9d8cde99 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,6 +1,10 @@ + Knot Resolver X.Y.X (yyyy-mm-dd) + ================================ + ++Bugfixes ++-------- ++- fix map() command on 32-bit platforms; regressed in 5.2.0 (!1093) ++ + + Knot Resolver 5.2.0 (2020-11-11) + ================================ +diff --git a/daemon/bindings/impl.c b/daemon/bindings/impl.c +index d10f4525..d9ad0774 100644 +--- a/daemon/bindings/impl.c ++++ b/daemon/bindings/impl.c +@@ -2,6 +2,7 @@ + * SPDX-License-Identifier: GPL-3.0-or-later + */ + ++#include + #include + #include + #include +@@ -29,6 +30,29 @@ const char * lua_table_checkindices(lua_State *L, const char *keys[]) + return NULL; + } + ++/** Return table listing filenames in a given directory (ls -A). */ ++static int kluautil_list_dir(lua_State *L) ++{ ++ lua_newtable(L); // empty table even on errors ++ ++ const char *path = lua_tolstring(L, 1, NULL); ++ if (!path) return 1; ++ DIR *dir = opendir(path); ++ if (!dir) return 1; ++ ++ struct dirent *entry; ++ int lua_i = 1; ++ while ((entry = readdir(dir)) != NULL) { ++ if (strcmp(entry->d_name, ".") && strcmp(entry->d_name, "..")) { ++ lua_pushstring(L, entry->d_name); ++ lua_rawseti(L, -2, lua_i++); ++ } ++ } ++ ++ closedir(dir); ++ return 1; ++} ++ + + /* Each of these just creates the correspondingly named lua table of functions. */ + int kr_bindings_cache (lua_State *L); /* ./cache.c */ +@@ -44,6 +68,9 @@ void kr_bindings_register(lua_State *L) + kr_bindings_modules(L); + kr_bindings_net(L); + kr_bindings_worker(L); ++ ++ /* Finally some lua utils *written in C*, not really a binding. */ ++ lua_register(L, "kluautil_list_dir", kluautil_list_dir); + } + + void lua_error_p(lua_State *L, const char *fmt, ...) +diff --git a/daemon/lua/kluautil.lua b/daemon/lua/kluautil.lua +index 57912e7b..e73e952c 100644 +--- a/daemon/lua/kluautil.lua ++++ b/daemon/lua/kluautil.lua +@@ -1,6 +1,5 @@ + -- SPDX-License-Identifier: GPL-3.0-or-later + +-local ffi = require('ffi') + local kluautil = {} + + -- Get length of table +@@ -28,14 +27,6 @@ function kluautil.kr_table_unpack(tab) + return unpack(tab, 1, tab.n) + end + +-ffi.cdef([[ +- typedef struct __dirstream DIR; +- DIR *opendir(const char *name); +- struct dirent *readdir(DIR *dirp); +- int closedir(DIR *dirp); +- char *strerror(int errnum); +-]]) +- + -- Fetch over HTTPS + function kluautil.kr_https_fetch(url, out_file, ca_file) + local http_ok, http_request = pcall(require, 'http.request') +@@ -88,26 +79,6 @@ function kluautil.kr_https_fetch(url, out_file, ca_file) + return true + end + +--- List directory +-function kluautil.list_dir (path) +- local results = {} +- local dir = ffi.C.opendir(path) +- if dir == nil then +- return results +- end +- +- local entry = ffi.C.readdir(dir) +- while entry ~= nil do +- local entry_name = ffi.string(ffi.C.kr_dirent_name(entry)) +- if entry_name ~= '.' and entry_name ~= '..' then +- table.insert(results, entry_name) +- end +- entry = ffi.C.readdir(dir) +- end +- +- ffi.C.closedir(dir) +- +- return results +-end ++kluautil.list_dir = kluautil_list_dir + + return kluautil -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 06 11:40:37 2020 Received: (at 44596-done) by debbugs.gnu.org; 6 Dec 2020 16:40:37 +0000 Received: from localhost ([127.0.0.1]:51032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klx5R-0006dW-Dq for submit@debbugs.gnu.org; Sun, 06 Dec 2020 11:40:37 -0500 Received: from mail-oln040092255014.outbound.protection.outlook.com ([40.92.255.14]:15872 helo=APC01-HK2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klrUe-0003PS-1c for 44596-done@debbugs.gnu.org; Sun, 06 Dec 2020 05:42:17 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hsk5p7d2j1PENNBSB8z8iQeE3qWZkikVcs8X9U0SWHkgGad+J3VtmD70lk6KwE4SbtkzM2quZ4nxqrlcZFbEbe9GXXir/lH3pENYQ+GQ3WpDjRTUp2j01031juIuALirY6Do+U6lCsZ6xntdywYeuR70ycL1/VKtW9ls0EX/mCpcqiowaeS5MmgQyg3uP7dW14SJF+e7AAnFM+S+jEnwwNWLBTMrD+AL9cwOtk9ZzXEPyHTUn0+UWjwM5VKJNWrwJeAt+knkZfkNinsgZfsj7NIUrl8Ufz6BN1B4Zl3kLCctC8kSV3N/TG8iqN/N/ieLKpYlhEdzQmnnqpoduMN8bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nipbDw5/eE1RAejvEOrazSslLreT4B/GnsjDnZ8TNXY=; b=OmUThr5oHtXO8pdIM11NqNbthfUH5LR+vpDXnjQ+90dc5UL201PVVcYjhg35x31nryyMbhVgF4g88JxWWrrwXfuD39EFdo23qFmzD3t1tB51i9/csUxzI3yjOxdm0gJtD7xqNHuKMV4DFwX1vPJ32lDCKYMyEiLArg1hqbcNc0DrDsQHUdhhTQyQiNDpaCHG5qrbf9V+11LV2RHqjdpxquOrLb6n9TjNLol8OcUhelMCoZ1aO2HtZvZGjslTWPM4y8IbGcR5zyRpxH/7RlhrKX467RKKQtXqaGu2YWeu+3FzUehOvnZuwREAiOlDFZufN6f8F3VCGPF4Jfuzng678Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nipbDw5/eE1RAejvEOrazSslLreT4B/GnsjDnZ8TNXY=; b=Dg4h+S0ISiVFryd5K74/ezrSN8bPcoYs5KtQgRtmuczdV3Nf13pTxRuS/5unRyo+I3jabzScWManNb+NbRSuNU7d9cXRWGjeLn97OUWuxxSQuANzeAWjLoLKD2PlaA2N4Ed/3Y+aoufIAKBpOK5DX/NG6fTvN9psueNo41ldjl+XOL9qpUbz0QEZKryFpV3Cv82P9JB8yTR8gjNw/MW55Z9V4FzsnBNnFoC1gtIQ5Os6zrjOwdFf30n7zwraP65PWgIH0xKVx2dBZnIZxtyMifsMnA1wVmEdTdtVoN8Z/TUctt2SZ023cTYNA2etpz1Swjbft/8peeUwiRFgoYtZBA== Received: from HK2APC01FT050.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebc::4b) by HK2APC01HT078.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebc::332) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.17; Sun, 6 Dec 2020 10:42:03 +0000 Received: from TYAP286MB0185.JPNP286.PROD.OUTLOOK.COM (2a01:111:e400:7ebc::40) by HK2APC01FT050.mail.protection.outlook.com (2a01:111:e400:7ebc::343) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.17 via Frontend Transport; Sun, 6 Dec 2020 10:42:03 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:E5C162297174FF8A8B037CBB89BA2A596ADCF82726BDFEB57A497D58DC0468E0; UpperCasedChecksum:BB377ECFEC4ECB45719505063DCF80D633BFEDEDCEFE8FE9B923033BE63811EB; SizeAsReceived:7494; Count:46 Received: from TYAP286MB0185.JPNP286.PROD.OUTLOOK.COM ([fe80::d802:80c9:f6bd:1fbb]) by TYAP286MB0185.JPNP286.PROD.OUTLOOK.COM ([fe80::d802:80c9:f6bd:1fbb%8]) with mapi id 15.20.3632.017; Sun, 6 Dec 2020 10:42:02 +0000 From: =?utf-8?B?5a6L5paH5q2m?= To: Simon South Subject: Re: [bug#44596] [PATCH v2 0/2] gnu: knot-resolver: Update to 5.2.0; add "doc" output References: Date: Sun, 06 Dec 2020 18:41:57 +0800 In-Reply-To: (Simon South's message of "Tue, 1 Dec 2020 09:45:18 -0500") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) Content-Type: text/plain X-TMN: [driMXIRTd45ZdFEihVb/9gB+YwYv1sJ03g181LlxhMI=] X-ClientProxiedBy: HE1PR0701CA0052.eurprd07.prod.outlook.com (2603:10a6:3:9e::20) To TYAP286MB0185.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:8038::14) X-Microsoft-Original-Message-ID: <87tuszqkqy.fsf@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (117.173.226.231) by HE1PR0701CA0052.eurprd07.prod.outlook.com (2603:10a6:3:9e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.5 via Frontend Transport; Sun, 6 Dec 2020 10:42:01 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 1bdb9555-adc8-48c1-22b2-08d899d3912d X-MS-TrafficTypeDiagnostic: HK2APC01HT078: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e/uQGoxtjcfRgdFhhhwNER3jiOt1GAN4EZlSWxAH13eTiQ6q3aiD3YuAj1RM7lZZh9DFfq61P1J8UAADlj5uEwdpU85+5Q/mcLlx0egunEaB3yBOo4i862fNXtv74gUWE8Nt26cLE8pn/bFeTjJGlBG+Nrfw2T2uzucDOm0xQfC6HU/5SOXB/iDDfJ85K7FR4s+6XUzgbH+ipHrSvSwD7w== X-MS-Exchange-AntiSpam-MessageData: iXcQmZzjOsp8ub/KlyY04f9Ohe9Jv9UjKrnWA5mq6J4Z3rIuM/NIi2oqg8rKz39x3/yWEgTNzUjzlJP+mtWQXPCsnH/xVA1N3HG4/+VIHTeM/C+l2J5XiZjeHtX7dfyKVWuV00UpclbnAzLwP4DKRg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1bdb9555-adc8-48c1-22b2-08d899d3912d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2020 10:42:02.8118 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HK2APC01FT050.eop-APC01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2APC01HT078 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 44596-done X-Mailman-Approved-At: Sun, 06 Dec 2020 11:40:33 -0500 Cc: 44596-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Simon South writes: > I've been waiting to see whether the Knot Resolver team would issue a point > release with their fix[0] for the bug discovered in version 5.2.0, but as that > doesn't seem to be happening here is an updated patchset that applies the fix > directly. > Pushed, thank you for the patches and this fix! From unknown Fri Aug 15 04:03:29 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 04 Jan 2021 12:24:15 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator