git: 60c3c8a895af - main - net/frr8: Update to 8.5.1

The branch main has been updated by olivier:

URL: https://cgit.FreeBSD.org/ports/commit/?id=60c3c8a895af84281c570f89ea1e999e64a1461a

commit 60c3c8a895af84281c570f89ea1e999e64a1461a
Author:     Olivier Cochard <olivier@FreeBSD.org>
AuthorDate: 2023-05-01 06:02:06 +0000
Commit:     Olivier Cochard <olivier@FreeBSD.org>
CommitDate: 2023-05-01 06:04:45 +0000

    net/frr8: Update to 8.5.1
    
    ChangeLog: https://frrouting.org/release/8.5.1/
---
 net/frr8/Makefile                           |  5 ++--
 net/frr8/distinfo                           |  6 ++---
 net/frr8/files/patch-bgpd_bgp__lcommunity.c | 42 -----------------------------
 net/frr8/pkg-plist                          |  2 --
 4 files changed, 6 insertions(+), 49 deletions(-)

diff --git a/net/frr8/Makefile b/net/frr8/Makefile
index acdfa1ea0581..749dc6d4edc3 100644
--- a/net/frr8/Makefile
+++ b/net/frr8/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	frr
-PORTVERSION=	8.5
+PORTVERSION=	8.5.1
 DISTVERSIONPREFIX=	frr-
 PORTREVISION=	1
 CATEGORIES=	net
@@ -93,7 +93,7 @@ GROUPS=	frr frrvty
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-# PIM compile but doesn't work on FreeBSD
+# PIMD and PBRD compile but doesn't work on FreeBSD
 CONFIGURE_ARGS=	--enable-user=frr \
 		--enable-group=frr \
 		--enable-vty-group=frrvty \
@@ -104,6 +104,7 @@ CONFIGURE_ARGS=	--enable-user=frr \
 		--disable-pathd \
 		--disable-ospfclient \
 		--disable-pimd \
+		--disable-pbrd \
 		--with-vtysh-pager=cat
 
 MANPAGES_BUILD_DEPENDS=		${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
diff --git a/net/frr8/distinfo b/net/frr8/distinfo
index 3fb541d03ffa..4bcdef346e2a 100644
--- a/net/frr8/distinfo
+++ b/net/frr8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1679345197
-SHA256 (FRRouting-frr-frr-8.5_GH0.tar.gz) = 98d471b3caa6da0ab5bac2027e136bc9942e3e3357a7850b135f4b337c963d24
-SIZE (FRRouting-frr-frr-8.5_GH0.tar.gz) = 10068379
+TIMESTAMP = 1682875450
+SHA256 (FRRouting-frr-frr-8.5.1_GH0.tar.gz) = 48fd98dc287021a4cf013d9475a22dbf0d082434fa035272b232f4fea2d4589f
+SIZE (FRRouting-frr-frr-8.5.1_GH0.tar.gz) = 10070910
diff --git a/net/frr8/files/patch-bgpd_bgp__lcommunity.c b/net/frr8/files/patch-bgpd_bgp__lcommunity.c
deleted file mode 100644
index 9f8566cea61d..000000000000
--- a/net/frr8/files/patch-bgpd_bgp__lcommunity.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- bgpd/bgp_lcommunity.c.orig	2023-03-13 14:01:47 UTC
-+++ bgpd/bgp_lcommunity.c
-@@ -211,12 +211,13 @@ static void set_lcommunity_string(struct lcommunity *l
- 	}
- 
- 	/* 1 space + lcom->size lcom strings + null terminator */
--	size_t str_buf_sz = BUFSIZ;
-+	size_t str_buf_sz = (LCOMMUNITY_STRLEN * lcom->size) + 2;
- 	str_buf = XCALLOC(MTYPE_LCOMMUNITY_STR, str_buf_sz);
- 
-+	len = 0;
- 	for (i = 0; i < lcom->size; i++) {
- 		if (i > 0)
--			strlcat(str_buf, " ", str_buf_sz);
-+			len = strlcat(str_buf, " ", str_buf_sz);
- 
- 		pnt = lcom->val + (i * LCOMMUNITY_SIZE);
- 		pnt = ptr_get_be32(pnt, &global);
-@@ -229,11 +230,22 @@ static void set_lcommunity_string(struct lcommunity *l
- 		snprintf(lcsb, sizeof(lcsb), "%u:%u:%u", global, local1,
- 			 local2);
- 
-+		/*
-+		 * Aliases can cause havoc, if the alias length is greater
-+		 * than the LCOMMUNITY_STRLEN for a particular item
-+		 * then we need to realloc the memory associated
-+		 * with the string so that it can fit
-+		 */
- 		const char *com2alias =
- 			translate_alias ? bgp_community2alias(lcsb) : lcsb;
-+		size_t individual_len = strlen(com2alias);
-+		if (individual_len + len > str_buf_sz) {
-+			str_buf_sz = individual_len + len + 1;
-+			str_buf = XREALLOC(MTYPE_LCOMMUNITY_STR, str_buf,
-+					   str_buf_sz);
-+		}
- 
- 		len = strlcat(str_buf, com2alias, str_buf_sz);
--		assert((unsigned int)len < str_buf_sz);
- 
- 		if (make_json) {
- 			json_string = json_object_new_string(com2alias);
diff --git a/net/frr8/pkg-plist b/net/frr8/pkg-plist
index 106f9f2a0331..8de4518c4a00 100644
--- a/net/frr8/pkg-plist
+++ b/net/frr8/pkg-plist
@@ -167,7 +167,6 @@ lib/libfrrcares.so.0.0.0
 %%MANPAGES%%%%LDPD%%man/man8/frr-ldpd.8.gz
 %%MANPAGES%%man/man8/frr-ospf6d.8.gz
 %%MANPAGES%%man/man8/frr-ospfd.8.gz
-%%MANPAGES%%man/man8/frr-pbrd.8.gz
 %%MANPAGES%%man/man8/frr-ripd.8.gz
 %%MANPAGES%%man/man8/frr-ripngd.8.gz
 %%MANPAGES%%man/man8/frr-zebra.8.gz
@@ -180,7 +179,6 @@ sbin/fabricd
 sbin/frr-reload
 sbin/ospf6d
 sbin/ospfd
-sbin/pbrd
 sbin/ripd
 sbin/ripngd
 sbin/staticd