From 987be5cf2373ab4bc1d1ab6862d6ee270149c7a1 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Fri, 15 Mar 2024 13:15:48 +0100 Subject: [PATCH] pdns: update to 4.9.0 and add maintainer Signed-off-by: Peter van Dijk --- net/pdns/Makefile | 6 +- net/pdns/files/pdns.conf-dist | 66 ++++++++----------- .../100-pdns-disable-pdns.conf-dist.patch | 15 +++-- 3 files changed, 39 insertions(+), 48 deletions(-) diff --git a/net/pdns/Makefile b/net/pdns/Makefile index 90f83ceb84..90a772e197 100644 --- a/net/pdns/Makefile +++ b/net/pdns/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pdns -PKG_VERSION:=4.8.4 +PKG_VERSION:=4.9.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/ -PKG_HASH:=7f40c8cbc4650d06fe49abba79902ebabb384363dabbd5cef271964a07c3645c +PKG_HASH:=fe1d5433c88446ed70d931605c6ec377da99839c4e151b90b71aa211bd6eea92 -PKG_MAINTAINER:=Peter van Dijk +PKG_MAINTAINER:=Peter van Dijk , Remi Gacogne PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:powerdns:authoritative diff --git a/net/pdns/files/pdns.conf-dist b/net/pdns/files/pdns.conf-dist index 2e417c4cb1..f8b0bb8e31 100644 --- a/net/pdns/files/pdns.conf-dist +++ b/net/pdns/files/pdns.conf-dist @@ -35,11 +35,6 @@ # # allow-unsigned-notify=yes -################################# -# allow-unsigned-supermaster Allow supermasters to create zones without TSIG signed NOTIFY -# -# allow-unsigned-supermaster=yes - ################################# # also-notify When notifying a zone, also notify these nameservers # @@ -61,7 +56,7 @@ # api-key= ################################# -# autosecondary Act as an autosecondary (formerly superslave) +# autosecondary Act as an autosecondary # # autosecondary=no @@ -71,7 +66,7 @@ # axfr-fetch-timeout=10 ################################# -# axfr-lower-serial Also AXFR a zone from a master with a lower serial +# axfr-lower-serial Also AXFR a zone from a primary with a lower serial # # axfr-lower-serial=no @@ -113,7 +108,7 @@ ################################# # config-dir Location of configuration directory (pdns.conf) # -# config-dir=/etc/powerdns +# config-dir=/usr/local/etc ################################# # config-name Name of this virtual configuration - will rename the binary image @@ -195,6 +190,11 @@ # # default-zsk-size=0 +################################# +# delay-notifications Configure a delay to send out notifications, no delay by default +# +# delay-notifications=0 + ################################# # direct-dnskey Fetch DNSKEY, CDS and CDNSKEY RRs from backend during DNSKEY or CDS/CDNSKEY synthesis # @@ -266,12 +266,12 @@ # expand-alias=no ################################# -# forward-dnsupdate A global setting to allow DNS update packages that are for a Slave zone, to be forwarded to the master. +# forward-dnsupdate A global setting to allow DNS update packages that are for a Secondary zone, to be forwarded to the primary. # # forward-dnsupdate=yes ################################# -# forward-notify IP addresses to forward received notifications to regardless of master or slave settings +# forward-notify IP addresses to forward received notifications to regardless of primary or secondary settings # # forward-notify= @@ -335,11 +335,26 @@ # # loglevel=4 +################################# +# loglevel-show Include log level indicator in log output +# +# loglevel-show=no + ################################# # lua-axfr-script Script to be used to edit incoming AXFRs # # lua-axfr-script= +################################# +# lua-consistent-hashes-cleanup-interval Pre-computed hashes cleanup interval (in seconds) +# +# lua-consistent-hashes-cleanup-interval=3600 + +################################# +# lua-consistent-hashes-expire-delay Cleanup pre-computed hashes that haven't been used for the given delay (in seconds). See pickchashed() LUA function +# +# lua-consistent-hashes-expire-delay=86400 + ################################# # lua-dnsupdate-policy-script Lua script with DNS update policy handler # @@ -365,11 +380,6 @@ # # lua-records-exec-limit=1000 -################################# -# master Act as a primary -# -# master=no - ################################# # max-cache-entries Maximum number of entries in the query cache # @@ -433,7 +443,7 @@ ################################# # module-dir Default directory for modules # -# module-dir=/usr/lib/powerdns/pdns +# module-dir=/usr/local/lib/pdns ################################# # negquery-cache-ttl Seconds to store negative query results in the QueryCache @@ -516,7 +526,7 @@ # resolver=no ################################# -# retrieval-threads Number of AXFR-retrieval threads for slave operation +# retrieval-threads Number of AXFR-retrieval threads for secondary operation # # retrieval-threads=2 @@ -576,30 +586,10 @@ # signing-threads=3 ################################# -# slave Act as a secondary -# -# slave=no - -################################# -# slave-cycle-interval Schedule slave freshness checks once every .. seconds -# -# slave-cycle-interval=60 - -################################# -# slave-renotify If we should send out notifications for secondaried updates -# -# slave-renotify=no - -################################# -# socket-dir Where the controlsocket will live, /var/run/pdns when unset and not chrooted +# socket-dir Where the controlsocket will live, /var/run/pdns when unset and not chrooted. Set to the RUNTIME_DIRECTORY environment variable when that variable has a value (e.g. under systemd). # # socket-dir= -################################# -# superslave Act as a autosecondary -# -# superslave=no - ################################# # svc-autohints Transparently fill ipv6hint=auto ipv4hint=auto SVC params with AAAA/A records for the target name of the record (if within the same zone) # diff --git a/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch b/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch index 7e8173e6e3..a8d966a9cc 100644 --- a/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch +++ b/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch @@ -1,6 +1,6 @@ --- a/pdns/Makefile.am +++ b/pdns/Makefile.am -@@ -80,7 +80,6 @@ CLEANFILES = \ +@@ -82,7 +82,6 @@ CLEANFILES = \ backends/gsql/gsqlbackend.gcda \ backends/gsql/gsqlbackend.gcno \ backends/gsql/gsqlbackend.gcov \ @@ -8,15 +8,16 @@ apidocfiles.h if !HAVE_API_SWAGGER_JSON -@@ -114,7 +113,6 @@ apidocfiles.h: api-swagger.yaml api-swag - ./incfiles $^ > $@ +@@ -116,8 +115,6 @@ apidocfiles.h: api-swagger.yaml api-swag + $(AM_V_GEN)$(srcdir)/incfiles $^ > $@.tmp + @mv $@.tmp $@ - noinst_SCRIPTS = pdns.init -sysconf_DATA = pdns.conf-dist - +- sbin_PROGRAMS = pdns_server bin_PROGRAMS = \ -@@ -155,7 +153,7 @@ if IXFRDIST + pdns_control \ +@@ -157,7 +154,7 @@ if IXFRDIST bin_PROGRAMS += \ ixfrdist @@ -25,7 +26,7 @@ ixfrdist.example.yml endif -@@ -1324,9 +1322,6 @@ dnspcap2protobuf_LDADD = \ +@@ -1341,9 +1338,6 @@ dnspcap2protobuf_LDADD = \ $(BOOST_PROGRAM_OPTIONS_LIBS) \ $(RT_LIBS) -- 2.30.2