[Buildroot] [PATCH 1/2] package/bird: add rpki support

[Buildroot] [PATCH 1/2] package/bird: add rpki support

[Fabrice Fontaine]

rpki support optionally depends on libssh

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 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)))
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/2] package/bird: bump to version 2.0.8

[Fabrice Fontaine]

- 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 <fontaine.fabrice@gmail.com>
---
 ...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 <fontaine.fabrice@gmail.com>
-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 <fontaine.fabrice@gmail.com>
----
- 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 <mq@ucw.cz>
-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 <bird@robert-scheck.de> who reported it
-and Toke Høiland-Jørgensen <toke@toke.dk> who suggested this patch.
-
-[Retrieved from:
-https://gitlab.nic.cz/labs/bird/-/commit/4bbc10614f3431c37e6352f5a6ea5c693c31021e]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- 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
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/bird: add rpki support

[Thomas Petazzoni]

On Wed, 21 Jul 2021 08:45:13 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> rpki support optionally depends on libssh
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/bird/Config.in | 5 +++++
>  package/bird/bird.mk   | 8 ++++++++
>  2 files changed, 13 insertions(+)

Both applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot