diff options
author | Neel Chauhan <nc@FreeBSD.org> | 2021-03-16 18:11:26 +0000 |
---|---|---|
committer | Neel Chauhan <nc@FreeBSD.org> | 2021-03-16 18:11:26 +0000 |
commit | 6acea16ab990613de103209466cc866c796bcfa9 (patch) | |
tree | 30cd03ec4b0f54ac106c01cba18fb86ac5579be3 /dns | |
parent | devel/lua-cqueues: Update to 20200726 and fix SSL (diff) |
dns/knot-resolver: Update to 5.3.0
Changes: https://www.knot-resolver.cz/2021-02-25-knot-resolver-5.3.0.html
PR: 254155
Submitted by: Leo Vandewoestijne <freebsd AT dns DOT company> (maintainer)
Notes
Notes:
svn path=/head/; revision=568596
Diffstat (limited to 'dns')
-rw-r--r-- | dns/knot-resolver/Makefile | 39 | ||||
-rw-r--r-- | dns/knot-resolver/distinfo | 6 | ||||
-rw-r--r-- | dns/knot-resolver/files/patch-meson.build | 18 | ||||
-rw-r--r-- | dns/knot-resolver/pkg-plist | 5 |
4 files changed, 36 insertions, 32 deletions
diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile index d89b59a89e45..c08e25e66bcc 100644 --- a/dns/knot-resolver/Makefile +++ b/dns/knot-resolver/Makefile @@ -2,8 +2,7 @@ # $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/ @@ -15,22 +14,24 @@ 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 @@ -42,7 +43,6 @@ SHEBANG_FILES= scripts/bench.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 \ @@ -86,7 +86,7 @@ PLIST_SUB= USERS=${USERS} \ 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 @@ -96,9 +96,9 @@ 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 @@ -107,15 +107,16 @@ 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 diff --git a/dns/knot-resolver/distinfo b/dns/knot-resolver/distinfo index f35b5cb5401a..60513e9313d8 100644 --- a/dns/knot-resolver/distinfo +++ b/dns/knot-resolver/distinfo @@ -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 diff --git a/dns/knot-resolver/files/patch-meson.build b/dns/knot-resolver/files/patch-meson.build index 87a828241e4b..fca26b528625 100644 --- a/dns/knot-resolver/files/patch-meson.build +++ b/dns/knot-resolver/files/patch-meson.build @@ -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' diff --git a/dns/knot-resolver/pkg-plist b/dns/knot-resolver/pkg-plist index 17b0717784db..2684bb39b90f 100644 --- a/dns/knot-resolver/pkg-plist +++ b/dns/knot-resolver/pkg-plist @@ -15,11 +15,13 @@ 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 @@ -79,6 +81,7 @@ 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 |