From owner-dev-commits-ports-main@freebsd.org Tue May 11 16:30:14 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1714963DC04; Tue, 11 May 2021 16:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ffk1208Ytz4YB8; Tue, 11 May 2021 16:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ECC1B1B45E; Tue, 11 May 2021 16:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14BGUDES060494; Tue, 11 May 2021 16:30:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14BGUD1j060489; Tue, 11 May 2021 16:30:13 GMT (envelope-from git) Date: Tue, 11 May 2021 16:30:13 GMT Message-Id: <202105111630.14BGUD1j060489@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 23ac052089f7 - main - dns/dnsdist: update to 1.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23ac052089f7c5659686437d28206c8e5545093e Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 May 2021 16:30:14 -0000 The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=23ac052089f7c5659686437d28206c8e5545093e commit 23ac052089f7c5659686437d28206c8e5545093e Author: Ralf van der Enden AuthorDate: 2021-05-11 16:29:40 +0000 Commit: Neel Chauhan 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 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 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 - static auto read(lua_State* state, int index) - -> boost::optional - { -+ 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::move(result) } : boost::none; - } - }; -