dnsdist: Update to 1.6.1

This patch makes this package available for aarch64. There are no
reasons why it shouldn't be.

Compiling has become more resource-hungry which is why the memory
consumption per process has been upped to 3GiB.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>

diff --git a/lfs/dnsdist b/lfs/dnsdist
index 7d0e55e5701e0fe833131c635bbd0cc603b8b454..8aaca95247c9e0c5c11c311920136e182fdd96ed 100644 (file)
--- a/lfs/dnsdist
+++ b/lfs/dnsdist
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.6.0
+VER        = 1.6.1
 
 THISAPP    = dnsdist-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,13 +32,13 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = dnsdist
-PAK_VER    = 9
+PAK_VER    = 10
 
-SUP_ARCH   = x86_64
+SUP_ARCH   = x86_64 aarch64
 
 DEPS       =
 
-MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 2048 )))
+MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 3072 )))
 
 ###############################################################################
 # Top-level Rules
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c15a95b19c6d9f39d89dae6995173ab3
+$(DL_FILE)_MD5 = fc314583a33d1256fecb41dac64a77e3
 
 install : $(TARGET)
 
@@ -81,7 +81,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/dnsdist-1.6.0-missing-mutex-header.patch
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
                --sysconfdir=/etc \

diff --git a/src/patches/dnsdist-1.6.0-missing-mutex-header.patch b/src/patches/dnsdist-1.6.0-missing-mutex-header.patch
deleted file mode 100644 (file)
index 8d9c977..0000000
--- a/src/patches/dnsdist-1.6.0-missing-mutex-header.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 65bb0ab32a449d8fb8cf9a4802d16ba4912d9fc4 Mon Sep 17 00:00:00 2001
-From: Remi Gacogne <remi.gacogne@powerdns.com>
-Date: Tue, 25 May 2021 10:09:43 +0200
-Subject: [PATCH] dnsdist-1.6.x: Backport a missing mutex header
-
----
- pdns/lock.hh | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/pdns/lock.hh b/pdns/lock.hh
-index 09299d7979d..0e88118c564 100644
---- a/pdns/lock.hh
-+++ b/pdns/lock.hh
-@@ -20,6 +20,8 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- #pragma once
-+
-+#include <mutex>
- #include <shared_mutex>
- 
- class ReadWriteLock