Hi,
After quite a few people have asked for QUIC functionality in net/knot and
running the server for the last month or two, I think it should be safe to
enable QUIC with the embedded ngtcp2 library, as it needs to be built with
gnutls and we build with openssl.
OK?
Best,
Aisha
diff --git a/net/knot/Makefile b/net/knot/Makefile
index 81a649ce893..23b3957f7e5 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.9
+DISTNAME = knot-3.3.3
SHARED_LIBS += dnssec 3.1 # .9.0
-SHARED_LIBS += knot 8.0 # .13.0
+SHARED_LIBS += knot 9.0 # .14.0
SHARED_LIBS += zscanner 1.1 # .4.0
CATEGORIES = net
@@ -40,6 +40,7 @@ LIB_DEPENDS = devel/gettext,-runtime \
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --with-storage=${LOCALSTATEDIR}/db/knot \
--with-libidn \
+ --enable-quic=embedded \
--disable-dnstap \
--disable-maxminddb
diff --git a/net/knot/distinfo b/net/knot/distinfo
index 7346bbf8522..a2c10f45efc 100644
--- a/net/knot/distinfo
+++ b/net/knot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (knot-3.2.9.tar.xz) = vB+euMn2f1KAXzrPotAVMZAkX6FFsAf6+pBo0topJQY=
-SIZE (knot-3.2.9.tar.xz) = 1642600
+SHA256 (knot-3.3.3.tar.xz) = qrQKqyrNc1xQDylrrKpchP8EiCIaQGjOmUbpc76sxa4=
+SIZE (knot-3.3.3.tar.xz) = 1586348
diff --git a/net/knot/pkg/PLIST b/net/knot/pkg/PLIST
index 134709c5eed..9077fba698d 100644
--- a/net/knot/pkg/PLIST
+++ b/net/knot/pkg/PLIST
@@ -53,6 +53,9 @@ include/libknot/packet/wire.h
include/libknot/probe/
include/libknot/probe/data.h
include/libknot/probe/probe.h
+include/libknot/quic/
+include/libknot/quic/quic.h
+include/libknot/quic/quic_conn.h
include/libknot/rdata.h
include/libknot/rdataset.h
include/libknot/rrset-dump.h
diff --git a/net/py-libknot/Makefile b/net/py-libknot/Makefile
index 8a37999a676..59f38b835f0 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.9
+MODPY_EGG_VERSION = 3.3.3
DISTNAME = libknot-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@@ -16,7 +16,7 @@ PERMIT_PACKAGE = Yes
MODULES = lang/python
MODPY_PI = Yes
-MODPY_PYBUILD = setuptools
+MODPY_PYBUILD = hatchling
FLAVORS = python3
FLAVOR = python3
diff --git a/net/py-libknot/distinfo b/net/py-libknot/distinfo
index 4efa1c68233..41596fd8740 100644
--- a/net/py-libknot/distinfo
+++ b/net/py-libknot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libknot-3.2.9.tar.gz) = Sx5JscKiaP7qdCcmPCoTXLb11DOJhBqkyyz569KRivU=
-SIZE (libknot-3.2.9.tar.gz) = 10408
+SHA256 (libknot-3.3.3.tar.gz) = w8VAA+llRg1xeAMRe7ISHo8H+qGi247jwOjTZHecFVM=
+SIZE (libknot-3.3.3.tar.gz) = 11082
diff --git a/net/py-libknot/pkg/PLIST b/net/py-libknot/pkg/PLIST
index 4068adfb2ab..42313ba0ce5 100644
--- a/net/py-libknot/pkg/PLIST
+++ b/net/py-libknot/pkg/PLIST
@@ -1,9 +1,18 @@
+@comment lib/python${MODPY_VERSION}/site-packages/PKG-INFO
+@comment lib/python${MODPY_VERSION}/site-packages/README.md
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/libknot/
lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}.dist-info/
lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}.dist-info/METADATA
lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}.dist-info/RECORD
lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}.dist-info/WHEEL
-lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/libknot.egg-info/
+lib/python${MODPY_VERSION}/site-packages/libknot.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/libknot.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/libknot.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/libknot.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/libknot/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libknot/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/libknot/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -17,3 +26,6 @@
lib/python${MODPY_VERSION}/site-packages/libknot/${MODPY_PYCACHE}probe.${MODPY_P
lib/python${MODPY_VERSION}/site-packages/libknot/control.py
lib/python${MODPY_VERSION}/site-packages/libknot/dname.py
lib/python${MODPY_VERSION}/site-packages/libknot/probe.py
+@comment lib/python${MODPY_VERSION}/site-packages/pyproject.toml
+@comment lib/python${MODPY_VERSION}/site-packages/setup.cfg
+@comment lib/python${MODPY_VERSION}/site-packages/setup.py
