Skip to contentSkip to conversation

frr: upgrade 8.3.1 -> 8.4.1

PATCH New Yi Zhao 1 participant 1 message Dec 14, 2022

lore
Share & tools
lore

Yi Zhao

author
#0 lore raw

PATCH 1/1 frr: upgrade 8.3.1 -> 8.4.1

Drop backport patches.

ChangeLog:
https://github.com/FRRouting/frr/releases/tag/frr-8.4.1

---
 ...dr-length-is-at-a-minimum-of-what-is.patch |  43 -----
 ...fy-race-between-io-and-main-pthreads.patch | 151 ------------------
 ...for-readline-function-instead-of-mai.patch |  32 ----
 ...check-for-python-x.y-emded.pc-not-py.patch |   9 +-
 ...UPPORT_OSPF_API-define-in-ospf_spf.c.patch |  48 ------
 .../frr/{frr_8.3.1.bb => frr_8.4.1.bb}        |   8 +-
 6 files changed, 9 insertions(+), 282 deletions(-)
 delete mode 100644 meta-networking/recipes-protocols/frr/frr/0001-bgpd-Make-sure-hdr-length-is-at-a-minimum-of-what-is.patch
 delete mode 100644 meta-networking/recipes-protocols/frr/frr/0001-bgpd-avoid-notify-race-between-io-and-main-pthreads.patch
 delete mode 100644 meta-networking/recipes-protocols/frr/frr/0001-configure-Check-for-readline-function-instead-of-mai.patch
 delete mode 100644 meta-networking/recipes-protocols/frr/frr/0001-ospfd-Adding-SUPPORT_OSPF_API-define-in-ospf_spf.c.patch
 rename meta-networking/recipes-protocols/frr/{frr_8.3.1.bb => frr_8.4.1.bb} (92%)
