From 40792d98e20f934140fbfab56d607f70803355e2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 10 Jun 2026 14:14:07 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=95=20Sync=202026-06-10=2014:14:07?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luci-app-amlogic/Makefile | 4 ++-- .../root/usr/sbin/openwrt-update-allwinner | 10 +++++----- luci-app-amlogic/root/usr/sbin/openwrt-update-amlogic | 10 +++++----- luci-app-amlogic/root/usr/sbin/openwrt-update-kvm | 10 +++++----- luci-app-amlogic/root/usr/sbin/openwrt-update-rockchip | 10 +++++----- luci-app-passwall/Makefile | 2 +- luci-app-passwall/luasrc/passwall/util_sing-box.lua | 5 +++++ luci-app-passwall/luasrc/passwall/util_xray.lua | 3 +-- opera-proxy/Makefile | 4 ++-- p910nd/Makefile | 4 ++-- rustdesk-server/Makefile | 4 ++-- rustdesk-server/patches/004-update-config-path.patch | 6 +++--- .../patches/005-fix-config-mac-fallback.patch | 2 +- teleproxy/Makefile | 4 ++-- vsftpd/Makefile | 5 +++-- 15 files changed, 44 insertions(+), 39 deletions(-) diff --git a/luci-app-amlogic/Makefile b/luci-app-amlogic/Makefile index d74ea3b2..f9745048 100644 --- 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 diff --git a/luci-app-amlogic/root/usr/sbin/openwrt-update-allwinner b/luci-app-amlogic/root/usr/sbin/openwrt-update-allwinner index a0c3bbe9..a1bb2da5 100755 --- 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." diff --git a/luci-app-amlogic/root/usr/sbin/openwrt-update-amlogic b/luci-app-amlogic/root/usr/sbin/openwrt-update-amlogic index 467416d5..d381d70c 100755 --- 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." diff --git a/luci-app-amlogic/root/usr/sbin/openwrt-update-kvm b/luci-app-amlogic/root/usr/sbin/openwrt-update-kvm index 0f81c320..0dbed087 100755 --- 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." diff --git a/luci-app-amlogic/root/usr/sbin/openwrt-update-rockchip b/luci-app-amlogic/root/usr/sbin/openwrt-update-rockchip index 682c4463..da6fe93f 100755 --- 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." diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index c5f46b7b..2b4f7fc3 100644 --- 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:= \ diff --git a/luci-app-passwall/luasrc/passwall/util_sing-box.lua b/luci-app-passwall/luasrc/passwall/util_sing-box.lua index 9b6747b3..5fc66e47 100644 --- 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 diff --git a/luci-app-passwall/luasrc/passwall/util_xray.lua b/luci-app-passwall/luasrc/passwall/util_xray.lua index 16ca2985..4510ec9a 100644 --- 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 diff --git a/opera-proxy/Makefile b/opera-proxy/Makefile index 56c53c96..46163df4 100644 --- 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 PKG_LICENSE:=MIT diff --git a/p910nd/Makefile b/p910nd/Makefile index 356bf0e4..feca9879 100644 --- 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 diff --git a/rustdesk-server/Makefile b/rustdesk-server/Makefile index f233bba3..8db042ab 100644 --- 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 diff --git a/rustdesk-server/patches/004-update-config-path.patch b/rustdesk-server/patches/004-update-config-path.patch index c4b463a6..995a56bb 100644 --- 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_::("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: P) -> PathBuf { -@@ -628,19 +590,12 @@ impl Config { +@@ -621,19 +583,12 @@ impl Config { } #[cfg(not(any(target_os = "android", target_os = "ios")))] { diff --git a/rustdesk-server/patches/005-fix-config-mac-fallback.patch b/rustdesk-server/patches/005-fix-config-mac-fallback.patch index cb34d418..3f67bb69 100644 --- 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 { diff --git a/teleproxy/Makefile b/teleproxy/Makefile index 9f2d6105..9d1ac991 100644 --- 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 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 diff --git a/vsftpd/Makefile b/vsftpd/Makefile index 7b5e2d73..a2a2fe37 100644 --- 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 -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