🍕 Sync 2026-06-10 14:14:07

2026-08-02 07:29:28 +08:00 · 2026-06-10 14:14:07 +08:00 · 2026-06-10 14:14:07 +08:00 · 40792d98e2
commit 40792d98e2
parent b567458c53
15 changed files with 44 additions and 39 deletions
--- a/luci-app-amlogic/Makefile
+++ b/luci-app-amlogic/Makefile
@ -16,8 +16,8 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=luci-app-amlogic
-PKG_VERSION:=3.1.317
-PKG_RELEASE:=14
+PKG_VERSION:=3.1.318
+PKG_RELEASE:=15

 PKG_LICENSE:=GPL-2.0 License
 PKG_MAINTAINER:=ophub <https://github.com/ophub/luci-app-amlogic>
--- a/luci-app-amlogic/root/usr/sbin/openwrt-update-allwinner
+++ b/luci-app-amlogic/root/usr/sbin/openwrt-update-allwinner
@ -125,23 +125,23 @@ elif [ $(ls *.img -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
 elif [ $(ls *.img.xz -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
    xz_file=$(ls *.img.xz | head -n 1)
    echo -e "Update using [ ${xz_file} ] file. Please wait a moment ..."
-    xz -d ${xz_file} 2>/dev/null
+    xz -d "${xz_file}" 2>/dev/null
    IMG_NAME=$(ls *.img | head -n 1)
 elif [ $(ls *.img.gz -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
    gz_file=$(ls *.img.gz | head -n 1)
    echo -e "Update using [ ${gz_file} ] file. Please wait a moment ..."
-    gzip -df ${gz_file} 2>/dev/null
+    gzip -df "${gz_file}" 2>/dev/null
    IMG_NAME=$(ls *.img | head -n 1)
 elif [ $(ls *.7z -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
    gz_file=$(ls *.7z | head -n 1)
    echo -e "Update using [ ${gz_file} ] file. Please wait a moment ..."
-    bsdtar -xmf ${gz_file} 2>/dev/null
-    [ $? -eq 0 ] || 7z x ${gz_file} -aoa -y 2>/dev/null
+    bsdtar -xmf "${gz_file}" 2>/dev/null
+    [ $? -eq 0 ] || 7z x "${gz_file}" -aoa -y 2>/dev/null
    IMG_NAME=$(ls *.img | head -n 1)
 elif [ $(ls *.zip -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
    zip_file=$(ls *.zip | head -n 1)
    echo -e "Update using [ ${zip_file} ] file. Please wait a moment ..."
-    unzip -o ${zip_file} 2>/dev/null
+    unzip -o "${zip_file}" 2>/dev/null
    IMG_NAME=$(ls *.img | head -n 1)
 else
    echo -e "Please upload or specify the update openwrt firmware file."
--- a/luci-app-amlogic/root/usr/sbin/openwrt-update-amlogic
+++ b/luci-app-amlogic/root/usr/sbin/openwrt-update-amlogic
@ -118,23 +118,23 @@ elif [ $(ls *.img -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
 elif [ $(ls *.img.xz -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
    xz_file=$(ls *.img.xz | head -n 1)
    echo -e "Update using [ ${xz_file} ] file. Please wait a moment ..."
-    xz -d ${xz_file} 2>/dev/null
+    xz -d "${xz_file}" 2>/dev/null
    IMG_NAME=$(ls *.img | head -n 1)
 elif [ $(ls *.img.gz -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
    gz_file=$(ls *.img.gz | head -n 1)
    echo -e "Update using [ ${gz_file} ] file. Please wait a moment ..."
-    gzip -df ${gz_file} 2>/dev/null
+    gzip -df "${gz_file}" 2>/dev/null
    IMG_NAME=$(ls *.img | head -n 1)
 elif [ $(ls *.7z -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
    gz_file=$(ls *.7z | head -n 1)
    echo -e "Update using [ ${gz_file} ] file. Please wait a moment ..."
-    bsdtar -xmf ${gz_file} 2>/dev/null
-    [ $? -eq 0 ] || 7z x ${gz_file} -aoa -y 2>/dev/null
+    bsdtar -xmf "${gz_file}" 2>/dev/null
+    [ $? -eq 0 ] || 7z x "${gz_file}" -aoa -y 2>/dev/null
    IMG_NAME=$(ls *.img | head -n 1)
 elif [ $(ls *.zip -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
    zip_file=$(ls *.zip | head -n 1)
    echo -e "Update using [ ${zip_file} ] file. Please wait a moment ..."
-    unzip -o ${zip_file} 2>/dev/null
+    unzip -o "${zip_file}" 2>/dev/null
    IMG_NAME=$(ls *.img | head -n 1)
 else
    echo -e "Please upload or specify the update openwrt firmware file."
--- a/luci-app-amlogic/root/usr/sbin/openwrt-update-kvm
+++ b/luci-app-amlogic/root/usr/sbin/openwrt-update-kvm
@ -146,23 +146,23 @@ elif [ $(ls *.img -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
 elif [ $(ls *.img.xz -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
    xz_file=$(ls *.img.xz | head -n 1)
    echo -e "Update using [ ${xz_file} ] file. Please wait a moment ..."
-    xz -d ${xz_file} 2>/dev/null
+    xz -d "${xz_file}" 2>/dev/null
    IMG_NAME=$(ls *.img | head -n 1)
 elif [ $(ls *.img.gz -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
    gz_file=$(ls *.img.gz | head -n 1)
    echo -e "Update using [ ${gz_file} ] file. Please wait a moment ..."
-    gzip -df ${gz_file} 2>/dev/null
+    gzip -df "${gz_file}" 2>/dev/null
    IMG_NAME=$(ls *.img | head -n 1)
 elif [ $(ls *.7z -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
    gz_file=$(ls *.7z | head -n 1)
    echo -e "Update using [ ${gz_file} ] file. Please wait a moment ..."
-    bsdtar -xmf ${gz_file} 2>/dev/null
-    [ $? -eq 0 ] || 7z x ${gz_file} -aoa -y 2>/dev/null
+    bsdtar -xmf "${gz_file}" 2>/dev/null
+    [ $? -eq 0 ] || 7z x "${gz_file}" -aoa -y 2>/dev/null
    IMG_NAME=$(ls *.img | head -n 1)
 elif [ $(ls *.zip -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
    zip_file=$(ls *.zip | head -n 1)
    echo -e "Update using [ ${zip_file} ] file. Please wait a moment ..."
-    unzip -o ${zip_file} 2>/dev/null
+    unzip -o "${zip_file}" 2>/dev/null
    IMG_NAME=$(ls *.img | head -n 1)
 else
    echo -e "Please upload or specify the update openwrt firmware file."
--- a/luci-app-amlogic/root/usr/sbin/openwrt-update-rockchip
+++ b/luci-app-amlogic/root/usr/sbin/openwrt-update-rockchip
@ -362,23 +362,23 @@ elif [ $(ls *.img -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
 elif [ $(ls *.img.xz -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
    xz_file=$(ls *.img.xz | head -n 1)
    echo -e "Update using [ ${xz_file} ] file. Please wait a moment ..."
-    xz -d ${xz_file} 2>/dev/null
+    xz -d "${xz_file}" 2>/dev/null
    IMG_NAME=$(ls *.img | head -n 1)
 elif [ $(ls *.img.gz -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
    gz_file=$(ls *.img.gz | head -n 1)
    echo -e "Update using [ ${gz_file} ] file. Please wait a moment ..."
-    gzip -df ${gz_file} 2>/dev/null
+    gzip -df "${gz_file}" 2>/dev/null
    IMG_NAME=$(ls *.img | head -n 1)
 elif [ $(ls *.7z -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
    gz_file=$(ls *.7z | head -n 1)
    echo -e "Update using [ ${gz_file} ] file. Please wait a moment ..."
-    bsdtar -xmf ${gz_file} 2>/dev/null
-    [ $? -eq 0 ] || 7z x ${gz_file} -aoa -y 2>/dev/null
+    bsdtar -xmf "${gz_file}" 2>/dev/null
+    [ $? -eq 0 ] || 7z x "${gz_file}" -aoa -y 2>/dev/null
    IMG_NAME=$(ls *.img | head -n 1)
 elif [ $(ls *.zip -l 2>/dev/null | grep "^-" | wc -l) -ge 1 ]; then
    zip_file=$(ls *.zip | head -n 1)
    echo -e "Update using [ ${zip_file} ] file. Please wait a moment ..."
-    unzip -o ${zip_file} 2>/dev/null
+    unzip -o "${zip_file}" 2>/dev/null
    IMG_NAME=$(ls *.img | head -n 1)
 else
    echo -e "Please upload or specify the update openwrt firmware file."
--- a/luci-app-passwall/Makefile
+++ b/luci-app-passwall/Makefile
@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=luci-app-passwall
 PKG_VERSION:=26.6.2
-PKG_RELEASE:=158
+PKG_RELEASE:=159
 PKG_PO_VERSION:=$(PKG_VERSION)

 PKG_CONFIG_DEPENDS:= \
--- a/luci-app-passwall/luasrc/passwall/util_sing-box.lua
+++ b/luci-app-passwall/luasrc/passwall/util_sing-box.lua
@ -1771,6 +1771,11 @@ function gen_config(var)
 	})

 	if COMMON.default_outbound_tag then
+		table.insert(route.rules, {
+			action = "route",
+			port_range = { "0:65535" },
+			outbound = COMMON.default_outbound_tag
+		})
 		route.final = COMMON.default_outbound_tag
 	end

--- a/luci-app-passwall/luasrc/passwall/util_xray.lua
+++ b/luci-app-passwall/luasrc/passwall/util_xray.lua
@ -1462,11 +1462,10 @@ function gen_config(var)
 			if default_outboundTag then
 				local rule = {
 					_flag = "default",
-					type = "field",
 					outboundTag = default_outboundTag
 				}
 				if node.domainStrategy == "IPIfNonMatch" then
-					rule.ip = { "0.0.0.0/0", "::/0" }
+					rule.port = "1-65535"
 				else
 					rule.network = "tcp,udp"
 				end
--- a/opera-proxy/Makefile
+++ b/opera-proxy/Makefile
@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=opera-proxy
-PKG_VERSION:=1.22.0
-PKG_RELEASE:=1
+PKG_VERSION:=1.23.0
+PKG_RELEASE:=2

 PKG_MAINTAINER:=Konstantine Shevlakov <shevlakov@132lan.ru>
 PKG_LICENSE:=MIT
--- a/p910nd/Makefile
+++ b/p910nd/Makefile
@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=p910nd
 PKG_VERSION:=0.97
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/p910nd
-PKG_LICENSE:=GPLv2
+PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=COPYING
 PKG_HASH:=skip
 PKG_MAINTAINER:=Philipp Kerling <pkerling@casix.org>
--- a/rustdesk-server/Makefile
+++ b/rustdesk-server/Makefile
@ -5,8 +5,8 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=rustdesk-server
-PKG_VERSION:=1.1.14
-PKG_RELEASE:=1
+PKG_VERSION:=1.1.15
+PKG_RELEASE:=2

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/rustdesk/rustdesk-server.git
--- a/rustdesk-server/patches/004-update-config-path.patch
+++ b/rustdesk-server/patches/004-update-config-path.patch
@ -1,6 +1,6 @@
 --- a/libs/hbb_common/src/config.rs
 +++ b/libs/hbb_common/src/config.rs
-@@ -403,36 +403,6 @@ pub fn get_online_state() -> i64 {
+@@ -396,36 +396,6 @@ pub fn get_online_state() -> i64 {
     *ONLINE.lock().unwrap().values().max().unwrap_or(&0)
 }
 
@ -37,7 +37,7 @@
 impl Config2 {
     fn load() -> Config2 {
         let mut config = Config::load_::<Config2>("2");
-@@ -608,15 +578,7 @@ impl Config {
+@@ -601,15 +571,7 @@ impl Config {
         #[cfg(any(target_os = "android", target_os = "ios"))]
         return PathBuf::from(APP_HOME_DIR.read().unwrap().as_str());
         #[cfg(not(any(target_os = "android", target_os = "ios")))]
@ -54,7 +54,7 @@
     }
 
     pub fn path<P: AsRef<Path>>(p: P) -> PathBuf {
-@@ -628,19 +590,12 @@ impl Config {
+@@ -621,19 +583,12 @@ impl Config {
         }
         #[cfg(not(any(target_os = "android", target_os = "ios")))]
         {
--- a/rustdesk-server/patches/005-fix-config-mac-fallback.patch
+++ b/rustdesk-server/patches/005-fix-config-mac-fallback.patch
@ -1,6 +1,6 @@
 --- a/libs/hbb_common/src/config.rs
 +++ b/libs/hbb_common/src/config.rs
-@@ -804,7 +804,12 @@ impl Config {
+@@ -797,7 +797,12 @@ impl Config {
                 id &= 0x1FFFFFFF;
                 Some(id.to_string())
             } else {
--- a/teleproxy/Makefile
+++ b/teleproxy/Makefile
@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=teleproxy
 PKG_VERSION:=4.15.0
-PKG_RELEASE:=20
+PKG_RELEASE:=21

 PKG_MAINTAINER:=Kosntantine Shevlakov <shevlakov@132lan.ru>
 PKG_LICENSE:=GPLv2
@ -10,7 +10,7 @@ PKG_LICENSE_FILES:=LICENSE

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/teleproxy/teleproxy.git
-PKG_SOURCE_VERSION:=c767e4ef0d909398814d283c66b9352e8539d142
+PKG_SOURCE_VERSION:=8cb4c57116dab588de6cd7509e65f8b6b6d31936

 PKG_SOURCE_SUBDIR:=$(PKG_NAME)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
--- a/vsftpd/Makefile
+++ b/vsftpd/Makefile
@ -9,14 +9,15 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=vsftpd
 PKG_VERSION:=3.0.5
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://security.appspot.com/downloads/
 PKG_HASH:=skip

 PKG_MAINTAINER:=Cezary Jackiewicz <cezary@eko.one.pl>
-PKG_LICENSE:=GPLv2
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=COPYING COPYRIGHT LICENSE
 PKG_CPE_ID:=cpe:/a:vsftpd_project:vsftpd

 PKG_BUILD_FLAGS:=gc-sections lto