From patchwork Sun Sep 13 15:04:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 3460 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BqCTD6bmvz3x3W for ; Sun, 13 Sep 2020 15:04:48 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BqCTB43QZzky; Sun, 13 Sep 2020 15:04:46 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BqCTB1rdJz2xlW; Sun, 13 Sep 2020 15:04:46 +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 "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BqCT94DWtz2xlG for ; Sun, 13 Sep 2020 15:04:45 +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) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BqCT867K8zky for ; Sun, 13 Sep 2020 15:04:44 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1600009484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=idh658enmBUDO2o+kxfHw7uYSRBTJC+WD4wDy7GYYpM=; b=AIf3BYbFzcayypf80D21j7rZny6+v+5Rqd632HSwp94dkmuspe5n/9tuOvWpi09ly0weHw FQYvFYJ3DISHLoDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1600009484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=idh658enmBUDO2o+kxfHw7uYSRBTJC+WD4wDy7GYYpM=; b=m7FSdWCUgtjR29XgbUJaD2iQCe+Vt5e2R1ymgFWZzbDQLL/IOUgzgWX6iMoyFsABqB3RNl jLpxxdGNPmyFQ3aZKJ0dnZve8xzmQSDgfEL8NpGGBAXXteA5plJvk0Sj6vPInAIihRtL29 3n0Vt/GtiG4CpBiXqIb00GQd3WgrI3/swY1tcwndzZ5tv5qnblSnCNrZYDv8FFrnR85ZHT WPdEyWT1xeM6g4vOQGBEAW3sp0sEooXAh3lsoXS8jHsc4ldp/ul/gyBxbCOMyAdRtGeFYK f2dA0ZoM0wY4VACKDEptcMkwfpOgu5EBCHRo0ab+Pb/Xi5td+Xbud+Ykw91YnQ== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH 1/2] knot: Update to 3.0.0 Date: Sun, 13 Sep 2020 17:04:38 +0200 Message-Id: <20200913150439.1397-1-matthias.fischer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org 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: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" For details see: https://www.knot-dns.cz/2020-09-09-version-300.html Signed-off-by: Matthias Fischer Reviewed-by: Michael Tremer --- config/rootfiles/common/knot | 8 ++++---- lfs/knot | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/rootfiles/common/knot b/config/rootfiles/common/knot index 960f14d0a..f352543b3 100644 --- a/config/rootfiles/common/knot +++ b/config/rootfiles/common/knot @@ -4,12 +4,12 @@ usr/bin/kdig #usr/lib/libdnssec.la #usr/lib/libdnssec.lai #usr/lib/libdnssec.so -usr/lib/libdnssec.so.7 -usr/lib/libdnssec.so.7.0.0 +usr/lib/libdnssec.so.8 +usr/lib/libdnssec.so.8.0.0 #usr/lib/libknot.la #usr/lib/libknot.lai #usr/lib/libknot.so -usr/lib/libknot.so.10 -usr/lib/libknot.so.10.0.0 +usr/lib/libknot.so.11 +usr/lib/libknot.so.11.0.0 #usr/lib/libknotus.a #usr/lib/libknotus.la diff --git a/lfs/knot b/lfs/knot index 9aa5d4f6c..153a9841b 100644 --- a/lfs/knot +++ b/lfs/knot @@ -24,7 +24,7 @@ include Config -VER = 2.9.6 +VER = 3.0.0 THISAPP = knot-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ccfdc71542e767cc01174d373efb56ee +$(DL_FILE)_MD5 = a49754adf3b76db78df678f2cb87fc54 install : $(TARGET) From patchwork Sun Sep 13 15:04:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 3459 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 "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BqCTD6QtJz3x3K for ; Sun, 13 Sep 2020 15:04:48 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BqCTC44d1zsc; Sun, 13 Sep 2020 15:04:47 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BqCTC2Zv8z2yRn; Sun, 13 Sep 2020 15:04:47 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BqCTB267kz2yZm for ; Sun, 13 Sep 2020 15:04:46 +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) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BqCT93Vz5zpP for ; Sun, 13 Sep 2020 15:04:45 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1600009485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=bYwNwCx2xhRdS1McCoRn4bSpa8IhWtPRijjPGqq/0Ek=; b=ahh/s3jMi2zI87aYYkf1v7d4y1UNyN2QRGtTKmoLwiCMVu+98qFsWPaEb8UcpMuJ3ry45Q UdIAQWQs+8sak6AA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1600009485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=bYwNwCx2xhRdS1McCoRn4bSpa8IhWtPRijjPGqq/0Ek=; b=B9naFN2oD8unU3VJXx//jRgZnnvlu5U3fP5ccZdQuz6KJ0EU8d+/jJ54hZgo0H7aW3yUP7 EIsixrbz/xaByu4OEbjyC2FeANf9c6H3BZNwk0HgAvXpifjqhRcZ09IVc/sZ02v650Pae5 59QZDNcA0CaJcMZy6WgW7V5mVISgfqiuEFx2vhLyF1NwjEqVCf1ig2/KDl1WA55r/Jkc2X upeaGTIOmdAp+FCODZLKd7wy7Jh5bqK5Er0lPpqJO8i/FoFNu8wL9omUlwkfYf6t3EcMyt wgaXTqvhe0Ospic58SrQu5CW4E+lWx+J3zB+sPoKH+GpQbfyT+uvX2GtNrc3mg== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH 2/2] New package: lmdb 0.9.24 - required for knot 3.0.0 Date: Sun, 13 Sep 2020 17:04:39 +0200 Message-Id: <20200913150439.1397-2-matthias.fischer@ipfire.org> In-Reply-To: <20200913150439.1397-1-matthias.fischer@ipfire.org> References: <20200913150439.1397-1-matthias.fischer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org 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: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Lightning Memory-mapped Database from symas. For details see: https://symas.com/lmdb/ In contrast to the information from the knot documentation (see: https://www.knot-dns.cz/docs/3.0/html/requirements.html#required-libraries), this library is no longer included. Signed-off-by: Matthias Fischer Reviewed-by: Michael Tremer --- config/rootfiles/common/lmdb | 10 +++++ lfs/lmdb | 83 ++++++++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 94 insertions(+) create mode 100644 config/rootfiles/common/lmdb create mode 100644 lfs/lmdb diff --git a/config/rootfiles/common/lmdb b/config/rootfiles/common/lmdb new file mode 100644 index 000000000..a65849b9e --- /dev/null +++ b/config/rootfiles/common/lmdb @@ -0,0 +1,10 @@ +#usr/bin/mdb_copy +#usr/bin/mdb_dump +#usr/bin/mdb_load +#usr/bin/mdb_stat +#usr/include/lmdb.h +usr/lib/liblmdb.so +#usr/share/man/man1/mdb_copy.1 +#usr/share/man/man1/mdb_dump.1 +#usr/share/man/man1/mdb_load.1 +#usr/share/man/man1/mdb_stat.1 diff --git a/lfs/lmdb b/lfs/lmdb new file mode 100644 index 000000000..1f496cd61 --- /dev/null +++ b/lfs/lmdb @@ -0,0 +1,83 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.9.24 + +THISAPP = lmdb-LMDB_$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = c3e3474daf4a59685d154cc7fc5c99ad + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP)/libraries/liblmdb && make $(MAKETUNING) + cd $(DIR_APP)/libraries/liblmdb && sed -i 's| liblmdb.a||' Makefile + cd $(DIR_APP)/libraries/liblmdb && make prefix=/usr install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) + diff --git a/make.sh b/make.sh index 4a9dd3cb6..27a9bf768 100755 --- a/make.sh +++ b/make.sh @@ -1632,6 +1632,7 @@ buildipfire() { lfsmake2 dehydrated lfsmake2 shairport-sync lfsmake2 borgbackup + lfsmake2 lmdb lfsmake2 knot lfsmake2 spectre-meltdown-checker lfsmake2 zabbix_agentd