From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 59BBD70217 for ; Fri, 3 Sep 2021 11:39:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 437EE19A4F for ; Fri, 3 Sep 2021 11:38:40 +0200 (CEST) Received: from kvmformation3.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 512D919A46 for ; Fri, 3 Sep 2021 11:38:38 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id EE093108DF0; Fri, 3 Sep 2021 11:38:35 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Fri, 3 Sep 2021 11:38:35 +0200 Message-Id: <20210903093835.949518-1-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.343 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% ENA_SUBJ_LONG_WORD 2.2 Subject has a very long word HEADER_FROM_DIFFERENT_DOMAINS 0.25 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KAM_LOTSOFHASH 0.25 Emails with lots of hash-like gibberish KHOP_HELO_FCRDNS 0.4 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com] Subject: [pve-devel] [PATCH frr] add upstream 7573cb86a259d3c9ef6eae9dd5d529f8080922cd.patch X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Sep 2021 09:39:10 -0000 user have requested a patch from upstream, fixing special manual config in frr https://forum.proxmox.com/threads/sdn-issue-with-frr-version-7-5-1-99-pve-really7-4-and-set-src.95532/ Signed-off-by: Alexandre Derumier --- debian/patches/series | 1 + ...cb86a259d3c9ef6eae9dd5d529f8080922cd.patch | 68 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 debian/patches/upstream/7573cb86a259d3c9ef6eae9dd5d529f8080922cd.patch diff --git a/debian/patches/series b/debian/patches/series index 41c48c5..8ea3ad1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-Adjust-the-ax_python.m4-to-hardcode-python3.9.patch pve/0001-enable-bgp-daemon.patch pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch +upstream/7573cb86a259d3c9ef6eae9dd5d529f8080922cd.patch \ No newline at end of file diff --git a/debian/patches/upstream/7573cb86a259d3c9ef6eae9dd5d529f8080922cd.patch b/debian/patches/upstream/7573cb86a259d3c9ef6eae9dd5d529f8080922cd.patch new file mode 100644 index 0000000..a413910 --- /dev/null +++ b/debian/patches/upstream/7573cb86a259d3c9ef6eae9dd5d529f8080922cd.patch @@ -0,0 +1,68 @@ +From 7573cb86a259d3c9ef6eae9dd5d529f8080922cd Mon Sep 17 00:00:00 2001 +From: Igor Ryzhov +Date: Thu, 22 Apr 2021 12:48:19 +0300 +Subject: [PATCH] yang: fix zebra module + +Fixes: #8521 +Signed-off-by: Igor Ryzhov +--- + 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 2efc45c1464..6b4be659152 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.30.2