Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 20 Jan 2026 14:37:11 +0000
From:      Vladimir Druzenko <vvd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Cc:        Leo Vandewoestijne <freebsd@dns.company>
Subject:   git: 7ea35d0e487b - 2026Q1 - dns/knot-resolver6: Update 6.0.17 => 6.1.0
Message-ID:  <696f9317.ccc3.508e42c6@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch 2026Q1 has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7ea35d0e487be55b3a63552202abcfda4b8e64d5

commit 7ea35d0e487be55b3a63552202abcfda4b8e64d5
Author:     Leo Vandewoestijne <freebsd@dns.company>
AuthorDate: 2026-01-20 14:09:13 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-01-20 14:36:21 +0000

    dns/knot-resolver6: Update 6.0.17 => 6.1.0
    
    Release Notes:
    https://www.knot-resolver.cz/documentation/v6.1.0/NEWS.html#knot-resolver-6-1-0-2026-01-08
    
    - Remove hardcoded lua 5.1 - upstream added support for newer versions.
    - Replace manual strip with --strip build option.
    - Remove unnecessary LDFLAGS.
    - Fix TESTUNIT option.
    
    PR:             292402 291928
    MFH:            2026Q1
    Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org>
    (cherry picked from commit faca4dc5dc0dd33badf29c92e3f86b2e5ac2c6bc)
---
 dns/knot-resolver6/Makefile | 38 ++++++++------------------------------
 dns/knot-resolver6/distinfo |  6 +++---
 2 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/dns/knot-resolver6/Makefile b/dns/knot-resolver6/Makefile
index a319a547ea9a..194ff3244636 100644
--- a/dns/knot-resolver6/Makefile
+++ b/dns/knot-resolver6/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	knot-resolver
-DISTVERSION=	6.0.17
+DISTVERSION=	6.1.0
 CATEGORIES=	dns
 MASTER_SITES=	https://knot-resolver.nic.cz/release/ \
 		https://dns.company/downloads/knot-resolver/
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash \
 		flake8:devel/py-flake8@${PY_FLAVOR} \
-		lua51-cqueues>=20200726_1:devel/lua-cqueues@lua51 \
+		${LUA_FLAVOR}-cqueues>=20200726_1:devel/lua-cqueues@${LUA_FLAVOR} \
 		luacheck:devel/lua-luacheck
 LIB_DEPENDS=	libdnssec.so:dns/knot3 \
 		libgnutls.so:security/gnutls \
@@ -23,10 +23,10 @@ LIB_DEPENDS=	libdnssec.so:dns/knot3 \
 		libnghttp2.so:www/libnghttp2 \
 		libuv.so:devel/libuv \
 		libzscanner.so:dns/knot3
-RUN_DEPENDS=	lua51-cqueues>=20200726_1:devel/lua-cqueues@lua51
+RUN_DEPENDS=	${LUA_FLAVOR}-cqueues>=20200726_1:devel/lua-cqueues@${LUA_FLAVOR}
 
-USES=		cmake:indirect compiler:c11 luajit meson ncurses ninja \
-		pkgconfig python:build tar:xz
+USES=		cmake:indirect compiler:c11 lua:build,run luajit meson ncurses \
+		ninja pkgconfig python:build tar:xz
 USE_CXXSTD=	c++11
 USE_RC_SUBR=	krescachegc kresd
 
@@ -38,6 +38,7 @@ MESON_ARGS=	--buildtype=release \
 		--libdir=${PREFIX}/lib \
 		--pkg-config-path=${PREFIX}/libdata/pkgconfig \
 		--prefix=${LOCALBASE} \
+		--strip \
 		-Dgroup=${GROUPS} \
 		-Dinstall_kresd_conf=enabled \
 		-Dkeyfile_default=${ETCDIR}/root.keys \
@@ -46,8 +47,6 @@ MESON_ARGS=	--buildtype=release \
 		-Duser=${USERS} \
 		-Dutils=enabled
 
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 CONFLICTS=	knot-resolver-[0-5].*
 
 SUB_FILES=	pkg-message
@@ -87,32 +86,11 @@ DNSTAP_PLIST_FILES=	lib/knot-resolver/kres_modules/dnstap.so
 TESTUNIT_BUILD_DEPENDS=	cmocka>=1.1.1:sysutils/cmocka
 TESTUNIT_MESON_ON=	-Dunit_tests=enabled
 TESTUNIT_MESON_OFF=	-Dunit_tests=disabled
-
-STRIP_TARGETS=	sbin/kres-cache-gc \
-		sbin/kresc \
-		sbin/kresd \
-		lib/knot-resolver/ahocorasick.so \
-		lib/knot-resolver/debug_opensslkeylog.so \
-		lib/knot-resolver/kres_modules/bogus_log.so \
-		lib/knot-resolver/kres_modules/dnstap.so \
-		lib/knot-resolver/kres_modules/edns_keepalive.so \
-		lib/knot-resolver/kres_modules/extended_error.so \
-		lib/knot-resolver/kres_modules/hints.so \
-		lib/knot-resolver/kres_modules/nsid.so \
-		lib/knot-resolver/kres_modules/refuse_nord.so \
-		lib/knot-resolver/kres_modules/stats.so
-
-pre-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${MKDIR} ${STAGEDIR}${RUNDIR}
+TESTUNIT_LDFLAGS=	-pthread
 
 post-install:
+	${MKDIR} ${STAGEDIR}${RUNDIR}
 	${MV} ${STAGEDIR}${ETCDIR}/kresd.conf ${STAGEDIR}${ETCDIR}/kresd.conf.sample
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
-.for STRIP_TGT in ${STRIP_TARGETS}
-	if [ -f ${STAGEDIR}${PREFIX}/${STRIP_TGT} ]; then \
-	  ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${STRIP_TGT}; \
-	fi
-.endfor
 
 .include <bsd.port.mk>
diff --git a/dns/knot-resolver6/distinfo b/dns/knot-resolver6/distinfo
index 4a2301a2c432..4c751f314648 100644
--- a/dns/knot-resolver6/distinfo
+++ b/dns/knot-resolver6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1765271763
-SHA256 (knot-resolver-6.0.17.tar.xz) = 13d4496ef87aeb2fbd3b0057e2211d4585205241e509a0cd4341dbe5e8cb5c1c
-SIZE (knot-resolver-6.0.17.tar.xz) = 2157140
+TIMESTAMP = 1768225823
+SHA256 (knot-resolver-6.1.0.tar.xz) = 7921df7507286d90574bbf5ae664a8a537805ce40b5fa8b15f5d0d33e2c438d0
+SIZE (knot-resolver-6.1.0.tar.xz) = 2158788
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?696f9317.ccc3.508e42c6>