Attachment #218449 for bug #250026




# Created by: Carlos J Puga Medina <cpm@fbsd.es>
# $FreeBSD$

PORTNAME=	dnsdist
DISTVERSION=	1.5.1
PORTREVISION=	1
CATEGORIES=	dns net
MASTER_SITES=	https://downloads.powerdns.com/releases/

MAINTAINER=	tremere@cainites.net
COMMENT=	Highly DNS-, DoS- and abuse-aware loadbalancer

LICENSE=	GPLv2 UNLICENSE
LICENSE_COMB=	multi
LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
LICENSE_FILE_UNLICENSE=	${WRKSRC}/ext/incbin/UNLICENSE

BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
		libh2o-evloop.so:www/h2o \
		libprotobuf.so:devel/protobuf \
		libre2.so:devel/re2 \
		libsodium.so:security/libsodium

USES=		bison:alias compiler:c++14-lang cpe gmake libedit libtool \
		localbase pkgconfig tar:bz2
USE_RC_SUBR=	dnsdist

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin \
		--enable-dns-over-https \
		--enable-dns-over-tls \
		--enable-dnscrypt \
		--sysconfdir=${ETCDIR} \
		--with-libsodium \
		--with-re2

INSTALL_TARGET=	install-strip

USERS=		_dnsdist
GROUPS=		_dnsdist

OPTIONS_DEFINE=		DNSTAP SNMP
OPTIONS_DEFAULT=	CDB GNUTLS LMDB LUA OPENSSL
OPTIONS_GROUP=		KSVOPT
OPTIONS_GROUP_KSVOPT=	CDB LMDB
OPTIONS_MULTI=		TLS
OPTIONS_MULTI_TLS=	GNUTLS OPENSSL
OPTIONS_SINGLE=		EXTLUA
OPTIONS_SINGLE_EXTLUA=	LUA LUAJIT LUAJITOR

CDB_DESC=	CDB backend
DNSTAP_DESC=	dnstap support (see dnstap.info)
KSVOPT_DESC=	Key Value Stores
LMDB_DESC=	LMDB backend
LUAJITOR_DESC=	Use lang/luajit-openresty
LUAJIT_DESC=	Use lang/luajit
LUA_DESC=	Use lang/lua

CDB_LIB_DEPENDS=	libcdb.so:databases/tinycdb
CDB_CONFIGURE_ON=	CDB_CFLAGS="-I${LOCALBASE}/include" \
			CDB_LIBS="-L${LOCALBASE}/lib -lcdb"

DNSTAP_LIB_DEPENDS=		libfstrm.so:devel/fstrm
DNSTAP_CONFIGURE_ENABLE=	fstrm

GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
GNUTLS_CONFIGURE_ENABLE=	gnutls

LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
LMDB_CONFIGURE_ON=	--with-lmdb=${LOCALBASE}
LMDB_CONFIGURE_OFF=	--without-lmdb

LUAJITOR_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
LUAJITOR_CONFIGURE_ON=	--with-lua=luajit

LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
LUAJIT_CONFIGURE_ON=	--with-lua=luajit

LUA_USES=		lua
LUA_CONFIGURE_ON=	--with-lua=lua-${LUA_VER}

OPENSSL_USES=		ssl
OPENSSL_CONFIGURE_ON=	LIBSSL_CFLAGS=-I${OPENSSLINC} \
			LIBSSL_LIBS="-L${OPENSSLLIB} -lssl"
OPENSSL_CONFIGURE_WITH=	libssl

SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
SNMP_CONFIGURE_WITH=	net-snmp

post-install:
	@${MKDIR} ${STAGEDIR}${ETCDIR}
	${INSTALL_DATA} ${FILESDIR}/dnsdist.conf.sample ${STAGEDIR}${ETCDIR}

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/dns/dnsdist/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1596123185	1	TIMESTAMP = 1601556422
2	SHA256 (dnsdist-1.5.0.tar.bz2) = 2c07c4ef0c497f5223909ff181fe3ba7c6016962a2855cffe26b7f3609f27b58	2	SHA256 (dnsdist-1.5.1.tar.bz2) = cae759729a87703f4d09b0ed4227cb224aaaa252fa92f2432fd7116f560afbf1
3	SIZE (dnsdist-1.5.0.tar.bz2) = 1067645	3	SIZE (dnsdist-1.5.1.tar.bz2) = 1068061




