Attachment 147906 Details for Bug 194057 – final port patch

[patch] final port patch

p (text/plain), 22.70 KB, created by me on 2014-10-02 11:23:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: me

Created: 2014-10-02 11:23:18 UTC

Size: 22.70 KB

patch

obsolete

>diff -ruN /usr/ports/dns/powerdns.orig/Makefile /usr/ports/dns/powerdns/Makefile
>--- /usr/ports/dns/powerdns.orig/Makefile	2014-08-23 18:23:12.000000000 +0200
>+++ /usr/ports/dns/powerdns/Makefile	2014-10-02 13:11:55.783268262 +0200
>@@ -1,11 +1,11 @@
>-# $FreeBSD: head/dns/powerdns/Makefile 365753 2014-08-23 16:23:12Z marino $
>+# $FreeBSD$
> 
> PORTNAME=	powerdns
>-PORTVERSION=	3.3.1
>-PORTREVISION=	5
>+PORTVERSION=	3.4.0
> CATEGORIES=	dns ipv6
> MASTER_SITES=	http://downloads.powerdns.com/releases/
> DISTNAME=	pdns-${PORTVERSION}
>+PORTREVISION=	5
> 
> MAINTAINER=	tremere@cainites.net
> COMMENT=	Advanced DNS server with multiple backends including SQL
>@@ -16,7 +16,9 @@
> 
> CONFLICTS=	powerdns-devel-[2-3].[0-9]*
> 
>-USES=		gmake libtool lua:51 pkgconfig
>+USE_BZIP2=	YES
>+
>+USES=		gmake libtool pkgconfig lua
> USE_SUBMAKE=	YES
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
>@@ -38,10 +40,10 @@
> USE_RC_SUBR=	pdns
> 
> OPTIONS_DEFINE=	GEO MYSQL MYSQL_LOCAL OPENDBX OPENLDAP OPENLDAP_LOCAL \
>-		PGSQL PGSQL_LOCAL POLARSSL SQLITE3 TOOLS
>+		PGSQL PGSQL_LOCAL POLARSSL REMOTE SQLITE3 TOOLS
> OPTIONS_GROUP=	DNSSEC EXPERIMENTAL
> OPTIONS_GROUP_DNSSEC=	BOTAN110 CRYPTOPP
>-OPTIONS_GROUP_EXPERIMENTAL=	LUA MYDNS REMOTE REMOTE_HTTP TINYDNS
>+OPTIONS_GROUP_EXPERIMENTAL=	LUA MYDNS TINYDNS
> 
> PGSQL_DESC=		PostgreSQL backend
> PGSQL_LOCAL_DESC=	RUN_DEPEND on PostgreSQL server
>@@ -55,15 +57,14 @@
> DNSSEC_DESC=		Extra DNSSEC options
> BOTAN110_DESC=		Faster signing + ECDSA & GOST algorithms
> CRYPTOPP_DESC=		ECDSA algorithms
>-POLARSSL_DESC=		Use embedded PolarSSL
>+POLARSSL_DESC=		Use system PolarSSL
> LUA_DESC=		Lua backend
> MYDNS_DESC=		MyDNS backend
>-REMOTE_DESC=		Remote backend
>-REMOTE_HTTP_DESC=	Enable HTTP for the Remote backed
>+REMOTE_DESC=		Remote backend (Unix, Pipe, HTTP)
> TINYDNS_DESC=		TinyDNS backend
> TOOLS_DESC=		Build extra tools
> 
>-OPTIONS_DEFAULT=	PGSQL DNSSEC BOTAN110 POLARSSL
>+OPTIONS_DEFAULT=	PGSQL
> 
> OPTIONS_SUB=	yes
> 
>@@ -90,8 +91,7 @@
> OPENLDAP_USE=		OPENLDAP=YES
> OPENLDAP_LOCAL_RUN_DEPENDS=	openldap-server>=0:${PORTSDIR}/net/openldap24-server
> 
>-REMOTE_HTTP_CONFIGURE_ON=	--enable-remotebackend-http
>-REMOTE_HTTP_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
>+REMOTE_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
> 
> CRYPTOPP_CONFIGURE_ON=		--enable-cryptopp
> 
>@@ -105,6 +105,9 @@
> TINYDNS_LIB_DEPENDS=	libcdb.so:${PORTSDIR}/databases/tinycdb
> TINYDNS_CONFIGURE_ON=	CDB_LIBS="-L${LOCALBASE}/lib -lcdb" CDB_CFLAGS="-I${LOCALBASE}/include"
> 
>+LUA_CONFIGURE_ON=	--with-lua
>+LUA_CONFIGURE_OFF=	--without-lua
>+
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MGEO}
>@@ -174,24 +177,23 @@
> .endif
> 
> .if ${PORT_OPTIONS:MPOLARSSL}
>-CONFIGURE_ARGS+=	--without-system-polarssl
>-.else
>+CONFIGURE_ARGS+=	--with-system-polarssl
> LIB_DEPENDS+=		libpolarssl.so:${PORTSDIR}/security/polarssl
> .endif
> 
>-post-patch:
>-.if ${PORT_OPTIONS:MOPENLDAP}
>-	@${REINPLACE_CMD} -e 's;-I. ;-I. -I${LOCALBASE}/include ;' \
>-		-e 's;la_LDFLAGS =;la_LDFLAGS = -L${LOCALBASE}/lib;' \
>-		${WRKSRC}/modules/ldapbackend/Makefile.in
>-	@${REINPLACE_CMD} -e 's;@LIBDL@;@LIBDL@ -L${LOCALBASE}/lib;' \
>-		-e 's;@modulelibs@;@modulelibs@ -llber;' \
>-		${WRKSRC}/pdns/Makefile.in
>-.endif
>-.if ${PORT_OPTIONS:MPGSQL}
>-	@${REINPLACE_CMD} -E -e 's;(PGSQL_inc_check="\$$withval/include/pgsql)";\1 \$$withval/include";' \
>-		${WRKSRC}/configure
>-.endif
>+#post-patch:
>+#.if ${PORT_OPTIONS:MOPENLDAP}
>+#	@${REINPLACE_CMD} -e 's;-I. ;-I. -I${LOCALBASE}/include ;' \
>+#		-e 's;la_LDFLAGS =;la_LDFLAGS = -L${LOCALBASE}/lib;' \
>+#		${WRKSRC}/modules/ldapbackend/Makefile.in
>+#	@${REINPLACE_CMD} -e 's;@LIBDL@;@LIBDL@ -L${LOCALBASE}/lib;' \
>+#		-e 's;@modulelibs@;@modulelibs@ -llber;' \
>+#		${WRKSRC}/pdns/Makefile.in
>+#.endif
>+#.if ${PORT_OPTIONS:MPGSQL}
>+#	@${REINPLACE_CMD} -E -e 's;(PGSQL_inc_check="\$$withval/include/pgsql)";\1 \$$withval/include";' \
>+#		${WRKSRC}/configure
>+#.endif
> 
> post-install:
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>diff -ruN /usr/ports/dns/powerdns.orig/distinfo /usr/ports/dns/powerdns/distinfo
>--- /usr/ports/dns/powerdns.orig/distinfo	2014-01-23 21:12:54.000000000 +0100
>+++ /usr/ports/dns/powerdns/distinfo	2014-10-01 05:43:38.595079265 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (pdns-3.3.1.tar.gz) = feb566994725e049391e9b862c9437ca545f1bb970143d2387e474a6ff645bf3
>-SIZE (pdns-3.3.1.tar.gz) = 1403435
>+SHA256 (pdns-3.4.0.tar.bz2) = 0780f7a7fe768f9debc9decadb5d3a555b716eed14296e7c41f355bf8db4825e
>+SIZE (pdns-3.4.0.tar.bz2) = 1234318
>diff -ruN /usr/ports/dns/powerdns.orig/files/patch-pdns__Makefile.in /usr/ports/dns/powerdns/files/patch-pdns__Makefile.in
>--- /usr/ports/dns/powerdns.orig/files/patch-pdns__Makefile.in	2014-01-23 21:12:54.000000000 +0100
>+++ /usr/ports/dns/powerdns/files/patch-pdns__Makefile.in	1970-01-01 01:00:00.000000000 +0100
>@@ -1,49 +0,0 @@
>---- ./pdns/Makefile.in.orig	2013-12-17 14:47:45.000000000 +0100
>-+++ ./pdns/Makefile.in	2014-01-16 13:37:09.328942976 +0100
>-@@ -66,7 +66,7 @@
>- 	nproxy$(EXEEXT) notify$(EXEEXT) pdnssec$(EXEEXT) \
>- 	dnsbulktest$(EXEEXT) nsec3dig$(EXEEXT)
>- @BOTAN110_TRUE@am__append_4 = botan110signers.cc botansigners.cc
>--@BOTAN110_TRUE@am__append_5 = $(BOTAN110_LIBS) -lgmp -lrt
>-+@BOTAN110_TRUE@am__append_5 = $(BOTAN110_LIBS)
>- @BOTAN18_TRUE@am__append_6 = botan18signers.cc botansigners.cc
>- @BOTAN18_TRUE@am__append_7 = $(BOTAN18_LIBS) -lgmp
>- @CRYPTOPP_TRUE@am__append_8 = cryptoppsigners.cc
>-@@ -74,7 +74,7 @@
>- @SQLITE3_TRUE@am__append_10 = ssqlite3.cc ssqlite3.hh
>- @ORACLE_TRUE@am__append_11 = $(ORACLE_LIBS)
>- @BOTAN110_TRUE@am__append_12 = botan110signers.cc botansigners.cc
>--@BOTAN110_TRUE@am__append_13 = $(BOTAN110_LIBS) -lgmp -lrt
>-+@BOTAN110_TRUE@am__append_13 = $(BOTAN110_LIBS)
>- @BOTAN18_TRUE@am__append_14 = botan18signers.cc botansigners.cc
>- @BOTAN18_TRUE@am__append_15 = $(BOTAN18_LIBS) -lgmp
>- @CRYPTOPP_TRUE@am__append_16 = cryptoppsigners.cc
>-@@ -750,8 +750,8 @@
>- top_builddir = @top_builddir@
>- top_srcdir = @top_srcdir@
>- AM_CXXFLAGS = -DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) $(POLARSSL_CFLAGS) -Iext/rapidjson/include
>--AM_CPPFLAGS = -Ibackends/bind $(BOOST_CPPFLAGS) @THREADFLAGS@ \
>--	$(LIBCURL_CFLAGS) $(am__append_1) $(am__append_2)
>-+AM_CPPFLAGS = -Ibackends/bind @THREADFLAGS@ \
>-+	$(am__append_1) $(am__append_2) $(BOOST_CPPFLAGS)
>- EXTRA_DIST = dnslabeltext.rl dnslabeltext.cc mtasker.cc inflighter.cc docs/pdns_control.8  \
>- 	docs/pdns_server.8 docs/zone2sql.8 docs/zone2ldap.8 docs/pdnssec.8 \
>- 	docs/dnsreplay.8 docs/dnsscope.8 docs/dnswasher.8 docs/pdnssec.8 docs/zone2ldap.8 \
>-@@ -797,7 +797,7 @@
>- #
>- pdns_server_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic
>- pdns_server_LDADD = $(POLARSSL_LIBS) $(BOOST_SERIALIZATION_LIBS) \
>--	$(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(am__append_5) \
>-+	$(LUA_LIBS) $(SQLITE3_LIBS) $(am__append_5) \
>- 	$(am__append_7) $(am__append_9) $(am__append_11)
>- pdnssec_SOURCES = pdnssec.cc dbdnsseckeeper.cc sstuff.hh dnsparser.cc \
>- 	dnsparser.hh dnsrecords.cc dnswriter.cc dnswriter.hh misc.cc \
>-@@ -819,7 +819,7 @@
>- 	$(am__append_18)
>- pdnssec_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) 
>- pdnssec_LDADD = $(POLARSSL_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) \
>--	$(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) \
>-+	$(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) \
>- 	$(am__append_13) $(am__append_15) $(am__append_17) \
>- 	$(am__append_19)
>- sdig_SOURCES = sdig.cc sstuff.hh dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter.cc dnslabeltext.cc dnswriter.hh \
>diff -ruN /usr/ports/dns/powerdns.orig/files/pdns.conf /usr/ports/dns/powerdns/files/pdns.conf
>--- /usr/ports/dns/powerdns.orig/files/pdns.conf	2014-01-24 01:14:07.000000000 +0100
>+++ /usr/ports/dns/powerdns/files/pdns.conf	2014-10-01 05:53:43.047039221 +0200
>@@ -1,50 +1,13 @@
>-# MySQL
>-#launch=gmysql
>-#gmysql-host=127.0.0.1
>-#gmysql-dbname=pdns
>-#gmysql-user=pdns
>-#gmysql-password=pdns
>-
>-# PostgreSQL
>-#launch=gpgsql
>-#gpgsql-host=127.0.0.1
>-#gpgsql-dbname=pdns
>-#gpgsql-user=pdns
>-#gpgsql-password=pdns
>-
>-# SQLite 2
>-#launch=gsqlite
>-#gsqlite-database=<path to your SQLite database>
>-
>-# SQLite 3
>-#launch=gsqlite3
>-#gsqlite3-database=<path to your SQLite database>
>-
>-# LDAP (check http://www.linuxnetworks.de for more information)
>-#launch=ldap
>-#ldap-host (default "127.0.0.1:389")
>-#ldap-starttls (default "no")
>-#ldap-basedn (default "")
>-#ldap-binddn (default "")
>-#ldap-secret (default "")
>-#ldap-method (default "simple")
>-#ldap-filter-axfr (default "(:target:)" )
>-#ldap-filter-lookup (default "(:target:)" )
>-
>-# OpenDBX (check http://www.linuxnetworks.de for more information)
>-#launch=opendbx
>-#opendbx-backend (default "mysql")
>-#opendbx-host-read (default "127.0.0.1")
>-#opendbx-host-write (default "127.0.0.1")
>-#opendbx-database (default "powerdns")
>-#opendbx-username (default "powerdns")
>-#opendbx-password (default "")
>-
> # Autogenerated configuration file template
> #################################
> # allow-axfr-ips	Allow zonetransfers only to these subnets
> #
>-# allow-axfr-ips=0.0.0.0/0,::/0
>+# allow-axfr-ips=127.0.0.0/8,::1
>+
>+#################################
>+# allow-dnsupdate-from	A global setting to allow DNS updates from these IP ranges.
>+#
>+# allow-dnsupdate-from=127.0.0.0/8,::1
> 
> #################################
> # allow-recursion	List of subnets that are allowed to recurse
>@@ -52,9 +15,14 @@
> # allow-recursion=0.0.0.0/0
> 
> #################################
>-# allow-recursion-override	Set this so that local data fully overrides the recursor
>+# also-notify	When notifying a domain, also notify these nameservers
> #
>-# allow-recursion-override=no
>+# also-notify=
>+
>+#################################
>+# any-to-tcp	Answer ANY queries with tc=1, shunting to TCP
>+#
>+# any-to-tcp=no
> 
> #################################
> # cache-ttl	Seconds to store packets in the PacketCache
>@@ -62,6 +30,21 @@
> # cache-ttl=20
> 
> #################################
>+# carbon-interval	Number of seconds between carbon (graphite) updates
>+#
>+# carbon-interval=30
>+
>+#################################
>+# carbon-ourname	If set, overrides our reported hostname for carbon stats
>+#
>+# carbon-ourname=
>+
>+#################################
>+# carbon-server	If set, send metrics in carbon (graphite) format to this server
>+#
>+# carbon-server=
>+
>+#################################
> # chroot	If set, chroot to this directory for more security
> #
> # chroot=
>@@ -69,7 +52,7 @@
> #################################
> # config-dir	Location of configuration directory (pdns.conf)
> #
>-# config-dir=/usr/local/etc/pdns
>+# config-dir=/usr/local/etc
> 
> #################################
> # config-name	Name of this virtual configuration - will rename the binary image
>@@ -87,6 +70,21 @@
> # daemon=no
> 
> #################################
>+# default-ksk-algorithms	Default KSK algorithms
>+#
>+# default-ksk-algorithms=rsasha256
>+
>+#################################
>+# default-ksk-size	Default KSK size (0 means default)
>+#
>+# default-ksk-size=0
>+
>+#################################
>+# default-soa-mail	mail address to insert in the SOA record if none set in the backend
>+#
>+# default-soa-mail=
>+
>+#################################
> # default-soa-name	name to insert in the SOA record if none set in the backend
> #
> # default-soa-name=a.misconfigured.powerdns.server
>@@ -97,11 +95,31 @@
> # default-ttl=3600
> 
> #################################
>+# default-zsk-algorithms	Default ZSK algorithms
>+#
>+# default-zsk-algorithms=rsasha256
>+
>+#################################
>+# default-zsk-size	Default ZSK size (0 means default)
>+#
>+# default-zsk-size=0
>+
>+#################################
>+# direct-dnskey	Fetch DNSKEY RRs from backend during DNSKEY synthesis
>+#
>+# direct-dnskey=no
>+
>+#################################
> # disable-axfr	Disable zonetransfers but do allow TCP queries
> #
> # disable-axfr=no
> 
> #################################
>+# disable-axfr-rectify	Disable the rectify step during an outgoing AXFR. Only required for regression testing.
>+#
>+# disable-axfr-rectify=no
>+
>+#################################
> # disable-tcp	Do not listen to TCP queries
> #
> # disable-tcp=no
>@@ -114,12 +132,7 @@
> #################################
> # do-ipv6-additional-processing	Do AAAA additional processing
> #
>-# do-ipv6-additional-processing=no
>-
>-#################################
>-# edns-subnet-option-number	EDNS option number to use
>-#
>-# edns-subnet-option-number=20730
>+# do-ipv6-additional-processing=yes
> 
> #################################
> # edns-subnet-processing	If we should act on EDNS Subnet options
>@@ -132,9 +145,34 @@
> # entropy-source=/dev/urandom
> 
> #################################
>-# fancy-records	Process URL and MBOXFW records
>+# experimental-api-readonly	If the JSON API should disallow data modification
> #
>-# fancy-records=no
>+# experimental-api-readonly=no
>+
>+#################################
>+# experimental-dname-processing	If we should support DNAME records
>+#
>+# experimental-dname-processing=no
>+
>+#################################
>+# experimental-dnsupdate	Enable/Disable DNS update (RFC2136) support. Default is no.
>+#
>+# experimental-dnsupdate=no
>+
>+#################################
>+# experimental-json-interface	If the webserver should serve JSON data
>+#
>+# experimental-json-interface=no
>+
>+#################################
>+# experimental-logfile	Filename of the log file for JSON parser
>+#
>+# experimental-logfile=/var/log/pdns.log
>+
>+#################################
>+# forward-dnsupdate	A global setting to allow DNS update packages that are for a Slave domain, to be forwarded to the master.
>+#
>+# forward-dnsupdate=yes
> 
> #################################
> # guardian	Run within a guardian process
>@@ -142,14 +180,14 @@
> # guardian=no
> 
> #################################
>-# launch	Which backends to launch and order to query them in
>+# include-dir	Include *.conf files from this directory
> #
>-# launch=
>+# include-dir=
> 
> #################################
>-# lazy-recursion	Only recurse if question cannot be answered locally
>+# launch	Which backends to launch and order to query them in
> #
>-# lazy-recursion=yes
>+# launch=
> 
> #################################
> # load-modules	Load this module - supply absolute or relative path
>@@ -162,11 +200,21 @@
> # local-address=0.0.0.0
> 
> #################################
>+# local-address-nonexist-fail	Fail to start if one or more of the local-address's do not exist on this server
>+#
>+# local-address-nonexist-fail=yes
>+
>+#################################
> # local-ipv6	Local IP address to which we bind
> #
> # local-ipv6=
> 
> #################################
>+# local-ipv6-nonexist-fail	Fail to start if one or more of the local-ipv6 addresses do not exist on this server
>+#
>+# local-ipv6-nonexist-fail=yes
>+
>+#################################
> # local-port	The port on which we listen
> #
> # local-port=53
>@@ -174,7 +222,7 @@
> #################################
> # log-dns-details	If PDNS should log DNS non-erroneous details
> #
>-# log-dns-details=
>+# log-dns-details=no
> 
> #################################
> # log-dns-queries	If PDNS should log all incoming DNS queries
>@@ -182,16 +230,6 @@
> # log-dns-queries=no
> 
> #################################
>-# log-failed-updates	If PDNS should log failed update requests
>-#
>-# log-failed-updates=
>-
>-#################################
>-# logfile	Logfile to use (Windows only)
>-#
>-# logfile=pdns.log
>-
>-#################################
> # logging-facility	Log under a specific facility
> #
> # logging-facility=
>@@ -202,6 +240,11 @@
> # loglevel=4
> 
> #################################
>+# lua-prequery-script	Lua script with prequery handler
>+#
>+# lua-prequery-script=
>+
>+#################################
> # master	Act as a master
> #
> # master=no
>@@ -212,11 +255,26 @@
> # max-cache-entries=1000000
> 
> #################################
>+# max-ent-entries	Maximum number of empty non-terminals in a zone
>+#
>+# max-ent-entries=100000
>+
>+#################################
>+# max-nsec3-iterations	Limit the number of NSEC3 hash iterations
>+#
>+# max-nsec3-iterations=500
>+
>+#################################
> # max-queue-length	Maximum queuelength before considering situation lost
> #
> # max-queue-length=5000
> 
> #################################
>+# max-signature-cache-entries	Maximum number of signatures cache entries
>+#
>+# max-signature-cache-entries=
>+
>+#################################
> # max-tcp-connections	Maximum number of TCP connections
> #
> # max-tcp-connections=10
>@@ -224,10 +282,10 @@
> #################################
> # module-dir	Default directory for modules
> #
>-# module-dir=/usr/local/lib
>+# module-dir=/usr/local/lib/pdns
> 
> #################################
>-# negquery-cache-ttl	Seconds to store packets in the PacketCache
>+# negquery-cache-ttl	Seconds to store negative query results in the QueryCache
> #
> # negquery-cache-ttl=60
> 
>@@ -237,6 +295,11 @@
> # no-shuffle=off
> 
> #################################
>+# only-notify	Only send AXFR NOTIFY to these IP addresses or netmasks
>+#
>+# only-notify=0.0.0.0/0,::/0
>+
>+#################################
> # out-of-zone-additional-processing	Do out of zone additional processing
> #
> # out-of-zone-additional-processing=yes
>@@ -247,17 +310,17 @@
> # overload-queue-length=0
> 
> #################################
>-# per-zone-axfr-acls	When set, backends that implement it perform per-zone AXFL ACL checks
>+# pipebackend-abi-version	Version of the pipe backend ABI
> #
>-# per-zone-axfr-acls=off
>+# pipebackend-abi-version=1
> 
> #################################
>-# pipebackend-abi-version	Version of the pipe backend ABI
>+# prevent-self-notification	Don't send notifications to what we think is ourself
> #
>-# pipebackend-abi-version=1
>+# prevent-self-notification=yes
> 
> #################################
>-# query-cache-ttl	Seconds to store packets in the PacketCache
>+# query-cache-ttl	Seconds to store query results in the QueryCache
> #
> # query-cache-ttl=20
> 
>@@ -282,12 +345,12 @@
> # queue-limit=1500
> 
> #################################
>-# receiver-threads	Default number of Distributor (backend) threads to start
>+# receiver-threads	Default number of receiver threads to start
> #
> # receiver-threads=1
> 
> #################################
>-# recursive-cache-ttl	Seconds to store packets in the PacketCache
>+# recursive-cache-ttl	Seconds to store packets for recursive queries in the PacketCache
> #
> # recursive-cache-ttl=10
> 
>@@ -302,12 +365,17 @@
> # retrieval-threads=2
> 
> #################################
>+# reuseport	Enable higher performance on compliant kernels by using SO_REUSEPORT allowing each receiver thread to open its own socket
>+#
>+# reuseport=no
>+
>+#################################
> # send-root-referral	Send out old-fashioned root-referral instead of ServFail in case of no authority
> #
> # send-root-referral=no
> 
> #################################
>-# server-id	Returned when queried for 'server.id' TXT or NSID, defaults to hostname
>+# server-id	Returned when queried for 'server.id' TXT or NSID, defaults to hostname - disabled or custom
> #
> # server-id=
> 
>@@ -327,11 +395,6 @@
> # signing-threads=3
> 
> #################################
>-# skip-cname	Do not perform CNAME indirection for each query
>-#
>-# skip-cname=no
>-
>-#################################
> # slave	Act as a slave
> #
> # slave=no
>@@ -347,17 +410,12 @@
> # slave-renotify=no
> 
> #################################
>-# smtpredirector	Our smtpredir MX host
>-#
>-# smtpredirector=a.misconfigured.powerdns.smtp.server
>-
>-#################################
> # soa-expire-default	Default SOA expire
> #
> # soa-expire-default=604800
> 
> #################################
>-# soa-minimum-ttl	Default SOA mininum ttl
>+# soa-minimum-ttl	Default SOA minimum ttl
> #
> # soa-minimum-ttl=3600
> 
>@@ -372,21 +430,11 @@
> # soa-retry-default=3600
> 
> #################################
>-# soa-serial-offset	Make sure that no SOA serial is less than this number
>-#
>-# soa-serial-offset=0
>-
>-#################################
> # socket-dir	Where the controlsocket will live
> #
> # socket-dir=/var/run
> 
> #################################
>-# strict-rfc-axfrs	Perform strictly rfc compliant axfrs (very slow)
>-#
>-# strict-rfc-axfrs=no
>-
>-#################################
> # tcp-control-address	If set, PowerDNS can be controlled over TCP on this address
> #
> # tcp-control-address=
>@@ -407,19 +455,19 @@
> # tcp-control-secret=
> 
> #################################
>-# trusted-notification-proxy	IP address of incoming notification proxy
>+# traceback-handler	Enable the traceback handler (Linux only)
> #
>-# trusted-notification-proxy=
>+# traceback-handler=yes
> 
> #################################
>-# urlredirector	Where we send hosts to that need to be url redirected
>+# trusted-notification-proxy	IP address of incoming notification proxy
> #
>-# urlredirector=127.0.0.1
>+# trusted-notification-proxy=
> 
> #################################
>-# use-logfile	Use a log file (Windows only)
>+# udp-truncation-threshold	Maximum UDP response size before we truncate
> #
>-# use-logfile=no
>+# udp-truncation-threshold=1680
> 
> #################################
> # version-string	PowerDNS version in packets - full, anonymous, powerdns or custom
>@@ -437,6 +485,11 @@
> # webserver-address=127.0.0.1
> 
> #################################
>+# webserver-allow-from	Webserver access is only allowed from these subnets
>+#
>+# webserver-allow-from=0.0.0.0/0,::/0
>+
>+#################################
> # webserver-password	Password required for accessing the webserver
> #
> # webserver-password=
>@@ -451,14 +504,4 @@
> #
> # webserver-print-arguments=no
> 
>-#################################
>-# wildcard-url	Process URL and MBOXFW records
>-#
>-# wildcard-url=no
>-
>-#################################
>-# wildcards	Honor wildcards in the database
>-#
>-# wildcards=
>-
> 
>diff -ruN /usr/ports/dns/powerdns.orig/pkg-plist /usr/ports/dns/powerdns/pkg-plist
>--- /usr/ports/dns/powerdns.orig/pkg-plist	2014-08-23 18:23:12.000000000 +0200
>+++ /usr/ports/dns/powerdns/pkg-plist	2014-10-02 13:07:21.026288254 +0200
>@@ -12,17 +12,17 @@
> %%TOOLS%%bin/dnswasher
> %%TOOLS%%bin/nproxy
> %%TOOLS%%bin/nsec3dig
>-%%PGSQL%%lib/libgpgsqlbackend.so
>-%%MYSQL%%lib/libgmysqlbackend.so
>-%%SQLITE3%%lib/libgsqlite3backend.so
>-%%OPENLDAP%%lib/libldapbackend.so
>-%%OPENDBX%%lib/libopendbxbackend.so
>-%%GEO%%lib/libgeobackend.so
>-%%TINYDNS%%lib/libtinydnsbackend.so
>-%%REMOTE%%lib/libremotebackend.so
>-%%MYDNS%%lib/libmydnsbackend.so
>-%%LUA%%lib/libluabackend.so
>-lib/libpipebackend.so
>+%%PGSQL%%lib/pdns/libgpgsqlbackend.so
>+%%MYSQL%%lib/pdns/libgmysqlbackend.so
>+%%SQLITE3%%lib/pdns/libgsqlite3backend.so
>+%%OPENLDAP%%lib/pdns/libldapbackend.so
>+%%OPENDBX%%lib/pdns/libopendbxbackend.so
>+%%GEO%%lib/pdns/libgeobackend.so
>+%%TINYDNS%%lib/pdns/libtinydnsbackend.so
>+%%REMOTE%%lib/pdns/libremotebackend.so
>+%%MYDNS%%lib/pdns/libmydnsbackend.so
>+%%LUA%%lib/pdns/libluabackend.so
>+lib/pdns/libpipebackend.so
> %%TOOLS%%man/man1/dnstcpbench.1.gz
> %%TOOLS%%man/man8/dnsreplay.8.gz
> %%TOOLS%%man/man8/dnsscope.8.gz
>@@ -37,4 +37,4 @@
> @exec [ -f %B/pdns.conf ] || cp %B/%f %B/pdns.conf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pdns.conf
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
>-@dirrmtry etc/pdns
>+@dir etc/pdns

Actions: View | Diff

Attachments on bug 194057: 147870 | 147871 | 147906 | 147940 | 148199 | 148200 | 148201 | 148222 | 148229 | 148231 | 148232 | 148233 | 148234 | 148235