From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 0O63JDLEe191ZwAA0tVLHw (envelope-from ) for ; Tue, 06 Oct 2020 01:11:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id UCZpIDLEe19qDgAAbx9fmQ (envelope-from ) for ; Tue, 06 Oct 2020 01:11:14 +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 2E5359402B6 for ; Tue, 6 Oct 2020 01:11:14 +0000 (UTC) Received: from localhost ([::1]:55338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPaur-0004qD-8a for larch@yhetil.org; Mon, 05 Oct 2020 20:33:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPaud-0004ot-Vx for guix-patches@gnu.org; Mon, 05 Oct 2020 20:33:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39285) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kPaud-0005GU-Bo for guix-patches@gnu.org; Mon, 05 Oct 2020 20:33:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kPaud-00027c-9T for guix-patches@gnu.org; Mon, 05 Oct 2020 20:33:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43823] [PATCH 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 00:33: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.16019443618112 (code B ref 43823); Tue, 06 Oct 2020 00:33:03 +0000 Received: (at 43823) by debbugs.gnu.org; 6 Oct 2020 00:32:41 +0000 Received: from localhost ([127.0.0.1]:50829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPauG-00026l-MY for submit@debbugs.gnu.org; Mon, 05 Oct 2020 20:32:40 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:47686) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPauE-00026Z-Vh for 43823@debbugs.gnu.org; Mon, 05 Oct 2020 20:32:39 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id BACFD20B2A; Tue, 6 Oct 2020 00:32: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 fRNB4_HHZB-m; Tue, 6 Oct 2020 00:32: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 5F3ED209FB; Tue, 6 Oct 2020 00:32:29 +0000 (UTC) From: Simon South Date: Mon, 5 Oct 2020 20:27:48 -0400 Message-Id: X-Mailer: git-send-email 2.25.2 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: 5.49 X-TUID: B7LpIPfiBvns * 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 +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