Attachment 192056 Details for Bug 227175 – patch

[patch] patch

dnsdist.diff (text/plain), 3.64 KB, created by Carlos J. Puga Medina on 2018-04-01 14:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J. Puga Medina

Created: 2018-04-01 14:50:01 UTC

Size: 3.64 KB

patch

obsolete

>Index: dns/dnsdist/Makefile
>===================================================================
>--- dns/dnsdist/Makefile	(revision 466161)
>+++ dns/dnsdist/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	dnsdist
> DISTVERSION=	1.3.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	dns net
> MASTER_SITES=	https://downloads.powerdns.com/releases/ \
> 		LOCAL/cpm
>@@ -22,9 +22,10 @@
> 		libsodium.so:security/libsodium
> 
> GNU_CONFIGURE=	yes
>-USES=		bison compiler cpe gmake libedit libtool localbase lua:52 \
>+USES=		bison compiler cpe gmake libedit libtool localbase \
> 		pkgconfig tar:bz2
> CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin \
>+		--enable-dns-over-tls \
> 		--enable-dnscrypt \
> 		--enable-libsodium \
> 		--enable-re2
>@@ -36,6 +37,30 @@
> 
> USE_RC_SUBR=	dnsdist
> 
>+OPTIONS_DEFINE=		FSTRM 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
>+
>+FSTRM_LIB_DEPENDS=	libfstrm.so:devel/fstrm
>+FSTRM_CONFIGURE_ENABLE=	fstrm
>+
>+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
>+GNUTLS_CONFIGURE_ENABLE=gnutls
>+
>+LUAJIT_LIB_DEPENDS=	libluajit-5.1.so.2:lang/luajit
>+LUAJIT_USES_OFF=	lua
>+LUAJIT_CONFIGURE_WITH=	luajit
>+
>+OPENSSL_USES=		ssl
>+OPENSSL_CONFIGURE_ENABLE=libssl
>+
>+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
>+SNMP_CONFIGURE_WITH=	net-snmp
>+
> .include <bsd.port.pre.mk>
> 
> # Fix dnsdist binaries when building on FreeBSD 10.3
>Index: dns/dnsdist/files/dnsdist.in
>===================================================================
>--- dns/dnsdist/files/dnsdist.in	(revision 466161)
>+++ dns/dnsdist/files/dnsdist.in	(working copy)
>@@ -22,7 +22,10 @@
> : ${dnsdist_priv_group:=_dnsdist}
> : ${dnsdist_enable:=NO}
> 
>-command=/usr/local/sbin/${name}
>-command_args="-u ${dnsdist_priv_user} -g ${dnsdist_priv_group}"
>+pidfile=/var/run/${name}.pid
> 
>+command=/usr/sbin/daemon
>+actual_command=/usr/local/sbin/${name}
>+command_args="-c -f -r -P ${pidfile} ${actual_command} -u ${dnsdist_priv_user} -g ${dnsdist_priv_group} --supervised"
>+
> run_rc_command "$1"
>Index: dns/dnsdist/files/patch-ext_luawrapper_include_LuaContext.hpp
>===================================================================
>--- dns/dnsdist/files/patch-ext_luawrapper_include_LuaContext.hpp	(nonexistent)
>+++ dns/dnsdist/files/patch-ext_luawrapper_include_LuaContext.hpp	(working copy)
>@@ -0,0 +1,28 @@
>+--- ext/luawrapper/include/LuaContext.hpp.orig	2018-03-29 15:25:58 UTC
>++++ ext/luawrapper/include/LuaContext.hpp
>+@@ -2635,11 +2635,21 @@ struct LuaContext::Reader<std::string>
>+     static auto read(lua_State* state, int index)
>+         -> boost::optional<std::string>
>+     {
>++        std::string result;
>++
>++        // lua_tolstring might convert the variable that would confuse lua_next, so we
>++        //   make a copy of the variable.
>++        lua_pushvalue(state, index);
>++
>+         size_t len;
>+-        const auto val = lua_tolstring(state, index, &len);
>+-        if (val == 0)
>+-            return boost::none;
>+-        return std::string(val, len);
>++        const auto val = lua_tolstring(state, -1, &len);
>++
>++        if (val != 0)
>++          result.assign(val, len);
>++
>++        lua_pop(state, 1);
>++
>++        return val != 0 ? boost::optional<std::string>{ std::move(result) } : boost::none;
>+     }
>+ };
>+ 
>
>Property changes on: dns/dnsdist/files/patch-ext_luawrapper_include_LuaContext.hpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 227175: 192054 | 192056