Attachment 224838 Details for Bug 255781 – Update to dnsdist 1.6.0

[patch] Update to dnsdist 1.6.0

dnsdist-1.6.0.diff (text/plain), 2.58 KB, created by Ralf van der Enden on 2021-05-11 11:04:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf van der Enden

Created: 2021-05-11 11:04:31 UTC

Size: 2.58 KB

patch

obsolete

>diff --git a/dns/dnsdist/Makefile b/dns/dnsdist/Makefile
>index 23b3a9d6f0..0e0808d33e 100644
>--- a/dns/dnsdist/Makefile
>+++ b/dns/dnsdist/Makefile
>@@ -1,18 +1,18 @@
> # Created by: Carlos J Puga Medina <cpm@fbsd.es>
> 
> PORTNAME=	dnsdist
>-DISTVERSION=	1.5.1
>-PORTREVISION=	4
>+DISTVERSION=	1.6.0
> CATEGORIES=	dns net
> MASTER_SITES=	https://downloads.powerdns.com/releases/
> 
> MAINTAINER=	tremere@cainites.net
>-COMMENT=	Highly DNS-, DoS-, and abuse-aware load balancer
>+COMMENT=	Highly DNS-, DoS- and abuse-aware loadbalancer
> 
>-LICENSE=	GPLv2 UNLICENSE
>+LICENSE=	GPLv2 ISCL MIT
> LICENSE_COMB=	multi
> LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
>-LICENSE_FILE_UNLICENSE=	${WRKSRC}/ext/incbin/UNLICENSE
>+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 \
>diff --git a/dns/dnsdist/distinfo b/dns/dnsdist/distinfo
>index ffbc5bb8a9..44d121803a 100644
>--- a/dns/dnsdist/distinfo
>+++ b/dns/dnsdist/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1601542484
>-SHA256 (dnsdist-1.5.1.tar.bz2) = cae759729a87703f4d09b0ed4227cb224aaaa252fa92f2432fd7116f560afbf1
>-SIZE (dnsdist-1.5.1.tar.bz2) = 1068061
>+TIMESTAMP = 1620725957
>+SHA256 (dnsdist-1.6.0.tar.bz2) = a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
>+SIZE (dnsdist-1.6.0.tar.bz2) = 1328707
>diff --git a/dns/dnsdist/files/patch-ext_luawrapper_include_LuaContext.hpp b/dns/dnsdist/files/patch-ext_luawrapper_include_LuaContext.hpp
>deleted file mode 100644
>index 90c376cb7e..0000000000
>--- a/dns/dnsdist/files/patch-ext_luawrapper_include_LuaContext.hpp
>+++ /dev/null
>@@ -1,28 +0,0 @@
>---- 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;
>-     }
>- };
>-

Flags:

tremere: maintainer-approval+

Actions: View | Diff

Attachments on bug 255781: 224833 | 224838