Date: Sat, 15 Feb 2020 18:19:15 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526235 - in head/dns/knot-resolver: . files Message-ID: <202002151819.01FIJFoC051066@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Sat Feb 15 18:19:15 2020 New Revision: 526235 URL: https://svnweb.freebsd.org/changeset/ports/526235 Log: dns/knot-resolver: upgrade 4.2.2 -> 5.0.1 - for changes from 4.x to 5.x which might cause trouble during upgrades, please read: https://knot-resolver.readthedocs.io/en/stable/upgrading.html PR: 243948 Submitted by: Leo Vandewoestijne <freebsd@dns.company> (maintainer) Relnotes: https://www.knot-resolver.cz/2020-01-27-knot-resolver-5.0.0.html https://www.knot-resolver.cz/2020-02-05-knot-resolver-5.0.1.html Modified: head/dns/knot-resolver/Makefile head/dns/knot-resolver/distinfo head/dns/knot-resolver/files/pkg-message.in head/dns/knot-resolver/pkg-plist Modified: head/dns/knot-resolver/Makefile ============================================================================== --- head/dns/knot-resolver/Makefile Sat Feb 15 18:17:30 2020 (r526234) +++ head/dns/knot-resolver/Makefile Sat Feb 15 18:19:15 2020 (r526235) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= knot-resolver -DISTVERSION= 4.2.2 -PORTREVISION= 1 +DISTVERSION= 5.0.1 CATEGORIES= dns MASTER_SITES= https://secure.nic.cz/files/knot-resolver/ \ https://dns.company/downloads/knot-resolver/ @@ -12,22 +11,27 @@ MAINTAINER= freebsd@dns.company COMMENT= Caching full resolver implementation LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= bash:shells/bash \ - git:devel/git + cmocka>=1.1.1:sysutils/cmocka \ + flake8:devel/py-flake8@${PY_FLAVOR} \ + luacheck:devel/lua-luacheck + LIB_DEPENDS= libgnutls.so:security/gnutls \ libknot.so:dns/knot2-lib \ liblmdb.so:databases/lmdb \ - libluajit-5.1.so:lang/luajit \ + libluajit-5.1.so:lang/luajit-openresty \ libuv.so:devel/libuv -TEST_DEPENDS= cmocka>=1.1.1:sysutils/cmocka USES= compiler:c11 compiler:c++11-lang libedit libtool meson \ - ncurses ninja pkgconfig shebangfix tar:xz + ncurses ninja pkgconfig python shebangfix tar:xz USE_CXXSTD= c++11 USE_LDCONFIG= yes -LDFLAGS= -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib +SUB_FILES= pkg-message + SHEBANG_FILES= scripts/bench.sh \ scripts/build-in-obs.sh \ scripts/coverage_c_combine.sh \ @@ -40,6 +44,7 @@ SHEBANG_FILES= scripts/bench.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 \ @@ -47,73 +52,70 @@ SHEBANG_FILES= scripts/bench.sh \ CONFLICTS= knot-1.* knot1-[0-6].* -MESON_ARGS= --default-library=static \ - --mandir=${MANPREFIX} \ +MESON_ARGS= --buildtype=release \ + --default-library=static \ --prefix=${LOCALBASE} \ - -Dsystemd=false -#MESON_ARGS+= --libdir=${PREFIX}/lib -#MESON_ARGS+= --pkg-config-path=${PREFIX}/libdata/pkgconfig -#MESON_ARGS+= lmdb_CFLAGS=-I${PREFIX}/include lmdb_LIBS=-llmdb + -Duser=${USERS} \ + -Dgroup=${GROUPS} \ + -Dinstall_kresd_conf=enabled \ + -Dclient=enabled \ + -Dutils=enabled \ + -Dinstall_root_keys=enabled \ + -Dkeyfile_default=${ETCDIR}/root.keys \ + -Dmanaged_ta=enabled \ + -Droot_hints=${ETCDIR}/root.hints \ + -Dunit_tests=enabled -OPTIONS_DEFINE= DOCS DNSTAP DOXYGEN GO TRUSTANCHOR -OPTIONS_DEFAULT= DOCS DNSTAP DOXYGEN GO +# --libdir=${PREFIX}/lib +# --pkg-config-path=${PREFIX}/libdata/pkgconfig +# lmdb_CFLAGS=-I${PREFIX}/include lmdb_LIBS=-llmdb +# -Dlmdb_CFLAGS=-I${PREFIX}/include \ # doesn't help +# -Dlmdb_LIBS=-llmdb # doesn't help +# -Dconfig_tests=enabled \ # complains about missing cqueues lua package +# -Dextra_tests=enabled \ # also requires -Dsendmmsg=disabled -# COOKIES will come return/reworked to reflect IETF dnsop group development -#COOKIES_DESC= cookies -#COOKIES_LIB_DEPENDS= libnettle.so:security/nettle -#COOKIES_MAKE_ARGS_ON= HAS_nettle=yes -#COOKIES_MAKE_ARGS_OFF= HAS_nettle=no -#COOKIES_PLIST_FILES= lib/kdns_modules/cookies.so \ -# include/libkres/alg_containers.h \ -# include/libkres/alg_sha.h \ -# include/libkres/control.h \ -# include/libkres/helper.h \ -# include/libkres/lru_cache.h \ -# include/libkres/nonce.h +OPTIONS_DEFINE= DOCS DNSTAP DOXYGEN TRUSTANCHOR +OPTIONS_DEFAULT= DOCS DNSTAP DOXYGEN +# docs/meson.build wants python2 or python3 - not -for example- python3.7 +# So this currently is partially broken: +#DOCS_MESON_ON= -Ddoc=enabled + DNSTAP_DESC= dnstap support DNSTAP_LIB_DEPENDS= libprotobuf.so:devel/protobuf \ libprotobuf-c.so:devel/protobuf-c \ libfstrm.so:devel/fstrm -#DNSTAP_MAKE_ARGS_ON= HAS_libprotobuf-c=yes HAS_libfstrm=yes -#DNSTAP_MAKE_ARGS_OFF= HAS_libprotobuf-c=no HAS_libfstrm=no DNSTAP_PLIST_FILES= lib/knot-resolver/kres_modules/dnstap.so +DNSTAP_MESON_ON= -Ddnstap=enabled +DNSTAP_MESON_OFF= -Ddnstap=disabled DOXYGEN_IMPLIES= DOCS -DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen -#DOXYGEN_MAKE_ARGS_ON= HAS_doxygen=yes -#DOXYGEN_MAKE_ARGS_OFF= HAS_doxygen=no +DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ + ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} -GO_DESC= go -GO_USES= go:no_targets -#GO_MAKE_ARGS_ON= HAS_go=yes -#GO_MAKE_ARGS_OFF= HAS_go=no - TRUSTANCHOR_DESC= Trust anchor bootstrapping and stats TRUSTANCHOR_USES= lua -#TRUSTANCHOR_MAKE_ARGS_ON= HAS_ltn12=yes HAS_ssl.https=yes -#TRUSTANCHOR_MAKE_ARGS_OFF= HAS_ltn12=no HAS_ssl.https=no TRUSTANCHOR_BUILD_DEPENDS= ${LUA_PKGNAMEPREFIX}luasocket>=0:net/luasocket \ ${LUA_PKGNAMEPREFIX}luasec>=0:security/luasec .include <bsd.port.options.mk> USERS= kresd -GROUPS= kresd +GROUPS= ${USERS} -PORTDOCS= AUTHORS COPYING CodingStyle README.md +PORTDOCS= AUTHORS COPYING CodingStyle NEWS README.md -# check below list. -# libkres shouldn't have versioning anymore... -STRIP_TARGETS= sbin/kresd \ - sbin/kresc \ - lib/libkres.so.7 \ - lib/kdns_modules/ahocorasick.so \ - lib/kdns_modules/bogus_log.so \ - lib/kdns_modules/cookies.so \ - lib/kdns_modules/dnstap.so \ - lib/kdns_modules/hints.so \ - lib/kdns_modules/stats.so +STRIP_TARGETS= sbin/kresd \ + sbin/kresc \ + 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-TEST-on: do-test Modified: head/dns/knot-resolver/distinfo ============================================================================== --- head/dns/knot-resolver/distinfo Sat Feb 15 18:17:30 2020 (r526234) +++ head/dns/knot-resolver/distinfo Sat Feb 15 18:19:15 2020 (r526235) @@ -1,3 +1,3 @@ -TIMESTAMP = 1575403719 -SHA256 (knot-resolver-4.2.2.tar.xz) = 03b68dff16429aed7a5b0cea7189276c8056e8ecd567b678c2595d48d9a51458 -SIZE (knot-resolver-4.2.2.tar.xz) = 1680220 +TIMESTAMP = 1581020689 +SHA256 (knot-resolver-5.0.1.tar.xz) = 4a93264ad0cda7ea2252d1ba057e474722f77848165f2893e0c76e21ae406415 +SIZE (knot-resolver-5.0.1.tar.xz) = 1725780 Modified: head/dns/knot-resolver/files/pkg-message.in ============================================================================== --- head/dns/knot-resolver/files/pkg-message.in Sat Feb 15 18:17:30 2020 (r526234) +++ head/dns/knot-resolver/files/pkg-message.in Sat Feb 15 18:19:15 2020 (r526235) @@ -1,6 +1,7 @@ [ { type: install message: <<EOM + Please consult the documentation: - man kresd - https://knot-resolver.readthedocs.io/ Modified: head/dns/knot-resolver/pkg-plist ============================================================================== --- head/dns/knot-resolver/pkg-plist Sat Feb 15 18:17:30 2020 (r526234) +++ head/dns/knot-resolver/pkg-plist Sat Feb 15 18:19:15 2020 (r526235) @@ -27,7 +27,8 @@ include/libkres/trie.h include/libkres/utils.h include/libkres/zonecut.h lib/knot-resolver/ahocorasick.so -lib/knot-resolver/config.lua +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 @@ -79,19 +80,23 @@ 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/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 -man8/kresd.8 +man/man8/kresd.8.gz sbin/kres-cache-gc sbin/kresc sbin/kresd -%%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/examples/config.cluster %%PORTDOCS%%%%DOCSDIR%%/examples/config.docker +%%PORTDOCS%%%%DOCSDIR%%/examples/config.internal %%PORTDOCS%%%%DOCSDIR%%/examples/config.isp %%PORTDOCS%%%%DOCSDIR%%/examples/config.personal +%%PORTDOCS%%%%DOCSDIR%%/examples/config.privacy %%PORTDOCS%%%%DOCSDIR%%/examples/config.splitview
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002151819.01FIJFoC051066>