Attachment #224838 for bug #255781




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

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

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

LICENSE=	GPLv2 ISCL MIT
LICENSE_COMB=	multi
LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
LICENSE_FILE_ISCL=	${WRKSRC}/ext/ipcrypt/LICENSE
LICENSE_FILE_MIT=	${WRKSRC}/ext/yahttp/LICENSE

BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \

Lines 1-3 Link Here

(-)b/dns/dnsdist/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1601542484	1	TIMESTAMP = 1620725957
2	SHA256 (dnsdist-1.5.1.tar.bz2) = cae759729a87703f4d09b0ed4227cb224aaaa252fa92f2432fd7116f560afbf1	2	SHA256 (dnsdist-1.6.0.tar.bz2) = a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
3	SIZE (dnsdist-1.5.1.tar.bz2) = 1068061	3	SIZE (dnsdist-1.6.0.tar.bz2) = 1328707




--- ext/luawrapper/include/LuaContext.hpp.orig	2018-11-12 08:33:58 UTC
+++ ext/luawrapper/include/LuaContext.hpp
@@ -2649,11 +2649,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;
     }
 };
 

Return to bug 255781

Lines 1-18 Link Here

(-)b/dns/dnsdist/Makefile (-5 / +5 lines)
1	# Created by: Carlos J Puga Medina <cpm@fbsd.es>	1	# Created by: Carlos J Puga Medina <cpm@fbsd.es>
2		2
3	PORTNAME= dnsdist	3	PORTNAME= dnsdist
4	DISTVERSION= 1.5.1	4	DISTVERSION= 1.6.0
5	PORTREVISION= 4
6	CATEGORIES= dns net	5	CATEGORIES= dns net
7	MASTER_SITES= https://downloads.powerdns.com/releases/	6	MASTER_SITES= https://downloads.powerdns.com/releases/
8		7
9	MAINTAINER= tremere@cainites.net	8	MAINTAINER= tremere@cainites.net
10	COMMENT= Highly DNS-, DoS-, and abuse-aware load balancer	9	COMMENT= Highly DNS-, DoS- and abuse-aware loadbalancer
11		10
12	LICENSE= GPLv2 UNLICENSE	11	LICENSE= GPLv2 ISCL MIT
13	LICENSE_COMB= multi	12	LICENSE_COMB= multi
14	LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING	13	LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
15	LICENSE_FILE_UNLICENSE= ${WRKSRC}/ext/incbin/UNLICENSE	14	LICENSE_FILE_ISCL= ${WRKSRC}/ext/ipcrypt/LICENSE
		15	LICENSE_FILE_MIT= ${WRKSRC}/ext/yahttp/LICENSE
16		16
17	BUILD_DEPENDS= ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops	17	BUILD_DEPENDS= ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
18	LIB_DEPENDS= libboost_serialization.so:devel/boost-libs \	18	LIB_DEPENDS= libboost_serialization.so:devel/boost-libs \

Removed Link Here

(-)a/dns/dnsdist/files/patch-ext_luawrapper_include_LuaContext.hpp (-28 lines)
1	--- ext/luawrapper/include/LuaContext.hpp.orig 2018-11-12 08:33:58 UTC
2	+++ ext/luawrapper/include/LuaContext.hpp
3	@@ -2649,11 +2649,21 @@ struct LuaContext::Reader<std::string>
4	static auto read(lua_State* state, int index)
5	-> boost::optional<std::string>
6	{
7	+ std::string result;
8	+
9	+ // lua_tolstring might convert the variable that would confuse lua_next, so we
10	+ // make a copy of the variable.
11	+ lua_pushvalue(state, index);
12	+
13	size_t len;
14	- const auto val = lua_tolstring(state, index, &len);
15	- if (val == 0)
16	- return boost::none;
17	- return std::string(val, len);
18	+ const auto val = lua_tolstring(state, -1, &len);
19	+
20	+ if (val != 0)
21	+ result.assign(val, len);
22	+
23	+ lua_pop(state, 1);
24	+
25	+ return val != 0 ? boost::optional<std::string>{ std::move(result) } : boost::none;
26	}
27	};
28