Backport of:
	https://github.com/PowerDNS/pdns/commit/e7c6996eb650d17372548899408160bb2d712511

--- dnsdist-console.cc.orig	2020-08-28 19:39:07 UTC
+++ dnsdist-console.cc
@@ -526,7 +526,7 @@ const std::vector<ConsoleKeyword> g_consoleKeywords{
   { "setMaxTCPQueriesPerConnection", true, "n", "set the maximum number of queries in an incoming TCP connection. 0 means unlimited" },
   { "setMaxTCPQueuedConnections", true, "n", "set the maximum number of TCP connections queued (waiting to be picked up by a client thread)" },
   { "setMaxUDPOutstanding", true, "n", "set the maximum number of outstanding UDP queries to a given backend server. This can only be set at configuration time and defaults to 65535" },
-  { "SetNegativeAndSOAAction", "true", "nxd, zone, ttl, mname, rname, serial, refresh, retry, expire, minimum [, options]", "Turn a query into a NXDomain or NoData answer and sets a SOA record in the additional section" },
+  { "SetNegativeAndSOAAction", true, "nxd, zone, ttl, mname, rname, serial, refresh, retry, expire, minimum [, options]", "Turn a query into a NXDomain or NoData answer and sets a SOA record in the additional section" },
   { "setPayloadSizeOnSelfGeneratedAnswers", true, "payloadSize", "set the UDP payload size advertised via EDNS on self-generated responses" },
   { "setPoolServerPolicy", true, "policy, pool", "set the server selection policy for this pool to that policy" },
   { "setPoolServerPolicyLua", true, "name, func, pool", "set the server selection policy for this pool to one named 'name' and provided by 'function'" },

Return to bug 250026

Lines 1-95 Link Here

(-)b/dns/dnsdist/Makefile (-2 / +1 lines)
1	# Created by: Carlos J Puga Medina <cpm@fbsd.es>	1	# Created by: Carlos J Puga Medina <cpm@fbsd.es>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= dnsdist	4	PORTNAME= dnsdist
5	DISTVERSION= 1.5.0	5	DISTVERSION= 1.5.1
6	PORTREVISION= 1
7	CATEGORIES= dns net	6	CATEGORIES= dns net
8	MASTER_SITES= https://downloads.powerdns.com/releases/	7	MASTER_SITES= https://downloads.powerdns.com/releases/
9		8
10	MAINTAINER= tremere@cainites.net	9	MAINTAINER= tremere@cainites.net
11	COMMENT= Highly DNS-, DoS- and abuse-aware loadbalancer	10	COMMENT= Highly DNS-, DoS- and abuse-aware loadbalancer
12		11
13	LICENSE= GPLv2 UNLICENSE	12	LICENSE= GPLv2 UNLICENSE
14	LICENSE_COMB= multi	13	LICENSE_COMB= multi
15	LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING	14	LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
16	LICENSE_FILE_UNLICENSE= ${WRKSRC}/ext/incbin/UNLICENSE	15	LICENSE_FILE_UNLICENSE= ${WRKSRC}/ext/incbin/UNLICENSE
17		16
18	BUILD_DEPENDS= ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops	17	BUILD_DEPENDS= ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
19	LIB_DEPENDS= libboost_serialization.so:devel/boost-libs \	18	LIB_DEPENDS= libboost_serialization.so:devel/boost-libs \
20	libh2o-evloop.so:www/h2o \	19	libh2o-evloop.so:www/h2o \
21	libprotobuf.so:devel/protobuf \	20	libprotobuf.so:devel/protobuf \
22	libre2.so:devel/re2 \	21	libre2.so:devel/re2 \
23	libsodium.so:security/libsodium	22	libsodium.so:security/libsodium
24		23
25	USES= bison:alias compiler:c++14-lang cpe gmake libedit libtool \	24	USES= bison:alias compiler:c++14-lang cpe gmake libedit libtool \
26	localbase pkgconfig tar:bz2	25	localbase pkgconfig tar:bz2
27	USE_RC_SUBR= dnsdist	26	USE_RC_SUBR= dnsdist
28		27
29	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
30	CONFIGURE_ARGS= --bindir=${PREFIX}/sbin \	29	CONFIGURE_ARGS= --bindir=${PREFIX}/sbin \
31	--enable-dns-over-https \	30	--enable-dns-over-https \
32	--enable-dns-over-tls \	31	--enable-dns-over-tls \
33	--enable-dnscrypt \	32	--enable-dnscrypt \
34	--sysconfdir=${ETCDIR} \	33	--sysconfdir=${ETCDIR} \
35	--with-libsodium \	34	--with-libsodium \
36	--with-re2	35	--with-re2
37		36
38	INSTALL_TARGET= install-strip	37	INSTALL_TARGET= install-strip
39		38
40	USERS= _dnsdist	39	USERS= _dnsdist
41	GROUPS= _dnsdist	40	GROUPS= _dnsdist
42		41
43	OPTIONS_DEFINE= DNSTAP SNMP	42	OPTIONS_DEFINE= DNSTAP SNMP
44	OPTIONS_DEFAULT= CDB GNUTLS LMDB LUA OPENSSL	43	OPTIONS_DEFAULT= CDB GNUTLS LMDB LUA OPENSSL
45	OPTIONS_GROUP= KSVOPT	44	OPTIONS_GROUP= KSVOPT
46	OPTIONS_GROUP_KSVOPT= CDB LMDB	45	OPTIONS_GROUP_KSVOPT= CDB LMDB
47	OPTIONS_MULTI= TLS	46	OPTIONS_MULTI= TLS
48	OPTIONS_MULTI_TLS= GNUTLS OPENSSL	47	OPTIONS_MULTI_TLS= GNUTLS OPENSSL
49	OPTIONS_SINGLE= EXTLUA	48	OPTIONS_SINGLE= EXTLUA
50	OPTIONS_SINGLE_EXTLUA= LUA LUAJIT LUAJITOR	49	OPTIONS_SINGLE_EXTLUA= LUA LUAJIT LUAJITOR
51		50
52	CDB_DESC= CDB backend	51	CDB_DESC= CDB backend
53	DNSTAP_DESC= dnstap support (see dnstap.info)	52	DNSTAP_DESC= dnstap support (see dnstap.info)
54	KSVOPT_DESC= Key Value Stores	53	KSVOPT_DESC= Key Value Stores
55	LMDB_DESC= LMDB backend	54	LMDB_DESC= LMDB backend
56	LUAJITOR_DESC= Use lang/luajit-openresty	55	LUAJITOR_DESC= Use lang/luajit-openresty
57	LUAJIT_DESC= Use lang/luajit	56	LUAJIT_DESC= Use lang/luajit
58	LUA_DESC= Use lang/lua	57	LUA_DESC= Use lang/lua
59		58
60	CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb	59	CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb
61	CDB_CONFIGURE_ON= CDB_CFLAGS="-I${LOCALBASE}/include" \	60	CDB_CONFIGURE_ON= CDB_CFLAGS="-I${LOCALBASE}/include" \
62	CDB_LIBS="-L${LOCALBASE}/lib -lcdb"	61	CDB_LIBS="-L${LOCALBASE}/lib -lcdb"
63		62
64	DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm	63	DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm
65	DNSTAP_CONFIGURE_ENABLE= fstrm	64	DNSTAP_CONFIGURE_ENABLE= fstrm
66		65
67	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls	66	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
68	GNUTLS_CONFIGURE_ENABLE= gnutls	67	GNUTLS_CONFIGURE_ENABLE= gnutls
69		68
70	LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb	69	LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb
71	LMDB_CONFIGURE_ON= --with-lmdb=${LOCALBASE}	70	LMDB_CONFIGURE_ON= --with-lmdb=${LOCALBASE}
72	LMDB_CONFIGURE_OFF= --without-lmdb	71	LMDB_CONFIGURE_OFF= --without-lmdb
73		72
74	LUAJITOR_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty	73	LUAJITOR_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty
75	LUAJITOR_CONFIGURE_ON= --with-lua=luajit	74	LUAJITOR_CONFIGURE_ON= --with-lua=luajit
76		75
77	LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit	76	LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
78	LUAJIT_CONFIGURE_ON= --with-lua=luajit	77	LUAJIT_CONFIGURE_ON= --with-lua=luajit
79		78
80	LUA_USES= lua	79	LUA_USES= lua
81	LUA_CONFIGURE_ON= --with-lua=lua-${LUA_VER}	80	LUA_CONFIGURE_ON= --with-lua=lua-${LUA_VER}
82		81
83	OPENSSL_USES= ssl	82	OPENSSL_USES= ssl
84	OPENSSL_CONFIGURE_ON= LIBSSL_CFLAGS=-I${OPENSSLINC} \	83	OPENSSL_CONFIGURE_ON= LIBSSL_CFLAGS=-I${OPENSSLINC} \
85	LIBSSL_LIBS="-L${OPENSSLLIB} -lssl"	84	LIBSSL_LIBS="-L${OPENSSLLIB} -lssl"
86	OPENSSL_CONFIGURE_WITH= libssl	85	OPENSSL_CONFIGURE_WITH= libssl
87		86
88	SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp	87	SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
89	SNMP_CONFIGURE_WITH= net-snmp	88	SNMP_CONFIGURE_WITH= net-snmp
90		89
91	post-install:	90	post-install:
92	@${MKDIR} ${STAGEDIR}${ETCDIR}	91	@${MKDIR} ${STAGEDIR}${ETCDIR}
93	${INSTALL_DATA} ${FILESDIR}/dnsdist.conf.sample ${STAGEDIR}${ETCDIR}	92	${INSTALL_DATA} ${FILESDIR}/dnsdist.conf.sample ${STAGEDIR}${ETCDIR}
94		93
95	.include <bsd.port.mk>	94	.include <bsd.port.mk>

Removed Link Here

(-)a/dns/dnsdist/files/patch-dnsdist-console.cc (-14 lines)
1	Backport of:
2	https://github.com/PowerDNS/pdns/commit/e7c6996eb650d17372548899408160bb2d712511
3
4	--- dnsdist-console.cc.orig 2020-08-28 19:39:07 UTC
5	+++ dnsdist-console.cc
6	@@ -526,7 +526,7 @@ const std::vector<ConsoleKeyword> g_consoleKeywords{
7	{ "setMaxTCPQueriesPerConnection", true, "n", "set the maximum number of queries in an incoming TCP connection. 0 means unlimited" },
8	{ "setMaxTCPQueuedConnections", true, "n", "set the maximum number of TCP connections queued (waiting to be picked up by a client thread)" },
9	{ "setMaxUDPOutstanding", true, "n", "set the maximum number of outstanding UDP queries to a given backend server. This can only be set at configuration time and defaults to 65535" },
10	- { "SetNegativeAndSOAAction", "true", "nxd, zone, ttl, mname, rname, serial, refresh, retry, expire, minimum [, options]", "Turn a query into a NXDomain or NoData answer and sets a SOA record in the additional section" },
11	+ { "SetNegativeAndSOAAction", true, "nxd, zone, ttl, mname, rname, serial, refresh, retry, expire, minimum [, options]", "Turn a query into a NXDomain or NoData answer and sets a SOA record in the additional section" },
12	{ "setPayloadSizeOnSelfGeneratedAnswers", true, "payloadSize", "set the UDP payload size advertised via EDNS on self-generated responses" },
13	{ "setPoolServerPolicy", true, "policy, pool", "set the server selection policy for this pool to that policy" },
14	{ "setPoolServerPolicyLua", true, "name, func, pool", "set the server selection policy for this pool to one named 'name' and provided by 'function'" },