Hi,
Attached update for knot ports to 3.2.8, which drops the local patch for zone
journal looping.
OK?
Aisha
diff --git a/net/knot/Makefile b/net/knot/Makefile
index 0402ef39a53..551da20cec7 100644
--- a/net/knot/Makefile
+++ b/net/knot/Makefile
@@ -1,8 +1,7 @@
COMMENT = authoritative DNS server
# update net/py-libknot when updating this
-DISTNAME = knot-3.2.6
-REVISION = 0
+DISTNAME = knot-3.2.8
SHARED_LIBS += dnssec 3.1 # .9.0
SHARED_LIBS += knot 8.0 # .13.0
diff --git a/net/knot/distinfo b/net/knot/distinfo
index b256978d120..b8122249047 100644
--- a/net/knot/distinfo
+++ b/net/knot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (knot-3.2.6.tar.xz) = rBJPsX28SsUxCjCjliRaa6MEs8iavtD4pH1ydGLI2k0=
-SIZE (knot-3.2.6.tar.xz) = 1639600
+SHA256 (knot-3.2.8.tar.xz) = 70GaQo8yfe93eAvJDtp2O1HmEh/lSFQ9qEueuWomGm4=
+SIZE (knot-3.2.8.tar.xz) = 1681556
diff --git a/net/knot/patches/patch-src_knot_journal_journal_read_c
b/net/knot/patches/patch-src_knot_journal_journal_read_c
deleted file mode 100644
index fa1f450525a..00000000000
--- a/net/knot/patches/patch-src_knot_journal_journal_read_c
+++ /dev/null
@@ -1,36 +0,0 @@
-Stop journal from looping infinitely when reading a broken zone
-
-Index: src/knot/journal/journal_read.c
---- src/knot/journal/journal_read.c.orig
-+++ src/knot/journal/journal_read.c
-@@ -32,6 +32,8 @@ struct journal_read {
- const knot_dname_t *zone;
- wire_ctx_t wire;
- uint32_t next;
-+ uint32_t changesets_read;
-+ uint32_t changesets_total;
- };
-
- int journal_read_get_error(const journal_read_t *ctx, int another_error)
-@@ -56,6 +58,10 @@ static bool go_next_changeset(journal_read_t *ctx, boo
- ctx->txn.ret = KNOT_ELOOP;
- return false;
- }
-+ if (++ctx->changesets_read > ctx->changesets_total) {
-+ ctx->txn.ret = KNOT_ELOOP;
-+ return false;
-+ }
- ctx->next = journal_next_serial(&ctx->txn.cur_val);
- update_ctx_wire(ctx);
- return true;
-@@ -77,6 +83,10 @@ int journal_read_begin(zone_journal_t j, bool read_zon
- newctx->next = serial_from;
-
- knot_lmdb_begin(j.db, &newctx->txn, false);
-+
-+ journal_metadata_t md = { 0 };
-+ journal_load_metadata(&newctx->txn, newctx->zone, &md);
-+ newctx->changesets_total = md.changeset_count + (read_zone ? 1 : 0);
-
- if (go_next_changeset(newctx, read_zone, j.zone)) {
- *ctx = newctx;
diff --git a/net/py-libknot/Makefile b/net/py-libknot/Makefile
index afac51cb9f0..b2a14aa896e 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.6
+MODPY_EGG_VERSION = 3.2.8
DISTNAME = libknot-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
diff --git a/net/py-libknot/distinfo b/net/py-libknot/distinfo
index be58c3c2f7d..3e6b936bae0 100644
--- a/net/py-libknot/distinfo
+++ b/net/py-libknot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libknot-3.2.6.tar.gz) = lfL+Wzyb+H0Usf9MNpMAzOkSSRnu1dQOB2/Fex6vbGM=
-SIZE (libknot-3.2.6.tar.gz) = 10430
+SHA256 (libknot-3.2.8.tar.gz) = IChQCMJ1brI5UFQMQSgkl1vlRqptfYlXawdKM38FiGs=
+SIZE (libknot-3.2.8.tar.gz) = 10384
