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 8B0bBC8ug1+5GAAA0tVLHw (envelope-from ) for ; Sun, 11 Oct 2020 16:09:19 +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 UAxyOy4ug1+oXgAAB5/wlQ (envelope-from ) for ; Sun, 11 Oct 2020 16:09:18 +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 9596E94014A for ; Sun, 11 Oct 2020 16:09:17 +0000 (UTC) Received: from localhost ([::1]:53962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRduN-000251-Dc for larch@yhetil.org; Sun, 11 Oct 2020 12:09:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRduA-00024t-Q1 for guix-patches@gnu.org; Sun, 11 Oct 2020 12:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57553) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kRduA-0000rw-Gr for guix-patches@gnu.org; Sun, 11 Oct 2020 12:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kRduA-0003u9-BM for guix-patches@gnu.org; Sun, 11 Oct 2020 12:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43928] [PATCH] gnu: knot: Update to 3.0.1. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Oct 2020 16:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43928 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43928@debbugs.gnu.org Cc: simon@simonsouth.net X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160243249214949 (code B ref -1); Sun, 11 Oct 2020 16:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Oct 2020 16:08:12 +0000 Received: from localhost ([127.0.0.1]:40866 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRdtL-0003t3-Ry for submit@debbugs.gnu.org; Sun, 11 Oct 2020 12:08:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:42730) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRdtJ-0003sv-4V for submit@debbugs.gnu.org; Sun, 11 Oct 2020 12:08:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRdtI-00023X-W0 for guix-patches@gnu.org; Sun, 11 Oct 2020 12:08:09 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:32916) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRdtE-0000pP-2k for guix-patches@gnu.org; Sun, 11 Oct 2020 12:08:08 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 35894210B6; Sun, 11 Oct 2020 16:08:02 +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 5dp06LW8VcJK; Sun, 11 Oct 2020 16:08:01 +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 099FD21092; Sun, 11 Oct 2020 16:07:59 +0000 (UTC) From: Simon South Date: Sun, 11 Oct 2020 12:07:45 -0400 Message-Id: <20201011160745.19178-1-simon@simonsouth.net> X-Mailer: git-send-email 2.28.0 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/10/11 12:08:02 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, 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.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: ga9iXncYiaSQ * gnu/packages/dns.scm (knot): Update to 3.0.1. [source]: Remove obsolete patch. * gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/dns.scm | 6 ++---- ...est_net_shortwrite-ensure-connection.patch | 19 ------------------- 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch diff --git a/gnu/local.mk b/gnu/local.mk index b59b122e86..ff77e801ff 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1198,7 +1198,6 @@ 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 5b159bc656..0cf07853e0 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -807,7 +807,7 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "3.0.0") + (version "3.0.1") (source (origin (method git-fetch) @@ -816,9 +816,7 @@ Extensions} (DNSSEC).") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0fkvip7n5ihjfwnnivdc3jf44y8p85ifglvq7b0anxvj9cg1m78f")) - (patches - (search-patches "knot-test_net_shortwrite-ensure-connection.patch")) + (base32 "10mlzldxqvbaw78nghkr0s73rlbpz9wg16z14321xw2l9xfibkad")) (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 deleted file mode 100644 index 8b57ec522e..0000000000 --- a/gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch +++ /dev/null @@ -1,19 +0,0 @@ -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