Index: head/dns/knot-resolver/Makefile =================================================================== --- head/dns/knot-resolver/Makefile (revision 568595) +++ head/dns/knot-resolver/Makefile (revision 568596) @@ -1,157 +1,158 @@ # Created by: Leo Vandewoestijne # $FreeBSD$ PORTNAME= knot-resolver -DISTVERSION= 5.1.3 -PORTREVISION= 1 +DISTVERSION= 5.3.0 CATEGORIES= dns MASTER_SITES= https://secure.nic.cz/files/knot-resolver/ \ https://dns.company/downloads/knot-resolver/ MAINTAINER= freebsd@dns.company COMMENT= Caching full resolver implementation LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= bash:shells/bash \ + cmake:devel/cmake \ flake8:devel/py-flake8@${PY_FLAVOR} \ - lua51-cqueues>=20200603_1:devel/lua-cqueues@lua51 \ - luacheck:devel/lua-luacheck \ - cmake:devel/cmake + lua51-cqueues>=20200726_1:devel/lua-cqueues@lua51 \ + luacheck:devel/lua-luacheck + LIB_DEPENDS= libknot.so:dns/knot3-lib \ libdnssec.so:dns/knot3-lib \ libzscanner.so:dns/knot3-lib \ libgnutls.so:security/gnutls \ liblmdb.so:databases/lmdb \ libluajit-5.1.so:lang/luajit-openresty \ + libnghttp2.so:www/libnghttp2 \ libuv.so:devel/libuv -RUN_DEPENDS= lua51-cqueues>=20200603_1:devel/lua-cqueues@lua51 -USES= compiler:c11 compiler:c++11-lang libedit libtool \ - meson ncurses ninja pkgconfig python:3.5+,build \ - shebangfix tar:xz +RUN_DEPENDS= lua51-cqueues>=20200726_1:devel/lua-cqueues@lua51 +USES= compiler:c11 libedit libtool 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 \ scripts/build-in-obs.sh \ scripts/coverage_c_combine.sh \ scripts/coverage_env.sh \ scripts/gen-cdefs.sh \ scripts/get-date.sh \ - scripts/get-scanbuild-args.sh \ scripts/luacov_gen_empty.sh \ scripts/make-dev-archive.sh \ scripts/make-distrofiles.sh \ scripts/make-doc.sh \ scripts/make-srpm.sh \ scripts/obs-build.sh \ scripts/run-pylint.sh \ scripts/test-config.sh \ scripts/test-integration-prepare.sh \ scripts/update-root-hints.sh MESON_ARGS= --buildtype=release \ --default-library=static \ --libdir=${PREFIX}/lib \ --pkg-config-path=${PREFIX}/libdata/pkgconfig \ --prefix=${LOCALBASE} \ -Duser=${USERS} \ -Dgroup=${GROUPS} \ -Dinstall_kresd_conf=enabled \ -Dclient=enabled \ -Dutils=enabled \ -Dkeyfile_default=${ETCDIR}/root.keys \ -Droot_hints=${ETCDIR}/root.hints LDFLAGS+= -L${LOCALBASE}/lib CONFLICTS= knot-1.* knot1-[0-6].* SUB_FILES= pkg-message SUB_LIST= USERS=${USERS} \ GROUPS=${GROUPS} \ RUNDIR=${RUNDIR} USERS= kresd GROUPS= kresd RUNDIR= /var/run/kresd PLIST_SUB= USERS=${USERS} \ GROUPS=${GROUPS} \ RUNDIR=${RUNDIR} OPTIONS_DEFINE= DOCS EXAMPLES DNSTAP ROOTKEYS TRUSTANCHOR TEST TESTUNIT TESTCONF TESTEXTRA -OPTIONS_DEFAULT= DOCS EXAMPLES ROOTKEYS TRUSTANCHOR TEST TESTUNIT TESTCONF +OPTIONS_DEFAULT= DOCS EXAMPLES ROOTKEYS TRUSTANCHOR TEST TESTUNIT 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 TRUSTANCHOR_DESC= Trust anchor bootstrapping, management and stats -DNSTAP_LIB_DEPENDS= libprotobuf.so:devel/protobuf \ +DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ libprotobuf-c.so:devel/protobuf-c \ - libfstrm.so:devel/fstrm + libprotobuf.so:devel/protobuf DNSTAP_MESON_ON= -Ddnstap=enabled DNSTAP_MESON_OFF= -Ddnstap=disabled DNSTAP_PLIST_FILES= lib/knot-resolver/kres_modules/dnstap.so 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 +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 TRUSTANCHOR_MESON_ON= -Dmanaged_ta=enabled TRUSTANCHOR_MESON_OFF= -Dmanaged_ta=disabled PORTDOCS= AUTHORS COPYING CodingStyle NEWS README.md PORTEXAMPLES= config.cluster config.docker config.internal config.isp \ config.personal config.privacy config.splitview STRIP_TARGETS= sbin/kres-cache-gc \ sbin/kresc \ sbin/kresd \ lib/knot-resolver/ahocorasick.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/hints.so \ lib/knot-resolver/kres_modules/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} pre-install-TEST-on: do-test post-install: ${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 Index: head/dns/knot-resolver/distinfo =================================================================== --- head/dns/knot-resolver/distinfo (revision 568595) +++ head/dns/knot-resolver/distinfo (revision 568596) @@ -1,3 +1,3 @@ -TIMESTAMP = 1600248623 -SHA256 (knot-resolver-5.1.3.tar.xz) = 20cd829027e39a9f7d993894e3640e886825b492d9ac1a744ac5616cc101458b -SIZE (knot-resolver-5.1.3.tar.xz) = 1808868 +TIMESTAMP = 1614684836 +SHA256 (knot-resolver-5.3.0.tar.xz) = fb6cb2c03f4fffbdd8a0098127383d03b14cf7d6abf3a0cd229fb13ff68ee33e +SIZE (knot-resolver-5.3.0.tar.xz) = 1865456 Index: head/dns/knot-resolver/files/patch-meson.build =================================================================== --- head/dns/knot-resolver/files/patch-meson.build (revision 568595) +++ head/dns/knot-resolver/files/patch-meson.build (revision 568596) @@ -1,11 +1,11 @@ ---- meson.build.orig 2020-07-01 12:27:52 UTC +--- meson.build.orig 2021-03-02 13:30:46 UTC +++ meson.build -@@ -47,7 +47,7 @@ endif - prefix = get_option('prefix') - data_dir = join_paths(prefix, get_option('datadir'), 'knot-resolver') - doc_dir = join_paths(prefix, get_option('datadir'), 'doc', 'knot-resolver') --examples_dir = join_paths(doc_dir, 'examples') +@@ -48,7 +48,7 @@ prefix = get_option('prefix') + data_dir = prefix / get_option('datadir') / 'knot-resolver' + doc_dir = prefix / get_option('datadir') / 'doc' / 'knot-resolver' + info_dir = prefix / get_option('datadir') / 'info' +-examples_dir = doc_dir / 'examples' +examples_dir = join_paths(prefix, 'share', 'examples', 'knot-resolver') - etc_dir = join_paths(prefix, get_option('sysconfdir'), 'knot-resolver') - lib_dir = join_paths(prefix, get_option('libdir'), 'knot-resolver') - modules_dir = join_paths(lib_dir, 'kres_modules') + etc_dir = prefix / get_option('sysconfdir') / 'knot-resolver' + lib_dir = prefix / get_option('libdir') / 'knot-resolver' + modules_dir = lib_dir / 'kres_modules' Index: head/dns/knot-resolver/pkg-plist =================================================================== --- head/dns/knot-resolver/pkg-plist (revision 568595) +++ head/dns/knot-resolver/pkg-plist (revision 568596) @@ -1,94 +1,97 @@ @sample %%ETCDIR%%/kresd.conf %%ETCDIR%%/icann-ca.pem %%ETCDIR%%/root.hints include/libkres/api.h include/libkres/array.h include/libkres/cdb_api.h include/libkres/cdb_lmdb.h include/libkres/defines.h include/libkres/dnssec.h include/libkres/impl.h include/libkres/iterate.h include/libkres/layer.h include/libkres/lru.h include/libkres/map.h include/libkres/module.h include/libkres/nsec.h include/libkres/nsec3.h -include/libkres/nsrep.h include/libkres/pack.h include/libkres/queue.h include/libkres/resolve.h include/libkres/rplan.h +include/libkres/selection.h +include/libkres/selection_forward.h +include/libkres/selection_iter.h include/libkres/signature.h include/libkres/ta.h include/libkres/trie.h include/libkres/utils.h include/libkres/zonecut.h lib/knot-resolver/ahocorasick.so lib/knot-resolver/distro-preconfig.lua lib/knot-resolver/kluautil.lua lib/knot-resolver/kres-gen.lua lib/knot-resolver/kres.lua lib/knot-resolver/kres_modules/bogus_log.so lib/knot-resolver/kres_modules/daf.lua lib/knot-resolver/kres_modules/daf/daf.js lib/knot-resolver/kres_modules/detect_time_jump.lua lib/knot-resolver/kres_modules/detect_time_skew.lua lib/knot-resolver/kres_modules/dns64.lua lib/knot-resolver/kres_modules/edns_keepalive.so lib/knot-resolver/kres_modules/etcd.lua lib/knot-resolver/kres_modules/experimental_dot_auth.lua lib/knot-resolver/kres_modules/graphite.lua lib/knot-resolver/kres_modules/hints.so lib/knot-resolver/kres_modules/http.lua lib/knot-resolver/kres_modules/http/bootstrap-theme.min.css lib/knot-resolver/kres_modules/http/bootstrap.min.css lib/knot-resolver/kres_modules/http/bootstrap.min.js lib/knot-resolver/kres_modules/http/d3.js lib/knot-resolver/kres_modules/http/datamaps.world.min.js lib/knot-resolver/kres_modules/http/dygraph.min.js lib/knot-resolver/kres_modules/http/epoch.css lib/knot-resolver/kres_modules/http/epoch.js lib/knot-resolver/kres_modules/http/favicon.ico lib/knot-resolver/kres_modules/http/glyphicons-halflings-regular.woff2 lib/knot-resolver/kres_modules/http/jquery.js lib/knot-resolver/kres_modules/http/kresd.css lib/knot-resolver/kres_modules/http/kresd.js lib/knot-resolver/kres_modules/http/main.tpl lib/knot-resolver/kres_modules/http/selectize.bootstrap3.css lib/knot-resolver/kres_modules/http/selectize.min.js lib/knot-resolver/kres_modules/http/topojson.js lib/knot-resolver/kres_modules/http_doh.lua lib/knot-resolver/kres_modules/http_tls_cert.lua lib/knot-resolver/kres_modules/http_trace.lua lib/knot-resolver/kres_modules/nsid.so lib/knot-resolver/kres_modules/policy.lua lib/knot-resolver/kres_modules/predict.lua lib/knot-resolver/kres_modules/prefill.lua lib/knot-resolver/kres_modules/priming.lua lib/knot-resolver/kres_modules/prometheus.lua lib/knot-resolver/kres_modules/rebinding.lua lib/knot-resolver/kres_modules/refuse_nord.so lib/knot-resolver/kres_modules/renumber.lua lib/knot-resolver/kres_modules/serve_stale.lua lib/knot-resolver/kres_modules/stats.so lib/knot-resolver/kres_modules/ta_sentinel.lua lib/knot-resolver/kres_modules/ta_signal_query.lua lib/knot-resolver/kres_modules/ta_update.lua lib/knot-resolver/kres_modules/view.lua lib/knot-resolver/kres_modules/watchdog.lua lib/knot-resolver/kres_modules/workarounds.lua +lib/knot-resolver/krprint.lua lib/knot-resolver/postconfig.lua lib/knot-resolver/sandbox.lua lib/knot-resolver/trust_anchors.lua lib/knot-resolver/upgrade-4-to-5.lua lib/knot-resolver/zonefile.lua lib/libkres.a libdata/pkgconfig/libkres.pc man/man8/kresd.8.gz sbin/kres-cache-gc sbin/kresc sbin/kresd @dir(%%USERS%%,%%GROUPS%%,0755) %%ETCDIR%% @dir(%%USERS%%,%%GROUPS%%,0755) %%RUNDIR%%