From patchwork Thu Sep 23 11:54:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4724 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4HFYVr1xDWz3x1J for ; Thu, 23 Sep 2021 11:54:44 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4HFYVn4Hc2z6mT; Thu, 23 Sep 2021 11:54:41 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4HFYVn1XXLz2ylJ; Thu, 23 Sep 2021 11:54:41 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4HFYVm0FqDz2xxL for ; Thu, 23 Sep 2021 11:54:40 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4HFYVl3X0gz1Tx; Thu, 23 Sep 2021 11:54:39 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1632398079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=q1fp1QidkDNeVIbVOR7RWGN5Ywxiuhw4XfmeTzPCV1I=; b=Is2y1EeEzzA43l58hf4Tp/RZJCm/QEC9i0d30odVkfG9cC2c+KMk3x3Ph7csdYzq8NIr5z RljQpada7HlPcpBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1632398079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=q1fp1QidkDNeVIbVOR7RWGN5Ywxiuhw4XfmeTzPCV1I=; b=u1nTl1MKRziOHVWB4rbBxwFUwX45zDZDkR5q7u5dys+fJkmIZR5DnuBx5TgLDUtMJaqzf6 wHZFALll7tZ6B2UzdULWQvmV3wAmDSJG5Q8sOlfkFY2A1AHAP5TJbE++i6BDEQKi7q4E1n vVkwABELRnt0shRvdbVAUFZjNir/+Ri+yiR+iqEDVMRxDDLS2DOyV5MnALVb3Avn6tSdgD bKtoZNfDwrTNrXRY8v14T4rKN7dRAjdfr2TmlKSFnAMNPCQ9llqiprJYc5v3F/MZ/YxHE5 nfUL5NcSfZjg9AHkhr9Wob/UTX2Dmnj1sxmIJGbBrzO0L+jxgutz9IvH6fzeAw== From: Michael Tremer 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 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 Reviewed-by: Adolf Belka --- 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 @@ 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 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 -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 - #include - - class ReadWriteLock