Attachment #196151 for bug #229485




# $FreeBSD$

PORTNAME=	knot-resolver
DISTVERSION=	2.4.1
PORTREVISION=	2
CATEGORIES=	dns ipv6
MASTER_SITES=	https://secure.nic.cz/files/knot-resolver/ \
		https://dns.company/downloads/knot-resolver/


LICENSE=	GPLv3

BUILD_DEPENDS=	bash:shells/bash \
		git:devel/git
LIB_DEPENDS=	libgnutls.so:security/gnutls \
		libknot.so:dns/knot2 \
		liblmdb.so:databases/lmdb \
		libluajit-5.1.so:lang/luajit \
		libuv.so:devel/libuv
TEST_DEPENDS=	cmocka>=1.1.1:sysutils/cmocka

CONFLICTS=	knot-1.* knot1-[0-6].*


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=	COOKIES DNSTAP DOXYGEN GO TRUSTANCHOR

COOKIES_DESC=			cookies
COOKIES_LIB_DEPENDS=		libnettle.so:security/nettle

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

		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/kmemcached.so	\
		lib/kdns_modules/stats.so

post-install:

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1529357112	1	TIMESTAMP = 1534107905
2	SHA256 (knot-resolver-2.3.0.tar.xz) = 2d19c5daf8440bd3d2acd1886b9ede65f04f7753c6fd4618a92a1a4ba3b27a9b	2	SHA256 (knot-resolver-2.4.1.tar.xz) = e8044316cd897ad29b3c5284de06652e1568c4d5861e3147ec2191fbacd8d9ff
3	SIZE (knot-resolver-2.3.0.tar.xz) = 1522788	3	SIZE (knot-resolver-2.4.1.tar.xz) = 1564784

Line 0 Link Here

(-)files/patch-Makefile (+8 lines)
	1	--- Makefile.orig 2018-07-02 17:45:52.000000000 +0200
	2	+++ Makefile 2018-07-04 10:35:57.228161000 +0200
	3	@@ -1,4 +1,4 @@
	4	-SHELL=/bin/bash -o pipefail -o errexit
	5	+SHELL=/usr/local/bin/bash -o pipefail -o errexit
	6
	7	include config.mk
	8	include platform.mk

Lines 28-33 Link Here

(-)pkg-plist (+2 lines)
28	include/libkres/utils.h	28	include/libkres/utils.h
29	include/libkres/zonecut.h	29	include/libkres/zonecut.h
30	lib/kdns_modules/ahocorasick.so	30	lib/kdns_modules/ahocorasick.so
		31	lib/kdns_modules/bogus_log.so
31	lib/kdns_modules/daf.lua	32	lib/kdns_modules/daf.lua
32	lib/kdns_modules/daf/daf.js	33	lib/kdns_modules/daf/daf.js
33	lib/kdns_modules/detect_time_jump.lua	34	lib/kdns_modules/detect_time_jump.lua
Lines 64-69 Link Here
64	lib/kdns_modules/prefill.lua	65	lib/kdns_modules/prefill.lua
65	lib/kdns_modules/priming.lua	66	lib/kdns_modules/priming.lua
66	lib/kdns_modules/prometheus.lua	67	lib/kdns_modules/prometheus.lua
		68	lib/kdns_modules/rebinding.lua
67	lib/kdns_modules/renumber.lua	69	lib/kdns_modules/renumber.lua
68	lib/kdns_modules/serve_stale.lua	70	lib/kdns_modules/serve_stale.lua
69	lib/kdns_modules/stats.so	71	lib/kdns_modules/stats.so

Return to bug 229485

Lines 2-9 Link Here

