Updated to latest release, 3.4.3. Updated and defuzzed patches. Added cryptopp and zeromq options, which are disabled by default. ChangeLog: PowerDNS Authoritative Server 3.4.3 Warning: Version 3.4.3 of the PowerDNS Authoritative Server is a major upgrade if you are coming from 2.9.x. Additionally, if you are coming from any 3.x version (including 3.3.1), there is a mandatory SQL schema upgrade. Please refer to the Upgrade documentation for important information on correct and stable operation, as well as notes on performance and memory use. Released March 2nd, 2015 Bug fixes: commit ceb49ce: pdns_control: exit 1 on unknown command (Ruben Kerkhof) commit 1406891: evaluate KSK ZSK pairs per algorithm (Kees Monshouwer) commit 3ca050f: always set di.notified_serial in getAllDomains (Kees Monshouwer) commit d9d09e1: pdns_control: don't open socket in /tmp (Ruben Kerkhof) New features: commit 2f67952: Limit who can send us AXFR notify queries (Ruben Kerkhof) Improvements: commit d7bec64: respond REFUSED instead of NOERROR for "unknown zone" situations commit ebeb9d7: Check for Lua 5.3 (Ruben Kerkhof) commit d09931d: Check compiler for relro support instead of linker (Ruben Kerkhof) commit c4b0d0c: Replace PacketHandler with UeberBackend where possible (Christian Hofstaedtler) commit 5a85152: PacketHandler: Share UeberBackend with DNSSECKeeper (Christian Hofstaedtler) commit 97bd444: fix building with GCC 5 Experimental API changes (Christian Hofstaedtler): commit ca44706: API: move shared DomainInfo reader into it's own function commit 102602f: API: allow writing to domains.account field commit d82f632: API: read and expose domain account field commit 2b06977: API: be more strict when parsing record contents commit 2f72b7c: API: Reject unknown types (TYPE0) commit d82f632: API: read and expose domain account field PowerDNS Authoritative Server 3.4.2 Warning: Version 3.4.2 of the PowerDNS Authoritative Server is a major upgrade if you are coming from 2.9.x. Additionally, if you are coming from any 3.x version (including 3.3.1), there is a mandatory SQL schema upgrade. Please refer to the Upgrade documentation for important information on correct and stable operation, as well as notes on performance and memory use. Released February 3rd, 2015 Find the downloads on our download page. This is a performance and bugfix update to 3.4.1 and any earlier version. For high traffic setups, including those using DNSSEC, upgrading to 3.4.2 may show tremendous performance increases. A list of changes since 3.4.1 follows. Improvements: commit 73004f1: implement CORS for the HTTP API commit 4d9c289: qtype is now case insensitive in API and database commit 13af5d8, commit 223373a, commit 1d5a68d, commit 705a73f, commit b418d52: Allow (optional) PIE hardening commit 2f86f20: json-api: remove priority from json commit cefcf9f: backport remotebackend fixes commit 920f987, commit dd8853c: Support Lua 5.3 commit 003aae5: support single-type ZSK signing commit 1c57e1d: Potential fix for ticket #1907, we now try to trigger libgcc_s.so.1 to load before we chroot. I can't reproduce the bug on my local system, but this "should" help. Seriously. commit 031ab21: update polarssl to 1.3.9 Bug fixes: commit 60b2b7c, commit d962fbc: refuse overly long labels in names commit a64fd6a: auth: limit long version strings to 63 characters and catch exceptions in secpoll commit fa52e02: pdnssec: fix ttl check for RRSIG records commit 0678b25: fix up latency reporting for sub-millisecond latencies (would clip to 0) commit d45c1f1: make sure we don't throw an exception on "pdns_control show" of an unknown variable commit 63c8088: fix startup race condition with carbon thread already trying to broadcast uninitialized data commit 796321c: make qsize-q more robust commit 407867c: mind04 discovered we count corrupt packets and EAGAIN situations as validly received packets, skewing the udp questions/answers graphs on auth. commit f06d069: make latency & qsize reporting 'live'. Plus fix that we only reported the qsize of the first distributor. commit 2f3498e: fix up statbag for carbon protocol and function pointers commit 0f2f999: get priority from table in Lua axfrfilter; fixes ticket #1857 commit 96963e2, commit bbcbbbe, commit d5c9c07: various backends: fix records pointing at root commit e94c2c4: remove additional layer of trailing . stripping, which broke MX records to the root in the BIND backend. Should close ticket #1243. commit 8f35ba2: api: use uncached results for getKeys() commit c574336: read ALLOW-AXFR-FROM from the backend with the metadata Minor changes: commit 1e39b4c: move manpages to section 1 commit b3992d9: secpoll: Replace ~ with _ commit 9799ef5: only zones with an active ksk are secure commit d02744f: api: show keys for zones without active ksk New features: commit 1b97ba0: add signatures metric to auth, so we can plot signatures/second commit 92cef2d: pdns_control: make it posible to notify all zones at once commit f648752: JSON API: provide flush-cache, notify, axfr-retrieve commit 02653a7: add 'bench-db' to do very simple database backend performance benchmark commit a83257a: enable callback based metrics to statbas, and add 5 such metrics: uptime, sys-msec, user-msec, key-cache-size, meta-cache-size, signature-cache-size Performance improvements: commit a37fe8c: better key for packetcache commit e5217bb: don't do time(0) under signature cache lock commit d061045, commit 135db51, commit 7d0f392: shard the packet cache, closing ticket #1910. commit d71a712: with thanks to Jack Lloyd, this works around the default Botan allocator slowing down for us during production use.diff -r1.10 -r1.11 pkgsrc/net/powerdns/Makefile.common
(rodent)
@@ -1,31 +1,34 @@ | @@ -1,31 +1,34 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.10 2014/12/10 14:50:08 fhajny Exp $ | 1 | # $NetBSD: Makefile.common,v 1.11 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | PDNS_VERSION= 3.4.1 | 3 | PDNS_VERSION= 3.4.3 | |
4 | DISTNAME= pdns-${PDNS_VERSION} | 4 | DISTNAME= pdns-${PDNS_VERSION} | |
5 | CATEGORIES= net | 5 | CATEGORIES= net | |
6 | MASTER_SITES= http://downloads.powerdns.com/releases/ | 6 | MASTER_SITES= http://downloads.powerdns.com/releases/ | |
7 | EXTRACT_SUFX= .tar.bz2 | 7 | EXTRACT_SUFX= .tar.bz2 | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://www.powerdns.com/ | 10 | HOMEPAGE= http://www.powerdns.com/ | |
11 | LICENSE= gnu-gpl-v2 | 11 | LICENSE= gnu-gpl-v2 | |
12 | 12 | |||
13 | USE_TOOLS+= gmake pkg-config | 13 | USE_TOOLS+= bison flex gmake pkg-config | |
14 | USE_LANGUAGES= c c++ | 14 | USE_LANGUAGES= c c++ | |
15 | USE_LIBTOOL= yes | 15 | USE_LIBTOOL= yes | |
16 | GNU_CONFIGURE= yes | 16 | GNU_CONFIGURE= yes | |
17 | 17 | |||
18 | BUILD_DEPENDS+= ragel-[0-9]*:../../devel/ragel | |||
19 | ||||
18 | GNU_CONFIGURE_LIBSUBDIR=pdns | 20 | GNU_CONFIGURE_LIBSUBDIR=pdns | |
19 | 21 | |||
20 | CONFIGURE_ARGS+= --enable-pdns_server | 22 | CONFIGURE_ARGS+= --enable-pdns_server | |
21 | CONFIGURE_ARGS+= --with-system-polarssl | 23 | CONFIGURE_ARGS+= --with-system-polarssl | |
22 | CONFIGURE_ARGS+= --without-lua | 24 | CONFIGURE_ARGS+= --without-lua | |
23 | 25 | |||
24 | BUILDLINK_TRANSFORM+= rm:-fstack-protector | 26 | BUILDLINK_TRANSFORM+= rm:-fstack-protector | |
25 | 27 | |||
28 | .include "../../mk/dlopen.buildlink3.mk" | |||
26 | .include "../../devel/boost-headers/buildlink3.mk" | 29 | .include "../../devel/boost-headers/buildlink3.mk" | |
27 | .include "../../devel/boost-libs/buildlink3.mk" | 30 | .include "../../devel/boost-libs/buildlink3.mk" | |
28 | .include "../../devel/gmp/buildlink3.mk" | 31 | .include "../../devel/gmp/buildlink3.mk" | |
29 | .include "../../devel/zlib/buildlink3.mk" | 32 | .include "../../devel/zlib/buildlink3.mk" | |
30 | .include "../../security/polarssl/buildlink3.mk" | 33 | .include "../../security/polarssl/buildlink3.mk" | |
31 | .include "../../mk/pthread.buildlink3.mk" | 34 | .include "../../mk/pthread.buildlink3.mk" |
@@ -1,37 +1,38 @@ | @@ -1,37 +1,38 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.6 2014/12/10 14:50:08 fhajny Exp $ | 1 | @comment $NetBSD: PLIST,v 1.7 2015/03/27 23:37:52 rodent Exp $ | |
2 | ${PLIST.tools}bin/dnsbulktest | 2 | ${PLIST.tools}bin/dnsbulktest | |
3 | ${PLIST.tools}bin/dnsdist | 3 | ${PLIST.tools}bin/dnsdist | |
4 | ${PLIST.tools}bin/dnsreplay | 4 | ${PLIST.tools}bin/dnsreplay | |
5 | ${PLIST.tools}bin/dnsscan | 5 | ${PLIST.tools}bin/dnsscan | |
6 | ${PLIST.tools}bin/dnsscope | 6 | ${PLIST.tools}bin/dnsscope | |
7 | ${PLIST.tools}bin/dnstcpbench | 7 | ${PLIST.tools}bin/dnstcpbench | |
8 | ${PLIST.tools}bin/dnswasher | 8 | ${PLIST.tools}bin/dnswasher | |
9 | ${PLIST.tools}bin/nproxy | 9 | ${PLIST.tools}bin/nproxy | |
10 | ${PLIST.tools}bin/nsec3dig | 10 | ${PLIST.tools}bin/nsec3dig | |
11 | bin/pdns_control | 11 | bin/pdns_control | |
12 | bin/pdnssec | 12 | bin/pdnssec | |
13 | ${PLIST.tools}bin/saxfr | 13 | ${PLIST.tools}bin/saxfr | |
14 | bin/zone2json | 14 | bin/zone2json | |
15 | bin/zone2ldap | 15 | bin/zone2ldap | |
16 | bin/zone2sql | 16 | bin/zone2sql | |
17 | lib/pdns/pdns/libgeobackend.la | 17 | lib/pdns/pdns/libgeobackend.la | |
18 | ${PLIST.bind}lib/pdns/pdns/libbindbackend.la | 18 | ${PLIST.bind}lib/pdns/pdns/libbindbackend.la | |
19 | ${PLIST.pipe}lib/pdns/pdns/libpipebackend.la | 19 | ${PLIST.pipe}lib/pdns/pdns/libpipebackend.la | |
20 | ${PLIST.random}lib/pdns/pdns/librandombackend.la | 20 | ${PLIST.random}lib/pdns/pdns/librandombackend.la | |
21 | ${PLIST.remote}lib/pdns/pdns/libremotebackend.la | 21 | ${PLIST.remote}lib/pdns/pdns/libremotebackend.la | |
22 | ${PLIST.sqlite}lib/pdns/pdns/libgsqlite3backend.la | 22 | ${PLIST.sqlite}lib/pdns/pdns/libgsqlite3backend.la | |
23 | ${PLIST.tools}man/man1/dnsdist.1 | 23 | ${PLIST.tools}man/man1/dnsdist.1 | |
24 | ${PLIST.tools}man/man1/dnstcpbench.1 | 24 | ${PLIST.tools}man/man1/dnstcpbench.1 | |
25 | ${PLIST.tools}man/man8/dnsreplay.8 | 25 | ${PLIST.tools}man/man1/dnsreplay.1 | |
26 | ${PLIST.tools}man/man8/dnsscope.8 | 26 | ${PLIST.tools}man/man1/dnsscope.1 | |
27 | ${PLIST.tools}man/man8/dnswasher.8 | 27 | ${PLIST.tools}man/man1/dnstcpbench.1 | |
28 | man/man8/pdns_control.8 | 28 | ${PLIST.tools}man/man1/dnswasher.1 | |
29 | man/man8/pdns_server.8 | 29 | man/man1/pdns_control.1 | |
30 | man/man8/pdnssec.8 | 30 | man/man1/pdns_server.1 | |
31 | man/man8/zone2ldap.8 | 31 | man/man1/pdnssec.1 | |
32 | man/man8/zone2sql.8 | 32 | man/man1/zone2ldap.1 | |
33 | man/man1/zone2sql.1 | |||
33 | sbin/pdns_server | 34 | sbin/pdns_server | |
34 | ${PLIST.sqlite}share/doc/pdns/dnssec-3.x_to_3.4.0_schema.sqlite3.sql | 35 | ${PLIST.sqlite}share/doc/pdns/dnssec-3.x_to_3.4.0_schema.sqlite3.sql | |
35 | ${PLIST.sqlite}share/doc/pdns/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql | 36 | ${PLIST.sqlite}share/doc/pdns/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql | |
36 | ${PLIST.sqlite}share/doc/pdns/schema.sqlite3.sql | 37 | ${PLIST.sqlite}share/doc/pdns/schema.sqlite3.sql | |
37 | share/examples/pdns/pdns.conf-dist | 38 | share/examples/pdns/pdns.conf-dist |
@@ -1,26 +1,25 @@ | @@ -1,26 +1,25 @@ | |||
1 | $NetBSD: distinfo,v 1.17 2015/02/17 02:00:07 rodent Exp $ | 1 | $NetBSD: distinfo,v 1.18 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | SHA1 (pdns-3.4.1.tar.bz2) = e4d807b4dc27ef130a49e0efaf82a74cb66f5b11 | 3 | SHA1 (pdns-3.4.3.tar.bz2) = 578968d94fda8578473bdb357df77ce8e4cb7448 | |
4 | RMD160 (pdns-3.4.1.tar.bz2) = fe9df921ac82db834bc011c7c20ad9b436c70cec | 4 | RMD160 (pdns-3.4.3.tar.bz2) = e8ab5774ceb12178853d6207c4777b60e6c82933 | |
5 | Size (pdns-3.4.1.tar.bz2) = 1237002 bytes | 5 | Size (pdns-3.4.3.tar.bz2) = 1332686 bytes | |
6 | SHA1 (patch-aa) = 7fc9bf227c21983d5492f7359d313a3b4e56e43f | 6 | SHA1 (patch-aa) = 5d7a2f6d7b74139fbdcd7673181ccaeb91f1e565 | |
7 | SHA1 (patch-ab) = 705a7f5f7035a46ab72b08ef24b1db888a406122 | 7 | SHA1 (patch-ab) = a816def3825c0260642dab85f518bebaf4ba904b | |
8 | SHA1 (patch-configure) = ef0dc268eb81470c3449eab39cde6ddf9f49175f | 8 | SHA1 (patch-modules_luabackend_luabackend.hh) = 23ae1a2c047f367a51b7bfa10a546aeb91cccea4 | |
9 | SHA1 (patch-modules_luabackend_luabackend.hh) = fd1d04d71ff560efd92137bd468475d5e5c165ce | 9 | SHA1 (patch-modules_pipebackend_pipebackend.cc) = 975cf47dc92bf4402167b5a25f85eaf527398c06 | |
10 | SHA1 (patch-modules_pipebackend_pipebackend.cc) = 51cd06282231768df2e6f82c01e30575dc390a95 | |||
11 | SHA1 (patch-modules_pipebackend_pipebackend.hh) = 3ff9f666a1b348810be38ffe67fd740521390630 | 10 | SHA1 (patch-modules_pipebackend_pipebackend.hh) = 3ff9f666a1b348810be38ffe67fd740521390630 | |
12 | SHA1 (patch-pdns_botan18signers.cc) = 6827a3e2eade467c53d710b57352bd9ed978b47c | 11 | SHA1 (patch-pdns_botan18signers.cc) = 58df2d630ac46ea2fd1ce2699ce7a3bd927de177 | |
13 | SHA1 (patch-pdns_dns.hh) = ced89abc892e4790f2968858122fca5a02b17a30 | 12 | SHA1 (patch-pdns_dns.hh) = 6f47292c573d1a01cdd2ba3312edf17e216c2dbc | |
14 | SHA1 (patch-pdns_dnspacket.cc) = 9b3abf3e572d0cdf978d18caca82b601d55f3cc1 | 13 | SHA1 (patch-pdns_dnspacket.cc) = 822d8f1758069cbdc90f09b29e538257af5f5141 | |
15 | SHA1 (patch-pdns_dnsparser.cc) = ec1a279a48825a2adbc528a644b711d225a7e728 | 14 | SHA1 (patch-pdns_dnsparser.cc) = 3b7f1929013261d09112394e525dede41e03afff | |
16 | SHA1 (patch-pdns_dnsparser.hh) = d9480c40b97fb8c7d8f1dbbe1777c42ef270d9d1 | 15 | SHA1 (patch-pdns_dnsparser.hh) = 1ad7090312992915a0ad9bf8b006d229262936c3 | |
17 | SHA1 (patch-pdns_dnsscope.cc) = cc38014e1eb20ed3c65b59714e2725a8283f6391 | 16 | SHA1 (patch-pdns_dnsscope.cc) = a42bbda2d5d9e2bc2a0004ffc77efcd5d5beeb28 | |
18 | SHA1 (patch-pdns_dynloader.cc) = 6ef7957917936f077307a4b6c79afe5a4a6ef7c7 | 17 | SHA1 (patch-pdns_dynloader.cc) = 9a4119a17a5ed2144737d2b6161aceaa633f66c6 | |
19 | SHA1 (patch-pdns_htimer.cc) = 43eb784a58dcad9b3cedca4a6aeae777e33bd2f9 | 18 | SHA1 (patch-pdns_htimer.cc) = 6064c73db33d2e7cc65979757e90ecdf8d7c16e6 | |
20 | SHA1 (patch-pdns_misc.cc) = 989bd75074f6349b7e0720a490ff99a4af558f6e | 19 | SHA1 (patch-pdns_misc.cc) = 832cf6bd2f0b018d66a49e5b0f9f879a107c1a90 | |
21 | SHA1 (patch-pdns_nameserver.cc) = 0b6b888edc0656d9428dda760b4891c0c19f9e47 | 20 | SHA1 (patch-pdns_nameserver.cc) = 13011d7cd1e6915c4b547f7817fa72e595ac2a3a | |
22 | SHA1 (patch-pdns_pdns_recursor.cc) = df9465d337fceb93caaff7ffc32d17681a8fe77d | 21 | SHA1 (patch-pdns_pdns_recursor.cc) = 97f3688baef5a7520514764a4590d0b92fa51fda | |
23 | SHA1 (patch-pdns_receiver.cc) = 4411bfeccb2814550b834ddabee930918631c666 | 22 | SHA1 (patch-pdns_receiver.cc) = 11e096024b007d53528d61083a65fd5e941fe6eb | |
24 | SHA1 (patch-pdns_recursor__cache.cc) = a4c63c20a3e58d996a631c8a7754b8afb45cdb86 | 23 | SHA1 (patch-pdns_recursor__cache.cc) = 36dc4c4691f6d88fb7b6cc452cda19dc07a1b53b | |
25 | SHA1 (patch-pdns_resolver.cc) = 3b03f3dde04217d527f6e841ad9d5f19bbc79f53 | 24 | SHA1 (patch-pdns_resolver.cc) = 0f3de1aef64d1e24a5b0f87bfdd866c75ff3c1ff | |
26 | SHA1 (patch-pdns_tcpreceiver.cc) = 3d86e0e87fe82c034210f61d6a3c57cd7ab9d3ba | 25 | SHA1 (patch-pdns_tcpreceiver.cc) = 0624ac68b2b1f609febb46be97e14c3d358f37b9 |
@@ -1,45 +1,64 @@ | @@ -1,45 +1,64 @@ | |||
1 | # $NetBSD: options.mk,v 1.1 2014/12/10 14:50:08 fhajny Exp $ | 1 | # $NetBSD: options.mk,v 1.2 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.powerdns | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.powerdns | |
4 | PKG_SUPPORTED_OPTIONS= bind botan pipe random remote sqlite tools | 4 | PKG_SUPPORTED_OPTIONS= bind botan cryptopp pipe random remote sqlite tools | |
5 | PKG_SUPPORTED_OPTIONS+= zeromq | |||
5 | PKG_SUGGESTED_OPTIONS= bind pipe random | 6 | PKG_SUGGESTED_OPTIONS= bind pipe random | |
6 | 7 | |||
7 | .include "../../mk/bsd.options.mk" | 8 | .include "../../mk/bsd.options.mk" | |
8 | 9 | |||
9 | PLIST_VARS+= bind pipe random remote sqlite tools | 10 | PLIST_VARS+= bind pipe random remote sqlite tools | |
10 | 11 | |||
11 | .if !empty(PKG_OPTIONS:Mbind) | 12 | .if !empty(PKG_OPTIONS:Mbind) | |
12 | PDNS_MODULES+= bind | 13 | PDNS_MODULES+= bind | |
13 | PLIST.bind= yes | 14 | PLIST.bind= yes | |
14 | .endif | 15 | .endif | |
15 | 16 | |||
16 | .if !empty(PKG_OPTIONS:Mbotan) | 17 | .if !empty(PKG_OPTIONS:Mbotan) | |
17 | CONFIGURE_ARGS+= --enable-botan1.8 | 18 | CONFIGURE_ARGS+= --enable-botan1.8 | |
18 | .include "../../security/botan/buildlink3.mk" | 19 | .include "../../security/botan/buildlink3.mk" | |
19 | .endif | 20 | .endif | |
20 | 21 | |||
22 | .if !empty(PKG_OPTIONS:Mcryptopp) | |||
23 | .include "../../security/crypto++/buildlink3.mk" | |||
24 | CONFIGURE_ARGS+= --enable-cryptopp=yes | |||
25 | CRYPTOPP_CFLAGS= -I${BUILDLINK_PREFIX.cryptopp}/include | |||
26 | CRYPTOPP_LIBS= -L${BUILDLINK_PREFIX.cryptopp}/lib -Wl,-R${BUILDLINK_PREFIX.cryptopp}/lib -lcryptopp | |||
27 | CONFIGURE_ENV+= CRYPTOPP_CFLAGS=${CRYPTOPP_CFLAGS:Q} | |||
28 | CONFIGURE_ENV+= CRYPTOPP_LIBS=${CRYPTOPP_LIBS:Q} | |||
29 | .else | |||
30 | CONFIGURE_ARGS+= --enable-cryptopp=no | |||
31 | .endif | |||
32 | ||||
21 | .if !empty(PKG_OPTIONS:Mpipe) | 33 | .if !empty(PKG_OPTIONS:Mpipe) | |
22 | PLIST.pipe= yes | 34 | PLIST.pipe= yes | |
23 | PDNS_MODULES+= pipe | 35 | PDNS_MODULES+= pipe | |
24 | .endif | 36 | .endif | |
25 | 37 | |||
26 | .if !empty(PKG_OPTIONS:Mrandom) | 38 | .if !empty(PKG_OPTIONS:Mrandom) | |
27 | PLIST.random= yes | 39 | PLIST.random= yes | |
28 | PDNS_MODULES+= random | 40 | PDNS_MODULES+= random | |
29 | .endif | 41 | .endif | |
30 | 42 | |||
31 | .if !empty(PKG_OPTIONS:Mremote) | 43 | .if !empty(PKG_OPTIONS:Mremote) | |
32 | PLIST.remote= yes | 44 | PLIST.remote= yes | |
33 | PDNS_MODULES+= remote | 45 | PDNS_MODULES+= remote | |
34 | .endif | 46 | .endif | |
35 | 47 | |||
36 | .if !empty(PKG_OPTIONS:Msqlite) | 48 | .if !empty(PKG_OPTIONS:Msqlite) | |
37 | PDNS_MODULES+= gsqlite3 | 49 | PDNS_MODULES+= gsqlite3 | |
38 | PLIST.sqlite= yes | 50 | PLIST.sqlite= yes | |
39 | .include "../../databases/sqlite3/buildlink3.mk" | 51 | .include "../../databases/sqlite3/buildlink3.mk" | |
40 | .endif | 52 | .endif | |
41 | 53 | |||
42 | .if !empty(PKG_OPTIONS:Mtools) | 54 | .if !empty(PKG_OPTIONS:Mtools) | |
43 | CONFIGURE_ARGS+= --enable-tools | 55 | CONFIGURE_ARGS+= --enable-tools | |
44 | PLIST.tools= yes | 56 | PLIST.tools= yes | |
45 | .endif | 57 | .endif | |
58 | ||||
59 | .if !empty(PKG_OPTIONS:Mzeromq) | |||
60 | .include "../../net/zeromq/buildlink3.mk" | |||
61 | CONFIGURE_ARGS+= --enable-remotebackend-zeromq=yes | |||
62 | .else | |||
63 | CONFIGURE_ARGS+= --enable-remotebackend-zeromq=no | |||
64 | .endif |
@@ -1,19 +1,30 @@ | @@ -1,19 +1,30 @@ | |||
1 | $NetBSD: patch-aa,v 1.4 2014/12/10 14:50:09 fhajny Exp $ | 1 | $NetBSD: patch-aa,v 1.5 2015/03/27 23:37:52 rodent Exp $ | |
2 | ||||
3 | Handle CONF_FILES. `hostname -f` is not portable. | |||
2 | 4 | |||
3 | Installation destination for example config file. | 5 | Installation destination for example config file. | |
4 | --- pdns/Makefile.in.orig 2014-10-30 10:18:39.000000000 +0000 | 6 | --- pdns/Makefile.in.orig 2015-03-02 13:17:27.000000000 +0000 | |
5 | +++ pdns/Makefile.in | 7 | +++ pdns/Makefile.in | |
6 | @@ -1627,18 +1627,18 @@ clean-libtool: | 8 | @@ -1176,7 +1176,7 @@ misc.cc unix_utility.cc qtype.cc | |
9 | pdns_control_LDFLAGS = $(THREADFLAGS) | |||
10 | @UNIT_TESTS_TRUE@TESTS_ENVIRONMENT = env BOOST_TEST_LOG_LEVEL=message | |||
11 | build_date = $(shell LC_TIME=C date '+%Y%m%d%H%M%S') | |||
12 | -build_host = $(shell id -u -n)@$(shell hostname -f) | |||
13 | +build_host = $(shell id -u -n)@$(shell hostname) | |||
14 | # Do the test in shell, so we don't confuse automake with ifeq/ifneq. | |||
15 | @RELEASE_BUILD_FALSE@pdns_version = $(shell test -z "$(git_version)" && echo UNKNOWN || echo "git-$(git_version)") | |||
16 | @RELEASE_BUILD_TRUE@pdns_version = $(PACKAGE_VERSION) | |||
17 | @@ -1632,18 +1632,18 @@ clean-libtool: | |||
7 | -rm -rf .libs _libs | 18 | -rm -rf .libs _libs | |
8 | install-sysconfDATA: $(sysconf_DATA) | 19 | install-sysconfDATA: $(sysconf_DATA) | |
9 | @$(NORMAL_INSTALL) | 20 | @$(NORMAL_INSTALL) | |
10 | - @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ | 21 | - @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ | |
11 | + @list='$(sysconf_DATA)'; test -n "$(EGDIR)" || list=; \ | 22 | + @list='$(sysconf_DATA)'; test -n "$(EGDIR)" || list=; \ | |
12 | if test -n "$$list"; then \ | 23 | if test -n "$$list"; then \ | |
13 | - echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ | 24 | - echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ | |
14 | - $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ | 25 | - $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ | |
15 | + echo " $(MKDIR_P) '$(DESTDIR)$(EGDIR)'"; \ | 26 | + echo " $(MKDIR_P) '$(DESTDIR)$(EGDIR)'"; \ | |
16 | + $(MKDIR_P) "$(DESTDIR)$(EGDIR)" || exit 1; \ | 27 | + $(MKDIR_P) "$(DESTDIR)$(EGDIR)" || exit 1; \ | |
17 | fi; \ | 28 | fi; \ | |
18 | for p in $$list; do \ | 29 | for p in $$list; do \ | |
19 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | 30 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
@@ -1,23 +1,23 @@ | @@ -1,23 +1,23 @@ | |||
1 | $NetBSD: patch-ab,v 1.4 2014/12/10 14:50:09 fhajny Exp $ | 1 | $NetBSD: patch-ab,v 1.5 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | Default paths. | 3 | Default paths. | |
4 | --- pdns/pdns.conf-dist.orig 2014-10-28 10:41:09.000000000 +0000 | 4 | --- pdns/pdns.conf-dist.orig 2015-03-02 13:17:12.000000000 +0000 | |
5 | +++ pdns/pdns.conf-dist | 5 | +++ pdns/pdns.conf-dist | |
6 | @@ -52,7 +52,7 @@ | 6 | @@ -57,7 +57,7 @@ | |
7 | ################################# | 7 | ################################# | |
8 | # config-dir Location of configuration directory (pdns.conf) | 8 | # config-dir Location of configuration directory (pdns.conf) | |
9 | # | 9 | # | |
10 | -# config-dir=/usr/local/etc | 10 | -# config-dir=/usr/local/etc | |
11 | +# config-dir=@PKG_SYSCONFDIR@ | 11 | +# config-dir=@PKG_SYSCONFDIR@ | |
12 | 12 | |||
13 | ################################# | 13 | ################################# | |
14 | # config-name Name of this virtual configuration - will rename the binary image | 14 | # config-name Name of this virtual configuration - will rename the binary image | |
15 | @@ -287,7 +287,7 @@ | 15 | @@ -292,7 +292,7 @@ | |
16 | ################################# | 16 | ################################# | |
17 | # module-dir Default directory for modules | 17 | # module-dir Default directory for modules | |
18 | # | 18 | # | |
19 | -# module-dir=/usr/local/lib/pdns | 19 | -# module-dir=/usr/local/lib/pdns | |
20 | +# module-dir=@PREFIX@/lib/pdns | 20 | +# module-dir=@PREFIX@/lib/pdns | |
21 | 21 | |||
22 | ################################# | 22 | ################################# | |
23 | # negquery-cache-ttl Seconds to store negative query results in the QueryCache | 23 | # negquery-cache-ttl Seconds to store negative query results in the QueryCache |
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | $NetBSD: patch-modules_luabackend_luabackend.hh,v 1.1 2014/12/10 14:50:09 fhajny Exp $ | 1 | $NetBSD: patch-modules_luabackend_luabackend.hh,v 1.2 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | u_int32_t not defined on SunOS. | 3 | u_int32_t not defined on SunOS. | |
4 | --- modules/luabackend/luabackend.hh.orig 2014-02-04 11:33:04.000000000 +0000 | 4 | --- modules/luabackend/luabackend.hh.orig 2015-03-02 13:17:08.000000000 +0000 | |
5 | +++ modules/luabackend/luabackend.hh | 5 | +++ modules/luabackend/luabackend.hh | |
6 | @@ -17,6 +17,9 @@ using std::string; | 6 | @@ -17,6 +17,9 @@ using std::string; | |
7 | 7 | |||
8 | //#undef L | 8 | //#undef L | |
9 | 9 | |||
10 | +#ifdef __sun | 10 | +#ifdef __sun | |
11 | +typedef uint32_t u_int32_t; | 11 | +typedef uint32_t u_int32_t; | |
12 | +#endif | 12 | +#endif | |
13 | 13 | |||
14 | 14 | |||
15 | class LUAException { | 15 | class LUAException { |
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | $NetBSD: patch-pdns_botan18signers.cc,v 1.1 2014/12/10 14:50:09 fhajny Exp $ | 1 | $NetBSD: patch-pdns_botan18signers.cc,v 1.2 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | Resolve boost symbol ambiguity. | 3 | Resolve boost symbol ambiguity. | |
4 | --- pdns/botan18signers.cc.orig 2013-04-26 19:54:34.000000000 +0000 | 4 | --- pdns/botan18signers.cc.orig 2015-03-02 13:17:09.000000000 +0000 | |
5 | +++ pdns/botan18signers.cc | 5 | +++ pdns/botan18signers.cc | |
6 | @@ -36,8 +36,8 @@ public: | 6 | @@ -36,8 +36,8 @@ public: | |
7 | 7 | |||
8 | private: | 8 | private: | |
9 | static EC_Domain_Params getECParams(unsigned int algorithm); | 9 | static EC_Domain_Params getECParams(unsigned int algorithm); | |
10 | - shared_ptr<ECDSA_PrivateKey> d_key; | 10 | - shared_ptr<ECDSA_PrivateKey> d_key; | |
11 | - shared_ptr<ECDSA_PublicKey> d_pubkey; | 11 | - shared_ptr<ECDSA_PublicKey> d_pubkey; | |
12 | + boost::shared_ptr<ECDSA_PrivateKey> d_key; | 12 | + boost::shared_ptr<ECDSA_PrivateKey> d_key; | |
13 | + boost::shared_ptr<ECDSA_PublicKey> d_pubkey; | 13 | + boost::shared_ptr<ECDSA_PublicKey> d_pubkey; | |
14 | }; | 14 | }; | |
15 | 15 | |||
16 | EC_Domain_Params ECDSADNSCryptoKeyEngine::getECParams(unsigned int algorithm) | 16 | EC_Domain_Params ECDSADNSCryptoKeyEngine::getECParams(unsigned int algorithm) | |
17 | @@ -56,7 +56,7 @@ void ECDSADNSCryptoKeyEngine::create(uns | 17 | @@ -56,7 +56,7 @@ void ECDSADNSCryptoKeyEngine::create(uns |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: patch-pdns_dnsscope.cc,v 1.1 2014/12/10 14:50:09 fhajny Exp $ | 1 | $NetBSD: patch-pdns_dnsscope.cc,v 1.2 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | IP_OFFMASK not defined on SunOS. | 3 | IP_OFFMASK not defined on SunOS. | |
4 | --- pdns/dnsscope.cc.orig 2014-06-26 11:22:02.000000000 +0000 | 4 | --- pdns/dnsscope.cc.orig 2015-03-02 13:17:10.000000000 +0000 | |
5 | +++ pdns/dnsscope.cc | 5 | +++ pdns/dnsscope.cc | |
6 | @@ -16,6 +16,10 @@ | 6 | @@ -16,6 +16,10 @@ | |
7 | #include "namespaces.hh" | 7 | #include "namespaces.hh" | |
8 | #include <deque> | 8 | #include <deque> | |
9 | 9 | |||
10 | +#ifndef IP_OFFMASK | 10 | +#ifndef IP_OFFMASK | |
11 | +# define IP_OFFMASK 0x1fff | 11 | +# define IP_OFFMASK 0x1fff | |
12 | +#endif | 12 | +#endif | |
13 | + | 13 | + | |
14 | namespace po = boost::program_options; | 14 | namespace po = boost::program_options; | |
15 | po::variables_map g_vm; | 15 | po::variables_map g_vm; | |
16 | 16 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: patch-pdns_misc.cc,v 1.1 2014/12/15 12:56:41 fhajny Exp $ | 1 | $NetBSD: patch-pdns_misc.cc,v 1.2 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | Do not use IP_PKTINFO on NetBSD. | 3 | Do not use IP_PKTINFO on NetBSD. | |
4 | --- pdns/misc.cc.orig 2014-10-30 10:18:22.000000000 +0000 | 4 | --- pdns/misc.cc.orig 2015-03-02 13:17:12.000000000 +0000 | |
5 | +++ pdns/misc.cc | 5 | +++ pdns/misc.cc | |
6 | @@ -802,7 +802,7 @@ void addCMsgSrcAddr(struct msghdr* msgh, | 6 | @@ -802,7 +802,7 @@ void addCMsgSrcAddr(struct msghdr* msgh, | |
7 | msgh->msg_controllen = cmsg->cmsg_len; // makes valgrind happy and is slightly better style | 7 | msgh->msg_controllen = cmsg->cmsg_len; // makes valgrind happy and is slightly better style | |
8 | } | 8 | } | |
9 | else { | 9 | else { | |
10 | -#ifdef IP_PKTINFO | 10 | -#ifdef IP_PKTINFO | |
11 | +#if defined(IP_PKTINFO) && !defined(__NetBSD__) | 11 | +#if defined(IP_PKTINFO) && !defined(__NetBSD__) | |
12 | struct in_pktinfo *pkt; | 12 | struct in_pktinfo *pkt; | |
13 | 13 | |||
14 | msgh->msg_control = cmsgbuf; | 14 | msgh->msg_control = cmsgbuf; |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: patch-modules_pipebackend_pipebackend.cc,v 1.2 2014/12/10 14:50:09 fhajny Exp $ | 1 | $NetBSD: patch-modules_pipebackend_pipebackend.cc,v 1.3 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | Resolve boost symbol ambiguity. | 3 | Resolve boost symbol ambiguity. | |
4 | --- modules/pipebackend/pipebackend.cc.orig 2014-10-30 10:18:22.000000000 +0000 | 4 | --- modules/pipebackend/pipebackend.cc.orig 2015-03-02 13:17:08.000000000 +0000 | |
5 | +++ modules/pipebackend/pipebackend.cc | 5 | +++ modules/pipebackend/pipebackend.cc | |
6 | @@ -92,7 +92,7 @@ PipeBackend::PipeBackend(const string &s | 6 | @@ -92,7 +92,7 @@ PipeBackend::PipeBackend(const string &s | |
7 | signal(SIGCHLD, SIG_IGN); | 7 | signal(SIGCHLD, SIG_IGN); | |
8 | setArgPrefix("pipe"+suffix); | 8 | setArgPrefix("pipe"+suffix); | |
9 | try { | 9 | try { | |
10 | - d_coproc=shared_ptr<CoWrapper>(new CoWrapper(getArg("command"), getArgAsNum("timeout"))); | 10 | - d_coproc=shared_ptr<CoWrapper>(new CoWrapper(getArg("command"), getArgAsNum("timeout"))); | |
11 | + d_coproc=boost::shared_ptr<CoWrapper>(new CoWrapper(getArg("command"), getArgAsNum("timeout"))); | 11 | + d_coproc=boost::shared_ptr<CoWrapper>(new CoWrapper(getArg("command"), getArgAsNum("timeout"))); | |
12 | d_regex=getArg("regex").empty() ? 0 : new Regex(getArg("regex")); | 12 | d_regex=getArg("regex").empty() ? 0 : new Regex(getArg("regex")); | |
13 | d_regexstr=getArg("regex"); | 13 | d_regexstr=getArg("regex"); | |
14 | d_abiVersion = ::arg().asNum("pipebackend-abi-version"); | 14 | d_abiVersion = ::arg().asNum("pipebackend-abi-version"); |
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | $NetBSD: patch-pdns_dnsparser.cc,v 1.2 2014/12/10 14:50:09 fhajny Exp $ | 1 | $NetBSD: patch-pdns_dnsparser.cc,v 1.3 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | Resolve boost symbol ambiguity. | 3 | Resolve boost symbol ambiguity. | |
4 | --- pdns/dnsparser.cc.orig 2014-08-29 14:33:20.000000000 +0000 | 4 | --- pdns/dnsparser.cc.orig 2015-03-02 13:17:09.000000000 +0000 | |
5 | +++ pdns/dnsparser.cc | 5 | +++ pdns/dnsparser.cc | |
6 | @@ -109,7 +109,7 @@ static const string EncodeDNSLabel(const | 6 | @@ -109,7 +109,7 @@ static const string EncodeDNSLabel(const | |
7 | } | 7 | } | |
8 | 8 | |||
9 | 9 | |||
10 | -shared_ptr<DNSRecordContent> DNSRecordContent::unserialize(const string& qname, uint16_t qtype, const string& serialized) | 10 | -shared_ptr<DNSRecordContent> DNSRecordContent::unserialize(const string& qname, uint16_t qtype, const string& serialized) | |
11 | +boost::shared_ptr<DNSRecordContent> DNSRecordContent::unserialize(const string& qname, uint16_t qtype, const string& serialized) | 11 | +boost::shared_ptr<DNSRecordContent> DNSRecordContent::unserialize(const string& qname, uint16_t qtype, const string& serialized) | |
12 | { | 12 | { | |
13 | dnsheader dnsheader; | 13 | dnsheader dnsheader; | |
14 | memset(&dnsheader, 0, sizeof(dnsheader)); | 14 | memset(&dnsheader, 0, sizeof(dnsheader)); | |
15 | @@ -143,7 +143,7 @@ shared_ptr<DNSRecordContent> DNSRecordCo | 15 | @@ -143,7 +143,7 @@ shared_ptr<DNSRecordContent> DNSRecordCo | |
16 | memcpy(&packet[pos], serialized.c_str(), serialized.size()); pos+=(uint16_t)serialized.size(); | 16 | memcpy(&packet[pos], serialized.c_str(), serialized.size()); pos+=(uint16_t)serialized.size(); | |
17 | 17 |
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | $NetBSD: patch-pdns_dnsparser.hh,v 1.2 2014/12/10 14:50:09 fhajny Exp $ | 1 | $NetBSD: patch-pdns_dnsparser.hh,v 1.3 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | Resolve boost symbol ambiguity. | 3 | Resolve boost symbol ambiguity. | |
4 | --- pdns/dnsparser.hh.orig 2014-04-25 09:42:01.000000000 +0000 | 4 | --- pdns/dnsparser.hh.orig 2015-03-02 13:17:09.000000000 +0000 | |
5 | +++ pdns/dnsparser.hh | 5 | +++ pdns/dnsparser.hh | |
6 | @@ -183,7 +183,7 @@ public: | 6 | @@ -183,7 +183,7 @@ public: | |
7 | return record; | 7 | return record; | |
8 | } | 8 | } | |
9 | 9 | |||
10 | - static shared_ptr<DNSRecordContent> unserialize(const string& qname, uint16_t qtype, const string& serialized); | 10 | - static shared_ptr<DNSRecordContent> unserialize(const string& qname, uint16_t qtype, const string& serialized); | |
11 | + static boost::shared_ptr<DNSRecordContent> unserialize(const string& qname, uint16_t qtype, const string& serialized); | 11 | + static boost::shared_ptr<DNSRecordContent> unserialize(const string& qname, uint16_t qtype, const string& serialized); | |
12 | 12 | |||
13 | void doRecordCheck(const struct DNSRecord&){} | 13 | void doRecordCheck(const struct DNSRecord&){} | |
14 | 14 | |||
15 | @@ -327,9 +327,9 @@ public: | 15 | @@ -327,9 +327,9 @@ public: | |
16 | //! All answers contained in this packet | 16 | //! All answers contained in this packet | |
17 | answers_t d_answers; | 17 | answers_t d_answers; |
@@ -1,26 +1,26 @@ | @@ -1,26 +1,26 @@ | |||
1 | $NetBSD: patch-pdns_dynloader.cc,v 1.2 2014/12/10 14:50:09 fhajny Exp $ | 1 | $NetBSD: patch-pdns_dynloader.cc,v 1.3 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | Resolve boost symbol ambiguity. | 3 | Resolve boost symbol ambiguity. | |
4 | --- pdns/dynloader.cc.orig 2014-04-29 11:02:00.000000000 +0000 | 4 | --- pdns/dynloader.cc.orig 2015-03-02 13:17:11.000000000 +0000 | |
5 | +++ pdns/dynloader.cc | 5 | +++ pdns/dynloader.cc | |
6 | @@ -103,9 +103,9 @@ int main(int argc, char **argv) | 6 | @@ -97,9 +97,9 @@ int main(int argc, char **argv) | |
7 | 7 | |||
8 | try { | 8 | try { | |
9 | string command=commands[0]; | 9 | string command=commands[0]; | |
10 | - shared_ptr<DynMessenger> D; | 10 | - shared_ptr<DynMessenger> D; | |
11 | + boost::shared_ptr<DynMessenger> D; | 11 | + boost::shared_ptr<DynMessenger> D; | |
12 | if(::arg()["remote-address"].empty()) | 12 | if(::arg()["remote-address"].empty()) | |
13 | - D=shared_ptr<DynMessenger>(new DynMessenger(localdir,socketname)); | 13 | - D=shared_ptr<DynMessenger>(new DynMessenger(socketname)); | |
14 | + D=boost::shared_ptr<DynMessenger>(new DynMessenger(localdir,socketname)); | 14 | + D=boost::shared_ptr<DynMessenger>(new DynMessenger(socketname)); | |
15 | else { | 15 | else { | |
16 | uint16_t port; | 16 | uint16_t port; | |
17 | try { | 17 | try { | |
18 | @@ -116,7 +116,7 @@ int main(int argc, char **argv) | 18 | @@ -110,7 +110,7 @@ int main(int argc, char **argv) | |
19 | exit(99); | 19 | exit(99); | |
20 | } | 20 | } | |
21 | 21 | |||
22 | - D=shared_ptr<DynMessenger>(new DynMessenger(ComboAddress(::arg()["remote-address"], port), ::arg()["secret"])); | 22 | - D=shared_ptr<DynMessenger>(new DynMessenger(ComboAddress(::arg()["remote-address"], port), ::arg()["secret"])); | |
23 | + D=boost::shared_ptr<DynMessenger>(new DynMessenger(ComboAddress(::arg()["remote-address"], port), ::arg()["secret"])); | 23 | + D=boost::shared_ptr<DynMessenger>(new DynMessenger(ComboAddress(::arg()["remote-address"], port), ::arg()["secret"])); | |
24 | } | 24 | } | |
25 | 25 | |||
26 | string message; | 26 | string message; |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: patch-pdns_htimer.cc,v 1.2 2014/12/10 14:50:09 fhajny Exp $ | 1 | $NetBSD: patch-pdns_htimer.cc,v 1.3 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | Resolve boost symbol ambiguity. | 3 | Resolve boost symbol ambiguity. | |
4 | --- pdns/htimer.cc.orig 2013-12-17 17:42:51.000000000 +0000 | 4 | --- pdns/htimer.cc.orig 2015-03-02 13:17:11.000000000 +0000 | |
5 | +++ pdns/htimer.cc | 5 | +++ pdns/htimer.cc | |
6 | @@ -128,7 +128,7 @@ int main() | 6 | @@ -128,7 +128,7 @@ int main() | |
7 | HTimerSentinel hts=htloop.getSentinel(); | 7 | HTimerSentinel hts=htloop.getSentinel(); | |
8 | for(int i=0; i < 1000; ++i) | 8 | for(int i=0; i < 1000; ++i) | |
9 | { | 9 | { | |
10 | - shared_ptr<char> p(shared_ptr<char>(new char)); | 10 | - shared_ptr<char> p(shared_ptr<char>(new char)); | |
11 | + boost::shared_ptr<char> p(boost::shared_ptr<char>(new char)); | 11 | + boost::shared_ptr<char> p(boost::shared_ptr<char>(new char)); | |
12 | } | 12 | } | |
13 | } | 13 | } | |
14 | 14 |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: patch-pdns_receiver.cc,v 1.2 2014/12/10 14:50:09 fhajny Exp $ | 1 | $NetBSD: patch-pdns_receiver.cc,v 1.3 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | Limit inclusion of boost headers to only those necessary to avoid conflicting | 3 | Limit inclusion of boost headers to only those necessary to avoid conflicting | |
4 | types errors on Solaris. | 4 | types errors on Solaris. | |
5 | 5 | |||
6 | --- pdns/receiver.cc.orig 2014-09-02 08:02:05.000000000 +0000 | 6 | --- pdns/receiver.cc.orig 2015-03-02 13:17:12.000000000 +0000 | |
7 | +++ pdns/receiver.cc | 7 | +++ pdns/receiver.cc | |
8 | @@ -42,7 +42,7 @@ | 8 | @@ -42,7 +42,7 @@ | |
9 | #include <sys/mman.h> | 9 | #include <sys/mman.h> | |
10 | #include <fcntl.h> | 10 | #include <fcntl.h> | |
11 | #include <fstream> | 11 | #include <fstream> | |
12 | -#include <boost/algorithm/string.hpp> | 12 | -#include <boost/algorithm/string.hpp> | |
13 | +#include <boost/algorithm/string/trim.hpp> | 13 | +#include <boost/algorithm/string/trim.hpp> | |
14 | 14 | |||
15 | #include "config.h" | 15 | #include "config.h" | |
16 | #include "dns.hh" | 16 | #include "dns.hh" |
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | $NetBSD: patch-pdns_recursor__cache.cc,v 1.2 2014/12/10 14:50:09 fhajny Exp $ | 1 | $NetBSD: patch-pdns_recursor__cache.cc,v 1.3 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | Resolve boost symbol ambiguity. | 3 | Resolve boost symbol ambiguity. | |
4 | --- pdns/recursor_cache.cc.orig 2014-10-30 10:18:22.000000000 +0000 | 4 | --- pdns/recursor_cache.cc.orig 2015-03-02 13:17:12.000000000 +0000 | |
5 | +++ pdns/recursor_cache.cc | 5 | +++ pdns/recursor_cache.cc | |
6 | @@ -53,7 +53,7 @@ DNSResourceRecord String2DNSRR(const str | 6 | @@ -53,7 +53,7 @@ DNSResourceRecord String2DNSRR(const str | |
7 | rr.content="."; | 7 | rr.content="."; | |
8 | } | 8 | } | |
9 | else { | 9 | else { | |
10 | - shared_ptr<DNSRecordContent> regen=DNSRecordContent::unserialize(qname, qt.getCode(), serial); | 10 | - shared_ptr<DNSRecordContent> regen=DNSRecordContent::unserialize(qname, qt.getCode(), serial); | |
11 | + boost::shared_ptr<DNSRecordContent> regen=DNSRecordContent::unserialize(qname, qt.getCode(), serial); | 11 | + boost::shared_ptr<DNSRecordContent> regen=DNSRecordContent::unserialize(qname, qt.getCode(), serial); | |
12 | rr.content=regen->getZoneRepresentation(); | 12 | rr.content=regen->getZoneRepresentation(); | |
13 | } | 13 | } | |
14 | rr.content.reserve(0); | 14 | rr.content.reserve(0); | |
15 | @@ -79,7 +79,7 @@ string DNSRR2String(const DNSResourceRec | 15 | @@ -79,7 +79,7 @@ string DNSRR2String(const DNSResourceRec | |
16 | return simpleCompress(rr.content, rr.qname); | 16 | return simpleCompress(rr.content, rr.qname); | |
17 | else { | 17 | else { |
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | $NetBSD: patch-pdns_tcpreceiver.cc,v 1.2 2014/12/10 14:50:09 fhajny Exp $ | 1 | $NetBSD: patch-pdns_tcpreceiver.cc,v 1.3 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | Resolve boost symbol ambiguity. | 3 | Resolve boost symbol ambiguity. | |
4 | --- pdns/tcpreceiver.cc.orig 2014-10-21 11:31:14.000000000 +0000 | 4 | --- pdns/tcpreceiver.cc.orig 2015-03-02 13:17:13.000000000 +0000 | |
5 | +++ pdns/tcpreceiver.cc | 5 | +++ pdns/tcpreceiver.cc | |
6 | @@ -173,7 +173,7 @@ void connectWithTimeout(int fd, struct s | 6 | @@ -173,7 +173,7 @@ void connectWithTimeout(int fd, struct s | |
7 | ; | 7 | ; | |
8 | } | 8 | } | |
9 | 9 | |||
10 | -void TCPNameserver::sendPacket(shared_ptr<DNSPacket> p, int outsock) | 10 | -void TCPNameserver::sendPacket(shared_ptr<DNSPacket> p, int outsock) | |
11 | +void TCPNameserver::sendPacket(boost::shared_ptr<DNSPacket> p, int outsock) | 11 | +void TCPNameserver::sendPacket(boost::shared_ptr<DNSPacket> p, int outsock) | |
12 | { | 12 | { | |
13 | 13 | |||
14 | /* Query statistics */ | 14 | /* Query statistics */ | |
15 | @@ -203,7 +203,7 @@ catch(NetworkError& ae) { | 15 | @@ -203,7 +203,7 @@ catch(NetworkError& ae) { | |
16 | throw NetworkError("Error reading DNS data from TCP client "+remote.toString()+": "+ae.what()); | 16 | throw NetworkError("Error reading DNS data from TCP client "+remote.toString()+": "+ae.what()); | |
17 | } | 17 | } |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: patch-pdns_dns.hh,v 1.3 2015/02/17 02:00:07 rodent Exp $ | 1 | $NetBSD: patch-pdns_dns.hh,v 1.4 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | Add DragonFly support. | 3 | Add DragonFly support. | |
4 | --- pdns/dns.hh.orig 2014-10-30 10:18:22.000000000 +0000 | 4 | --- pdns/dns.hh.orig 2015-03-02 13:17:09.000000000 +0000 | |
5 | +++ pdns/dns.hh | 5 | +++ pdns/dns.hh | |
6 | @@ -207,7 +207,7 @@ enum { | 6 | @@ -207,7 +207,7 @@ enum { | |
7 | ns_t_any = 255, /* Wildcard match. */ | 7 | ns_t_any = 255, /* Wildcard match. */ | |
8 | }; | 8 | }; | |
9 | 9 | |||
10 | -#if __FreeBSD__ || __APPLE__ || __OpenBSD__ || defined(__FreeBSD_kernel__) | 10 | -#if __FreeBSD__ || __APPLE__ || __OpenBSD__ || __DragonFly__ || defined(__FreeBSD_kernel__) | |
11 | +#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) | 11 | +#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) | |
12 | #include <machine/endian.h> | 12 | #include <machine/endian.h> | |
13 | #elif __linux__ || __GNU__ | 13 | #elif __linux__ || __GNU__ | |
14 | # include <endian.h> | 14 | # include <endian.h> |
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | $NetBSD: patch-pdns_dnspacket.cc,v 1.3 2015/01/12 11:40:43 jperkin Exp $ | 1 | $NetBSD: patch-pdns_dnspacket.cc,v 1.4 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | Resolve boost symbol ambiguity. | 3 | Resolve boost symbol ambiguity. | |
4 | Avoid ambiguous abs() call. | 4 | Avoid ambiguous abs() call. | |
5 | 5 | |||
6 | --- pdns/dnspacket.cc.orig 2014-10-30 10:18:22.000000000 +0000 | 6 | --- pdns/dnspacket.cc.orig 2015-03-02 13:17:09.000000000 +0000 | |
7 | +++ pdns/dnspacket.cc | 7 | +++ pdns/dnspacket.cc | |
8 | @@ -312,7 +312,7 @@ void DNSPacket::wrapup() | 8 | @@ -312,7 +312,7 @@ void DNSPacket::wrapup() | |
9 | pos->content="."; | 9 | pos->content="."; | |
10 | 10 | |||
11 | pw.startRecord(pos->qname, pos->qtype.getCode(), pos->ttl, pos->qclass, (DNSPacketWriter::Place)pos->d_place); | 11 | pw.startRecord(pos->qname, pos->qtype.getCode(), pos->ttl, pos->qclass, (DNSPacketWriter::Place)pos->d_place); | |
12 | - shared_ptr<DNSRecordContent> drc(DNSRecordContent::mastermake(pos->qtype.getCode(), 1, pos->content)); | 12 | - shared_ptr<DNSRecordContent> drc(DNSRecordContent::mastermake(pos->qtype.getCode(), 1, pos->content)); | |
13 | + boost::shared_ptr<DNSRecordContent> drc(DNSRecordContent::mastermake(pos->qtype.getCode(), 1, pos->content)); | 13 | + boost::shared_ptr<DNSRecordContent> drc(DNSRecordContent::mastermake(pos->qtype.getCode(), 1, pos->content)); | |
14 | drc->toPacket(pw); | 14 | drc->toPacket(pw); | |
15 | if(pw.size() + 20U > (d_tcp ? 65535 : getMaxReplyLen())) { // 20 = room for EDNS0 | 15 | if(pw.size() + 20U > (d_tcp ? 65535 : getMaxReplyLen())) { // 20 = room for EDNS0 | |
16 | pw.rollback(); | 16 | pw.rollback(); | |
17 | @@ -601,7 +601,7 @@ bool checkForCorrectTSIG(const DNSPacket | 17 | @@ -601,7 +601,7 @@ bool checkForCorrectTSIG(const DNSPacket | |
18 | string message; | 18 | string message; | |
19 | 19 |
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | $NetBSD: patch-pdns_nameserver.cc,v 1.3 2014/12/15 12:56:41 fhajny Exp $ | 1 | $NetBSD: patch-pdns_nameserver.cc,v 1.4 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | Do not use IP_PKTINFO on NetBSD. | 3 | Do not use IP_PKTINFO on NetBSD. | |
4 | --- pdns/nameserver.cc.orig 2014-10-30 10:18:22.000000000 +0000 | 4 | --- pdns/nameserver.cc.orig 2015-03-02 13:17:12.000000000 +0000 | |
5 | +++ pdns/nameserver.cc | 5 | +++ pdns/nameserver.cc | |
6 | @@ -81,7 +81,7 @@ extern StatBag S; | 6 | @@ -81,7 +81,7 @@ extern StatBag S; | |
7 | The main() of PowerDNS can be found in receiver.cc - start reading there for further insights into the operation of the nameserver | 7 | The main() of PowerDNS can be found in receiver.cc - start reading there for further insights into the operation of the nameserver | |
8 | */ | 8 | */ | |
9 | 9 | |||
10 | -#if defined(IP_PKTINFO) | 10 | -#if defined(IP_PKTINFO) | |
11 | +#if defined(IP_PKTINFO) || !defined(__NetBSD__) | 11 | +#if defined(IP_PKTINFO) || !defined(__NetBSD__) | |
12 | #define GEN_IP_PKTINFO IP_PKTINFO | 12 | #define GEN_IP_PKTINFO IP_PKTINFO | |
13 | #elif defined(IP_RECVDSTADDR) | 13 | #elif defined(IP_RECVDSTADDR) | |
14 | #define GEN_IP_PKTINFO IP_RECVDSTADDR | 14 | #define GEN_IP_PKTINFO IP_RECVDSTADDR | |
15 | @@ -337,7 +337,7 @@ static bool HarvestDestinationAddress(st | 15 | @@ -337,7 +337,7 @@ static bool HarvestDestinationAddress(st | |
16 | memset(destination, 0, sizeof(*destination)); | 16 | memset(destination, 0, sizeof(*destination)); | |
17 | struct cmsghdr *cmsg; | 17 | struct cmsghdr *cmsg; |
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | $NetBSD: patch-pdns_pdns_recursor.cc,v 1.3 2014/12/10 14:50:09 fhajny Exp $ | 1 | $NetBSD: patch-pdns_pdns_recursor.cc,v 1.4 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | Resolve boost symbol ambiguity. | 3 | Resolve boost symbol ambiguity. | |
4 | --- pdns/pdns_recursor.cc.orig 2014-10-30 10:18:22.000000000 +0000 | 4 | --- pdns/pdns_recursor.cc.orig 2015-03-02 13:17:12.000000000 +0000 | |
5 | +++ pdns/pdns_recursor.cc | 5 | +++ pdns/pdns_recursor.cc | |
6 | @@ -80,9 +80,9 @@ uint64_t g_latencyStatSize; | 6 | @@ -80,9 +80,9 @@ uint64_t g_latencyStatSize; | |
7 | bool g_logCommonErrors; | 7 | bool g_logCommonErrors; | |
8 | bool g_anyToTcp; | 8 | bool g_anyToTcp; | |
9 | uint16_t g_udpTruncationThreshold; | 9 | uint16_t g_udpTruncationThreshold; | |
10 | -__thread shared_ptr<RecursorLua>* t_pdl; | 10 | -__thread shared_ptr<RecursorLua>* t_pdl; | |
11 | +__thread boost::shared_ptr<RecursorLua>* t_pdl; | 11 | +__thread boost::shared_ptr<RecursorLua>* t_pdl; | |
12 | __thread RemoteKeeper* t_remotes; | 12 | __thread RemoteKeeper* t_remotes; | |
13 | -__thread shared_ptr<Regex>* t_traceRegex; | 13 | -__thread shared_ptr<Regex>* t_traceRegex; | |
14 | +__thread boost::shared_ptr<Regex>* t_traceRegex; | 14 | +__thread boost::shared_ptr<Regex>* t_traceRegex; | |
15 | 15 | |||
16 | RecursorControlChannel s_rcc; // only active in thread 0 | 16 | RecursorControlChannel s_rcc; // only active in thread 0 | |
17 | 17 |
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | $NetBSD: patch-pdns_resolver.cc,v 1.3 2014/12/10 14:50:09 fhajny Exp $ | 1 | $NetBSD: patch-pdns_resolver.cc,v 1.4 2015/03/27 23:37:52 rodent Exp $ | |
2 | 2 | |||
3 | Limit inclusion of boost headers to only those necessary to avoid conflicting | 3 | Limit inclusion of boost headers to only those necessary to avoid conflicting | |
4 | types errors on Solaris. | 4 | types errors on Solaris. | |
5 | Resolve boost symbol ambiguity. | 5 | Resolve boost symbol ambiguity. | |
6 | 6 | |||
7 | --- pdns/resolver.cc.orig 2014-10-30 10:18:22.000000000 +0000 | 7 | --- pdns/resolver.cc.orig 2015-03-02 13:17:12.000000000 +0000 | |
8 | +++ pdns/resolver.cc | 8 | +++ pdns/resolver.cc | |
9 | @@ -33,7 +33,7 @@ | 9 | @@ -33,7 +33,7 @@ | |
10 | #include <cstring> | 10 | #include <cstring> | |
11 | #include <string> | 11 | #include <string> | |
12 | #include <vector> | 12 | #include <vector> | |
13 | -#include <boost/algorithm/string.hpp> | 13 | -#include <boost/algorithm/string.hpp> | |
14 | +#include <boost/algorithm/string/erase.hpp> | 14 | +#include <boost/algorithm/string/erase.hpp> | |
15 | #include "dns.hh" | 15 | #include "dns.hh" | |
16 | #include "qtype.hh" | 16 | #include "qtype.hh" | |
17 | #include "tcpreceiver.hh" | 17 | #include "tcpreceiver.hh" | |
18 | @@ -286,12 +286,12 @@ bool Resolver::tryGetSOASerial(string* d | 18 | @@ -286,12 +286,12 @@ bool Resolver::tryGetSOASerial(string* d | |
19 | bool gotSOA=false; | 19 | bool gotSOA=false; | |
20 | BOOST_FOREACH(const MOADNSParser::answers_t::value_type& drc, mdp.d_answers) { | 20 | BOOST_FOREACH(const MOADNSParser::answers_t::value_type& drc, mdp.d_answers) { |