On Wed, Jul 14, 2021 at 02:45:34PM +0300, Adrian Bunk wrote: > Package: release.debian.org > Severity: normal > User: release.debian....@packages.debian.org > Usertags: unblock > > Please unblock package frr > > * Backport upstream fix for compatibility with the bullseye > libyang1. (Closes: #990585) > > autopkgtest for frr/7.5.1-1.1: amd64: Pass, arm64: Pass, armhf: Pass, i386: > Pass, ppc64el: Pass > Too young, only 1 of 20 days old > > I have confirmed that the example from > https://github.com/FRRouting/frr/issues/8521 > fails without the fix and passes with the fix.
And now with attachment. cu Adrian
diff -Nru frr-7.5.1/debian/changelog frr-7.5.1/debian/changelog --- frr-7.5.1/debian/changelog 2021-03-08 10:40:19.000000000 +0200 +++ frr-7.5.1/debian/changelog 2021-07-11 19:15:04.000000000 +0300 @@ -1,3 +1,11 @@ +frr (7.5.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fix for compatibility with the bullseye + libyang1. (Closes: #990585) + + -- Adrian Bunk <b...@debian.org> Sun, 11 Jul 2021 19:15:04 +0300 + frr (7.5.1-1) unstable; urgency=medium * Update the d/gbp.conf for 7.5.1 release diff -Nru frr-7.5.1/debian/patches/0001-yang-fix-zebra-module.patch frr-7.5.1/debian/patches/0001-yang-fix-zebra-module.patch --- frr-7.5.1/debian/patches/0001-yang-fix-zebra-module.patch 1970-01-01 02:00:00.000000000 +0200 +++ frr-7.5.1/debian/patches/0001-yang-fix-zebra-module.patch 2021-07-11 18:41:30.000000000 +0300 @@ -0,0 +1,71 @@ +From 7573cb86a259d3c9ef6eae9dd5d529f8080922cd Mon Sep 17 00:00:00 2001 +From: Igor Ryzhov <iryz...@nfware.com> +Date: Thu, 22 Apr 2021 12:48:19 +0300 +Subject: yang: fix zebra module + +Fixes: #8521 +Signed-off-by: Igor Ryzhov <iryz...@nfware.com> +--- + yang/frr-zebra.yang | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/yang/frr-zebra.yang b/yang/frr-zebra.yang +index 2efc45c14..6b4be6591 100644 +--- a/yang/frr-zebra.yang ++++ b/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; +-- +2.20.1 + diff -Nru frr-7.5.1/debian/patches/series frr-7.5.1/debian/patches/series --- frr-7.5.1/debian/patches/series 1970-01-01 02:00:00.000000000 +0200 +++ frr-7.5.1/debian/patches/series 2021-07-11 19:15:01.000000000 +0300 @@ -0,0 +1 @@ +0001-yang-fix-zebra-module.patch