Attachment #209320 for bug #242125




# $FreeBSD$

PORTNAME=	dnsdist
DISTVERSION=	1.4.0
PORTREVISION=	11
CATEGORIES=	dns net
MASTER_SITES=	https://downloads.powerdns.com/releases/
		LOCAL/cpm

MAINTAINER=	cpm@FreeBSD.org
COMMENT=	Highly DNS-, DoS- and abuse-aware loadbalancer

		libre2.so:devel/re2 \
		libsodium.so:security/libsodium

GNU_CONFIGURE=	yes
USES=		bison 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 \
		--with-libsodium \
		--with-re2

INSTALL_TARGET=	install-strip


USERS=		_dnsdist
GROUPS=		_dnsdist

OPTIONS_DEFINE=		DNSTAP DOH LUAJIT SNMP

OPTIONS_DEFINE=		FSTRM LUAJIT SNMP
OPTIONS_DEFAULT=	GNUTLS OPENSSL
OPTIONS_MULTI=		TLS
OPTIONS_MULTI_TLS=	GNUTLS OPENSSL

DNSTAP_DESC=	dnstap support (see dnstap.info)
DOH_DESC=	DNS-over-HTTPS support
LUAJIT_DESC=	Use LuaJIT instead of Lua

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

DOH_LIB_DEPENDS=	libh2o-evloop.so:www/h2o
DOH_CONFIGURE_ENABLE=	dns-over-https

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

LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
LUAJIT_USES_OFF=	lua
LUAJIT_CONFIGURE_OFF=	--with-lua=lua-${LUA_VER}
LUAJIT_CONFIGURE_ON=	--with-lua=luajit
LUAJIT_CONFIGURE_OFF=	--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

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1541860683	1	TIMESTAMP = 1574322989
2	SHA256 (dnsdist-1.3.3.tar.bz2) = 9fb24f9032025955169f3c6e9b0a05b6aa9d6441ec47da08d22de1c1aa23e8cf	2	SHA256 (dnsdist-1.4.0.tar.bz2) = a336fa2c3eb381c2464d9d9790014fd6d4505029ed2c1b73ee1dc9115a2f1dc0
3	SIZE (dnsdist-1.3.3.tar.bz2) = 971253	3	SIZE (dnsdist-1.4.0.tar.bz2) = 1044479

Lines 1-11 Link Here

(-)files/patch-dnsdist-lua-vars.cc (-11 lines)
1	--- dnsdist-lua-vars.cc.orig 2018-10-03 09:48:10 UTC
2	+++ dnsdist-lua-vars.cc
3	@@ -22,6 +22,8 @@
4	#include "dnsdist.hh"
5	#include "ednsoptions.hh"
6
7	+#undef BADSIG // signal.h SIG_ERR
8	+
9	void setupLuaVars()
10	{
11	g_lua.writeVariable("DNSAction", std::unordered_map<string,int>{

Return to bug 242125

Lines 2-12 Link Here

(-)Makefile (-19 / +23 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= dnsdist	4	PORTNAME= dnsdist
5	DISTVERSION= 1.3.3	5	DISTVERSION= 1.4.0
6	PORTREVISION= 11
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	LOCAL/cpm
10		8
11	MAINTAINER= cpm@FreeBSD.org	9	MAINTAINER= cpm@FreeBSD.org
12	COMMENT= Highly DNS-, DoS- and abuse-aware loadbalancer	10	COMMENT= Highly DNS-, DoS- and abuse-aware loadbalancer
Lines 22-35 Link Here
22	libre2.so:devel/re2 \	20	libre2.so:devel/re2 \
23	libsodium.so:security/libsodium	21	libsodium.so:security/libsodium
24		22
25	GNU_CONFIGURE= yes
26	USES= bison compiler:c++14-lang cpe gmake libedit libtool localbase \	23	USES= bison compiler:c++14-lang cpe gmake libedit libtool localbase \
27	pkgconfig tar:bz2	24	pkgconfig tar:bz2
		25	USE_RC_SUBR= dnsdist
		26
		27	GNU_CONFIGURE= yes
28	CONFIGURE_ARGS= --bindir=${PREFIX}/sbin \	28	CONFIGURE_ARGS= --bindir=${PREFIX}/sbin \
		29	--enable-dns-over-https \
29	--enable-dns-over-tls \	30	--enable-dns-over-tls \
30	--enable-dnscrypt \	31	--enable-dnscrypt \
31	--enable-libsodium \	32	--with-libsodium \
32	--enable-re2	33	--with-re2
33		34
34	INSTALL_TARGET= install-strip	35	INSTALL_TARGET= install-strip
35		36
Lines 36-65 Link Here
36	USERS= _dnsdist	37	USERS= _dnsdist
37	GROUPS= _dnsdist	38	GROUPS= _dnsdist
38		39
39	USE_RC_SUBR= dnsdist	40	OPTIONS_DEFINE= DNSTAP DOH LUAJIT SNMP
40
41	OPTIONS_DEFINE= FSTRM LUAJIT SNMP
42	OPTIONS_DEFAULT= GNUTLS OPENSSL	41	OPTIONS_DEFAULT= GNUTLS OPENSSL
43	OPTIONS_MULTI= TLS	42	OPTIONS_MULTI= TLS
44	OPTIONS_MULTI_TLS= GNUTLS OPENSSL	43	OPTIONS_MULTI_TLS= GNUTLS OPENSSL
45		44
46	FSTRM_DESC= dnstap support (see dnstap.info)	45	DNSTAP_DESC= dnstap support (see dnstap.info)
47	LUAJIT_DESC= Use LuaJIT instead of Lua	46	DOH_DESC= DNS-over-HTTPS support
		47	LUAJIT_DESC= Use LuaJIT instead of Lua
48		48
49	FSTRM_LIB_DEPENDS= libfstrm.so:devel/fstrm	49	DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm
50	FSTRM_CONFIGURE_ENABLE= fstrm	50	DNSTAP_CONFIGURE_ENABLE= dnstap
51		51
		52	DOH_LIB_DEPENDS= libh2o-evloop.so:www/h2o
		53	DOH_CONFIGURE_ENABLE= dns-over-https
		54
52	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls	55	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
53	GNUTLS_CONFIGURE_ENABLE=gnutls	56	GNUTLS_CONFIGURE_WITH= gnutls
54		57
55	LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit	58	LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty
56	LUAJIT_USES_OFF= lua	59	LUAJIT_USES_OFF= lua
		60	LUAJIT_CONFIGURE_OFF= --with-lua=lua-${LUA_VER}
57	LUAJIT_CONFIGURE_ON= --with-lua=luajit	61	LUAJIT_CONFIGURE_ON= --with-lua=luajit
58	LUAJIT_CONFIGURE_OFF= --with-lua=lua-${LUA_VER}
59		62
60	OPENSSL_USES= ssl	63	OPENSSL_USES= ssl
61	OPENSSL_CONFIGURE_ENABLE=libssl	64	OPENSSL_CONFIGURE_ON= LIBSSL_CFLAGS=-I${OPENSSLINC} \
62	OPENSSL_CONFIGURE_ON= LIBSSL_CFLAGS=-I${OPENSSLINC} LIBSSL_LIBS="-L${OPENSSLLIB} -lssl"	65	LIBSSL_LIBS="-L${OPENSSLLIB} -lssl"
		66	OPENSSL_CONFIGURE_WITH= libssl
63		67
64	SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp	68	SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
65	SNMP_CONFIGURE_WITH= net-snmp	69	SNMP_CONFIGURE_WITH= net-snmp