svn commit: r484473 - head/dns/knot-resolver

[Kurt Jaeger]

Author: pi
Date: Thu Nov  8 19:47:59 2018
New Revision: 484473
URL: https://svnweb.freebsd.org/changeset/ports/484473

Log:
  dns/knot-resolver: update 2.4.1 -> 3.1.0
  
  PR:		230842
  Submitted by:	Leo Vandewoestijne <freebsd at dns.company> (maintainer)
  Relnotes:	https://www.knot-resolver.cz/2018-08-20-knot-resolver-3.0.0.html
  		https://www.knot-resolver.cz/2018-11-02-knot-resolver-3.1.0.html

Modified:
  head/dns/knot-resolver/Makefile
  head/dns/knot-resolver/distinfo
  head/dns/knot-resolver/pkg-plist

Modified: head/dns/knot-resolver/Makefile
==============================================================================
--- head/dns/knot-resolver/Makefile	Thu Nov  8 19:37:51 2018	(r484472)
+++ head/dns/knot-resolver/Makefile	Thu Nov  8 19:47:59 2018	(r484473)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	knot-resolver
-DISTVERSION=	2.4.1
+DISTVERSION=	3.1.0
 CATEGORIES=	dns ipv6
 MASTER_SITES=	https://secure.nic.cz/files/knot-resolver/ \
 		https://dns.company/downloads/knot-resolver/
@@ -21,6 +21,11 @@ LIB_DEPENDS=	libgnutls.so:security/gnutls \
 		libuv.so:devel/libuv
 TEST_DEPENDS=	cmocka>=1.1.1:sysutils/cmocka
 
+USES=		gmake libedit libtool ncurses pkgconfig shebangfix tar:xz
+
+SHEBANG_FILES=	scripts/coverage_env.sh
+USE_LDCONFIG=	yes
+
 CONFLICTS=	knot-1.* knot1-[0-6].*
 
 MAKE_ARGS+=	PREFIX=${LOCALBASE}
@@ -29,24 +34,21 @@ 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 shebangfix tar:xz
-SHEBANG_FILES=	scripts/coverage_env.sh
-USE_LDCONFIG=	yes
+OPTIONS_DEFINE=	DOCS DNSTAP DOXYGEN GO TRUSTANCHOR
 
-OPTIONS_DEFINE=	DOCS COOKIES DNSTAP DOXYGEN GO TRUSTANCHOR
+# 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
 
-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 \
@@ -71,6 +73,13 @@ TRUSTANCHOR_MAKE_ARGS_ON=	HAS_ltn12=yes HAS_ssl.https=
 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>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1120000
+NOT_FOR_ARCHS=	i386
+NOT_FOR_ARCHS_REASON_i386=	libknot (installed by knot2) is broken on 11.2 at i386
+.endif
 
 USERS=		kresd
 GROUPS=		kresd

Modified: head/dns/knot-resolver/distinfo
==============================================================================
--- head/dns/knot-resolver/distinfo	Thu Nov  8 19:37:51 2018	(r484472)
+++ head/dns/knot-resolver/distinfo	Thu Nov  8 19:47:59 2018	(r484473)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534107905
-SHA256 (knot-resolver-2.4.1.tar.xz) = e8044316cd897ad29b3c5284de06652e1568c4d5861e3147ec2191fbacd8d9ff
-SIZE (knot-resolver-2.4.1.tar.xz) = 1564784
+TIMESTAMP = 1541518702
+SHA256 (knot-resolver-3.1.0.tar.xz) = 8f3deba4695784a666cde317bc6af80ecf42ce1047b01f4b9c582fdc021c7492
+SIZE (knot-resolver-3.1.0.tar.xz) = 1671480

Modified: head/dns/knot-resolver/pkg-plist
==============================================================================
--- head/dns/knot-resolver/pkg-plist	Thu Nov  8 19:37:51 2018	(r484472)
+++ head/dns/knot-resolver/pkg-plist	Thu Nov  8 19:47:59 2018	(r484473)
@@ -20,6 +20,7 @@ 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
@@ -72,12 +73,11 @@ 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.7
+lib/libkres.so.8
 libdata/pkgconfig/libkres.pc
 man/man8/kresd.8.gz
 sbin/kresc