diff --git a/package/frr/0001-build-find-all-future-minor-versions-of-python3.patch b/package/frr/0001-build-find-all-future-minor-versions-of-python3.patch deleted file mode 100644 index 1eb693703b..0000000000 --- a/package/frr/0001-build-find-all-future-minor-versions-of-python3.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 838cb35e08eb98acbc27637808162105ae2c4549 Mon Sep 17 00:00:00 2001 -From: Michal Ruprich <michalruprich@gmail.com> -Date: Wed, 17 Jun 2020 13:47:30 +0200 -Subject: [PATCH] build: find all future minor versions of python3 - -This way we can find every python from 3.8 further - -Signed-off-by: Michal Ruprich <michalruprich@gmail.com> - -[Retrieved from: -https://github.com/FRRouting/frr/commit/838cb35e08eb98acbc27637808162105ae2c4549] -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> ---- - m4/ax_python.m4 | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/m4/ax_python.m4 b/m4/ax_python.m4 -index 9f43ea0ab12..91d12b99b43 100644 ---- a/m4/ax_python.m4 -+++ b/m4/ax_python.m4 -@@ -186,7 +186,8 @@ AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl - AC_MSG_RESULT([yes]) - - PYTHON_CFLAGS="`\"$pycfg\" --includes`" -- if test x"${py_ver}" = x"3.8" || test x"{py_ver}" = x"3.9"; then -+ minor_ver=${py_ver#*\.} -+ if test $((minor_ver)) -gt 7; then - PYTHON_LIBS="`\"$pycfg\" --ldflags --embed`" - else - PYTHON_LIBS="`\"$pycfg\" --ldflags`" diff --git a/package/frr/frr.hash b/package/frr/frr.hash index 1c8c27ec4e..942065f0f3 100644 --- a/package/frr/frr.hash +++ b/package/frr/frr.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3c8204fda1c9b178d8446562579bbbc49d134b98f3ad02aa56f68724a2f9e40a frr-7.4.tar.gz +sha256 54066e82a82751ec5876d9b67aa0cb24fe94e19e7371af290ac25099eda9f136 frr-7.5.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/frr/frr.mk b/package/frr/frr.mk index 6beaf776ac..3ae292874a 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -4,7 +4,7 @@ # ################################################################################ -FRR_VERSION = 7.4 +FRR_VERSION = 7.5 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0 FRR_LICENSE_FILES = COPYING