From owner-svn-ports-head@freebsd.org Tue Apr 17 09:33:39 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BAB01F937FA; Tue, 17 Apr 2018 09:33:39 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8A4887560A; Tue, 17 Apr 2018 09:33:39 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 82A1528B7; Tue, 17 Apr 2018 09:33:39 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3H9XdWJ024098; Tue, 17 Apr 2018 09:33:39 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3H9XdXi024097; Tue, 17 Apr 2018 09:33:39 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804170933.w3H9XdXi024097@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 17 Apr 2018 09:33:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467588 - head/dns/dnsdist/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/dns/dnsdist/files X-SVN-Commit-Revision: 467588 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Apr 2018 09:33:40 -0000 Author: jbeich Date: Tue Apr 17 09:33:39 2018 New Revision: 467588 URL: https://svnweb.freebsd.org/changeset/ports/467588 Log: dns/dnsdist: unbreak with boost 1.67 In file included from dnsdist.cc:44: In file included from ./dnsdist.hh:46: In file included from /usr/local/include/boost/uuid/uuid_generators.hpp:17: In file included from /usr/local/include/boost/uuid/random_generator.hpp:19: In file included from /usr/local/include/boost/tti/has_member_function.hpp:15: In file included from /usr/local/include/boost/tti/detail/dmem_fun.hpp:11: In file included from /usr/local/include/boost/function_types/is_member_function_pointer.hpp:14: In file included from /usr/local/include/boost/function_types/components.hpp:61: /usr/local/include/boost/function_types/detail/class_transform.hpp:26:31: error: expected a qualified name after 'typename' template ^ ./dns.hh:238:11: note: expanded from macro 'L' #define L theL() ^ PR: 227427 Reported by: antoine (via exp-run) Obtained from: upstream Added: head/dns/dnsdist/files/patch-boost-1.67 (contents, props changed) Added: head/dns/dnsdist/files/patch-boost-1.67 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/dnsdist/files/patch-boost-1.67 Tue Apr 17 09:33:39 2018 (r467588) @@ -0,0 +1,53 @@ +https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 + +--- dns.hh.orig 2018-03-29 15:25:58 UTC ++++ dns.hh +@@ -235,7 +235,6 @@ inline uint16_t * getFlagsFromDNSHeader(struct dnshead + #define FLAGS_CD_OFFSET (12) + #endif + +-#define L theL() + extern time_t s_starttime; + + uint32_t hashQuestion(const char* packet, uint16_t len, uint32_t init); +--- dnsdist-carbon.cc.orig 2018-03-29 15:25:58 UTC ++++ dnsdist-carbon.cc +@@ -27,7 +27,6 @@ + #include "sstuff.hh" + + #include "namespaces.hh" +-#undef L + #include "dnsdist.hh" + + GlobalStateHolder > g_carbon; +--- dnsdist.cc.orig 2018-03-29 15:25:58 UTC ++++ dnsdist.cc +@@ -2258,7 +2258,7 @@ try + bindAny(cs->local.sin4.sin_family, cs->udpFD); + + // if (!setSocketTimestamps(cs->udpFD)) +- // L<local)) { +--- remote_logger.cc.orig 2018-03-29 15:25:58 UTC ++++ remote_logger.cc +@@ -22,7 +22,7 @@ bool RemoteLogger::reconnect() + } + catch(const std::exception& e) { + #ifdef WE_ARE_RECURSOR +- L<