From 5d20215e79b414efb3d90e05c57fc5f4aafa8ea9 Mon Sep 17 00:00:00 2001 From: roy Date: Tue, 28 Feb 2012 10:49:27 +0000 Subject: Bump to 3.3, changes include: * Many threading changes for greater perfomance * Can now make TCP/IP queries to remote IPv6 addresses * Domains can be forwarded to IPv6 addresses --- net/powerdns-recursor/Makefile | 4 +- net/powerdns-recursor/distinfo | 22 +++--- net/powerdns-recursor/options.mk | 3 +- net/powerdns-recursor/patches/patch-Makefile | 86 ++++++++++++++++++++++ net/powerdns-recursor/patches/patch-aa | 77 ------------------- net/powerdns-recursor/patches/patch-ab | 17 ----- net/powerdns-recursor/patches/patch-ae | 29 -------- net/powerdns-recursor/patches/patch-af | 29 -------- net/powerdns-recursor/patches/patch-ag | 14 ---- net/powerdns-recursor/patches/patch-ah | 13 ---- net/powerdns-recursor/patches/patch-ai | 12 --- net/powerdns-recursor/patches/patch-dns.hh | 15 ++++ .../patches/patch-kqueuemplexer.cc | 16 ++++ .../patches/patch-pdns__recursor.1 | 33 +++++++++ .../patches/patch-pdns__recursor.cc | 15 ++++ .../patches/patch-rec__channel.cc | 14 ++++ net/powerdns-recursor/patches/patch-rec__control.1 | 33 +++++++++ 17 files changed, 226 insertions(+), 206 deletions(-) create mode 100644 net/powerdns-recursor/patches/patch-Makefile delete mode 100644 net/powerdns-recursor/patches/patch-aa delete mode 100644 net/powerdns-recursor/patches/patch-ab delete mode 100644 net/powerdns-recursor/patches/patch-ae delete mode 100644 net/powerdns-recursor/patches/patch-af delete mode 100644 net/powerdns-recursor/patches/patch-ag delete mode 100644 net/powerdns-recursor/patches/patch-ah delete mode 100644 net/powerdns-recursor/patches/patch-ai create mode 100644 net/powerdns-recursor/patches/patch-dns.hh create mode 100644 net/powerdns-recursor/patches/patch-kqueuemplexer.cc create mode 100644 net/powerdns-recursor/patches/patch-pdns__recursor.1 create mode 100644 net/powerdns-recursor/patches/patch-pdns__recursor.cc create mode 100644 net/powerdns-recursor/patches/patch-rec__channel.cc create mode 100644 net/powerdns-recursor/patches/patch-rec__control.1 diff --git a/net/powerdns-recursor/Makefile b/net/powerdns-recursor/Makefile index d3ab83fc530..c873b842ba8 100644 --- a/net/powerdns-recursor/Makefile +++ b/net/powerdns-recursor/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2010/01/29 13:26:45 roy Exp $ +# $NetBSD: Makefile,v 1.7 2012/02/28 10:49:27 roy Exp $ # -DISTNAME= pdns-recursor-3.1.7.2 +DISTNAME= pdns-recursor-3.3 CATEGORIES= net MASTER_SITES= http://downloads.powerdns.com/releases/ EXTRACT_SUFX= .tar.bz2 diff --git a/net/powerdns-recursor/distinfo b/net/powerdns-recursor/distinfo index 407898410a3..427978c6c75 100644 --- a/net/powerdns-recursor/distinfo +++ b/net/powerdns-recursor/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.5 2011/04/06 10:35:38 roy Exp $ +$NetBSD: distinfo,v 1.6 2012/02/28 10:49:27 roy Exp $ -SHA1 (pdns-recursor-3.1.7.2.tar.bz2) = 9dcaca50fe0c373d601e135a78f24f5b85480020 -RMD160 (pdns-recursor-3.1.7.2.tar.bz2) = 2a1118763ab630646b9ba25273d6066e380e55c6 -Size (pdns-recursor-3.1.7.2.tar.bz2) = 174082 bytes -SHA1 (patch-aa) = 8ea6d7bd6e4b1625ca5df7fb115085223f8fb147 -SHA1 (patch-ab) = b8607622c082d2168aecf06586818760f1a6035c -SHA1 (patch-ae) = d832951abad18a429e7d567563af61b77f61c179 -SHA1 (patch-af) = 5a7ba19325f37922c0fcc8a8b23cc023c2b28789 -SHA1 (patch-ag) = 952182b856fa0ec995d9ba307124e069c1831049 -SHA1 (patch-ah) = 1d8c62313b730afed492b12e6e28c1c0757e9c24 -SHA1 (patch-ai) = ad4339f5e51f12c26dc3c4a3b4bfb2b649b62e64 +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-Makefile) = 840d0be6dd7decf4b037efc4f9da05a97815ce8e +SHA1 (patch-dns.hh) = 1ed10a5ffa59f84fa17c8dfd5e2c57476f7eb75c +SHA1 (patch-kqueuemplexer.cc) = e67ca0cc9703e5ba5f89f85eefd457c72495ca52 +SHA1 (patch-pdns__recursor.1) = 33170dd8ec13b0607ebf2ef8366656c565ca4664 +SHA1 (patch-pdns__recursor.cc) = 2f66151305a34229f5789b765434995e2918c4ff +SHA1 (patch-rec__channel.cc) = 5432261c1771a3ed4498e1ce78494307b153f302 +SHA1 (patch-rec__control.1) = e6ea8e7b93e23cd37bddb272e7cd64858cdf7f83 diff --git a/net/powerdns-recursor/options.mk b/net/powerdns-recursor/options.mk index e532247a68f..a90f996763e 100644 --- a/net/powerdns-recursor/options.mk +++ b/net/powerdns-recursor/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2009/12/23 13:00:41 ghen Exp $ +# $NetBSD: options.mk,v 1.2 2012/02/28 10:49:27 roy Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.powerdns-recursor PKG_SUPPORTED_OPTIONS= lua @@ -13,4 +13,3 @@ MAKE_ENV+= LUA=1 MAKE_ENV+= LUA_LIBS_CONFIG=-llua .include "../../lang/lua/buildlink3.mk" .endif - diff --git a/net/powerdns-recursor/patches/patch-Makefile b/net/powerdns-recursor/patches/patch-Makefile new file mode 100644 index 00000000000..882185480fd --- /dev/null +++ b/net/powerdns-recursor/patches/patch-Makefile @@ -0,0 +1,86 @@ +$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 '', 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 --git a/net/powerdns-recursor/patches/patch-aa b/net/powerdns-recursor/patches/patch-aa deleted file mode 100644 index e8328948d5c..00000000000 --- a/net/powerdns-recursor/patches/patch-aa +++ /dev/null @@ -1,77 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2009/04/21 14:16:47 roy Exp $ - ---- Makefile (revision 1354) -+++ Makefile-recursor (working copy) -@@ -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 -DBOOST_SP_DISABLE_THREADS $(OPTFLAGS) $(PROFILEFLAGS) -@@ -8,6 +10,13 @@ - 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 - LUA_CPPFLAGS_CONFIG ?= -I/usr/include/lua5.1 - LUA_LIBS_CONFIG ?= -llua5.1 -@@ -28,7 +37,7 @@ - REC_CONTROL_OBJECTS=rec_channel.o rec_control.o arguments.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 -@@ -72,17 +81,19 @@ - rm -f dep ; \ - fi - -+recursor.conf-dist: pdns_recursor -+ @# Not cross-compile friendly :/ -+ ./pdns_recursor --config > $@ -+ - 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: -@@ -94,7 +105,7 @@ - -include dep - - optional: -- mkdir optional -+ $(INSTALL_DIR) optional - - pdns_recursor: optional $(OPTIONALS) $(PDNS_RECURSOR_OBJECTS) malloc.o - $(LINKCC) $(PDNS_RECURSOR_OBJECTS) $(wildcard optional/*.o) $(LDFLAGS) -o $@ diff --git a/net/powerdns-recursor/patches/patch-ab b/net/powerdns-recursor/patches/patch-ab deleted file mode 100644 index 31dd9c8fa60..00000000000 --- a/net/powerdns-recursor/patches/patch-ab +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2009/04/21 14:16:47 roy Exp $ - ---- dns.hh.orig 2009-04-20 23:55:30.000000000 +0100 -+++ dns.hh 2009-04-20 23:56:45.000000000 +0100 -@@ -166,10 +166,11 @@ - ns_t_any = 255, /* Wildcard match. */ - }; - -+#include - #ifdef WIN32 - #define BYTE_ORDER 1 - #define LITTLE_ENDIAN 1 --#elif __FreeBSD__ || __APPLE__ -+#elif BSD - #include - #elif __linux__ - # include diff --git a/net/powerdns-recursor/patches/patch-ae b/net/powerdns-recursor/patches/patch-ae deleted file mode 100644 index 0d7e2cb1e11..00000000000 --- a/net/powerdns-recursor/patches/patch-ae +++ /dev/null @@ -1,29 +0,0 @@ ---- pdns_recursor.1.orig 2010-01-03 14:26:42.000000000 +0000 -+++ pdns_recursor.1 2010-01-29 13:11:15.000000000 +0000 -@@ -5,7 +5,7 @@ - .\" Manual: - .\" Source: - .\" --.TH "PDNS_RECURSOR" "1" "12/29/2009" "" "" -+.TH "PDNS_RECURSOR" "8" "12/29/2009" "" "" - .\" disable hyphenation - .nh - .\" disable justification (adjust text to left margin only) -@@ -16,7 +16,7 @@ - \fIpdns_recursor\fR [\-\-daemon] [\-\-local\-address] [\-\-help, \-h] [\-\-allow\-from] - .sp - .SH "DESCRIPTION" --pdns_recursor(1) is a high performance, simple and secure recursing nameserver\&. It currently powers over two million internet connections\&. -+pdns_recursor(8) is a high performance, simple and secure recursing nameserver\&. It currently powers over two million internet connections\&. - .sp - The recursor is configured via a configuration file, but each item in that file can be overridden on the command line\&. - .sp -@@ -242,7 +242,7 @@ - Website: http://wiki\&.powerdns\&.com, http://www\&.powerdns\&.com - .sp - .SH "SEE ALSO" --rec_control(1) -+rec_control(8) - .sp - .SH "COPYING" - Copyright \(co 2006 PowerDNS\&.COM BV\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 2\&. diff --git a/net/powerdns-recursor/patches/patch-af b/net/powerdns-recursor/patches/patch-af deleted file mode 100644 index c85a9eefc55..00000000000 --- a/net/powerdns-recursor/patches/patch-af +++ /dev/null @@ -1,29 +0,0 @@ ---- rec_control.1.orig 2010-01-03 14:26:42.000000000 +0000 -+++ rec_control.1 2010-01-29 13:12:27.000000000 +0000 -@@ -5,7 +5,7 @@ - .\" Manual: - .\" Source: - .\" --.TH "REC_CONTROL" "1" "12/29/2009" "" "" -+.TH "REC_CONTROL" "8" "12/29/2009" "" "" - .\" disable hyphenation - .nh - .\" disable justification (adjust text to left margin only) -@@ -16,7 +16,7 @@ - \fIrec_control\fR [\-\-help] [\-\-socket\-dir] [\-\-socket\-pid] command \&.\&. - .sp - .SH "DESCRIPTION" --rec_control(1) allows the operator to control a running instance of the pdns_recursor\&. -+rec_control(8) allows the operator to control a running instance of the pdns_recursor\&. - .sp - The commands that can be passed to the recursor are described on http://doc\&.powerdns\&.com/rec\-control\&.html - .sp -@@ -105,7 +105,7 @@ - Website: http://wiki\&.powerdns\&.com, http://www\&.powerdns\&.com - .sp - .SH "SEE ALSO" --pdns_recursor(1) -+pdns_recursor(8) - .sp - .SH "COPYING" - Copyright \(co 2006 PowerDNS\&.COM BV\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 2\&. diff --git a/net/powerdns-recursor/patches/patch-ag b/net/powerdns-recursor/patches/patch-ag deleted file mode 100644 index 8f2f4c1c391..00000000000 --- a/net/powerdns-recursor/patches/patch-ag +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2009/04/21 22:52:38 roy Exp $ - ---- kqueuemplexer.cc.orig 2009-04-21 23:45:31.000000000 +0100 -+++ kqueuemplexer.cc 2009-04-21 23:45:41.000000000 +0100 -@@ -6,9 +6,7 @@ - #include - #include "syncres.hh" - #include --#ifdef __FreeBSD__ - #include --#endif - #include - - using namespace boost; diff --git a/net/powerdns-recursor/patches/patch-ah b/net/powerdns-recursor/patches/patch-ah deleted file mode 100644 index c70a581c3c7..00000000000 --- a/net/powerdns-recursor/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2009/06/24 20:44:21 hasso Exp $ - ---- brg_endian.h.orig 2009-06-24 11:27:29 +0300 -+++ brg_endian.h 2009-06-24 11:28:15 +0300 -@@ -34,7 +34,7 @@ - /* Include files where endian defines and byteswap functions may reside */ - #if defined( __sun ) - # include --#elif defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) -+#elif defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) || defined( __DragonFly__ ) - # include - #elif defined( BSD ) && ( BSD >= 199103 ) || defined( __APPLE__ ) || \ - defined( __CYGWIN32__ ) || defined( __DJGPP__ ) || defined( __osf__ ) diff --git a/net/powerdns-recursor/patches/patch-ai b/net/powerdns-recursor/patches/patch-ai deleted file mode 100644 index 62f9c991785..00000000000 --- a/net/powerdns-recursor/patches/patch-ai +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2011/04/06 10:35:38 roy Exp $ - ---- rec_channel.cc 2011-04-06 11:27:13.000000000 +0100 -+++ rec_channel.cc 2011-04-06 11:27:33.000000000 +0100 -@@ -2,6 +2,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/net/powerdns-recursor/patches/patch-dns.hh b/net/powerdns-recursor/patches/patch-dns.hh new file mode 100644 index 00000000000..c85f79603cb --- /dev/null +++ b/net/powerdns-recursor/patches/patch-dns.hh @@ -0,0 +1,15 @@ +$NetBSD: patch-dns.hh,v 1.1 2012/02/28 10:49:28 roy Exp $ + +Only attempt to define byte order if unset. + +--- dns.hh.orig 2010-09-21 16:22:09.000000000 +0000 ++++ dns.hh +@@ -181,7 +181,7 @@ enum { + #elif __linux__ + # include + +-#else // with thanks to ++#elif !defined(BYTE_ORDER) // with thanks to + + # define LITTLE_ENDIAN 1234 /* least-significant byte first (vax, pc) */ + # define BIG_ENDIAN 4321 /* most-significant byte first (IBM, net) */ diff --git a/net/powerdns-recursor/patches/patch-kqueuemplexer.cc b/net/powerdns-recursor/patches/patch-kqueuemplexer.cc new file mode 100644 index 00000000000..0268f631b50 --- /dev/null +++ b/net/powerdns-recursor/patches/patch-kqueuemplexer.cc @@ -0,0 +1,16 @@ +$NetBSD: patch-kqueuemplexer.cc,v 1.1 2012/02/28 10:49:28 roy Exp $ + +kqueue systems normally have sys/event.h + +--- kqueuemplexer.cc.orig 2010-09-21 16:22:09.000000000 +0000 ++++ kqueuemplexer.cc +@@ -6,9 +6,7 @@ + #include + #include "syncres.hh" + #include +-#ifdef __FreeBSD__ + #include +-#endif + #include + + #include "namespaces.hh" diff --git a/net/powerdns-recursor/patches/patch-pdns__recursor.1 b/net/powerdns-recursor/patches/patch-pdns__recursor.1 new file mode 100644 index 00000000000..b96b94e42d9 --- /dev/null +++ b/net/powerdns-recursor/patches/patch-pdns__recursor.1 @@ -0,0 +1,33 @@ +$NetBSD: patch-pdns__recursor.1,v 1.1 2012/02/28 10:49:29 roy Exp $ + +Man page lives in section 8. + +--- pdns_recursor.1.orig 2010-09-21 16:22:09.000000000 +0000 ++++ pdns_recursor.1 +@@ -7,7 +7,7 @@ + .\" Source: [FIXME: source] + .\" Language: English + .\" +-.TH "PDNS_RECURSOR" "1" "02/10/2010" "[FIXME: source]" "[FIXME: manual]" ++.TH "PDNS_RECURSOR" "8" "02/10/2010" "[FIXME: source]" "[FIXME: manual]" + .\" ----------------------------------------------------------------- + .\" * set default formatting + .\" ----------------------------------------------------------------- +@@ -25,7 +25,7 @@ pdns_recursor \- high\-performance, simp + \fIpdns_recursor\fR [\-\-daemon] [\-\-local\-address] [\-\-help, \-h] [\-\-allow\-from] + .SH "DESCRIPTION" + .sp +-pdns_recursor(1) is a high performance, simple and secure recursing nameserver\&. It currently powers over two million internet connections\&. ++pdns_recursor(8) is a high performance, simple and secure recursing nameserver\&. It currently powers over two million internet connections\&. + .sp + The recursor is configured via a configuration file, but each item in that file can be overridden on the command line\&. + .sp +@@ -264,7 +264,7 @@ Written by PowerDNS\&.COM BV, bert huber + Website: \m[blue]\fBhttp://wiki\&.powerdns\&.com\fR\m[], \m[blue]\fBhttp://www\&.powerdns\&.com\fR\m[] + .SH "SEE ALSO" + .sp +-rec_control(1) ++rec_control(8) + .SH "COPYING" + .sp + Copyright \(co 2006 PowerDNS\&.COM BV\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 2\&. diff --git a/net/powerdns-recursor/patches/patch-pdns__recursor.cc b/net/powerdns-recursor/patches/patch-pdns__recursor.cc new file mode 100644 index 00000000000..d477ab3de14 --- /dev/null +++ b/net/powerdns-recursor/patches/patch-pdns__recursor.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-pdns__recursor.cc,v 1.1 2012/02/28 10:49:29 roy Exp $ + +Cast to int so we use the correct overload. + +--- pdns_recursor.cc.orig 2010-09-21 16:22:09.000000000 +0000 ++++ pdns_recursor.cc +@@ -1065,7 +1065,7 @@ void doStats(void) + + time_t now = time(0); + if(lastOutputTime && lastQueryCount && now != lastOutputTime) { +- L< + #include ++#include + #include + #include + #include diff --git a/net/powerdns-recursor/patches/patch-rec__control.1 b/net/powerdns-recursor/patches/patch-rec__control.1 new file mode 100644 index 00000000000..33785a23ac1 --- /dev/null +++ b/net/powerdns-recursor/patches/patch-rec__control.1 @@ -0,0 +1,33 @@ +$NetBSD: patch-rec__control.1,v 1.1 2012/02/28 10:49:29 roy Exp $ + +Man page lives in section 8. + +--- rec_control.1.orig 2010-09-21 16:22:09.000000000 +0000 ++++ rec_control.1 +@@ -7,7 +7,7 @@ + .\" Source: [FIXME: source] + .\" Language: English + .\" +-.TH "REC_CONTROL" "1" "08/30/2010" "[FIXME: source]" "[FIXME: manual]" ++.TH "REC_CONTROL" "8" "08/30/2010" "[FIXME: source]" "[FIXME: manual]" + .\" ----------------------------------------------------------------- + .\" * set default formatting + .\" ----------------------------------------------------------------- +@@ -25,7 +25,7 @@ rec_control \- control pdns_recursor + \fIrec_control\fR [\-\-help] [\-\-socket\-dir] [\-\-socket\-pid] command \&.\&. + .SH "DESCRIPTION" + .sp +-rec_control(1) allows the operator to control a running instance of the pdns_recursor\&. ++rec_control(8) allows the operator to control a running instance of the pdns_recursor\&. + .sp + The commands that can be passed to the recursor are described on \m[blue]\fBhttp://doc\&.powerdns\&.com/rec\-control\&.html\fR\m[] + .SH "EXAMPLES" +@@ -133,7 +133,7 @@ Written by PowerDNS\&.COM BV, bert huber + Website: \m[blue]\fBhttp://wiki\&.powerdns\&.com\fR\m[], \m[blue]\fBhttp://www\&.powerdns\&.com\fR\m[] + .SH "SEE ALSO" + .sp +-pdns_recursor(1) ++pdns_recursor(8) + .SH "COPYING" + .sp + Copyright \(co 2006 PowerDNS\&.COM BV\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 2\&. -- cgit v1.2.3