From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id ZFNVCTN4fF9LCAAA0tVLHw (envelope-from ) for ; Tue, 06 Oct 2020 13:59:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id sIKCBDN4fF+oKAAAB5/wlQ (envelope-from ) for ; Tue, 06 Oct 2020 13:59:15 +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 B8F08940222 for ; Tue, 6 Oct 2020 13:59:14 +0000 (UTC) Received: from localhost ([::1]:34496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPnUn-0000Tp-KG for larch@yhetil.org; Tue, 06 Oct 2020 09:59:13 -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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) 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: 3.99 X-TUID: HfrJ991Fo+4j * 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