From nobody Mon May 01 06:05:18 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q8t3g051qz47rgZ; Mon, 1 May 2023 06:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q8t3f6h9yz3qqT; Mon, 1 May 2023 06:05:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682921118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=En0CSgJajMugpRdCNkQCSg3HLSHC1JHV72BJ2H0hyKQ=; b=EKnn8jF9kARhCfDSMOq12CWPabxQURRVZTnotXBwAKWYHLRRh8miKM60K8Sql1mo3jyCqk TgRBMNyw45SfqLEoYXQH3XEBVYVc267isUe4m/OAvqTIaeNdaaC/cP0+FAy8xSqJVPUjyp SipRlFexl07kkFfnbGT55ln5MMJ7u19zG3sVyhpCC0sf4sQBWomOFQ03cA0XexR5orbslY PIdqES6qDdRZB2k/Ym4rvP3BQyu/SX/GKmfHgvrwaSZwTa/rSVpeJoMphcxGKmgvCKQjee oEn3qu5zp8eJo6ABaG3w1TRAHtmAF3uwe5/OsKRDsCGGEXgVfTfK6QEFDlQlFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682921118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=En0CSgJajMugpRdCNkQCSg3HLSHC1JHV72BJ2H0hyKQ=; b=N2Df1MtuYyKSUJGV+nvkuZyRLBRXO+4m/9rbKEIMHikInqT5Wdue70QrPBjx+0y6Btq4MO dvehJq91rZa9yuIx/NDMylrB7wN7GYTuJpaSqGdeMtPgDo2qfgllQ5gxbWCi2WZCptuo1V hZUKhjF6mYqeLPBV67hHcnuacBz+MX0VnIypG0/jQd4X/WgXe2n4YUkEDTzYYUKN0AVCfW rJuVn1anEgSxOyvjm6aDmSRO8izPytUn31hkV5NGpMK9r6f2WD7F+0NsKaCK0fwmvvhOyj /QMBZECHrJWFt6QaGqaaNuBihlhnJ98Fq1C/tGVyROK0KRibTlxnZz0BchI5Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682921118; a=rsa-sha256; cv=none; b=hjgZ9LC/k+vxuG0SFcD77KKVmL2nGDhUS+Igx4ayHzWLjq0/EWFd1/CQsSHbx77c5WUBuk R0F57TG1vFzzBSQrfOcNzQVf4byxhoPO2tJbJG0lXRbBPDaSAL+wQTP13Gc4naiwFBEZrJ KOeZ1dawpb2QhL8zGEhRSEXMgEro3RusonTcSJV/3Pqbo32lTw5GZNy+TzIag1qRSksnMQ dsoo6PPFaMLhCwHtSuRegA4beMaNYxC3KFzbU2xzAiqZ+v+yqJfcBapjZauvMVC3X84Oql YKN1W7+zEUkETRfvDdXShrnwjunU9sLOjLL9Jqwt4z/h3DgB8dM9ZQihW+dM4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q8t3f5m3szts3; Mon, 1 May 2023 06:05:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34165IxL064007; Mon, 1 May 2023 06:05:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34165IkM064006; Mon, 1 May 2023 06:05:18 GMT (envelope-from git) Date: Mon, 1 May 2023 06:05:18 GMT Message-Id: <202305010605.34165IkM064006@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Cochard Subject: git: 60c3c8a895af - main - net/frr8: Update to 8.5.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60c3c8a895af84281c570f89ea1e999e64a1461a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=60c3c8a895af84281c570f89ea1e999e64a1461a commit 60c3c8a895af84281c570f89ea1e999e64a1461a Author: Olivier Cochard AuthorDate: 2023-05-01 06:02:06 +0000 Commit: Olivier Cochard 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