Import of pkgsrc-2016Q3

net/powerdns/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/06/12 10:50:58 fhajny Exp $
+# $NetBSD: Makefile,v 1.19 2016/06/16 09:24:42 fhajny Exp $
 
 .include "Makefile.common"
 

net/powerdns/Makefile.common

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.13 2015/06/12 10:50:58 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.16 2016/06/16 09:24:42 fhajny Exp $
 
-PDNS_VERSION=		3.4.5
+PDNS_VERSION=		3.4.9
 DISTNAME=		pdns-${PDNS_VERSION}
 CATEGORIES=		net
 MASTER_SITES=		http://downloads.powerdns.com/releases/
@@ -28,5 +28,5 @@ BUILDLINK_TRANSFORM+=	rm:-fstack-protector
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
-.include "../../security/mbedtls/buildlink3.mk"
+.include "../../security/mbedtls1/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

net/powerdns/PLIST

@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2015/03/27 23:37:52 rodent Exp $
+@comment $NetBSD: PLIST,v 1.8 2016/06/03 11:45:34 fhajny Exp $
 ${PLIST.tools}bin/dnsbulktest
-${PLIST.tools}bin/dnsdist
 ${PLIST.tools}bin/dnsreplay
 ${PLIST.tools}bin/dnsscan
 ${PLIST.tools}bin/dnsscope
@@ -20,7 +19,6 @@ ${PLIST.pipe}lib/pdns/pdns/libpipebackend.la
 ${PLIST.random}lib/pdns/pdns/librandombackend.la
 ${PLIST.remote}lib/pdns/pdns/libremotebackend.la
 ${PLIST.sqlite}lib/pdns/pdns/libgsqlite3backend.la
-${PLIST.tools}man/man1/dnsdist.1
 ${PLIST.tools}man/man1/dnstcpbench.1
 ${PLIST.tools}man/man1/dnsreplay.1
 ${PLIST.tools}man/man1/dnsscope.1

net/powerdns/distinfo

@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.19 2015/06/10 16:24:44 fhajny Exp $
+$NetBSD: distinfo,v 1.21 2016/06/03 11:45:34 fhajny Exp $
 
-SHA1 (pdns-3.4.5.tar.bz2) = 8d848d832d477c85280fa26fb78e4f53b59798f2
-RMD160 (pdns-3.4.5.tar.bz2) = 904b7f30f474aa68e28f0e96779a6ec1e4f31b83
-Size (pdns-3.4.5.tar.bz2) = 1337222 bytes
+SHA1 (pdns-3.4.9.tar.bz2) = 51f677c692af92e6c84c5706d0698ce2c1a80de4
+RMD160 (pdns-3.4.9.tar.bz2) = f1eb7f5ffd4f94c1ab468ca82d65dea433f2d5f0
+SHA512 (pdns-3.4.9.tar.bz2) = ad0d619bfa0bbce332c4c16734cb37c588cf0d7a05bde3a484ecdf13492ca9b4b4d8d7afe448c5c2c6d35b72165f3c8fbd41a91fd5cfbe4194a3eddc5f600a38
+Size (pdns-3.4.9.tar.bz2) = 1351434 bytes
 SHA1 (patch-aa) = a7e66245ab7acbff4f568650ee285ee18a88ea56
 SHA1 (patch-ab) = a816def3825c0260642dab85f518bebaf4ba904b
 SHA1 (patch-modules_luabackend_luabackend.hh) = 23ae1a2c047f367a51b7bfa10a546aeb91cccea4
@@ -19,7 +20,7 @@ SHA1 (patch-pdns_htimer.cc) = 6064c73db33d2e7cc65979757e90ecdf8d7c16e6
 SHA1 (patch-pdns_misc.cc) = 832cf6bd2f0b018d66a49e5b0f9f879a107c1a90
 SHA1 (patch-pdns_nameserver.cc) = 13011d7cd1e6915c4b547f7817fa72e595ac2a3a
 SHA1 (patch-pdns_pdns_recursor.cc) = 97f3688baef5a7520514764a4590d0b92fa51fda
-SHA1 (patch-pdns_receiver.cc) = 11e096024b007d53528d61083a65fd5e941fe6eb
+SHA1 (patch-pdns_receiver.cc) = a7f44e2c9196f27fc5855183a8e3c34565a9e34c
 SHA1 (patch-pdns_recursor__cache.cc) = 36dc4c4691f6d88fb7b6cc452cda19dc07a1b53b
 SHA1 (patch-pdns_resolver.cc) = 0f3de1aef64d1e24a5b0f87bfdd866c75ff3c1ff
 SHA1 (patch-pdns_tcpreceiver.cc) = 994203d32464044ca303973cc27ac4080a654678

net/powerdns/files/smf/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="pdns">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/pdns" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
@@ -20,7 +20,6 @@
     <property_group name="application" type="application">
       <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/pdns.conf" />
     </property_group>
-    <stability value="Evolving" />
     <template>
       <common_name>
         <loctext xml:lang="C">PowerDNS server service</loctext>

net/powerdns/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2015/06/12 10:50:58 fhajny Exp $
+# $NetBSD: options.mk,v 1.4 2016/05/19 22:12:09 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.powerdns
 PKG_SUPPORTED_OPTIONS=	bind botan cryptopp pipe random remote sqlite tools
@@ -15,7 +15,7 @@ PLIST.bind=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mbotan)
-CONFIGURE_ARGS+=	--enable-botan1.8
+CONFIGURE_ARGS+=	--enable-botan1.10
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../security/botan/buildlink3.mk"
 .endif

net/powerdns/patches/patch-pdns_receiver.cc

@@ -1,9 +1,9 @@
-$NetBSD: patch-pdns_receiver.cc,v 1.3 2015/03/27 23:37:52 rodent Exp $
+$NetBSD: patch-pdns_receiver.cc,v 1.4 2016/06/03 11:45:34 fhajny Exp $
 
 Limit inclusion of boost headers to only those necessary to avoid conflicting
 types errors on Solaris.
 
---- pdns/receiver.cc.orig	2015-03-02 13:17:12.000000000 +0000
+--- pdns/receiver.cc.orig	2016-05-13 16:04:50.000000000 +0000
 +++ pdns/receiver.cc
 @@ -42,7 +42,7 @@
  #include <sys/mman.h>
@@ -11,6 +11,6 @@ types errors on Solaris.
  #include <fstream>
 -#include <boost/algorithm/string.hpp>
 +#include <boost/algorithm/string/trim.hpp>
- 
- #include "config.h"
- #include "dns.hh"
+ #ifdef HAVE_OPENSSL
+ #include "opensslsigners.hh"
+ #endif