From patchwork Wed Jul 21 06:45:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1507939 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=JNYG5BPt; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GV5gd05G4z9sX1 for ; Wed, 21 Jul 2021 16:45:33 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C2BBF40299; Wed, 21 Jul 2021 06:45:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 50LJWgSW30s4; Wed, 21 Jul 2021 06:45:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id D9F184029B; Wed, 21 Jul 2021 06:45:27 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 8E3B91BF5A5 for ; Wed, 21 Jul 2021 06:45:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 7CF0F4029B for ; Wed, 21 Jul 2021 06:45:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nsER4lfkQjnO for ; Wed, 21 Jul 2021 06:45:25 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by smtp4.osuosl.org (Postfix) with ESMTPS id 8BDA140299 for ; Wed, 21 Jul 2021 06:45:25 +0000 (UTC) Received: by mail-wm1-x332.google.com with SMTP id o30-20020a05600c511eb029022e0571d1a0so326504wms.5 for ; Tue, 20 Jul 2021 23:45:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=49vaIRX0EQE7svjgP0hTIDZuZjNvuR09FK8dRLnZCF8=; b=JNYG5BPtUJZz4kDeB1GW9OAqI1LzsBZPjtwKMswGKkx+9aI34Qb7lMcsgOJ33Y4m8x 7EnSw37XV27p/5dLrEGwCDX6vSyQgFkan5DJEbP/H6Ryy1eIWU2nhviT9jN5zNOQwnYp NgGjt8C52pLNpmA0vo3VQseuDisH1ZdG6yPp9AXsx1KJrxrJQBuuZUAWkvoaAl9hGCAO LcmGMV9uea3v8SSs8Yyp43pxIir3HcI0taAJLo1vkJePuSoV5j25jYEW+VH1/nuE6evy dbM9B7FzCzJKAAhS/gRCLa8DgL6AUTIiNEtH83Y6Bomb3glS0gJtvEVT+TYlWbQ+W7cr aiiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=49vaIRX0EQE7svjgP0hTIDZuZjNvuR09FK8dRLnZCF8=; b=TNM25NtzdRT/bTFrZ0sU+otG3W33rNwpzym7TPunty2IzXW1CVM7eleOxJZt1+gGUF hfpj7mRluqqANOAOXCEuvkcR2bejywCdQwfxiwpcCtgaLmMlK5C7e5rkDEEdrAvjr8Mr OjYE734EA8ZB5nsQm5ScPHzSwcj6xcRp+HOCazIJVPcsHjQvf+myf+C4ThvirpoBAzTE 8e25T42l+CTRQPNYK2sM2h93wSXf1+6Kse8hiKPHwKdOqZ1TDhUk1t4KTvCYvIg/Zm3O apgNC9kbjtzgWCqZuLqsPSSsxWZjRlo6eD6Rxq2V8wZaY7fc5r+ZMRors16wxK2gB6XT GAFA== X-Gm-Message-State: AOAM5329/AqmBqAju+6gB81Yivg/636u2LbMcR02GfB0ExlLtPAW58oE HaFDpzoJSZxzzXR1tbHQPlxdPUbWxHsQuQ== X-Google-Smtp-Source: ABdhPJyLE9NbRlXVdO0m05soQVyZnAUg2lO52AIZpv2CY3GPa/DIao5czVVidK4+HQZZjNC8DDUfzw== X-Received: by 2002:a1c:7407:: with SMTP id p7mr34592856wmc.111.1626849922974; Tue, 20 Jul 2021 23:45:22 -0700 (PDT) Received: from kali.home (lfbn-ren-1-1383-171.w86-229.abo.wanadoo.fr. [86.229.230.171]) by smtp.gmail.com with ESMTPSA id k24sm26938371wrh.30.2021.07.20.23.45.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 23:45:22 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Wed, 21 Jul 2021 08:45:13 +0200 Message-Id: <20210721064514.440851-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/bird: add rpki support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Adrien_Gallou=C3=ABt?= , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" rpki support optionally depends on libssh Signed-off-by: Fabrice Fontaine --- package/bird/Config.in | 5 +++++ package/bird/bird.mk | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/package/bird/Config.in b/package/bird/Config.in index e78dfdf90f..866fc65617 100644 --- a/package/bird/Config.in +++ b/package/bird/Config.in @@ -73,6 +73,11 @@ config BR2_PACKAGE_BIRD_RIP help Enable RIP protocol. +config BR2_PACKAGE_BIRD_RPKI + bool "rpki" + help + Enable RPKI protocol. + config BR2_PACKAGE_BIRD_STATIC bool "static" help diff --git a/package/bird/bird.mk b/package/bird/bird.mk index 4d4dfe1dca..4d6159b075 100644 --- a/package/bird/bird.mk +++ b/package/bird/bird.mk @@ -19,6 +19,13 @@ else BIRD_CONF_OPTS += --disable-client endif +ifeq ($(BR2_PACKAGE_LIBSSH),y) +BIRD_CONF_OPTS += --enable-libssh +BIRD_DEPENDENCIES += libssh +else +BIRD_CONF_OPTS += --disable-libssh +endif + BIRD_PROTOCOLS = \ $(if $(BR2_PACKAGE_BIRD_BFD),bfd) \ $(if $(BR2_PACKAGE_BIRD_BABEL),babel) \ @@ -29,6 +36,7 @@ BIRD_PROTOCOLS = \ $(if $(BR2_PACKAGE_BIRD_PIPE),pipe) \ $(if $(BR2_PACKAGE_BIRD_RADV),radv) \ $(if $(BR2_PACKAGE_BIRD_RIP),rip) \ + $(if $(BR2_PACKAGE_BIRD_RPKI),rpki) \ $(if $(BR2_PACKAGE_BIRD_STATIC),static) BIRD_CONF_OPTS += --with-protocols=$(subst $(space),$(comma),$(strip $(BIRD_PROTOCOLS))) From patchwork Wed Jul 21 06:45:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1507940 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=m3h8nRen; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GV5gs0bDgz9s24 for ; Wed, 21 Jul 2021 16:45:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id BB67A83104; Wed, 21 Jul 2021 06:45:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QA-uS-Gc-S2e; Wed, 21 Jul 2021 06:45:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id E940A830E3; Wed, 21 Jul 2021 06:45:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 6886C1BF5A5 for ; Wed, 21 Jul 2021 06:45:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 57C06402CB for ; Wed, 21 Jul 2021 06:45:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qWHZG2AUsDZF for ; Wed, 21 Jul 2021 06:45:28 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by smtp2.osuosl.org (Postfix) with ESMTPS id 5E0B5401F3 for ; Wed, 21 Jul 2021 06:45:28 +0000 (UTC) Received: by mail-wr1-x42f.google.com with SMTP id l7so918887wrv.7 for ; Tue, 20 Jul 2021 23:45:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fxekd+MIa8ARbvLAD2Ajos2QpON6WERB44ySUZ/ofkY=; b=m3h8nRenMtSdZEAaz82YWbvbDeXYJfE/n0iS8hQbSjWpPqRG2ilH2A7PxkxrvIAMDW 1kIMnshndar/m5rQX75hnzsXvDg3RCFcreNb/NP3tCCFedY4hwFCMfKI56hEuzcmFs4N UnhcWydgYaG1xOpgKUiXoJEhyB+P0ISyheJEvsgnAALuh8uZKcIOv8B6fFKVxlotVl82 tdfKGuwoiulPx8SVDS2Oj36lfrqSIybIozkhMF9HKH//pRyDC07CJxwuoiLNSfDr3q1Z tZz7dLbvbq0hSaL37BKwcFUnK1JcHpzQdtEfW3wG1Db6gMVN2UZY9bCf0RbRUh1m1iqd OtQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fxekd+MIa8ARbvLAD2Ajos2QpON6WERB44ySUZ/ofkY=; b=tXoeVz4Jf7CrVxUu8u6oGhesxYSr0q4jRspZNw7U0nQGLtnlL0ufiyUDiN/0EPdJsO cXmJKreutsxhLny6sefhoLMunPAjcm5V2YxMGwhr53xyQXttubGBnkBP6kpkCN/CZuLS Ho2+BC0QqS9ELZIr0kEa1dsaY8lVSY/yzkvuX0v+V9ZwA79IEZCs2PJVEvQ/82oMqisj OsCst4LjBcPeRl/jvLLd97l19AjgpmJYmALRWvwFedVt0goDZOoTPYev8E0cPStP6Nol xd0/Wy/P5ApYv/5KoOccIUoIHiIZ9DAXppfdK/oc6xGC9n2dqyxi5uy0wzZzdia9Hkbe 8n+w== X-Gm-Message-State: AOAM531IifpIOE40XDk6MEzF+iwSaCGr4gCW/oAgPGCo3Ji6p7fgF7E5 7KWq8prPFJM/jQ6qL+buZNCaJZSjzWXPIg== X-Google-Smtp-Source: ABdhPJyuut0mz7RQHV+75MFCkTZgT6840W6gPwpnjqZXlATxL35KYT6no92duSUSJE6FwVFUKIzo8A== X-Received: by 2002:adf:a287:: with SMTP id s7mr40099434wra.120.1626849926105; Tue, 20 Jul 2021 23:45:26 -0700 (PDT) Received: from kali.home (lfbn-ren-1-1383-171.w86-229.abo.wanadoo.fr. [86.229.230.171]) by smtp.gmail.com with ESMTPSA id k24sm26938371wrh.30.2021.07.20.23.45.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 23:45:25 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Wed, 21 Jul 2021 08:45:14 +0200 Message-Id: <20210721064514.440851-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210721064514.440851-1-fontaine.fabrice@gmail.com> References: <20210721064514.440851-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/bird: bump to version 2.0.8 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Adrien_Gallou=C3=ABt?= , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Drop patches (already in version) - Update indentation in hash file (two spaces) https://gitlab.nic.cz/labs/bird/-/blob/v2.0.8/NEWS Signed-off-by: Fabrice Fontaine --- ...001-Nest-Fix-build-without-protocols.patch | 28 --------------- package/bird/0002-Added-missing-extern.patch | 34 ------------------- package/bird/bird.hash | 4 +-- package/bird/bird.mk | 2 +- 4 files changed, 3 insertions(+), 65 deletions(-) delete mode 100644 package/bird/0001-Nest-Fix-build-without-protocols.patch delete mode 100644 package/bird/0002-Added-missing-extern.patch diff --git a/package/bird/0001-Nest-Fix-build-without-protocols.patch b/package/bird/0001-Nest-Fix-build-without-protocols.patch deleted file mode 100644 index 48d21441ca..0000000000 --- a/package/bird/0001-Nest-Fix-build-without-protocols.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f9eb9b4cab65b850c61738dd56632bae0e7329ca Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 19 Oct 2019 12:50:27 +0200 -Subject: [PATCH] Nest: Fix build without protocols - -(CHECK keyword added by commiter) -[Retrieved from: -https://gitlab.labs.nic.cz/labs/bird/commit/f9eb9b4cab65b850c61738dd56632bae0e7329ca] -Signed-off-by: Fabrice Fontaine ---- - nest/config.Y | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/nest/config.Y b/nest/config.Y -index c62501a3..1bc203dd 100644 ---- a/nest/config.Y -+++ b/nest/config.Y -@@ -75,6 +75,7 @@ CF_KEYWORDS(BGP, PASSWORDS, DESCRIPTION, SORTED) - CF_KEYWORDS(RELOAD, IN, OUT, MRTDUMP, MESSAGES, RESTRICT, MEMORY, IGP_METRIC, CLASS, DSCP) - CF_KEYWORDS(TIMEFORMAT, ISO, SHORT, LONG, ROUTE, PROTOCOL, BASE, LOG, S, MS, US) - CF_KEYWORDS(GRACEFUL, RESTART, WAIT, MAX, FLUSH, AS) -+CF_KEYWORDS(CHECK, LINK) - - /* For r_args_channel */ - CF_KEYWORDS(IPV4, IPV4_MC, IPV4_MPLS, IPV6, IPV6_MC, IPV6_MPLS, IPV6_SADR, VPN4, VPN4_MC, VPN4_MPLS, VPN6, VPN6_MC, VPN6_MPLS, ROA4, ROA6, FLOW4, FLOW6, MPLS, PRI, SEC) --- -2.21.0 - diff --git a/package/bird/0002-Added-missing-extern.patch b/package/bird/0002-Added-missing-extern.patch deleted file mode 100644 index 00aab3e92b..0000000000 --- a/package/bird/0002-Added-missing-extern.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4bbc10614f3431c37e6352f5a6ea5c693c31021e Mon Sep 17 00:00:00 2001 -From: Maria Matejka -Date: Tue, 4 Feb 2020 10:11:16 +0100 -Subject: [PATCH] Added missing extern -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Thanks to Robert Scheck who reported it -and Toke Høiland-Jørgensen who suggested this patch. - -[Retrieved from: -https://gitlab.nic.cz/labs/bird/-/commit/4bbc10614f3431c37e6352f5a6ea5c693c31021e] -Signed-off-by: Fabrice Fontaine ---- - nest/route.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/nest/route.h b/nest/route.h -index d2a07f09..b927db5f 100644 ---- a/nest/route.h -+++ b/nest/route.h -@@ -458,7 +458,7 @@ typedef struct rta { - protocol-specific metric is availabe */ - - --const char * rta_dest_names[RTD_MAX]; -+extern const char * rta_dest_names[RTD_MAX]; - - static inline const char *rta_dest_name(uint n) - { return (n < RTD_MAX) ? rta_dest_names[n] : "???"; } --- -2.26.2 - diff --git a/package/bird/bird.hash b/package/bird/bird.hash index 303fc21205..2d20491dd6 100644 --- a/package/bird/bird.hash +++ b/package/bird/bird.hash @@ -1,2 +1,2 @@ -sha256 631d2b58aebdbd651aaa3c68c3756c02ebfe5b1e60d307771ea909eeaa5b1066 bird-2.0.7.tar.gz -sha256 94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2 README +sha256 19d2de83ee25a307b9e5b9e58797dd68766d439bcee33e3ac617ed502370e7f6 bird-2.0.8.tar.gz +sha256 94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2 README diff --git a/package/bird/bird.mk b/package/bird/bird.mk index 4d6159b075..a8b9b18b50 100644 --- a/package/bird/bird.mk +++ b/package/bird/bird.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIRD_VERSION = 2.0.7 +BIRD_VERSION = 2.0.8 BIRD_SITE = ftp://bird.network.cz/pub/bird BIRD_LICENSE = GPL-2.0+ BIRD_LICENSE_FILES = README