pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/powerdns-recursor Update net/powerdns-recursor to ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/462940de8963
branches: trunk
changeset: 652934:462940de8963
user: fhajny <fhajny%pkgsrc.org@localhost>
date: Wed Jun 10 14:22:29 2015 +0000
description:
Update net/powerdns-recursor to 3.7.3.
Add SMF support.
Defuzz patches.
PowerDNS Recursor 3.7.3
- Limit the maximum length of a qname
- pdnssec: check for glue and delegations in parent zones
PowerDNS Recursor 3.7.2
- Fix handling of forward references in label compressed packets;
fixes CVE-2015-1868.
- Minor improvements and bugfixes.
PowerDNS Recursor 3.7.1
- New root-nx-trust flag makes PowerDNS generalize NXDOMAIN responses
from the root-servers
- getregisteredname() for Lua, which turns 'www.bbc.co.uk' into 'bbc.co.uk'
- Lua preoutquery filter
- Lua IP-based filter (ipfilter) before parsing packets
- iputils class for Lua, to quickly process IP addresses and netmasks
in their native format
- getregisteredname function for Lua, to find the registered domain
for a given name
- Various new ringbuffers: top-servfail-remotes, top-largeanswer-remotes,
top-servfail-queries
- Minor improvements and bugfixes.
PowerDNS Recursor 3.6.2
- Minor improvements and bugfixes.
PowerDNS Recursor 3.6.1
- Fix for a crash under a specific sequence of packets.
PowerDNS Recursor 3.6.0
- Implement minimum-ttl-override config setting, plus runtime configurability
via 'rec_control set-minimum-ttl'.
- Lots of work on the JSON API, which is exposed via Aki Tuomi's 'yahttp'.
- Lua modules can now use 'pdnslog(INFO..')
- Adopt any-to-tcp feature to the recursor.
- Implement built-in statistics dumper using the 'carbon' protocol, which
is also understood by metronome (our mini-graphite). Use 'carbon-server',
'carbon-ourname' and 'carbon-interval' settings.
- New setting 'udp-truncation-threshold' to configure from how many bytes
we should truncate. commit a09a8ce.
- Proper support for CHaos class for CHAOS TXT queries.
- Added support for Lua scripts to drop queries w/o further processing.
- Kevin Holly added qtype statistics to recursor and rec_control.
- Add support for include-files in configuration, also reload ACLs and zones
defined in them.
- Paulo Anes contributed server-down-max-fails which helps combat
Recursive DNS based amplification attacks.
- Implement "followCNAMERecords" feature in the Lua hooks.
- Minor improvements and bugfixes.
PowerDNS Recursor 3.5.3
- This is a bugfix and performance update to 3.5.2. It brings serious
performance improvements for dual stack users.
PowerDNS Recursor 3.5.2
- This is a stability and bugfix update to 3.5.1. It contains important
fixes that improve operation for certain domains.
PowerDNS Recursor 3.5.1
- This is a stability and bugfix update to 3.5.
PowerDNS Recursor 3.5
- The local zone server now understands wildcards.
- The Lua postresolve and nodata hooks.
- A new feature, rec_control trace-regex allows the tracing of lookups
for specific names
- A new setting, export-etc-hosts-search-suffix, adds a configurable
suffix to names imported from /etc/hosts
- Minor improvements & bugfixes
PowerDNS Recursor 3.3.1
- Small number of important fixes, adds some memory usage statistics,
but no new features
diffstat:
net/powerdns-recursor/Makefile | 25 +--
net/powerdns-recursor/distinfo | 43 ++---
net/powerdns-recursor/options.mk | 3 +-
net/powerdns-recursor/patches/patch-CVE-2014-8601 | 60 -------
net/powerdns-recursor/patches/patch-Makefile | 86 -----------
net/powerdns-recursor/patches/patch-Makefile.in | 98 ++++++++++++
net/powerdns-recursor/patches/patch-brg_endian.h | 14 -
net/powerdns-recursor/patches/patch-cachecleaner.hh | 24 ---
net/powerdns-recursor/patches/patch-dns.hh | 15 +-
net/powerdns-recursor/patches/patch-dnsparser.cc | 10 +-
net/powerdns-recursor/patches/patch-dnsparser.hh | 10 +-
net/powerdns-recursor/patches/patch-iputils.hh | 17 ++
net/powerdns-recursor/patches/patch-kqueuemplexer.cc | 6 +-
net/powerdns-recursor/patches/patch-namespaces.hh | 8 +-
net/powerdns-recursor/patches/patch-pdns__recursor.1 | 52 +++---
net/powerdns-recursor/patches/patch-pdns__recursor.cc | 117 ++++++--------
net/powerdns-recursor/patches/patch-rec__channel.cc | 26 +-
net/powerdns-recursor/patches/patch-rec__channel__rec.cc | 20 +-
net/powerdns-recursor/patches/patch-rec__control.1 | 52 +++---
net/powerdns-recursor/patches/patch-recpacketcache.hh | 15 -
net/powerdns-recursor/patches/patch-recursor__cache.cc | 19 +-
net/powerdns-recursor/patches/patch-recursor__cache.hh | 13 -
net/powerdns-recursor/patches/patch-reczones.cc | 10 +-
net/powerdns-recursor/patches/patch-syncres.cc | 70 --------
net/powerdns-recursor/patches/patch-syncres.hh | 13 -
net/powerdns-recursor/patches/patch-sysdeps_SunOS.inc | 14 +
26 files changed, 317 insertions(+), 523 deletions(-)
diffs (truncated from 1169 to 300 lines):
diff -r 3c88df72ed14 -r 462940de8963 net/powerdns-recursor/Makefile
--- a/net/powerdns-recursor/Makefile Wed Jun 10 13:29:57 2015 +0000
+++ b/net/powerdns-recursor/Makefile Wed Jun 10 14:22:29 2015 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2014/12/11 20:18:17 roy Exp $
+# $NetBSD: Makefile,v 1.17 2015/06/10 14:22:29 fhajny Exp $
#
-DISTNAME= pdns-recursor-3.3
-PKGREVISION= 5
+DISTNAME= pdns-recursor-3.7.2
CATEGORIES= net
MASTER_SITES= http://downloads.powerdns.com/releases/
EXTRACT_SUFX= .tar.bz2
@@ -12,29 +11,22 @@
COMMENT= PowerDNS resolver/recursing nameserver
LICENSE= gnu-gpl-v2
-MAKE_JOBS_SAFE= no
-
-USE_TOOLS= gmake
+HAS_CONFIGURE= yes
USE_LANGUAGES= c c++
+USE_TOOLS+= gmake
RCD_SCRIPTS+= pdns_recursor
EGDIR= ${PREFIX}/share/examples/pdns-recursor
-BUILD_MAKE_FLAGS+= CONFIGDIR=${PKG_SYSCONFDIR} OPTFLAGS=
+BUILD_MAKE_FLAGS+= SYSCONFDIR=${PKG_SYSCONFDIR} OPTFLAGS=
INSTALL_MAKE_FLAGS+= BINDIR=${PREFIX}/bin SBINDIR=${PREFIX}/sbin
-INSTALL_MAKE_FLAGS+= CONFIGDIR=${EGDIR} MANDIR=${PREFIX}/${PKGMANDIR}
+INSTALL_MAKE_FLAGS+= SYSCONFDIR=${EGDIR} MANDIR=${PREFIX}/${PKGMANDIR}
CONF_FILES+= ${EGDIR}/recursor.conf-dist \
${PKG_SYSCONFDIR}/recursor.conf
-SUBST_CLASSES+= whitespace
-SUBST_STAGE.whitespace= pre-configure
-SUBST_MESSAGE.whitespace= Fixing C++ semantic whitespace.
-SUBST_FILES.whitespace= pdns_recursor.cc
-SUBST_SED.whitespace= -e 's|"VERSION"|" VERSION "|'
-
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mclang)
CXXFLAGS+= -std=c++11 -Wno-c++11-narrowing
@@ -42,10 +34,7 @@
.include "options.mk"
-post-patch:
- ${SED} -e "s:/etc/powerdns:${PKG_SYSCONFDIR}:" \
- ${WRKSRC}/config.h >${WRKSRC}/config.h.new
- ${MV} ${WRKSRC}/config.h.new ${WRKSRC}/config.h
+pre-configure:
${LN} -s FreeBSD.inc ${WRKSRC}/sysdeps/NetBSD.inc
${MV} ${WRKSRC}/pdns_recursor.1 ${WRKSRC}/pdns_recursor.8
${MV} ${WRKSRC}/rec_control.1 ${WRKSRC}/rec_control.8
diff -r 3c88df72ed14 -r 462940de8963 net/powerdns-recursor/distinfo
--- a/net/powerdns-recursor/distinfo Wed Jun 10 13:29:57 2015 +0000
+++ b/net/powerdns-recursor/distinfo Wed Jun 10 14:22:29 2015 +0000
@@ -1,25 +1,20 @@
-$NetBSD: distinfo,v 1.12 2014/12/11 20:18:17 roy Exp $
+$NetBSD: distinfo,v 1.13 2015/06/10 14:22:29 fhajny Exp $
-SHA1 (pdns-recursor-3.3.tar.bz2) = 2f42955b8b8de355709e9072da2d5dbfadd7ffac
-RMD160 (pdns-recursor-3.3.tar.bz2) = 17bd7ac68892c3fca218c3dc3e70074dd9e748d6
-Size (pdns-recursor-3.3.tar.bz2) = 145785 bytes
-SHA1 (patch-CVE-2014-8601) = dae3dec54e53022183a8889eb1c741b00d08cd0b
-SHA1 (patch-Makefile) = 840d0be6dd7decf4b037efc4f9da05a97815ce8e
-SHA1 (patch-brg_endian.h) = 2fb9d3231e969b2be57d160b0952e11091ae6e26
-SHA1 (patch-cachecleaner.hh) = e9a9ade3fe63160eb897df959f6921b791122499
-SHA1 (patch-dns.hh) = 4d24a3c2bad973e05ed4b1c20bacce3b70992e5a
-SHA1 (patch-dnsparser.cc) = 257072b44d3d68ccd3b773cd4db7d0495f67d874
-SHA1 (patch-dnsparser.hh) = 85dad11c65d242630244a600ab5d857af591db9f
-SHA1 (patch-kqueuemplexer.cc) = e67ca0cc9703e5ba5f89f85eefd457c72495ca52
-SHA1 (patch-namespaces.hh) = 3c9b7c68a8576fd63747b6773549b98f30cba1a0
-SHA1 (patch-pdns__recursor.1) = 33170dd8ec13b0607ebf2ef8366656c565ca4664
-SHA1 (patch-pdns__recursor.cc) = 02baa1f54035aae06d241f1732bd165af60dd584
-SHA1 (patch-rec__channel.cc) = 3bd902cf9152cb90c3cb934263dd0482cac16d16
-SHA1 (patch-rec__channel__rec.cc) = a183984d31aad6d1665d11c40e872511c18bd740
-SHA1 (patch-rec__control.1) = e6ea8e7b93e23cd37bddb272e7cd64858cdf7f83
-SHA1 (patch-recpacketcache.hh) = aef8dbc00cfdd45e75f357b20e48e89ad26d5317
-SHA1 (patch-recursor__cache.cc) = b3ff1ae80e6ec592feb037cfa3964bcbc3798938
-SHA1 (patch-recursor__cache.hh) = f56f189f851fd1e764476851055f2a21e5acbb06
-SHA1 (patch-reczones.cc) = a8d0770d7db449e703e3d66fabfb21bcd02e049e
-SHA1 (patch-syncres.cc) = ca3ba23a8d36ca54832452dab47ceb50754e2c35
-SHA1 (patch-syncres.hh) = 4a85e102a2da9a3533ac019e394594834d430214
+SHA1 (pdns-recursor-3.7.2.tar.bz2) = 1780b34c7a0d38cc62f5581484cf25de91bbe1ca
+RMD160 (pdns-recursor-3.7.2.tar.bz2) = a87ac0783da412e24a00a6fca9f42fd70f63c706
+Size (pdns-recursor-3.7.2.tar.bz2) = 244582 bytes
+SHA1 (patch-Makefile.in) = 4aa3fc487afab1795532cc6a09975fa6580625fe
+SHA1 (patch-dns.hh) = 7e9c1b10a066a605b74ebdbee2d894aed50f6c68
+SHA1 (patch-dnsparser.cc) = acd60fbeaa5ad3aa09db306eeaddb1071bbedfb7
+SHA1 (patch-dnsparser.hh) = 289e271629969a50b41e805ae9f092ce75a1483f
+SHA1 (patch-iputils.hh) = 01134b045189653046036d7cb081a2f4d1ed27e4
+SHA1 (patch-kqueuemplexer.cc) = 1e3923aec5f81400eaedffa07c50762da7bdd5c8
+SHA1 (patch-namespaces.hh) = b7abe73b649569819fb070e10d3c926c95589bfb
+SHA1 (patch-pdns__recursor.1) = de3c561e770558850a9f1bdf13f60570d90a5643
+SHA1 (patch-pdns__recursor.cc) = b1d6ba1d1abfbd2759431caffc113bca22513abd
+SHA1 (patch-rec__channel.cc) = dee9fba4bbe240ca2070cdf8a8f303bb2e3bce61
+SHA1 (patch-rec__channel__rec.cc) = b0b277167fff8a080528f6a5cc75a81658f7c66f
+SHA1 (patch-rec__control.1) = 6a38b768cf5ab6f91fcf6eb7e4d5f0c62824f723
+SHA1 (patch-recursor__cache.cc) = c2f86bd695ed01ae6b415a61a099696c87f78d63
+SHA1 (patch-reczones.cc) = f187de66d755a8e134804282ceb7723aa9bd392e
+SHA1 (patch-sysdeps_SunOS.inc) = e2087d1469437c88266bc30566cf9d7415e7af69
diff -r 3c88df72ed14 -r 462940de8963 net/powerdns-recursor/options.mk
--- a/net/powerdns-recursor/options.mk Wed Jun 10 13:29:57 2015 +0000
+++ b/net/powerdns-recursor/options.mk Wed Jun 10 14:22:29 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2014/05/03 13:01:24 alnsn Exp $
+# $NetBSD: options.mk,v 1.4 2015/06/10 14:22:29 fhajny Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.powerdns-recursor
PKG_SUPPORTED_OPTIONS= lua
@@ -9,7 +9,6 @@
### Build with Lua scripting support
###
.if !empty(PKG_OPTIONS:Mlua)
-LUA_VERSIONS_INCOMPATIBLE= 52
MAKE_ENV+= LUA=1
MAKE_ENV+= LUA_LIBS_CONFIG=-llua
MAKE_ENV+= LUA_CPPFLAGS_CONFIG=-I${PREFIX}/${LUA_INCDIR}
diff -r 3c88df72ed14 -r 462940de8963 net/powerdns-recursor/patches/patch-CVE-2014-8601
--- a/net/powerdns-recursor/patches/patch-CVE-2014-8601 Wed Jun 10 13:29:57 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-$NetBSD: patch-CVE-2014-8601,v 1.1 2014/12/11 20:18:17 roy Exp $
-
-Upstream backported fix for CVE-2014-8601
-
-commit 62d189c81359c70821523d7ba9831d0f6e57b012
-Author: Your Name <you%example.com@localhost>
-Date: Tue Dec 2 08:50:41 2014 +0000
-
- backport query limiter to 3.3
-
-diff --git pdns_recursor.cc pdns_recursor.cc
-index 0f9b08f..3bb71e0 100644
---- pdns_recursor.cc
-+++ pdns_recursor.cc
-@@ -522,7 +522,14 @@ void startDoResolve(void *p)
- bool variableAnswer = false;
- // if there is a PowerDNSLua active, and it 'took' the query in preResolve, we don't launch beginResolve
- if(!t_pdl->get() || !(*t_pdl)->preresolve(dc->d_remote, g_listenSocketsAddresses[dc->d_socket], dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), ret, res, &variableAnswer)) {
-- res = sr.beginResolve(dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), dc->d_mdp.d_qclass, ret);
-+ try {
-+ res = sr.beginResolve(dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), dc->d_mdp.d_qclass, ret);
-+ }
-+ catch(ImmediateServFailException &e) {
-+ L<<Logger::Error<<"Sending SERVFAIL during resolve of '"<<dc->d_mdp.d_qname<<"' because: "<<e.reason<<endl;
-+
-+ res = RCode::ServFail;
-+ }
-
- if(t_pdl->get()) {
- if(res == RCode::NXDomain)
-diff --git a/syncres.cc b/syncres.cc
-index 4b05acf..08b2930 100644
---- syncres.cc
-+++ syncres.cc
-@@ -874,6 +874,7 @@ int SyncRes::doResolveAt(set<string, CIStringCompare> nameservers, string auth,
- }
- else {
- s_outqueries++; d_outqueries++;
-+ if(d_outqueries > 50) throw ImmediateServFailException("more than 50 queries sent while resolving "+qname);
- TryTCP:
- if(doTCP) {
- LOG<<prefix<<qname<<": using TCP with "<< remoteIP->toStringWithPort() <<endl;
-diff --git a/syncres.hh b/syncres.hh
-index e3249d2..6c151e0 100644
---- syncres.hh
-+++ syncres.hh
-@@ -502,6 +502,13 @@ private:
- static AtomicCounter s_currentConnections; //!< total number of current TCP connections
- };
-
-+class ImmediateServFailException
-+{
-+public:
-+ ImmediateServFailException(string r){reason=r;};
-+
-+ string reason; //! Print this to tell the user what went wrong
-+};
-
- struct RemoteKeeper
- {
diff -r 3c88df72ed14 -r 462940de8963 net/powerdns-recursor/patches/patch-Makefile
--- a/net/powerdns-recursor/patches/patch-Makefile Wed Jun 10 13:29:57 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2012/02/28 10:49:27 roy Exp $
-
-Support conigurable installation location.
-Man pages belong in section 8.
-
---- Makefile.orig 2010-09-21 16:22:09.000000000 +0000
-+++ Makefile
-@@ -1,6 +1,8 @@
- # user editable stuff:
--SBINDIR=/usr/sbin/
--BINDIR=/usr/bin/
-+PREFIX?=/usr
-+SBINDIR=$(PREFIX)/sbin/
-+BINDIR=$(PREFIX)/bin/
-+MANDIR=$(PREFIX)/share/man
- CONFIGDIR="/etc/powerdns/"
- OPTFLAGS?=-O3
- CXXFLAGS:= $(CXXFLAGS) -Wall $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -pthread
-@@ -10,6 +12,13 @@ LDFLAGS:=$(LDFLAGS) $(ARCHFLAGS) -pthrea
- LINKCC=$(CXX)
- CC?=gcc
-
-+INSTALL?=install
-+SHAREMODE?=644
-+MANMODE?=444
-+INSTALL_DIR?=$(INSTALL) -d
-+INSTALL_DATA?=$(INSTALL) -m $(SHAREMODE)
-+INSTALL_MAN?=$(INSTALL) -m $(MANMODE)
-+
- # Lua 5.1 settings
-
- # static dependencies
-@@ -25,7 +34,7 @@ REC_CONTROL_OBJECTS=rec_channel.o rec_co
- unix_utility.o logger.o qtype.o
-
- # what we need
--all: message pdns_recursor rec_control
-+all: message pdns_recursor rec_control recursor.conf-dist
-
- # OS specific instructions
- -include sysdeps/$(shell uname).inc
-@@ -52,6 +61,10 @@ endif
-
- LDFLAGS += $(PROFILEFLAGS) $(STATICFLAGS)
-
-+recursor.conf-dist: pdns_recursor
-+ @# Not cross-compile friendly :/
-+ ./pdns_recursor --config > $@
-+
- message:
- @echo
- @echo PLEASE READ: If you get an error mentioning \#include '<boost/something.hpp>', please read README
-@@ -70,16 +83,14 @@ basic_checks:
- fi
-
- install: all
-- -mkdir -p $(DESTDIR)/$(SBINDIR)
-- mv pdns_recursor $(DESTDIR)/$(SBINDIR)
-- strip $(DESTDIR)/$(SBINDIR)/pdns_recursor
-- mkdir -p $(DESTDIR)/$(BINDIR)
-- mv rec_control $(DESTDIR)/$(BINDIR)
-- strip $(DESTDIR)/$(BINDIR)/rec_control
-- -mkdir -p $(DESTDIR)/$(CONFIGDIR)
-- $(DESTDIR)/$(SBINDIR)/pdns_recursor --config > $(DESTDIR)/$(CONFIGDIR)/recursor.conf-dist
-- -mkdir -p $(DESTDIR)/usr/share/man/man1
-- cp pdns_recursor.1 rec_control.1 $(DESTDIR)/usr/share/man/man1
-+ $(INSTALL_DIR) $(DESTDIR)/$(SBINDIR)
-+ $(INSTALL) pdns_recursor $(DESTDIR)/$(SBINDIR)
-+ $(INSTALL_DIR) $(DESTDIR)/$(BINDIR)
-+ $(INSTALL) rec_control $(DESTDIR)/$(BINDIR)
-+ $(INSTALL_DIR) $(DESTDIR)/$(CONFIGDIR)
-+ $(INSTALL_DATA) recursor.conf-dist $(DESTDIR)/$(CONFIGDIR)
-+ $(INSTALL_DIR) $(DESTDIR)/$(MANDIR)/man8
-+ $(INSTALL_MAN) pdns_recursor.8 rec_control.8 $(DESTDIR)/$(MANDIR)/man8
- $(OS_SPECIFIC_INSTALL)
-
- clean: binclean
-@@ -94,7 +105,7 @@ dep:
- -include dep
-
- optional:
-- mkdir optional
-+ $(INSTALL_DIR) optional
-
- pdns_recursor: optional $(OPTIONALS) $(PDNS_RECURSOR_OBJECTS)
- $(LINKCC) $(PDNS_RECURSOR_OBJECTS) $(wildcard optional/*.o) $(LDFLAGS) -o $@
diff -r 3c88df72ed14 -r 462940de8963 net/powerdns-recursor/patches/patch-Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/powerdns-recursor/patches/patch-Makefile.in Wed Jun 10 14:22:29 2015 +0000
@@ -0,0 +1,98 @@
+$NetBSD: patch-Makefile.in,v 1.1 2015/06/10 14:22:29 fhajny Exp $
+
+Use proper locations and install scripts.
+
+--- Makefile.in.orig 2015-04-21 13:02:57.000000000 +0000
++++ Makefile.in
+@@ -1,6 +1,8 @@
+ # user editable stuff:
+-SBINDIR=/usr/sbin/
+-BINDIR=/usr/bin/
++PREFIX?=/usr
++SBINDIR=$(PREFIX)/sbin/
++BINDIR=$(PREFIX)/bin/
++MANDIR=$(PREFIX)/share/man
+ SYSCONFDIR=/etc/powerdns/
+ LOCALSTATEDIR=/var/run/
+ OPTFLAGS?=-O3
Home |
Main Index |
Thread Index |
Old Index