Attachment 209591 Details for Bug 242125 – Update to dnsdist 1.4.0 (and enable DoH by default)

[patch] Update to dnsdist 1.4.0 (and enable DoH by default)

dnsdist-1.4.0.diff (text/plain), 3.74 KB, created by Ralf van der Enden on 2019-12-02 08:44:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf van der Enden

Created: 2019-12-02 08:44:34 UTC

Size: 3.74 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 518817)
>+++ Makefile	(working copy)
>@@ -2,11 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	dnsdist
>-DISTVERSION=	1.3.3
>-PORTREVISION=	11
>+DISTVERSION=	1.4.0
> CATEGORIES=	dns net
>-MASTER_SITES=	https://downloads.powerdns.com/releases/ \
>-		LOCAL/cpm
>+MASTER_SITES=	https://downloads.powerdns.com/releases/
> 
> MAINTAINER=	cpm@FreeBSD.org
> COMMENT=	Highly DNS-, DoS- and abuse-aware loadbalancer
>@@ -18,18 +16,22 @@
> 
> 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
> 
>-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 \
>-		--enable-libsodium \
>-		--enable-re2
>+		--with-libsodium \
>+		--with-re2
> 
> INSTALL_TARGET=	install-strip
> 
>@@ -36,30 +38,29 @@
> USERS=		_dnsdist
> GROUPS=		_dnsdist
> 
>-USE_RC_SUBR=	dnsdist
>-
>-OPTIONS_DEFINE=		FSTRM LUAJIT SNMP
>+OPTIONS_DEFINE=		DNSTAP LUAJIT SNMP
> OPTIONS_DEFAULT=	GNUTLS OPENSSL
> OPTIONS_MULTI=		TLS
> OPTIONS_MULTI_TLS=	GNUTLS OPENSSL
> 
>-FSTRM_DESC=		dnstap support (see dnstap.info)
>-LUAJIT_DESC=		Use LuaJIT instead of Lua
>+DNSTAP_DESC=	dnstap support (see dnstap.info)
>+LUAJIT_DESC=	Use LuaJIT instead of Lua
> 
>-FSTRM_LIB_DEPENDS=	libfstrm.so:devel/fstrm
>-FSTRM_CONFIGURE_ENABLE=	fstrm
>+DNSTAP_LIB_DEPENDS=		libfstrm.so:devel/fstrm
>+DNSTAP_CONFIGURE_ENABLE=	dnstap
> 
> GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
>-GNUTLS_CONFIGURE_ENABLE=gnutls
>+GNUTLS_CONFIGURE_WITH=	gnutls
> 
>-LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
>+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_ENABLE=libssl
>-OPENSSL_CONFIGURE_ON=	LIBSSL_CFLAGS=-I${OPENSSLINC} LIBSSL_LIBS="-L${OPENSSLLIB} -lssl"
>+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
>Index: distinfo
>===================================================================
>--- distinfo	(revision 518817)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1541860683
>-SHA256 (dnsdist-1.3.3.tar.bz2) = 9fb24f9032025955169f3c6e9b0a05b6aa9d6441ec47da08d22de1c1aa23e8cf
>-SIZE (dnsdist-1.3.3.tar.bz2) = 971253
>+TIMESTAMP = 1574322989
>+SHA256 (dnsdist-1.4.0.tar.bz2) = a336fa2c3eb381c2464d9d9790014fd6d4505029ed2c1b73ee1dc9115a2f1dc0
>+SIZE (dnsdist-1.4.0.tar.bz2) = 1044479
>Index: files/patch-dnsdist-lua-vars.cc
>===================================================================
>--- files/patch-dnsdist-lua-vars.cc	(revision 518817)
>+++ files/patch-dnsdist-lua-vars.cc	(nonexistent)
>@@ -1,11 +0,0 @@
>---- dnsdist-lua-vars.cc.orig	2018-10-03 09:48:10 UTC
>-+++ dnsdist-lua-vars.cc
>-@@ -22,6 +22,8 @@
>- #include "dnsdist.hh"
>- #include "ednsoptions.hh"
>- 
>-+#undef BADSIG // signal.h SIG_ERR
>-+
>- void setupLuaVars()
>- {
>-   g_lua.writeVariable("DNSAction", std::unordered_map<string,int>{
>
>Property changes on: files/patch-dnsdist-lua-vars.cc
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 242125: 209303 | 209305 | 209316 | 209320 | 209591 | 209658 | 209826 | 209886 | 210781 | 210948