From d298a9b0c278f435134f37f9d255a4d9d673ea72 Mon Sep 17 00:00:00 2001 From: action Date: Sun, 16 Aug 2026 12:29:32 +0800 Subject: [PATCH] update 2026-08-16 12:29:32 --- dae/Makefile | 4 ++-- .../root/etc/uci-defaults/luci-app-passwall_server | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dae/Makefile b/dae/Makefile index 031dd326..ff593683 100644 --- a/dae/Makefile +++ b/dae/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dae -PKG_VERSION:=2026.08.15 +PKG_VERSION:=2026.08.16 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=e261ead2f7036d7fbd89b45e2f77d9d45ad3891b +PKG_SOURCE_VERSION:=51710757f8dc8b08d7dc008864b4e9c740dcf7a4 PKG_SOURCE_URL:=https://github.com/olicesx/dae.git PKG_MIRROR_HASH:=skip diff --git a/luci-app-passwall/root/etc/uci-defaults/luci-app-passwall_server b/luci-app-passwall/root/etc/uci-defaults/luci-app-passwall_server index ea4ff0c9..f6d9f7ee 100755 --- a/luci-app-passwall/root/etc/uci-defaults/luci-app-passwall_server +++ b/luci-app-passwall/root/etc/uci-defaults/luci-app-passwall_server @@ -24,6 +24,15 @@ else fi uci commit firewall +# Migrate server sections from the old `user` section type. New user entries +# also use `user`, so only sections with a server `type` option are renamed. +for sid in $(uci -q show passwall_server | sed -n 's/^passwall_server\.\([^.=]*\)=user$/\1/p'); do + if [ -n "$(uci -q get "passwall_server.${sid}.type")" ]; then + uci -q set "passwall_server.${sid}=server" + fi +done +uci -q commit passwall_server + rm -f /tmp/luci-indexcache /tmp/luci-indexcache.* rm -rf /tmp/luci-modulecache/ killall -HUP rpcd 2>/dev/null