Date: Thu, 28 Oct 2021 12:17:34 GMT From: Olivier Cochard <olivier@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4460e8dbd810 - main - net/frr7: Fix warnings since latest libyang upgrade Message-ID: <202110281217.19SCHYWu050253@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=4460e8dbd81053072a959b120f647db09690a333 commit 4460e8dbd81053072a959b120f647db09690a333 Author: Olivier Cochard <olivier@FreeBSD.org> AuthorDate: 2021-10-28 12:08:10 +0000 Commit: Olivier Cochard <olivier@FreeBSD.org> CommitDate: 2021-10-28 12:17:24 +0000 net/frr7: Fix warnings since latest libyang upgrade PR: 259403 Reported by: John W. O'Brien <john@saltant.com> --- net/frr7/Makefile | 2 +- net/frr7/files/patch-yang_frr-zebra.yang.patch | 68 ++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) diff --git a/net/frr7/Makefile b/net/frr7/Makefile index ec5061be54f4..245eb1cf956d 100644 --- a/net/frr7/Makefile +++ b/net/frr7/Makefile @@ -1,7 +1,7 @@ PORTNAME= frr PORTVERSION= 7.5.1 DISTVERSIONPREFIX= frr- -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net .if defined(PYTHONTOOLS) PKGNAMESUFFIX= 7-pythontools diff --git a/net/frr7/files/patch-yang_frr-zebra.yang.patch b/net/frr7/files/patch-yang_frr-zebra.yang.patch new file mode 100644 index 000000000000..7ee309e0570b --- /dev/null +++ b/net/frr7/files/patch-yang_frr-zebra.yang.patch @@ -0,0 +1,68 @@ +From 7573cb86a259d3c9ef6eae9dd5d529f8080922cd Mon Sep 17 00:00:00 2001 +From: Igor Ryzhov <iryzhov@nfware.com> +Date: Thu, 22 Apr 2021 12:48:19 +0300 +Subject: [PATCH] yang: fix zebra module + +Fixes: #8521 +Signed-off-by: Igor Ryzhov <iryzhov@nfware.com> +--- + yang/frr-zebra.yang | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git yang/frr-zebra.yang yang/frr-zebra.yang +index 2efc45c1464..6b4be659152 100644 +--- yang/frr-zebra.yang ++++ yang/frr-zebra.yang +@@ -2184,8 +2184,8 @@ module frr-zebra { + + "/frr-route-map:match-condition" + + "/frr-route-map:condition-value" { + case ipv4-prefix-length { +- when "./condition = 'ipv4-prefix-length' or +- ./condition = 'ipv4-next-hop-prefix-length'"; ++ when "./frr-route-map:condition = 'ipv4-prefix-length' or ++ ./frr-route-map:condition = 'ipv4-next-hop-prefix-length'"; + leaf ipv4-prefix-length { + type uint8 { + range "0..32"; +@@ -2193,7 +2193,7 @@ module frr-zebra { + } + } + case ipv6-prefix-length { +- when "./condition = 'ipv6-prefix-length'"; ++ when "./frr-route-map:condition = 'ipv6-prefix-length'"; + leaf ipv6-prefix-length { + type uint8 { + range "0..128"; +@@ -2201,13 +2201,13 @@ module frr-zebra { + } + } + case source-protocol { +- when "./condition = 'source-protocol'"; ++ when "./frr-route-map:condition = 'source-protocol'"; + leaf source-protocol { + type frr-route-types:frr-route-types; + } + } + case source-instance { +- when "./condition = 'source-instance'"; ++ when "./frr-route-map:condition = 'source-instance'"; + leaf source-instance { + type uint8 { + range "0..255"; +@@ -2222,14 +2222,14 @@ module frr-zebra { + + "/frr-route-map:set-action" + + "/frr-route-map:action-value" { + case source-v4 { +- when "./action = 'source'"; ++ when "./frr-route-map:action = 'source'"; + leaf source-v4 { + description "IPv4 address"; + type inet:ipv4-address; + } + } + case source-v6 { +- when "./action = 'source'"; ++ when "./frr-route-map:action = 'source'"; + leaf source-v6 { + description "IPv6 address"; + type inet:ipv6-address;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110281217.19SCHYWu050253>