FreeBSD Bugzilla – Attachment 216207 Details for
Bug 247699
dns/knot-resolver: Update to 5.1.2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
updated patch
knot-resolver.patch (text/plain), 16.03 KB, created by
Andrew "RhodiumToad" Gierth
on 2020-07-04 22:37:54 UTC
(
hide
)
Description:
updated patch
Filename:
MIME Type:
Creator:
Andrew "RhodiumToad" Gierth
Created:
2020-07-04 22:37:54 UTC
Size:
16.03 KB
patch
obsolete
>diff --git dns/knot-resolver/Makefile dns/knot-resolver/Makefile >index af56050982fa..242f85ba2ae9 100644 >--- dns/knot-resolver/Makefile >+++ dns/knot-resolver/Makefile >@@ -1,131 +1,158 @@ > # Created by: Leo Vandewoestijne <freebsd@dns.company> > # $FreeBSD$ > > PORTNAME= knot-resolver >-DISTVERSION= 5.1.1 >+DISTVERSION= 5.1.2 > 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 \ >- 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 \ >+ lua51-cqueues>=20200603_1:devel/lua-cqueues@lua51 \ >+ luacheck:devel/lua-luacheck \ >+ cmake:devel/cmake >+ >+LIB_DEPENDS= libknot.so:dns/knot2-lib \ >+ libdnssec.so:dns/knot2-lib \ >+ libzscanner.so:dns/knot2-lib \ >+ libgnutls.so:security/gnutls \ > liblmdb.so:databases/lmdb \ > libluajit-5.1.so:lang/luajit-openresty \ > libuv.so:devel/libuv > >-USES= compiler:c11 compiler:c++11-lang libedit libtool meson \ >- ncurses ninja pkgconfig python shebangfix tar:xz >+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 >+ > USE_CXXSTD= c++11 >-USE_LDCONFIG= yes >-LDFLAGS+= -L${LOCALBASE}/lib > >-SUB_FILES= pkg-message >+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 > >-CONFLICTS= knot-1.* knot1-[0-6].* >- > 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 \ >- -Dinstall_root_keys=enabled \ > -Dkeyfile_default=${ETCDIR}/root.keys \ >- -Dmanaged_ta=enabled \ >- -Droot_hints=${ETCDIR}/root.hints \ >- -Dunit_tests=enabled >- >-# --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 >- >-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_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 \ >- ${PY_SPHINX} \ >- ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} >- >-TRUSTANCHOR_DESC= Trust anchor bootstrapping and stats >-TRUSTANCHOR_USES= lua >-TRUSTANCHOR_BUILD_DEPENDS= ${LUA_PKGNAMEPREFIX}luasocket>=0:net/luasocket@${LUA_FLAVOR} \ >- ${LUA_PKGNAMEPREFIX}luasec>=0:security/luasec@${LUA_FLAVOR} >- >-.include <bsd.port.options.mk> >+ -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= ${USERS} >+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 >+ >+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 \ >+ libprotobuf-c.so:devel/protobuf-c \ >+ libfstrm.so:devel/fstrm >+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_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 >+ >+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/kresd \ >+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: >- @${MKDIR} ${STAGEDIR}${DOCSDIR} > ${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}; \ >+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${STRIP_TGT}; \ > fi > .endfor > > .include <bsd.port.mk> >diff --git dns/knot-resolver/distinfo dns/knot-resolver/distinfo >index a1114acc37d3..5ed793ee8a69 100644 >--- dns/knot-resolver/distinfo >+++ dns/knot-resolver/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1589914626 >-SHA256 (knot-resolver-5.1.1.tar.xz) = f72214046df8aae2b1a5c6d1ad0bc8b166aa060df5b008f6e88b4f6ba79cbf4e >-SIZE (knot-resolver-5.1.1.tar.xz) = 1744544 >+TIMESTAMP = 1593645886 >+SHA256 (knot-resolver-5.1.2.tar.xz) = caa4f941caf39080184554fb1310f383eba4b30d9c4c2215670d6b0a2de8f836 >+SIZE (knot-resolver-5.1.2.tar.xz) = 1749236 >diff --git dns/knot-resolver/files/krescachegc.in dns/knot-resolver/files/krescachegc.in >new file mode 100644 >index 000000000000..435303b24203 >--- /dev/null >+++ dns/knot-resolver/files/krescachegc.in >@@ -0,0 +1,35 @@ >+#!/bin/sh >+# >+# $FreeBSD$ >+# >+# PROVIDE: krescachegc >+# REQUIRE: SERVERS cleanvar >+# KEYWORD: shutdown >+# >+# Add the following lines to /etc/rc.conf to enable knot-resolver: >+# >+# krescachegc_enable="YES": Set to YES to enable krescachegc. >+# Set to NO by default. >+# krescachegc_millis="1000": Set to garbage collect interval in milliseconds >+# Set to 1000 by default. >+# >+ >+. /etc/rc.subr >+ >+name=krescachegc >+rcvar=krescachegc_enable >+ >+load_rc_config ${name} >+ >+# set defaults >+ >+krescachegc_enable=${krescachegc_enable:-"NO"} >+krescachegc_millis=${krescachegc_millis:-"1000"} >+ >+pidfile="%%RUNDIR%%/${name}.pid" >+procname="%%PREFIX%%/sbin/kres-cache-gc" >+ >+command=/usr/sbin/daemon >+command_args="-c -f -r -P ${pidfile} -u %%USERS%% -- ${procname} -c %%RUNDIR%% -d ${krescachegc_millis}" >+ >+run_rc_command "$1" >diff --git dns/knot-resolver/files/kresd.in dns/knot-resolver/files/kresd.in >new file mode 100644 >index 000000000000..a9564262a366 >--- /dev/null >+++ dns/knot-resolver/files/kresd.in >@@ -0,0 +1,37 @@ >+#!/bin/sh >+# >+# $FreeBSD$ >+# >+# PROVIDE: kresd >+# REQUIRE: NETWORKING >+# BEFORE: SERVERS >+# KEYWORD: shutdown >+# >+# Add the following lines to /etc/rc.conf to enable knot-resolver: >+# >+# kresd_enable="YES": Set to YES to enable kresd. >+# Set to NO by default. >+# kresd_config="": Set to %%ETCDIR%%/kresd.conf >+# by default. >+# >+ >+. /etc/rc.subr >+ >+name=kresd >+rcvar=kresd_enable >+ >+load_rc_config ${name} >+ >+# set defaults >+ >+kresd_enable=${kresd_enable:-"NO"} >+kresd_config=${kresd_config:-"%%ETCDIR%%/${name}.conf"} >+ >+pidfile="%%RUNDIR%%/${name}.pid" >+procname="%%PREFIX%%/sbin/${name}" >+required_files="${kresd_config}" >+ >+command="/usr/sbin/daemon" >+command_args="-c -f -S -r -P ${pidfile} -- ${procname} -c ${kresd_config} -n -q %%RUNDIR%%" >+ >+run_rc_command "$1" >diff --git dns/knot-resolver/files/patch-etc_meson.build dns/knot-resolver/files/patch-etc_meson.build >new file mode 100644 >index 000000000000..53b8b42ae54b >--- /dev/null >+++ dns/knot-resolver/files/patch-etc_meson.build >@@ -0,0 +1,14 @@ >+--- etc/meson.build.orig 2020-07-03 22:08:58.026241000 +0200 >++++ etc/meson.build 2020-07-03 22:09:08.794204000 +0200 >+@@ -7,9 +7,9 @@ >+ etc_files += 'root.hints' >+ endif >+ >+-if managed_ta >++#if managed_ta >+ etc_files += 'icann-ca.pem' >+-endif >++#endif >+ >+ if install_root_keys >+ root_keys_path = keyfile_default.split('/') >diff --git dns/knot-resolver/files/patch-meson.build dns/knot-resolver/files/patch-meson.build >new file mode 100644 >index 000000000000..6c85ae3f04ad >--- /dev/null >+++ dns/knot-resolver/files/patch-meson.build >@@ -0,0 +1,11 @@ >+--- meson.build.orig 2020-07-01 14:27:52.000000000 +0200 >++++ meson.build 2020-07-03 22:04:51.271036000 +0200 >+@@ -47,7 +47,7 @@ >+ 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') >++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') >diff --git dns/knot-resolver/files/pkg-message.in dns/knot-resolver/files/pkg-message.in >index ff7ba777af08..57a03bdd6e96 100644 >--- dns/knot-resolver/files/pkg-message.in >+++ dns/knot-resolver/files/pkg-message.in >@@ -1,16 +1,13 @@ > [ > { type: install > message: <<EOM > > Please consult the documentation: > - man kresd > - https://knot-resolver.readthedocs.io/ > >- To run as daemon see: >- - https://knot-resolver.readthedocs.io/en/latest/daemon.html >- > If upgrading: >- - https://knot-resolver.readthedocs.io/en/stable/upgrading.html >+ - https://knot-resolver.readthedocs.io/en/latest/upgrading.html > EOM > } > ] >diff --git dns/knot-resolver/pkg-descr dns/knot-resolver/pkg-descr >index 91459c3a424d..d37ace7a4ebf 100644 >--- dns/knot-resolver/pkg-descr >+++ dns/knot-resolver/pkg-descr >@@ -1,4 +1,10 @@ >-The Knot DNS Resolver is a caching full resolver implementation, >-including both a resolver library and a daemon. >+Knot Resolver is a caching DNS resolver scalable from huge resolver >+farms down to home network routers. >+Knot Resolver is a modern resolver implementation designed for >+scalability, resiliency, and flexibility. Its design is >+different from other resolvers: The core architecture is tiny and >+efficient, and most of the rich features are implemented as >+optional modules, which limits attack surface and improves >+performance. > > WWW: https://www.knot-resolver.cz/ >diff --git dns/knot-resolver/pkg-plist dns/knot-resolver/pkg-plist >index 19e21c1667a4..17b0717784db 100644 >--- dns/knot-resolver/pkg-plist >+++ dns/knot-resolver/pkg-plist >@@ -1,100 +1,94 @@ >+@sample %%ETCDIR%%/kresd.conf > %%ETCDIR%%/icann-ca.pem >-%%ETCDIR%%/kresd.conf > %%ETCDIR%%/root.hints >-%%ETCDIR%%/root.keys > 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/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/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 >-%%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 >+@dir(%%USERS%%,%%GROUPS%%,0755) %%ETCDIR%% >+@dir(%%USERS%%,%%GROUPS%%,0755) %%RUNDIR%%
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 247699
:
216121
|
216123
|
216141
|
216172
|
216182
| 216207