From 036868c669da185b41edda4234e255fab1c4150e Mon Sep 17 00:00:00 2001
From: Lucian CRISTIAN <lucian.cristian@gmail.com>
Date: Tue, 11 Nov 2025 22:57:49 +0200
Subject: [PATCH] frr: update to 10.4.1

switch to release codeload version
fix startup error messages

Signed-off-by: Lucian CRISTIAN <lucian.cristian@gmail.com>
---
 net/frr/Makefile                              | 18 +++++++++---------
 net/frr/files/frrcommon.sh                    |  2 +-
 net/frr/patches/098-fix_mips_libyang.patch    |  2 +-
 net/frr/patches/997-reverse_python_test.patch |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/net/frr/Makefile b/net/frr/Makefile
index 665551ad16..409fafa4c5 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -7,19 +7,18 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=frr
-PKG_VERSION:=10.3.1
+PKG_VERSION:=10.4.1
 PKG_RELEASE:=1
-PKG_SOURCE_DATE:=2025-06-08
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz
-PKG_SOURCE_VERSION:=44789ae469c30896d8b13b30bd429c01a4b0d96e
-PKG_SOURCE_URL:=https://codeload.github.com/FRRouting/frr/tar.gz/$(PKG_SOURCE_VERSION)?
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/FRRouting/frr/tar.gz/$(PKG_NAME)-$(PKG_VERSION)?
+PKG_HASH:=8e4003eaba168626c5ea7a6735f2c85c87b04214e6f8c8f2715b21f8ae40970b
+
 
-PKG_HASH:=b4c341be50dc76a3b96727dc41310745171e0d9affb137b8894d14f6eb6e226a
 PKG_MAINTAINER:=Lucian Cristian <lucian.cristian@gmail.com>
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION)
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_SOURCE_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION)
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=GPL-2.0-only LGPL-2.1-only
 PKG_CPE_ID:=cpe:/a:ffrouting:ffrouting
@@ -215,8 +214,9 @@ define Package/frr-watchfrr/install
 endef
 
 define Package/frr-zebra/install
-	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/usr/sbin $(1)/usr/lib
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libmlag_pb.so* $(1)/usr/lib/
 endef
 
 define Package/frr-pythontools/install
diff --git a/net/frr/files/frrcommon.sh b/net/frr/files/frrcommon.sh
index 003a126927..d221b739cf 100644
--- a/net/frr/files/frrcommon.sh
+++ b/net/frr/files/frrcommon.sh
@@ -35,7 +35,7 @@ FRR_DEFAULT_PROFILE="traditional" # traditional / datacenter
 # - keep zebra first
 # - watchfrr does NOT belong in this list
 
-DAEMONS="zebra mgmtd bgpd ripd ripngd ospfd ospf6d isisd babeld pimd pim6d ldpd nhrpd eigrpd sharpd pbrd staticd bfdd fabricd vrrpd pathd"
+DAEMONS="mgmtd zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd pim6d ldpd nhrpd eigrpd sharpd pbrd staticd bfdd fabricd vrrpd pathd"
 
 RELOAD_SCRIPT="$D_PATH/frr-reload.py"
 
diff --git a/net/frr/patches/098-fix_mips_libyang.patch b/net/frr/patches/098-fix_mips_libyang.patch
index 09f8ba3e2a..05ac6fbe8b 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
-@@ -711,11 +711,7 @@ struct frr_yang_module_info {
+@@ -747,11 +747,7 @@ struct frr_yang_module_info {
  
  		/* Priority - lower priorities are processed first. */
  		uint32_t priority;
diff --git a/net/frr/patches/997-reverse_python_test.patch b/net/frr/patches/997-reverse_python_test.patch
index 1a6e56c224..3fce9c10b6 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
-@@ -932,7 +932,6 @@ AC_DEFINE_UNQUOTED([DFLT_NAME], ["$DFLT_
+@@ -954,7 +954,6 @@ AC_DEFINE_UNQUOTED([DFLT_NAME], ["$DFLT_
  #
  
  AS_IF([test "$host" = "$build"], [
-- 
2.30.2