From 6ad046d5b6897fcaad71774348e0ac9f65254b64 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 5 Sep 2026 03:00:50 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=85=20Sync=202026-09-05=2003:00:50?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 3proxy/Makefile       |  4 ++--
 daed/Makefile         |  2 +-
 daed/files/daed-guard | 22 +++++++++++++++++++++-
 daed/files/daed.init  |  4 +++-
 natflow/Makefile      |  4 ++--
 5 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/3proxy/Makefile b/3proxy/Makefile
index 74142682..296050e8 100644
--- a/3proxy/Makefile
+++ b/3proxy/Makefile
@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=3proxy
 PKG_VERSION:=0.9.5
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/3proxy/3proxy/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=skip
+PKG_HASH:=6f6da51d9bba93231e12acd707bb6cf86a1ab9491dc6dd0c79750cb3641541a3
 
 PKG_CPE_ID:=cpe:/a:3proxy:3proxy
 PKG_LICENSE:=3proxy Apache-2.0 GPL-2.0-or-later LGPL-2.1-or-later
diff --git a/daed/Makefile b/daed/Makefile
index a2cc075e..4abdfc6a 100644
--- a/daed/Makefile
+++ b/daed/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=daed
 PKG_VERSION:=2026.08.28
-PKG_RELEASE:=51
+PKG_RELEASE:=52
 
 PKG_SOURCE:=daed-src-2026.08.28-73f01b995c34.tar.gz
 PKG_SOURCE_URL:=https://github.com/kenzok8/openwrt-daede/releases/download/daed-src
diff --git a/daed/files/daed-guard b/daed/files/daed-guard
index 8b063872..cc6e5cf5 100644
--- a/daed/files/daed-guard
+++ b/daed/files/daed-guard
@@ -6,4 +6,24 @@ if ! daed_cleanup_runtime; then
 	echo "daed: stale network state could not be removed" >&2
 	exit 1
 fi
-exec /usr/bin/daed "$@"
+
+# Keep daed as a child so a panic or unexpected exit is followed by an
+# immediate teardown of all kernel/runtime state before procd can respawn us.
+child_pid=
+cleanup_child() {
+	[ -n "$child_pid" ] && kill "$child_pid" 2>/dev/null
+}
+trap cleanup_child TERM INT
+
+/usr/bin/daed "$@" &
+child_pid=$!
+wait "$child_pid"
+status=$?
+child_pid=
+trap - TERM INT
+
+if ! daed_cleanup_runtime; then
+	echo "daed: runtime cleanup after exit failed" >&2
+	status=1
+fi
+exit "$status"
diff --git a/daed/files/daed.init b/daed/files/daed.init
index 692ce88d..51e9989a 100644
--- a/daed/files/daed.init
+++ b/daed/files/daed.init
@@ -33,7 +33,9 @@ start_service() {
 
 	procd_set_param limits core="unlimited"
 	procd_set_param limits nofile="1000000 1000000"
-	procd_set_param respawn
+	# Avoid an endless crash/respawn loop which can repeatedly reattach dae's
+	# data-plane hooks and make the router management plane unreachable.
+	procd_set_param respawn 3600 5 5
 	# procd_set_param stdout 1
 	procd_set_param stderr 1
 
diff --git a/natflow/Makefile b/natflow/Makefile
index 69de158a..7329a0f0 100644
--- a/natflow/Makefile
+++ b/natflow/Makefile
@@ -10,12 +10,12 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=natflow
 PKG_VERSION:=20260531
-PKG_RELEASE:=77
+PKG_RELEASE:=78
 
 PKG_SOURCE:=$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/ptpt52/natflow.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8c496c4b63198a20d417d34b8fefa78feadf16c5
+PKG_SOURCE_VERSION:=da0eb608568f2ff10ce80ee3337db87c8e49611b
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_MAINTAINER:=Chen Minqiang <ptpt52@gmail.com>
 PKG_LICENSE:=GPL-2.0