From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] dnsdist: Update to 1.6.1
Date: Thu, 23 Sep 2021 11:54:36 +0000
Message-ID: <20210923115436.23433-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8333877208549103094=="
List-Id: <development.lists.ipfire.org>

--===============8333877208549103094==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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(a)ipfire.org>
---
 lfs/dnsdist                                   | 11 +++++-----
 .../dnsdist-1.6.0-missing-mutex-header.patch  | 22 -------------------
 2 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 src/patches/dnsdist-1.6.0-missing-mutex-header.patch

diff --git a/lfs/dnsdist b/lfs/dnsdist
index 7d0e55e57..8aaca9524 100644
--- a/lfs/dnsdist
+++ b/lfs/dnsdist
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 1.6.0
+VER        =3D 1.6.1
=20
 THISAPP    =3D dnsdist-$(VER)
 DL_FILE    =3D $(THISAPP).tar.bz2
@@ -32,13 +32,13 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D dnsdist
-PAK_VER    =3D 9
+PAK_VER    =3D 10
=20
-SUP_ARCH   =3D x86_64
+SUP_ARCH   =3D x86_64 aarch64
=20
 DEPS       =3D
=20
-MAX_PARALLELISM =3D $(shell echo $$(( $(SYSTEM_MEMORY) / 2048 )))
+MAX_PARALLELISM =3D $(shell echo $$(( $(SYSTEM_MEMORY) / 3072 )))
=20
 ############################################################################=
###
 # Top-level Rules
@@ -48,7 +48,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D c15a95b19c6d9f39d89dae6995173ab3
+$(DL_FILE)_MD5 =3D fc314583a33d1256fecb41dac64a77e3
=20
 install : $(TARGET)
=20
@@ -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=3D/usr \
 		--sysconfdir=3D/etc \
diff --git a/src/patches/dnsdist-1.6.0-missing-mutex-header.patch b/src/patch=
es/dnsdist-1.6.0-missing-mutex-header.patch
deleted file mode 100644
index 8d9c97723..000000000
--- 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(a)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>
-=20
- class ReadWriteLock
--=20
2.20.1


--===============8333877208549103094==--