From patchwork Mon Sep 23 15:01:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2418 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 46cSGH5LB7z42TG for ; Mon, 23 Sep 2019 15:01:59 +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 "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 46cSGG0l14z2QS; Mon, 23 Sep 2019 15:01:58 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1569250918; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=fkJR9H1Y/MRPQKCLU68OOmBoAW1DJ7ly3E6hHj8po34=; b=BJcLNyPyTrV0CKGKuc0BO5iMswHEPr4qoAMiVXwzbVWspN6o8aOdTWXnsuwClbb4mGd9CS wp6FuoF3M6LtLODA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1569250918; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=fkJR9H1Y/MRPQKCLU68OOmBoAW1DJ7ly3E6hHj8po34=; b=oXtw2b4obXBHs/44RPrMDt0gVu7CKm18GmH9t6i3M69VwsHJm0Sd89GrNG4BCT5AiBI6QT 8kElCD5JV3WZPZ5trizfF7KHA0BfZks1ItxWVpp7QCvnZ9Cf/sfCwzy32paMJG1YzlTWFx kSvDAQ8m2nGRHWO0F7MoGFAE/5DbzAaKwVUgInyVG+QTKrAK/1DtCSWIQevHoGNtA2G1bU 9FBsqgFdSZGDKSjvURpk5fPwCWFyWWodKQUA9t8kZvExtN0jgqPbUR6J0F5KT9E02exZLr BuvvDW01LwNcff6pra1t5cIltns8wTSgOc0tfZuod8N7TmZbZRW4fJtWO+EF6w== Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 46cSGF4V1cz2yjM; Mon, 23 Sep 2019 15:01:57 +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 46cSGC0Kfsz2y0s for ; Mon, 23 Sep 2019 15:01:55 +0000 (UTC) Received: from michael.haj.ipfire.org (fw01.haj.ipfire.org [172.28.1.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 46cSGB5PjHz2Pc; Mon, 23 Sep 2019 15:01:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1569250914; 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=fkJR9H1Y/MRPQKCLU68OOmBoAW1DJ7ly3E6hHj8po34=; b=HRpsgkmfIjqszBRxWMXy4h1xMGrNJiJVCkHNsCN8zXI4LUkqwBBhfGmy33VEUY1E+0+w6E A0vWbi3rj9lv60yKq/0IruW3PVewrDaBnd9UEI/4aKDe7JU2ZmTnWCeOou8C5vRAyxEL0A 3ZT1694iBjYEebN0TSqMolKV+RU7opXruZMbxChRc6yWdXOMQLGIrrPd69ke1BRlTpTCDY OnUxc/YM5H+rYQkufi50Oe+LN3b69cCXgLPYEz2gESySqUnk0JnazNyjy/yZgOiCRYxTSU ncpjgvOfj3faWu9JDFQvWp6aA/d1UqXV5w8Xs3u/AmOZwWKVq8uY4YuZQhuCyA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1569250914; 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=fkJR9H1Y/MRPQKCLU68OOmBoAW1DJ7ly3E6hHj8po34=; b=O2Bq3f7HXzoFDds2sGMVgrfVKVwaUVPKGvaRXJsO8NpjD/H/J+ZUS5ej3rJ9FX5wAD64VK 2MN0/cjo0toS1RCQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 1/2] libssh: New package Date: Mon, 23 Sep 2019 15:01:46 +0000 Message-Id: <20190923150147.9976-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 is required by Bird to support RPKI. Signed-off-by: Michael Tremer --- config/rootfiles/common/libssh | 15 +++++++ lfs/libssh | 79 ++++++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 95 insertions(+) create mode 100644 config/rootfiles/common/libssh create mode 100644 lfs/libssh diff --git a/config/rootfiles/common/libssh b/config/rootfiles/common/libssh new file mode 100644 index 000000000..a454f07fb --- /dev/null +++ b/config/rootfiles/common/libssh @@ -0,0 +1,15 @@ +#usr/include/libssh +#usr/include/libssh/callbacks.h +#usr/include/libssh/legacy.h +#usr/include/libssh/libssh.h +#usr/include/libssh/libsshpp.hpp +#usr/include/libssh/server.h +#usr/include/libssh/sftp.h +#usr/include/libssh/ssh2.h +#usr/lib/cmake/libssh +#usr/lib/cmake/libssh/libssh-config-version.cmake +#usr/lib/cmake/libssh/libssh-config.cmake +#usr/lib/libssh.so +usr/lib/libssh.so.4 +usr/lib/libssh.so.4.8.1 +#usr/lib/pkgconfig/libssh.pc diff --git a/lfs/libssh b/lfs/libssh new file mode 100644 index 000000000..d8edca234 --- /dev/null +++ b/lfs/libssh @@ -0,0 +1,79 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 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.0 + +THISAPP = libssh-$(VER) +DL_FILE = $(THISAPP).tar.xz +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 = d2334521d83fe20309ed43a62321e7c2 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# 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) + -mkdir -pv $(DIR_APP)/build + cd $(DIR_APP)/build && cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr + cd $(DIR_APP)/build && make $(MAKETUNING) + cd $(DIR_APP)/build && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 30718c587..a87d33223 100755 --- a/make.sh +++ b/make.sh @@ -1260,6 +1260,7 @@ buildipfire() { lfsmake2 beep lfsmake2 libarchive lfsmake2 cmake + lfsmake2 libssh lfsmake2 cdrkit lfsmake2 dosfstools lfsmake2 reiserfsprogs From patchwork Mon Sep 23 15:01:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2419 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 46cSGJ0dFvz42TM for ; Mon, 23 Sep 2019 15:02:00 +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 "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 46cSGG24R6z2RF; Mon, 23 Sep 2019 15:01:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1569250918; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=D5R7uZkFLI7n2r5di/6k09/fPS8erUgQT8Zp1iMrTuw=; b=FbWChf2UVSCfHGCVERyRhdMU1XjjJ0eSWHVwATu6zMwbXwDkVBmur5Rzp3JbOosNa/+SW/ eyx3R3Kc67+x4NriP1ZQDZxlTdZzqoAAzYYoN9wrx43EB1XxD7GgQGTqdN4AK7dPpoIHqe evTu8ULHbyLEFkA05WweovpkhK8lTxVs4hFyvRWwU4lvqF6MChyaPsN5h9nyMzY6Kv6OQ1 4nfhTHTEtD4KfA2yi6e32BsYvWoKUz1/jeG+SX36i7Pec1mtdAcHFubcI+XLNaKyun45dw OWevXxqsSpuGMNYdNJLmFJKkdLt4mrWvsekDLPtLXCIQkFhc7r2DoWSibJF9xg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1569250918; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=D5R7uZkFLI7n2r5di/6k09/fPS8erUgQT8Zp1iMrTuw=; b=Z0WD0pEV9XQIh5CACGK/tl/1kYkOcir+MwAQGQNVziJVYoCisPHQVPO39VCA7CcUk+yy89 IMKoB2uNYRH2GYDw== Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 46cSGG05ckz2yjx; Mon, 23 Sep 2019 15:01:58 +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 46cSGC0z8Vz2yNF for ; Mon, 23 Sep 2019 15:01:55 +0000 (UTC) Received: from michael.haj.ipfire.org (fw01.haj.ipfire.org [172.28.1.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 46cSGB6Hpnz2QS; Mon, 23 Sep 2019 15:01:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1569250914; 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: in-reply-to:in-reply-to:references:references; bh=D5R7uZkFLI7n2r5di/6k09/fPS8erUgQT8Zp1iMrTuw=; b=jnqcCIXhQmeke8Pm7nLptZmb3iwICnu6NFbdgyis4ns3Zoyt7zqDF+wtl0ohXsmcW0Qv85 tQN9PxWlc55xneAznwZXixtIAxwMmZO/IHhvrP/1Pc16VY8vPgDiVhgT6epbg9MQJqJGpl 1gPG7QPwEgTFic9pXJza3hKrgiyBy+Z2MiEQ00P72VPBkrEa9dCPWOLLbIJ2o8H2F2bgt0 P2901EmBsyZUxnnb0bDIWE75G/oOq6V7oBnCqmFY/79aXm6NVqVgy3kPPqKViPCywyy13t dKFopD4CdkF6E3Ct+cnZZMyMRQTp718dz3ktmNYtpX1foTh1RcIfCobWgbrMNw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1569250914; 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: in-reply-to:in-reply-to:references:references; bh=D5R7uZkFLI7n2r5di/6k09/fPS8erUgQT8Zp1iMrTuw=; b=9kt/qB59mbxsD4GzYpdLjvfmbk1iSabfOEvm0uAgtbf9CEhe29I9xMc5N+gu0SZRWl1LtA 0MMOVZ4Uqr/em4BQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/2] bird: Update to 2.0.6 Date: Mon, 23 Sep 2019 15:01:47 +0000 Message-Id: <20190923150147.9976-2-michael.tremer@ipfire.org> In-Reply-To: <20190923150147.9976-1-michael.tremer@ipfire.org> References: <20190923150147.9976-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" Minor update which will enable support for RPKI because libssh is now present. Signed-off-by: Michael Tremer --- lfs/bird | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/bird b/lfs/bird index 0c908ec7b..7a2763b23 100644 --- a/lfs/bird +++ b/lfs/bird @@ -24,7 +24,7 @@ include Config -VER = 2.0.4 +VER = 2.0.6 THISAPP = bird-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = bird -PAK_VER = 4 +PAK_VER = 5 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f0d0db5c6325437be66a6165ea29e5f9 +$(DL_FILE)_MD5 = bc05f225f4fcb365da1dbb308a7e23cc install : $(TARGET)