From 74f444bd34ba4b377f2cebb3971a089b24151c19 Mon Sep 17 00:00:00 2001
From: Wang Mingyu <wangmy@fujitsu.com>
Date: Wed, 25 Feb 2026 17:37:17 +0800
Subject: mstpd: upgrade 0.1.0 -> 0.1.1

Changelog:
===========
- mstpctl: add showportparams cmd
- bridge-stp.in: use short-hand arguments for logger command
- bridge-stp.in: support different versions of pidof
- mstpctl-utils-functions.sh: fix shellcheck warnings
- Update bridge_track.c
- netif_utils: fix speeds > 65G
- ifupdown.sh.in: fix new shellcheck warnings
- libnetlink: fix socket file descriptor leak on error paths
- fix compilation for with GCC 15 / C23
- do not leak stack memory via struct holes

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-extended/networking/mstpd_0.1.1.bb | 30 ++++++++++++++++++++
 meta-oe/recipes-extended/networking/mstpd_git.bb   | 32 ----------------------
 2 files changed, 30 insertions(+), 32 deletions(-)
 create mode 100644 meta-oe/recipes-extended/networking/mstpd_0.1.1.bb
 delete mode 100644 meta-oe/recipes-extended/networking/mstpd_git.bb

diff --git a/meta-oe/recipes-extended/networking/mstpd_0.1.1.bb b/meta-oe/recipes-extended/networking/mstpd_0.1.1.bb
new file mode 100644
index 0000000000..3ac4d5b1fe
--- /dev/null
+++ b/meta-oe/recipes-extended/networking/mstpd_0.1.1.bb
@@ -0,0 +1,30 @@
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4325afd396febcb659c36b49533135d4"
+
+SRC_URI = " \
+    git://github.com/mstpd/mstpd;branch=master;protocol=https;tag=${PV} \
+    file://bridge-stp \
+    file://mstpd.service \
+"
+SRCREV = "d7dd987b101f277bfef8ac71de7c1d962a424e8e"
+
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+){2,})"
+
+inherit autotools pkgconfig systemd
+
+PACKAGES =+ "${PN}-mstpd"
+FILES:${PN}-mstpd = "${sbindir}/mstpd ${sbindir}/mstpctl ${sbindir}/bridge-stp"
+
+SYSTEMD_PACKAGES = "${PN}-mstpd"
+SYSTEMD_SERVICE:${PN}-mstpd = "mstpd.service"
+
+do_install:append() {
+    rm -rf ${D}${libexecdir} ${D}${libdir}/NetworkManager
+    rmdir ${D}${libdir} || true
+
+    install -d -m 0755 ${D}${sbindir}
+    install -m 0755 ${UNPACKDIR}/bridge-stp ${D}${sbindir}
+
+    install -d -m 0755 ${D}${systemd_system_unitdir}
+    install -m 0644 ${UNPACKDIR}/mstpd.service ${D}${systemd_system_unitdir}
+}
diff --git a/meta-oe/recipes-extended/networking/mstpd_git.bb b/meta-oe/recipes-extended/networking/mstpd_git.bb
deleted file mode 100644
index b003b52d25..0000000000
--- a/meta-oe/recipes-extended/networking/mstpd_git.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4325afd396febcb659c36b49533135d4"
-
-PV = "0.1.0+git"
-
-SRC_URI = " \
-    git://github.com/mstpd/mstpd;branch=master;protocol=https \
-    file://bridge-stp \
-    file://mstpd.service \
-"
-SRCREV = "181c453fc1a00573e19f14960dcc54ad84beea7c"
-
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+){2,})"
-
-inherit autotools pkgconfig systemd
-
-PACKAGES =+ "${PN}-mstpd"
-FILES:${PN}-mstpd = "${sbindir}/mstpd ${sbindir}/mstpctl ${sbindir}/bridge-stp"
-
-SYSTEMD_PACKAGES = "${PN}-mstpd"
-SYSTEMD_SERVICE:${PN}-mstpd = "mstpd.service"
-
-do_install:append() {
-    rm -rf ${D}${libexecdir} ${D}${libdir}/NetworkManager
-    rmdir ${D}${libdir} || true
-
-    install -d -m 0755 ${D}${sbindir}
-    install -m 0755 ${UNPACKDIR}/bridge-stp ${D}${sbindir}
-
-    install -d -m 0755 ${D}${systemd_system_unitdir}
-    install -m 0644 ${UNPACKDIR}/mstpd.service ${D}${systemd_system_unitdir}
-}
-- 
cgit v1.2.3-54-g00ecf