Hi, Attached update for knot and pylibknot to 3.2.2 libknot.so minor version bump due to new symbols being added, other libraries are still the same. all tests passing for net/knot, no longer need the test patch as it has been upstreamed.
ok? diff --git a/net/knot/Makefile b/net/knot/Makefile index 411c808758b..a56c4169029 100644 --- a/net/knot/Makefile +++ b/net/knot/Makefile @@ -1,10 +1,10 @@ COMMENT = authoritative DNS server # update net/py-libknot when updating this -DISTNAME = knot-3.2.1 +DISTNAME = knot-3.2.2 SHARED_LIBS += dnssec 3.1 # .9.0 -SHARED_LIBS += knot 8.0 # .13.0 +SHARED_LIBS += knot 8.1 # .13.0 SHARED_LIBS += zscanner 1.1 # .4.0 CATEGORIES = net diff --git a/net/knot/distinfo b/net/knot/distinfo index 9078d25fd86..3577c5755c3 100644 --- a/net/knot/distinfo +++ b/net/knot/distinfo @@ -1,2 +1,2 @@ -SHA256 (knot-3.2.1.tar.xz) = Ue+jb5JnmyXUPb+LpUPp8mE4VZ8PobpfrhcvVABlnI8= -SIZE (knot-3.2.1.tar.xz) = 1626796 +SHA256 (knot-3.2.2.tar.xz) = zqnBmIzc53UviPvjc3j2XoPE5UBIl4uU+yGpyS+IeI8= +SIZE (knot-3.2.2.tar.xz) = 1632748 diff --git a/net/knot/patches/patch-tests_contrib_test_net_c b/net/knot/patches/patch-tests_contrib_test_net_c deleted file mode 100644 index 88456340799..00000000000 --- a/net/knot/patches/patch-tests_contrib_test_net_c +++ /dev/null @@ -1,25 +0,0 @@ -Index: tests/contrib/test_net.c ---- tests/contrib/test_net.c.orig -+++ tests/contrib/test_net.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2021 CZ.NIC, z.s.p.o. <knot-...@labs.nic.cz> -+/* Copyright (C) 2022 CZ.NIC, z.s.p.o. <knot-...@labs.nic.cz> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -23,6 +23,7 @@ - #include <signal.h> - #include <stdbool.h> - #include <string.h> -+#include <unistd.h> - - #include "libknot/errcode.h" - #include "contrib/net.h" -@@ -383,6 +384,7 @@ static void test_refused(void) - - r = close(server); - is_int(0, r, "server, close socket"); -+ usleep(50000); - - r = net_stream_send(client, (uint8_t *)"", 1, TIMEOUT); - is_int(KNOT_ECONN, r, "client, refused on write"); diff --git a/net/py-libknot/Makefile b/net/py-libknot/Makefile index 75882cb71bf..67de17b0e3a 100644 --- a/net/py-libknot/Makefile +++ b/net/py-libknot/Makefile @@ -1,6 +1,6 @@ COMMENT = Python bindings for libknot -MODPY_EGG_VERSION = 3.2.1 +MODPY_EGG_VERSION = 3.2.2 DISTNAME = libknot-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} diff --git a/net/py-libknot/distinfo b/net/py-libknot/distinfo index dc7f95f29f1..cd6f8ec4edf 100644 --- a/net/py-libknot/distinfo +++ b/net/py-libknot/distinfo @@ -1,2 +1,2 @@ -SHA256 (libknot-3.2.1.tar.gz) = /nLyk98Aje3ZIt0t/VMNni19jHx8IXnQcdfkxR/68Mw= -SIZE (libknot-3.2.1.tar.gz) = 9495 +SHA256 (libknot-3.2.2.tar.gz) = LdH9Ylw+rr9vQq1x9x9HsVAtdoO4HjtpBQeMttf4LFo= +SIZE (libknot-3.2.2.tar.gz) = 9510