git: 23ac052089f7 - main - dns/dnsdist: update to 1.6.0

[Neel Chauhan]

The branch main has been updated by nc:

URL: https://cgit.FreeBSD.org/ports/commit/?id=23ac052089f7c5659686437d28206c8e5545093e

commit 23ac052089f7c5659686437d28206c8e5545093e
Author:     Ralf van der Enden <tremere at cainites.net>
AuthorDate: 2021-05-11 16:29:40 +0000
Commit:     Neel Chauhan <nc at FreeBSD.org>
CommitDate: 2021-05-11 16:29:40 +0000

    dns/dnsdist: update to 1.6.0
    
    Changes: https://blog.powerdns.com/2021/05/11/dnsdist-1-6-0-released/
    
    PR:     255781
---
 dns/dnsdist/Makefile                               | 10 ++++----
 dns/dnsdist/distinfo                               |  6 ++---
 .../patch-ext_luawrapper_include_LuaContext.hpp    | 28 ----------------------
 3 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/dns/dnsdist/Makefile b/dns/dnsdist/Makefile
index 23b3a9d6f039..0e0808d33ef1 100644
--- a/dns/dnsdist/Makefile
+++ b/dns/dnsdist/Makefile
@@ -1,18 +1,18 @@
 # Created by: Carlos J Puga Medina <cpm at 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 at 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 ffbc5bb8a933..44d121803a94 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 90c376cb7e70..000000000000
--- 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;
-     }
- };
-