pdns: update to 4.9.1

Signed-off-by: Peter van Dijk <peter.van.dijk@powerdns.com>
This commit is contained in:
Peter van Dijk
2024-05-28 11:29:28 +02:00
committed by Tianling Shen
parent 2fc0e8f794
commit 19bb71c85b
3 changed files with 14 additions and 28 deletions

View File

@@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=pdns PKG_NAME:=pdns
PKG_VERSION:=4.9.0 PKG_VERSION:=4.9.1
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/ PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/
PKG_HASH:=fe1d5433c88446ed70d931605c6ec377da99839c4e151b90b71aa211bd6eea92 PKG_HASH:=30d9671b8f084774dbcba20f5a53a3134d0822ab2edc3ef968da030e630dd09a
PKG_MAINTAINER:=Peter van Dijk <peter.van.dijk@powerdns.com>, Remi Gacogne <remi.gacogne@powerdns.com> PKG_MAINTAINER:=Peter van Dijk <peter.van.dijk@powerdns.com>, Remi Gacogne <remi.gacogne@powerdns.com>
PKG_LICENSE:=GPL-2.0-only PKG_LICENSE:=GPL-2.0-only

View File

@@ -211,7 +211,7 @@
# disable-axfr-rectify=no # disable-axfr-rectify=no
################################# #################################
# disable-syslog Disable logging to syslog, useful when running inside a supervisor that logs stdout # disable-syslog Disable logging to syslog, useful when running inside a supervisor that logs stderr
# #
# disable-syslog=no # disable-syslog=no
@@ -235,6 +235,11 @@
# #
# dnsupdate=no # dnsupdate=no
#################################
# dnsupdate-require-tsig Require TSIG secured DNS updates. Default is no.
#
# dnsupdate-require-tsig=no
################################# #################################
# domain-metadata-cache-ttl Seconds to cache zone metadata from the database # domain-metadata-cache-ttl Seconds to cache zone metadata from the database
# #
@@ -380,6 +385,11 @@
# #
# lua-records-exec-limit=1000 # lua-records-exec-limit=1000
#################################
# lua-records-insert-whitespace Insert whitespace when combining LUA chunks
#
# lua-records-insert-whitespace=no
################################# #################################
# max-cache-entries Maximum number of entries in the query cache # max-cache-entries Maximum number of entries in the query cache
# #

View File

@@ -1,24 +0,0 @@
commit c6b1e59f3b413493551910a7d0a3e9206d488599
Author: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Date: Sat Apr 6 23:51:35 2024 +0200
auth dnsproxy: fix build on s390x
--- a/pdns/dnsproxy.cc
+++ b/pdns/dnsproxy.cc
@@ -240,10 +240,11 @@ void DNSProxy::mainloop()
memcpy(&dHead, &buffer[0], sizeof(dHead));
{
auto conntrack = d_conntrack.lock();
-#if BYTE_ORDER == BIG_ENDIAN
- // this is needed because spoof ID down below does not respect the native byteorder
- d.id = (256 * (uint16_t)buffer[1]) + (uint16_t)buffer[0];
-#endif
+ if (BYTE_ORDER == BIG_ENDIAN) {
+ // this is needed because spoof ID down below does not respect the native byteorder
+ dHead.id = (256 * (uint16_t)buffer[1]) + (uint16_t)buffer[0];
+ }
+
auto iter = conntrack->find(dHead.id ^ d_xor);
if (iter == conntrack->end()) {
g_log << Logger::Error << "Discarding untracked packet from recursor backend with id " << (dHead.id ^ d_xor) << ". Conntrack table size=" << conntrack->size() << endl;