Attachment 216123 Details for Bug 247699 – knot-resolver

[patch] knot-resolver

knot-resolver.diff.txt (text/plain), 13.10 KB, created by Leo Vandewoestijne on 2020-07-02 00:51:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Leo Vandewoestijne

Created: 2020-07-02 00:51:55 UTC

Size: 13.10 KB

patch

obsolete

>diff -ruN dns/knot-resolver.orig/Makefile dns/knot-resolver/Makefile
>--- dns/knot-resolver.orig/Makefile     2020-06-14 19:19:12.000000000 +0000
>+++ dns/knot-resolver/Makefile  2020-07-01 23:47:17.321375000 +0000
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/dns/knot-resolver/Makefile 538826 2020-06-14 19:19:12Z pi $
> 
> 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/
>@@ -13,25 +13,43 @@
> LICENSE=       GPLv3+
> LICENSE_FILE=  ${WRKSRC}/COPYING
> 
>+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-${LUA_VER}.so:lang/luajit-openresty \
>+               libuv.so:devel/libuv
>+
> 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 \
>-               liblmdb.so:databases/lmdb \
>-               libluajit-5.1.so:lang/luajit-openresty \
>-               libuv.so:devel/libuv
>+USES=          compiler:c11 compiler:c++11-lang libedit libtool lua:51 \
>+               meson ncurses ninja pkgconfig python:build shebangfix tar:xz
> 
>-USES=          compiler:c11 compiler:c++11-lang libedit libtool meson \
>-               ncurses ninja pkgconfig python shebangfix tar:xz
> USE_CXXSTD=    c++11
>+
> USE_LDCONFIG=  yes
> LDFLAGS+=      -L${LOCALBASE}/lib
> 
>+USE_RC_SUBR=   krescachegc kresd
>+
> SUB_FILES=     pkg-message
> 
>+KRESDUSER?=    kresd
>+KRESDGROUP?=   kresd
>+KRESDRUNDIR1=  /var/run/kresd
>+KRESDRUNDIR2=  /var/run/krescachegc
>+
>+USERS=         ${KRESDUSER}
>+GROUPS=                ${KRESDGROUP}
>+
>+PLIST_SUB=     KRESDUSER=${KRESDUSER} \
>+               KRESDGROUP=${KRESDGROUP} \
>+               KRESDRUNDIR1=${KRESDRUNDIR1} \
>+               KRESDRUNDIR2=${KRESDRUNDIR2}
>+
> SHEBANG_FILES= scripts/bench.sh \
>                scripts/build-in-obs.sh \
>                scripts/coverage_c_combine.sh \
>@@ -60,54 +78,57 @@
>                -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
>+               -Droot_hints=${ETCDIR}/root.hints
> 
>-#              --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 EXAMPLES DNSTAP ROOTKEYS TRUSTANCHOR TEST TESTUNIT TESTCONF TESTEXTRA
>+OPTIONS_DEFAULT=       DOCS EXAMPLES        ROOTKEYS TRUSTANCHOR TEST TESTUNIT
> 
>-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
>+DNSTAP_PLIST_FILES=            lib/knot-resolver/kres_modules/dnstap.so
> 
>-DOXYGEN_IMPLIES=               DOCS
>-DOXYGEN_BUILD_DEPENDS=         doxygen:devel/doxygen \
>-                               ${PY_SPHINX} \
>-                               ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
>+ROOTKEYS_DESC=                 install root.keys
>+ROOTKEYS_MESON_ON=             -Dinstall_root_keys=enabled
>+ROOTKEYS_MESON_OFF=            -Dinstall_root_keys=disabled
>+ROOTKEYS_PLIST_FILES=          ${ETCDIR}/root.keys
> 
>-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}
>+TEST_DESC=                     Do tests
> 
>-.include <bsd.port.options.mk>
>+TESTUNIT_DESC=                 Do unit tests
>+TESTUNIT_MESON_ON=             -Dunit_tests=enabled
>+TESTUNIT_MESON_OFF=            -Dunit_tests=disabled
>+TESTUNIT_BUILD_DEPENDS=                cmocka>=1.1.1:sysutils/cmocka
> 
>-USERS=         kresd
>-GROUPS=                ${USERS}
>+TESTCONF_DESC=                 Do config tests
>+TESTCONF_MESON_ON=             -Dconfig_tests=enabled
>+TESTCONF_MESON_OFF=            -Dconfig_tests=disabled
>+TESTCONF_BROKEN=               Lua cqueues package seems missing
> 
>+TESTEXTRA_DESC=                        Do extra tests
>+TESTEXTRA_MESON_ON=            -Dextra_tests=enabled \
>+                               -Dsendmmsg=disabled
>+TESTEXTRA_MESON_OFF=           -Dextra_tests=disabled
>+TESTEXTRA_USES=                        cmake
>+TESTEXTRA_BROKEN=              CMake Error: The source directory misses CMakeLists.txt
>+
>+TRUSTANCHOR_DESC=              Trust anchor bootstrapping, management and stats
>+TRUSTANCHOR_MESON_ON=          -Dmanaged_ta=enabled
>+TRUSTANCHOR_MESON_OFF=         -Dmanaged_ta=disabled
>+
>+.include <bsd.port.options.mk>
>+
> 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 \
>@@ -119,8 +140,12 @@
> 
> pre-install-TEST-on: do-test
> 
>+pre-install:
>+       ${MKDIR} ${STAGEDIR}${DOCSDIR}
>+       ${MKDIR} ${STAGEDIR}/var/run/krescachegc
>+       ${MKDIR} ${STAGEDIR}/var/run/kresd
>+
> 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 \
>diff -ruN dns/knot-resolver.orig/distinfo dns/knot-resolver/distinfo
>--- dns/knot-resolver.orig/distinfo     2020-06-14 19:19:12.000000000 +0000
>+++ dns/knot-resolver/distinfo  2020-07-01 23:24:46.337418000 +0000
>@@ -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 -ruN dns/knot-resolver.orig/files/krescachegc.in dns/knot-resolver/files/krescachegc.in
>--- dns/knot-resolver.orig/files/krescachegc.in 1970-01-01 00:00:00.000000000 +0000
>+++ dns/knot-resolver/files/krescachegc.in      2020-06-29 10:24:33.193848000 +0000
>@@ -0,0 +1,39 @@
>+#!/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.
>+# krescachegc_rundir="":       Set to /var/run/krescachegc by default.
>+#
>+
>+. /etc/rc.subr
>+
>+name=krescachegc
>+rcvar=krescachegc_enable
>+
>+load_rc_config ${name}
>+
>+# set defaults
>+
>+krescachegc_enable=${krescachegc_enable:-"NO"}
>+krescachegc_rundir=${krescachegc_rundir:-"/var/run/${name}"}
>+krescachegc_millis=${krescachegc_millis:-"1000"}
>+user=kresd
>+group=kresd
>+
>+pidfile="${krescachegc_rundir}/${name}.pid"
>+procname="%%PREFIX%%/sbin/kres-cache-gc"
>+
>+command=/usr/sbin/daemon
>+command_args="-c -f -r -P ${pidfile} -u ${user} -- ${procname} -c ${krescachegc_rundir} -d ${krescachegc_millis}"
>+
>+run_rc_command "$1"
>diff -ruN dns/knot-resolver.orig/files/kresd.in dns/knot-resolver/files/kresd.in
>--- dns/knot-resolver.orig/files/kresd.in       1970-01-01 00:00:00.000000000 +0000
>+++ dns/knot-resolver/files/kresd.in    2020-07-02 00:48:32.660913000 +0000
>@@ -0,0 +1,39 @@
>+#!/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.
>+# kresd_rundir="":     Set to /var/run/kresd 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"}
>+kresd_rundir=${kresd_rundir:-"/var/run/${name}"}
>+
>+pidfile="${kresd_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 ${kresd_rundir}"
>+
>+run_rc_command "$1"
>diff -ruN dns/knot-resolver.orig/files/patch-meson.build dns/knot-resolver/files/patch-meson.build
>--- dns/knot-resolver.orig/files/patch-meson.build      1970-01-01 00:00:00.000000000 +0000
>+++ dns/knot-resolver/files/patch-meson.build   2020-06-23 09:59:27.612966000 +0000
>@@ -0,0 +1,11 @@
>+--- meson.build.orig   2020-06-23 09:59:10 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')
>++examples_dir = join_paths(prefix, get_option('datadir'), '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 -ruN dns/knot-resolver.orig/files/pkg-message.in dns/knot-resolver/files/pkg-message.in
>--- dns/knot-resolver.orig/files/pkg-message.in 2020-02-15 18:19:15.000000000 +0000
>+++ dns/knot-resolver/files/pkg-message.in      2020-06-30 09:35:50.197366000 +0000
>@@ -6,11 +6,8 @@
>    - 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 -ruN dns/knot-resolver.orig/pkg-descr dns/knot-resolver/pkg-descr
>--- dns/knot-resolver.orig/pkg-descr    2016-09-04 18:56:53.000000000 +0000
>+++ dns/knot-resolver/pkg-descr 2020-06-23 10:03:09.120544000 +0000
>@@ -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 -ruN dns/knot-resolver.orig/pkg-plist dns/knot-resolver/pkg-plist
>--- dns/knot-resolver.orig/pkg-plist    2020-06-14 19:19:12.000000000 +0000
>+++ dns/knot-resolver/pkg-plist 2020-06-30 11:49:29.841714000 +0000
>@@ -1,7 +1,6 @@
>+@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
>@@ -91,10 +90,6 @@
> 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(%%KRESDUSER%%,%%KRESDGROUP%%,0755) %%ETCDIR%%
>+@dir(%%KRESDUSER%%,%%KRESDGROUP%%,0755) %%KRESDRUNDIR1%%
>+@dir(%%KRESDUSER%%,%%KRESDGROUP%%,0755) %%KRESDRUNDIR2%%

Flags:

freebsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 247699: 216121 | 216123 | 216141 | 216172 | 216182 | 216207