git: 0cd67390c610 - main - dns/knot-resolver: Update to 5.6.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Nuno Teixeira <eduardo_at_FreeBSD.org>
Date: Tue, 07 Feb 2023 17:37:43 UTC
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0cd67390c61090ae6c3a213b06c891e6a9e76ddb

commit 0cd67390c61090ae6c3a213b06c891e6a9e76ddb
Author:     Leo Vandewoestijne <freebsd@dns.company>
AuthorDate: 2023-02-07 17:28:30 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2023-02-07 17:37:15 +0000

    dns/knot-resolver: Update to 5.6.0
    
     - Remove unused TEST option
     - Remove broken TESTCONFIG and TESTEXTRA options
     - Update TESTUNIT option description to reflect that it only builds
       tests so `make test` can be run after
    
    ChangeLog:      https://www.knot-resolver.cz/2023-01-26-knot-resolver-5.6.0.html
    PR:             269368
---
 dns/knot-resolver/Makefile | 31 +++++--------------------------
 dns/knot-resolver/distinfo |  6 +++---
 2 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile
index 9e7f80b8d1c9..d779f058afbe 100644
--- a/dns/knot-resolver/Makefile
+++ b/dns/knot-resolver/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	knot-resolver
-DISTVERSION=	5.5.2
-PORTREVISION=	2
+DISTVERSION=	5.6.0
 CATEGORIES=	dns
 MASTER_SITES=	https://secure.nic.cz/files/knot-resolver/ \
 		https://dns.company/downloads/knot-resolver/
@@ -17,7 +16,6 @@ BUILD_DEPENDS=	bash:shells/bash \
 		flake8:devel/py-flake8@${PY_FLAVOR} \
 		lua51-cqueues>=20200726_1:devel/lua-cqueues@lua51 \
 		luacheck:devel/lua-luacheck
-
 LIB_DEPENDS=	libdnssec.so:dns/knot3-lib \
 		libgnutls.so:security/gnutls \
 		libknot.so:dns/knot3-lib \
@@ -25,14 +23,11 @@ LIB_DEPENDS=	libdnssec.so:dns/knot3-lib \
 		libnghttp2.so:www/libnghttp2 \
 		libuv.so:devel/libuv \
 		libzscanner.so:dns/knot3-lib
-
 RUN_DEPENDS=	lua51-cqueues>=20200726_1:devel/lua-cqueues@lua51
 
 USES=		compiler:c11 libedit libtool luajit meson ncurses ninja \
 		pkgconfig python:3.5+,build shebangfix tar:xz
-
 USE_CXXSTD=	c++11
-
 USE_RC_SUBR=	krescachegc kresd
 
 SHEBANG_FILES=	scripts/bench.sh \
@@ -92,15 +87,12 @@ PORTDOCS=	AUTHORS COPYING CodingStyle NEWS README.md
 PORTEXAMPLES=	config.cluster config.docker config.internal config.isp \
 		config.personal config.privacy config.splitview
 
-OPTIONS_DEFINE=		DOCS EXAMPLES DNSTAP ROOTKEYS TRUSTANCHOR TEST TESTUNIT TESTCONF TESTEXTRA
-OPTIONS_DEFAULT=	DOCS EXAMPLES        ROOTKEYS TRUSTANCHOR TEST TESTUNIT
+OPTIONS_DEFINE=		DOCS EXAMPLES DNSTAP ROOTKEYS TRUSTANCHOR TESTUNIT
+OPTIONS_DEFAULT=	ROOTKEYS TRUSTANCHOR
 
 DNSTAP_DESC=		dnstap support
-ROOTKEYS_DESC=		install root.keys
-TESTCONF_DESC=		Do config tests
-TESTEXTRA_DESC=		Do extra tests
-TESTUNIT_DESC=		Do unit tests
-TEST_DESC=		Do tests
+ROOTKEYS_DESC=		Install root.keys
+TESTUNIT_DESC=		Build unit tests
 TRUSTANCHOR_DESC=	Trust anchor bootstrapping, management and stats
 
 DNSTAP_LIB_DEPENDS=	libfstrm.so:devel/fstrm \
@@ -114,17 +106,6 @@ ROOTKEYS_MESON_ON=	-Dinstall_root_keys=enabled
 ROOTKEYS_MESON_OFF=	-Dinstall_root_keys=disabled
 ROOTKEYS_PLIST_FILES=	${ETCDIR}/root.keys
 
-TESTCONF_BROKEN=	missing luajit basexx package
-TESTCONF_MESON_ON=	-Dconfig_tests=enabled
-TESTCONF_MESON_OFF=	-Dconfig_tests=disabled
-
-TESTEXTRA_BROKEN=		CMake Error: The source directory misses CMakeLists.txt
-TESTEXTRA_BUILD_DEPENDS=	git:devel/git
-TESTEXTRA_USES=			cmake python:3
-TESTEXTRA_MESON_ON=		-Dextra_tests=enabled \
-				-Dsendmmsg=disabled
-TESTEXTRA_MESON_OFF=		-Dextra_tests=disabled
-
 TESTUNIT_BUILD_DEPENDS=	cmocka>=1.1.1:sysutils/cmocka
 TESTUNIT_MESON_ON=	-Dunit_tests=enabled
 TESTUNIT_MESON_OFF=	-Dunit_tests=disabled
@@ -148,8 +129,6 @@ pre-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${RUNDIR}
 
-pre-install-TEST-on: do-test
-
 post-install:
 	${MV} ${STAGEDIR}${ETCDIR}/kresd.conf ${STAGEDIR}${ETCDIR}/kresd.conf.sample
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
diff --git a/dns/knot-resolver/distinfo b/dns/knot-resolver/distinfo
index 7f32be1d279e..d737c3cbb747 100644
--- a/dns/knot-resolver/distinfo
+++ b/dns/knot-resolver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661344347
-SHA256 (knot-resolver-5.5.2.tar.xz) = 3f78aa69c3f28edc42b5900b9788fba39498d8bffda7fb9c772bb470865780cb
-SIZE (knot-resolver-5.5.2.tar.xz) = 1921192
+TIMESTAMP = 1675677139
+SHA256 (knot-resolver-5.6.0.tar.xz) = 0c82ae937b685dc477fb3176098e3dc106c898b7cd83553e5bc54dccb83c80d7
+SIZE (knot-resolver-5.6.0.tar.xz) = 1923196