2 files changed, 7 insertions, 40 deletions

diff --git a/meta-networking/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch b/meta-networking/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch
deleted file mode 100644
index 8c83d5c8eb..0000000000
--- a/meta-networking/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 49aeccbec4bf620bb594999bbd4a9de669a3984c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 15 Mar 2024 14:34:06 -0700
-Subject: [PATCH] zebra: Mimic GNU basename() API for non-glibc library e.g.
- musl musl only provides POSIX version of basename and it has also removed
- providing it via string.h header [1] which now results in compile errors with
- newer compilers e.g. clang-18
-
-[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
-
-Upstream-Status: Submitted [https://github.com/FRRouting/frr/pull/15561/]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- zebra/zebra_netns_notify.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c
-index 1bb1292e34..d55df2f62d 100644
---- a/zebra/zebra_netns_notify.c
-+++ b/zebra/zebra_netns_notify.c
-@@ -41,6 +41,10 @@
- #define ZEBRA_NS_POLLING_INTERVAL_MSEC     1000
- #define ZEBRA_NS_POLLING_MAX_RETRIES  200
- 
-+#if !defined(__GLIBC__)
-+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src)
-+#endif
-+
- DEFINE_MTYPE_STATIC(ZEBRA, NETNS_MISC, "ZebraNetNSInfo");
- static struct event *zebra_netns_notify_current;
- 
--- 
-2.44.0
-
diff --git a/meta-networking/recipes-protocols/frr/frr_9.1.bb b/meta-networking/recipes-protocols/frr/frr_10.3.bb
index eea6d62f5f..f0f3f34ab3 100644
--- a/meta-networking/recipes-protocols/frr/frr_9.1.bb
+++ b/meta-networking/recipes-protocols/frr/frr_10.3.bb
@@ -10,18 +10,16 @@ LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a
                     file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c"
 
 
-SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/9.1 \
+SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.3 \
            file://frr.pam \
-           file://0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch \
            "
 
-SRCREV = "ca2d6f0f1e000951224a18973cc1827f7f5215b5"
+SRCREV = "85cf1ed576deed121751e16a64970f8a652a9e1e"
 
 UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$"
 
 CVE_PRODUCT = "frrouting"
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep python3native pkgconfig useradd systemd
 
@@ -77,8 +75,11 @@ SYSTEMD_AUTO_ENABLE = "disable"
 inherit update-alternatives multilib_script multilib_header
 
 ALTERNATIVE_PRIORITY = "100"
-ALTERNATIVE:${PN} = " ietf-interfaces "
+ALTERNATIVE:${PN} = " ietf-interfaces ietf-netconf-acm ietf-netconf-with-defaults ietf-netconf"
 ALTERNATIVE_LINK_NAME[ietf-interfaces] = "${datadir}/yang/ietf-interfaces.yang"
+ALTERNATIVE_LINK_NAME[ietf-netconf-acm] = "${datadir}/yang/ietf-netconf-acm.yang"
+ALTERNATIVE_LINK_NAME[ietf-netconf-with-defaults] = "${datadir}/yang/ietf-netconf-with-defaults.yang"
+ALTERNATIVE_LINK_NAME[ietf-netconf] = "${datadir}/yang/ietf-netconf.yang"
 do_compile:prepend () {
    sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' \
           -e 's#${RECIPE_SYSROOT}##g' ${S}/lib/version.h
@@ -104,7 +105,7 @@ do_install:append:class-target () {
 
     if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then
         install -d ${D}/${sysconfdir}/pam.d
-        install -m 644 ${WORKDIR}/frr.pam ${D}/${sysconfdir}/pam.d/frr
+        install -m 644 ${UNPACKDIR}/frr.pam ${D}/${sysconfdir}/pam.d/frr
     fi
 
     if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then