From: Lucian CRISTIAN <lucian.cristian@gmail.com>
Date: Sun, 8 Jun 2025 14:59:17 +0000 (+0300)
Subject: frr: update to 10.3.1
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=cd1439a6c6637a056b97ee21a1304c4479479c30;p=feed%2Fpackages.git

frr: update to 10.3.1

also add watchfrr and zebra as build daemon dependencies

Signed-off-by: Lucian CRISTIAN <lucian.cristian@gmail.com>
---

diff --git a/net/frr/Makefile b/net/frr/Makefile
index 79230dc700..665551ad16 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -7,15 +7,15 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=frr
-PKG_VERSION:=10.2.1
-PKG_RELEASE:=2
-PKG_SOURCE_DATE:=2025-01-29
+PKG_VERSION:=10.3.1
+PKG_RELEASE:=1
+PKG_SOURCE_DATE:=2025-06-08
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz
-PKG_SOURCE_VERSION:=05f9d44340755e5ca612e4852b710f4037254e7b
+PKG_SOURCE_VERSION:=44789ae469c30896d8b13b30bd429c01a4b0d96e
 PKG_SOURCE_URL:=https://codeload.github.com/FRRouting/frr/tar.gz/$(PKG_SOURCE_VERSION)?
 
-PKG_HASH:=8873e1f638fc4457a30227181e3fd26414795e63dbb11911c2e669876589f228
+PKG_HASH:=b4c341be50dc76a3b96727dc41310745171e0d9affb137b8894d14f6eb6e226a
 PKG_MAINTAINER:=Lucian Cristian <lucian.cristian@gmail.com>
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION)
@@ -132,7 +132,7 @@ define BuildDaemon
 ifeq ($(1),bgpd)
 	KCONFIG:=CONFIG_TCP_MD5SIG=y
 endif
-	DEPENDS+=$(2)
+	DEPENDS+=$(2) +frr-watchfrr +frr-zebra
     endef
 #	if [ "$(1)" == "bfdd" ]; then \
 #	export HAVE_BFDD == 1 ; fi
diff --git a/net/frr/patches/098-fix_mips_libyang.patch b/net/frr/patches/098-fix_mips_libyang.patch
index 39a84a7647..09f8ba3e2a 100644
--- a/net/frr/patches/098-fix_mips_libyang.patch
+++ b/net/frr/patches/098-fix_mips_libyang.patch
@@ -1,6 +1,6 @@
 --- a/lib/northbound.h
 +++ b/lib/northbound.h
-@@ -665,11 +665,7 @@ struct frr_yang_module_info {
+@@ -711,11 +711,7 @@ struct frr_yang_module_info {
  
  		/* Priority - lower priorities are processed first. */
  		uint32_t priority;
@@ -11,4 +11,4 @@
 -#endif
  };
  
- /* Northbound error codes. */
+ /* Default priority. */
diff --git a/net/frr/patches/997-reverse_python_test.patch b/net/frr/patches/997-reverse_python_test.patch
index 16232c410a..1a6e56c224 100644
--- a/net/frr/patches/997-reverse_python_test.patch
+++ b/net/frr/patches/997-reverse_python_test.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -913,7 +913,6 @@ AC_DEFINE_UNQUOTED([DFLT_NAME], ["$DFLT_
+@@ -932,7 +932,6 @@ AC_DEFINE_UNQUOTED([DFLT_NAME], ["$DFLT_
  #
  
  AS_IF([test "$host" = "$build"], [