Index: branches/2018Q2/dns/knot-resolver/Makefile =================================================================== --- branches/2018Q2/dns/knot-resolver/Makefile (revision 472873) +++ branches/2018Q2/dns/knot-resolver/Makefile (revision 472874) @@ -1,106 +1,106 @@ # Created by: Leo Vandewoestijne # $FreeBSD$ PORTNAME= knot-resolver -DISTVERSION= 2.1.1 +DISTVERSION= 2.3.0 CATEGORIES= dns ipv6 MASTER_SITES= https://secure.nic.cz/files/knot-resolver/ \ https://dns.company/downloads/knot-resolver/ MAINTAINER= freebsd@dns-lab.com COMMENT= Caching full resolver implementation LICENSE= GPLv3 LIB_DEPENDS= libgnutls.so:security/gnutls \ libknot.so:dns/knot2 \ liblmdb.so:databases/lmdb \ libluajit-5.1.so:lang/luajit \ libuv.so:devel/libuv CONFLICTS= knot-1.* knot1-[0-6].* MAKE_ARGS+= PREFIX=${LOCALBASE} MAKE_ARGS+= LIBDIR=${PREFIX}/lib MAKE_ARGS+= MANDIR=${PREFIX}/man MAKE_ARGS+= PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig MAKE_ARGS+= lmdb_CFLAGS=-I${PREFIX}/include lmdb_LIBS=-llmdb USES= gmake libedit libtool ncurses pkgconfig tar:xz USE_LDCONFIG= yes OPTIONS_DEFINE= COOKIES DNSTAP DOXYGEN GO MEMCACHED REDIS TRUSTANCHOR 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 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/kdns_modules/dnstap.so DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen DOXYGEN_MAKE_ARGS_ON= HAS_doxygen=yes DOXYGEN_MAKE_ARGS_OFF= HAS_doxygen=no GO_DESC= go GO_BUILD_DEPENDS= go>=1.5:lang/go GO_MAKE_ARGS_ON= HAS_go=yes GO_MAKE_ARGS_OFF= HAS_go=no MEMCACHED_DESC= memcached in-memory data-backend MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached MEMCACHED_MAKE_ARGS_ON= HAS_libmemcached=yes MEMCACHED_MAKE_ARGS_OFF= HAS_libmemcached=no MEMCACHED_PLIST_FILES= lib/kdns_modules/memcached.so REDIS_DESC= redis in-memory data-backend REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis REDIS_MAKE_ARGS_ON= HAS_hiredis=yes REDIS_MAKE_ARGS_OFF= HAS_hiredis=no REDIS_PLIST_FILES= lib/kdns_modules/redis.so 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 USERS= kresd GROUPS= kresd PORTDOCS= AUTHORS COPYING CodingStyle README.md STRIP_TARGETS= sbin/kresd \ sbin/kresc \ - lib/libkres.so.6 \ + lib/libkres.so.7 \ lib/kdns_modules/ahocorasick.so \ lib/kdns_modules/cookies.so \ lib/kdns_modules/dnstap.so \ lib/kdns_modules/hints.so \ lib/kdns_modules/kmemcached.so \ lib/kdns_modules/stats.so 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}; \ fi .endfor .include Index: branches/2018Q2/dns/knot-resolver/distinfo =================================================================== --- branches/2018Q2/dns/knot-resolver/distinfo (revision 472873) +++ branches/2018Q2/dns/knot-resolver/distinfo (revision 472874) @@ -1,3 +1,3 @@ -TIMESTAMP = 1520372546 -SHA256 (knot-resolver-2.1.1.tar.xz) = 0b9caee03d7cd30e1dc8fa0ce5fafade31fc1785314986bbf77cad446522a1b3 -SIZE (knot-resolver-2.1.1.tar.xz) = 1490064 +TIMESTAMP = 1529357112 +SHA256 (knot-resolver-2.3.0.tar.xz) = 2d19c5daf8440bd3d2acd1886b9ede65f04f7753c6fd4618a92a1a4ba3b27a9b +SIZE (knot-resolver-2.3.0.tar.xz) = 1522788 Index: branches/2018Q2/dns/knot-resolver/files/patch-contrib_ucw_mempool-fmt.c =================================================================== --- branches/2018Q2/dns/knot-resolver/files/patch-contrib_ucw_mempool-fmt.c (revision 472873) +++ branches/2018Q2/dns/knot-resolver/files/patch-contrib_ucw_mempool-fmt.c (nonexistent) @@ -1,11 +0,0 @@ ---- contrib/ucw/mempool-fmt.c.orig 2018-03-06 23:36:10 UTC -+++ contrib/ucw/mempool-fmt.c -@@ -11,7 +11,7 @@ - #include - #include - --#include -+#include "alloc.h" - #include - #include - Property changes on: branches/2018Q2/dns/knot-resolver/files/patch-contrib_ucw_mempool-fmt.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2018Q2/dns/knot-resolver/pkg-plist =================================================================== --- branches/2018Q2/dns/knot-resolver/pkg-plist (revision 472873) +++ branches/2018Q2/dns/knot-resolver/pkg-plist (revision 472874) @@ -1,81 +1,82 @@ %%ETCDIR%%/config.cluster %%ETCDIR%%/config.isp %%ETCDIR%%/config.personal %%ETCDIR%%/config.splitview %%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/resolve.h include/libkres/rplan.h -include/libkres/set.h include/libkres/signature.h include/libkres/ta.h +include/libkres/trie.h include/libkres/utils.h include/libkres/zonecut.h lib/kdns_modules/ahocorasick.so lib/kdns_modules/daf.lua lib/kdns_modules/daf/daf.js lib/kdns_modules/detect_time_jump.lua lib/kdns_modules/detect_time_skew.lua lib/kdns_modules/dns64.lua lib/kdns_modules/etcd.lua lib/kdns_modules/graphite.lua lib/kdns_modules/hints.so lib/kdns_modules/http.lua lib/kdns_modules/http/LICENSE lib/kdns_modules/http/bootstrap-theme.min.css lib/kdns_modules/http/bootstrap.min.css lib/kdns_modules/http/bootstrap.min.js lib/kdns_modules/http/d3.js lib/kdns_modules/http/datamaps.world.min.js lib/kdns_modules/http/dygraph-combined.js lib/kdns_modules/http/epoch.css lib/kdns_modules/http/epoch.js lib/kdns_modules/http/favicon.ico lib/kdns_modules/http/glyphicons-halflings-regular.woff2 lib/kdns_modules/http/jquery.js lib/kdns_modules/http/kresd.css lib/kdns_modules/http/kresd.js lib/kdns_modules/http/main.tpl lib/kdns_modules/http/selectize.bootstrap3.min.css lib/kdns_modules/http/selectize.min.css lib/kdns_modules/http/selectize.min.js lib/kdns_modules/http/topojson.js lib/kdns_modules/http_trace.lua lib/kdns_modules/kres.lua lib/kdns_modules/kres-gen.lua lib/kdns_modules/policy.lua lib/kdns_modules/predict.lua +lib/kdns_modules/prefill.lua lib/kdns_modules/priming.lua lib/kdns_modules/prometheus.lua lib/kdns_modules/renumber.lua lib/kdns_modules/serve_stale.lua lib/kdns_modules/stats.so lib/kdns_modules/ta_sentinel.lua lib/kdns_modules/ta_signal_query.lua lib/kdns_modules/trust_anchors.lua lib/kdns_modules/version.lua lib/kdns_modules/view.lua lib/kdns_modules/workarounds.lua lib/kdns_modules/zonefile.lua lib/libkres.so -lib/libkres.so.6 +lib/libkres.so.7 libdata/pkgconfig/libkres.pc man/man8/kresd.8.gz sbin/kresc sbin/kresd Index: branches/2018Q2 =================================================================== --- branches/2018Q2 (revision 472873) +++ branches/2018Q2 (revision 472874) Property changes on: branches/2018Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r472842