From 4457e58f5c5ac857e0b8ca43172309bbadfb3e8d Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 26 Dec 2024 10:18:42 +0100
Subject: [PATCH 1/3] Update bcm27xx-utils

---
 bcm27xx-utils/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bcm27xx-utils/Makefile b/bcm27xx-utils/Makefile
index 04dd6b8d6..8f5d91da8 100644
--- a/bcm27xx-utils/Makefile
+++ b/bcm27xx-utils/Makefile
@@ -3,13 +3,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bcm27xx-utils
-PKG_VERSION:=2024-04-24
+PKG_VERSION:=2024.10.25
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/raspberrypi/utils.git
-PKG_SOURCE_VERSION:=451b9881b72cb994c102724b5a7d9b93f97dc315
-PKG_MIRROR_HASH:=b453976171187e0ffe7cacfdcab36cec6b5d02db8b6d978cb9afbbcafcfcff9d
+PKG_SOURCE_VERSION:=6a2a6becebbc38fde34a94386457ac8210f9119b
+PKG_MIRROR_HASH:=a775c7ffb9fac2d798ec8e0a4c7707eb7133cbc9c4418a1cf9434f87c42c01bb
 
 PKG_FLAGS:=nonshared
 PKG_BUILD_FLAGS:=no-lto
@@ -46,6 +46,8 @@ define Package/bcm27xx-utils/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/eepflash.sh $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/eepmake $(1)/usr/bin
 
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/kdtc $(1)/usr/bin
+
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/otpset $(1)/usr/bin
 
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/overlaycheck $(1)/usr/bin

From 5a3e8ccff8c14a27dd5e80e23b45c24eac9c5ecd Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 26 Dec 2024 10:19:02 +0100
Subject: [PATCH 2/3] Fix omr-bypass

---
 omr-bypass/files/etc/init.d/omr-bypass-nft | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/omr-bypass/files/etc/init.d/omr-bypass-nft b/omr-bypass/files/etc/init.d/omr-bypass-nft
index 2b237601f..d9e8969ae 100755
--- a/omr-bypass/files/etc/init.d/omr-bypass-nft
+++ b/omr-bypass/files/etc/init.d/omr-bypass-nft
@@ -919,7 +919,7 @@ start_service() {
 	[ "$(uci -q get xray.main.enabled)" = "1" ] && _xray_rules_config
 
 
-	uci batch <<-EOF
+	uci -q batch <<-EOF
 		set firewall.omr_bypass=include
 		set firewall.omr_bypass.enabled='1'
 		set firewall.omr_bypass.type='script'
@@ -1022,7 +1022,6 @@ stop_service() {
 	config_foreach _delete_firewall_rules ipset
 	uci -q commit firewall
 	fw4 -q restart
-	exit 0
 }
 
 service_triggers() {

From 77b7adee4998d8e257b08df57cab10ed0638b3de Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 26 Dec 2024 10:19:40 +0100
Subject: [PATCH 3/3] Fix OpenVPN multi process

---
 openmptcprouter/files/etc/uci-defaults/2020-omr-vpn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn b/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
index 513eed491..0374a6977 100755
--- a/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
+++ b/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
@@ -182,9 +182,9 @@ if [ "$NBCPU" -gt 1 ] && [ -z "$(uci -q get openvpn.omr2)" ]; then
 			set openvpn.omr$c.disable_dco=1
 			set openvpn.omr$c.ping_restart=60
 			set openvpn.omr$c.tun_mtu=1420
-			del_list firewall.zone_vpn.device=tun$((c-1))
-			add_list firewall.zone_vpn.device=tun$((c-1))
 		EOF
+		[ -z "$(uci -q get firewall.zone_vpn.device | grep tun$((c-1)))" ] && add_list firewall.zone_vpn.device=tun$((c-1))
+
 	done
 	uci -q commit openvpn
 	uci -q commit firewall