Attachment #194872 for bug #229485




# $FreeBSD$

PORTNAME=	knot-resolver
DISTVERSION=	2.4.0
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 MEMCACHED REDIS TRUSTANCHOR

		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	\

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1529357112	1	TIMESTAMP = 1530684661
2	SHA256 (knot-resolver-2.3.0.tar.xz) = 2d19c5daf8440bd3d2acd1886b9ede65f04f7753c6fd4618a92a1a4ba3b27a9b	2	SHA256 (knot-resolver-2.4.0.tar.xz) = 8c88c73dd50dad6f371bfc170f49cd374022e59f8005ac1fa6cd99764f72b4d1
3	SIZE (knot-resolver-2.3.0.tar.xz) = 1522788	3	SIZE (knot-resolver-2.4.0.tar.xz) = 1560856




--- Makefile.orig	2018-07-02 17:45:52.000000000 +0200
+++ Makefile	2018-07-04 10:35:57.228161000 +0200
@@ -1,4 +1,4 @@
-SHELL=/bin/bash -o pipefail -o errexit
+SHELL=/usr/local/bin/bash -o pipefail -o errexit
 
 include config.mk
 include platform.mk
@@ -32,8 +32,8 @@
 $(eval $(call find_bin,doxygen))
 $(eval $(call find_bin,sphinx-build))
 $(eval $(call find_pythonpkg,breathe))
-#$(eval $(call find_lib,libmemcached,1.0))
-#$(eval $(call find_lib,hiredis,,yes))
+$(eval $(call find_lib,libmemcached,1.0))
+$(eval $(call find_lib,hiredis,,yes))
 $(eval $(call find_lib,socket_wrapper))
 $(eval $(call find_lib,libsystemd,227))
 $(eval $(call find_lib,gnutls))
@@ -118,8 +118,8 @@
 	$(info [$(HAS_sphinx-build)] sphinx-build (doc))
 	$(info [$(HAS_breathe)] python-breathe (doc))
 	$(info [$(HAS_go)] go (modules/go, Go buildmode=c-shared support))
-#	$(info [$(HAS_libmemcached)] libmemcached (modules/memcached))
-#	$(info [$(HAS_hiredis)] hiredis (modules/redis))
+	$(info [$(HAS_libmemcached)] libmemcached (modules/memcached))
+	$(info [$(HAS_hiredis)] hiredis (modules/redis))
 	$(info [$(HAS_cmocka)] cmocka (tests/unit))
 	$(info [$(HAS_libsystemd)] systemd (daemon))
 	$(info [$(HAS_nettle)] nettle (modules/cookies))

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 (-3 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= knot-resolver	4	PORTNAME= knot-resolver
5	DISTVERSION= 2.3.0	5	DISTVERSION= 2.4.0
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-33 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 MEMCACHED REDIS TRUSTANCHOR
Lines 89-94 Link Here
89	sbin/kresc \	92	sbin/kresc \
90	lib/libkres.so.7 \	93	lib/libkres.so.7 \
91	lib/kdns_modules/ahocorasick.so \	94	lib/kdns_modules/ahocorasick.so \
		95	lib/kdns_modules/bogus_log.so \
92	lib/kdns_modules/cookies.so \	96	lib/kdns_modules/cookies.so \
93	lib/kdns_modules/dnstap.so \	97	lib/kdns_modules/dnstap.so \
94	lib/kdns_modules/hints.so \	98	lib/kdns_modules/hints.so \

Line 0 Link Here

(-)files/patch-Makefile (+30 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
	9	@@ -32,8 +32,8 @@
	10	$(eval $(call find_bin,doxygen))
	11	$(eval $(call find_bin,sphinx-build))
	12	$(eval $(call find_pythonpkg,breathe))
	13	-#$(eval $(call find_lib,libmemcached,1.0))
	14	-#$(eval $(call find_lib,hiredis,,yes))
	15	+$(eval $(call find_lib,libmemcached,1.0))
	16	+$(eval $(call find_lib,hiredis,,yes))
	17	$(eval $(call find_lib,socket_wrapper))
	18	$(eval $(call find_lib,libsystemd,227))
	19	$(eval $(call find_lib,gnutls))
	20	@@ -118,8 +118,8 @@
	21	$(info [$(HAS_sphinx-build)] sphinx-build (doc))
	22	$(info [$(HAS_breathe)] python-breathe (doc))
	23	$(info [$(HAS_go)] go (modules/go, Go buildmode=c-shared support))
	24	-# $(info [$(HAS_libmemcached)] libmemcached (modules/memcached))
	25	-# $(info [$(HAS_hiredis)] hiredis (modules/redis))
	26	+ $(info [$(HAS_libmemcached)] libmemcached (modules/memcached))
	27	+ $(info [$(HAS_hiredis)] hiredis (modules/redis))
	28	$(info [$(HAS_cmocka)] cmocka (tests/unit))
	29	$(info [$(HAS_libsystemd)] systemd (daemon))
	30	$(info [$(HAS_nettle)] nettle (modules/cookies))