unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Simon South <simon@simonsouth.net>
To: 43928@debbugs.gnu.org
Cc: simon@simonsouth.net
Subject: [bug#43928] [PATCH] gnu: knot: Update to 3.0.1.
Date: Sun, 11 Oct 2020 12:07:45 -0400	[thread overview]
Message-ID: <20201011160745.19178-1-simon@simonsouth.net> (raw)

* 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





             reply	other threads:[~2020-10-11 16:09 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-11 16:07 Simon South [this message]
2020-10-13 19:28 ` bug#43928: [PATCH] gnu: knot: Update to 3.0.1 Simon South
2020-10-13 19:45   ` [bug#43928] " Tobias Geerinckx-Rice via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201011160745.19178-1-simon@simonsouth.net \
    --to=simon@simonsouth.net \
    --cc=43928@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).