meta-networking/recipes-protocols/frr/frr/0001-bgpd-Make-sure-hdr-length-is-at-a-minimum-of-what-is.patch deleted +0 -43
deleted file mode 100644
index 52b39c1e8..000000000
@@ -1,43 +0,0 @@
-From 066770ac1c69ee5b484bb82581b22ad0423b004d Mon Sep 17 00:00:00 2001
-From: Donald Sharp <[email protected]>
-Date: Thu, 21 Jul 2022 08:11:58 -0400
-Subject: [PATCH] bgpd: Make sure hdr length is at a minimum of what is
- expected
-
-Ensure that if the capability length specified is enough data.
-
-Signed-off-by: Donald Sharp <[email protected]>
-(cherry picked from commit ff6db1027f8f36df657ff2e5ea167773752537ed)
-
-CVE: CVE-2022-37032
-
-Upstream-Status: Backport
-[https://github.com/FRRouting/frr/commit/066770ac1c69ee5b484bb82581b22ad0423b004d]
-
-Signed-off-by: Yi Zhao <[email protected]>
----
- bgpd/bgp_packet.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
-index 7613ccc7d..a5f065a15 100644
---- a/bgpd/bgp_packet.c
-+++ b/bgpd/bgp_packet.c
-@@ -2621,6 +2621,14 @@ static int bgp_capability_msg_parse(struct peer *peer, uint8_t *pnt,
- 				"%s CAPABILITY has action: %d, code: %u, length %u",
- 				peer->host, action, hdr->code, hdr->length);
- 
-+		if (hdr->length < sizeof(struct capability_mp_data)) {
-+			zlog_info(
-+				"%pBP Capability structure is not properly filled out, expected at least %zu bytes but header length specified is %d",
-+				peer, sizeof(struct capability_mp_data),
-+				hdr->length);
-+			return BGP_Stop;
-+		}
-+
- 		/* Capability length check. */
- 		if ((pnt + hdr->length + 3) > end) {
- 			zlog_info("%s Capability length error", peer->host);
--- 
-2.25.1
-
meta-networking/recipes-protocols/frr/frr/0001-bgpd-avoid-notify-race-between-io-and-main-pthreads.patch deleted +0 -151

151 lines not on this page · raw message

meta-networking/recipes-protocols/frr/frr/0001-configure-Check-for-readline-function-instead-of-mai.patch deleted +0 -32
deleted file mode 100644
index 20e847223..000000000
@@ -1,32 +0,0 @@
-From 9399d58c13257849179d3c2b3698a2b43bc1b2a0 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Thu, 1 Sep 2022 10:39:23 -0700
-Subject: [PATCH] configure: Check for readline() function instead of main
-
-main is not a function found in libreadline, its better to check for a
-function thats provided by it.
-
-Upstream-Status: Backport
-[https://github.com/FRRouting/frr/commit/9399d58c13257849179d3c2b3698a2b43bc1b2a0]
-
-Signed-off-by: Khem Raj <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index b7e17d356..8c1fab0ea 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1372,7 +1372,7 @@ case "${enable_vtysh}" in
-   AC_DEFINE([VTYSH], [1], [VTY shell])
- 
-   prev_libs="$LIBS"
--  AC_CHECK_LIB([readline], [main], [
-+  AC_CHECK_LIB([readline], [readline], [
-     LIBREADLINE="-lreadline"
-   ], [
-     dnl readline failed - it might be incorrectly linked and missing its
--- 
-2.37.3
-
meta-networking/recipes-protocols/frr/frr/0001-m4-ax_python.m4-check-for-python-x.y-emded.pc-not-py.patch +7 -2
index 9e5cfd8f5..872a67c78 100644
@@ -1,4 +1,4 @@
-From 6a2984718d7c47612b07be46d663e7b5e5b7c57d Mon Sep 17 00:00:00 2001
+From a82d704b1ec6ece47b01d12e0e067d4b62b10894 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Wed, 9 Nov 2022 20:24:45 +0100
 Subject: [PATCH] m4/ax_python.m4: check for python-x.y-emded.pc, not
@@ -7,7 +7,9 @@ Subject: [PATCH] m4/ax_python.m4: check for python-x.y-emded.pc, not
 Only the embed version includes necessary linker flags to link
 with libpython.
 
-Upstream-Status: Submitted [https://github.com/FRRouting/frr/pull/12298]
+Upstream-Status: Backport
+[https://github.com/FRRouting/frr/commit/a82d704b1ec6ece47b01d12e0e067d4b62b10894]
+
 Signed-off-by: Alexander Kanavin <[email protected]>
 ---
  m4/ax_python.m4 | 2 +-
@@ -26,3 +28,6 @@ index 91d12b99b..f5e603b96 100644
      pkg="${pkg%-}"
      _PKG_CONFIG([PYTHON_CFLAGS], [cflags], [${pkg}])
      _PKG_CONFIG([PYTHON_LIBS], [libs], [${pkg}])
+-- 
+2.25.1
+
meta-networking/recipes-protocols/frr/frr/0001-ospfd-Adding-SUPPORT_OSPF_API-define-in-ospf_spf.c.patch deleted +0 -48

48 lines not on this page · raw message

meta-networking/recipes-protocols/frr/frr_8.4.1.bb renamed from meta-networking/recipes-protocols/frr/frr_8.3.1.bb +2 -6
similarity index 92%
rename from meta-networking/recipes-protocols/frr/frr_8.3.1.bb
rename to meta-networking/recipes-protocols/frr/frr_8.4.1.bb
index 67d50e3ed..d3c86e7d7 100644
@@ -9,16 +9,12 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING-LGPLv2.1;md5=4fbd65380cdd255951079008b364516c"
 
-SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/8.3 \
-           file://0001-configure-Check-for-readline-function-instead-of-mai.patch \
-           file://0001-ospfd-Adding-SUPPORT_OSPF_API-define-in-ospf_spf.c.patch \
-           file://0001-bgpd-avoid-notify-race-between-io-and-main-pthreads.patch \
-           file://0001-bgpd-Make-sure-hdr-length-is-at-a-minimum-of-what-is.patch \
+SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/8.4 \
            file://frr.pam \
            file://0001-m4-ax_python.m4-check-for-python-x.y-emded.pc-not-py.patch \
            "
 
-SRCREV = "a74f7a9ad9623e6f9654fe4a7177e5da0b194828"
+SRCREV = "70151e264bbb697a10fed711aa8c937d4f0009b1"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.25.1