From owner-svn-ports-branches@freebsd.org Tue Jan 23 15:52:46 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 57675EB46FF; Tue, 23 Jan 2018 15:52:46 +0000 (UTC) (envelope-from krion@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 3295383372; Tue, 23 Jan 2018 15:52:46 +0000 (UTC) (envelope-from krion@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 6F06810A40; Tue, 23 Jan 2018 15:52:45 +0000 (UTC) (envelope-from krion@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0NFqjdl029615; Tue, 23 Jan 2018 15:52:45 GMT (envelope-from krion@FreeBSD.org) Received: (from krion@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0NFqjpv029614; Tue, 23 Jan 2018 15:52:45 GMT (envelope-from krion@FreeBSD.org) Message-Id: <201801231552.w0NFqjpv029614@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: krion set sender to krion@FreeBSD.org using -f From: Kirill Ponomarev Date: Tue, 23 Jan 2018 15:52:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459781 - branches/2018Q1/dns/powerdns-recursor X-SVN-Group: ports-branches X-SVN-Commit-Author: krion X-SVN-Commit-Paths: branches/2018Q1/dns/powerdns-recursor X-SVN-Commit-Revision: 459781 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jan 2018 15:52:46 -0000 Author: krion Date: Tue Jan 23 15:52:45 2018 New Revision: 459781 URL: https://svnweb.freebsd.org/changeset/ports/459781 Log: Fix previous commit with mfh. Approved by: ports-secteam Modified: branches/2018Q1/dns/powerdns-recursor/Makefile Modified: branches/2018Q1/dns/powerdns-recursor/Makefile ============================================================================== --- branches/2018Q1/dns/powerdns-recursor/Makefile Tue Jan 23 15:45:58 2018 (r459780) +++ branches/2018Q1/dns/powerdns-recursor/Makefile Tue Jan 23 15:52:45 2018 (r459781) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= recursor -DISTVERSION= 4.1.0 -PORTREVISION= 1 +DISTVERSION= 4.1.1 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ PKGNAMEPREFIX= powerdns- @@ -23,6 +22,8 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.h LIB_DEPENDS= libboost_context.so:devel/boost-libs \ libprotobuf.so:devel/protobuf +CONFLICTS_INSTALL= powerdns-recursor40 + USES= compiler:c++11-lib cpe gmake localbase:ldflags pkgconfig ssl tar:bzip2 GNU_CONFIGURE= YES CXXFLAGS+= -D_GLIBCXX_USE_C99 @@ -33,26 +34,18 @@ CPE_VENDOR= powerdns USE_RC_SUBR= pdns-recursor -OPTIONS_DEFINE= OPTALGO SETUID -OPTIONS_DEFAULT= LUA SETUID -OPTIONS_RADIO= LUA_RG -OPTIONS_RADIO_LUA_RG= LUA LUAJIT -LUAJIT_DESC= Enable LuaJIT -LUA_RG_DESC= Lua Engine -OPTALGO_DESC= Enable optional algorithms (12 & 15) -SETUID_DESC= Run as pdns_recursor user - -LUA_CONFIGURE_WITH= lua -LUA_USES= lua - +OPTIONS_DEFINE= LUAJIT OPTALGO SETUID +OPTIONS_DEFAULT= SETUID LUAJIT_CONFIGURE_WITH= luajit LUAJIT_DESC= Use LuaJIT instead of Lua LUAJIT_LIB_DEPENDS= libluajit-5.1.so.2:lang/luajit LUAJIT_USES_OFF= lua OPTALGO_CONFIGURE_ON= --enable-botan \ + --enable-libdecaf \ --enable-libsodium OPTALGO_DESC= Enable optional algorithms (12, 15 & 16) OPTALGO_LIB_DEPENDS= libbotan-2.so:security/botan2 \ + libdecaf.so:security/libdecaf \ libsodium.so:security/libsodium SETUID_DESC= Run as pdns_recursor user SETUID_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-setuid