(-)Makefile (-17 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= knot-resolver	4	PORTNAME= knot-resolver
5	DISTVERSION= 2.3.0	5	DISTVERSION= 2.4.1
6	PORTREVISION= 2
7	CATEGORIES= dns ipv6	6	CATEGORIES= dns ipv6
8	MASTER_SITES= https://secure.nic.cz/files/knot-resolver/ \	7	MASTER_SITES= https://secure.nic.cz/files/knot-resolver/ \
9	https://dns.company/downloads/knot-resolver/	8	https://dns.company/downloads/knot-resolver/
Lines 13-23 Link Here
13		12
14	LICENSE= GPLv3	13	LICENSE= GPLv3
15		14
		15	BUILD_DEPENDS= bash:shells/bash \
		16	git:devel/git
16	LIB_DEPENDS= libgnutls.so:security/gnutls \	17	LIB_DEPENDS= libgnutls.so:security/gnutls \
17	libknot.so:dns/knot2 \	18	libknot.so:dns/knot2 \
18	liblmdb.so:databases/lmdb \	19	liblmdb.so:databases/lmdb \
19	libluajit-5.1.so:lang/luajit \	20	libluajit-5.1.so:lang/luajit \
20	libuv.so:devel/libuv	21	libuv.so:devel/libuv
		22	TEST_DEPENDS= cmocka>=1.1.1:sysutils/cmocka
21		23
22	CONFLICTS= knot-1.* knot1-[0-6].*	24	CONFLICTS= knot-1.* knot1-[0-6].*
23		25
Lines 27-36 Link Here
27	MAKE_ARGS+= PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig	29	MAKE_ARGS+= PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig
28	MAKE_ARGS+= lmdb_CFLAGS=-I${PREFIX}/include lmdb_LIBS=-llmdb	30	MAKE_ARGS+= lmdb_CFLAGS=-I${PREFIX}/include lmdb_LIBS=-llmdb
29		31
30	USES= gmake libedit libtool ncurses pkgconfig tar:xz	32	USES= gmake libedit libtool ncurses pkgconfig shebangfix tar:xz
		33	SHEBANG_FILES= scripts/coverage_env.sh
31	USE_LDCONFIG= yes	34	USE_LDCONFIG= yes
32		35
33	OPTIONS_DEFINE= COOKIES DNSTAP DOXYGEN GO MEMCACHED REDIS TRUSTANCHOR	36	OPTIONS_DEFINE= COOKIES DNSTAP DOXYGEN GO TRUSTANCHOR
34		37
35	COOKIES_DESC= cookies	38	COOKIES_DESC= cookies
36	COOKIES_LIB_DEPENDS= libnettle.so:security/nettle	39	COOKIES_LIB_DEPENDS= libnettle.so:security/nettle
Lines 61-78 Link Here
61	GO_MAKE_ARGS_ON= HAS_go=yes	64	GO_MAKE_ARGS_ON= HAS_go=yes
62	GO_MAKE_ARGS_OFF= HAS_go=no	65	GO_MAKE_ARGS_OFF= HAS_go=no
63		66
64	MEMCACHED_DESC= memcached in-memory data-backend
65	MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached
66	MEMCACHED_MAKE_ARGS_ON= HAS_libmemcached=yes
67	MEMCACHED_MAKE_ARGS_OFF= HAS_libmemcached=no
68	MEMCACHED_PLIST_FILES= lib/kdns_modules/memcached.so
69
70	REDIS_DESC= redis in-memory data-backend
71	REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis
72	REDIS_MAKE_ARGS_ON= HAS_hiredis=yes
73	REDIS_MAKE_ARGS_OFF= HAS_hiredis=no
74	REDIS_PLIST_FILES= lib/kdns_modules/redis.so
75
76	TRUSTANCHOR_DESC= Trust anchor bootstrapping and stats	67	TRUSTANCHOR_DESC= Trust anchor bootstrapping and stats
77	TRUSTANCHOR_USES= lua	68	TRUSTANCHOR_USES= lua
78	TRUSTANCHOR_MAKE_ARGS_ON= HAS_ltn12=yes HAS_ssl.https=yes	69	TRUSTANCHOR_MAKE_ARGS_ON= HAS_ltn12=yes HAS_ssl.https=yes
Lines 89-98 Link Here
89	sbin/kresc \	80	sbin/kresc \
90	lib/libkres.so.7 \	81	lib/libkres.so.7 \
91	lib/kdns_modules/ahocorasick.so \	82	lib/kdns_modules/ahocorasick.so \
		83	lib/kdns_modules/bogus_log.so \
92	lib/kdns_modules/cookies.so \	84	lib/kdns_modules/cookies.so \
93	lib/kdns_modules/dnstap.so \	85	lib/kdns_modules/dnstap.so \
94	lib/kdns_modules/hints.so \	86	lib/kdns_modules/hints.so \
95	lib/kdns_modules/kmemcached.so \
96	lib/kdns_modules/stats.so	87	lib/kdns_modules/stats.so
97		88
98	post-install:	89	post-install: