From 11565242c90af84173655dede201bb3649afc0af Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 8 Dec 2023 16:24:00 +0800 Subject: [PATCH] update 2023-12-08 16:24:00 --- luci-app-bmtedge/Makefile | 2 +- .../root/usr/libexec/istorec/bmtedge.sh | 2 +- luci-app-chinesesubfinder/Makefile | 2 +- .../usr/libexec/istorec/chinesesubfinder.sh | 2 +- luci-app-codeserver/Makefile | 2 +- .../root/usr/libexec/istorec/codeserver.sh | 2 +- luci-app-emby/Makefile | 2 +- .../root/usr/libexec/istorec/emby.sh | 2 +- luci-app-gogs/Makefile | 2 +- .../root/usr/libexec/istorec/gogs.sh | 2 +- luci-app-heimdall/Makefile | 2 +- .../root/usr/libexec/istorec/heimdall.sh | 2 +- luci-app-homeassistant/Makefile | 2 +- .../root/usr/libexec/istorec/homeassistant.sh | 2 +- luci-app-jackett/Makefile | 2 +- .../root/usr/libexec/istorec/jackett.sh | 2 +- luci-app-jellyfin/Makefile | 2 +- .../luasrc/model/cbi/jellyfin.lua | 2 +- luci-app-jellyfin/po/zh-cn/jellyfin.po | 4 +- luci-app-jellyfin/root/etc/config/jellyfin | 6 +-- .../root/usr/libexec/istorec/jellyfin.sh | 2 +- luci-app-lanraragi/Makefile | 2 +- .../root/usr/libexec/istorec/lanraragi.sh | 2 +- luci-app-memos/Makefile | 2 +- .../root/usr/libexec/istorec/memos.sh | 2 +- luci-app-nastools/Makefile | 2 +- .../root/usr/libexec/istorec/nastools.sh | 2 +- luci-app-navidrome/Makefile | 2 +- .../root/usr/libexec/istorec/navidrome.sh | 2 +- luci-app-nextcloud/Makefile | 2 +- .../root/usr/libexec/istorec/nextcloud.sh | 2 +- luci-app-owntone/Makefile | 2 +- .../root/usr/libexec/istorec/owntone.sh | 2 +- luci-app-passwall2/Makefile | 2 +- .../cbi/passwall2/client/type/sing-box.lua | 28 +++++++++++-- .../cbi/passwall2/server/type/sing-box.lua | 30 +++++++++++++ .../luasrc/passwall2/util_sing-box.lua | 42 ++++++++++++++++++- luci-app-photoprism/Makefile | 2 +- .../root/usr/libexec/istorec/photoprism.sh | 2 +- luci-app-plex/Makefile | 2 +- .../root/usr/libexec/istorec/plex.sh | 2 +- luci-app-ubuntu/Makefile | 2 +- .../root/usr/libexec/istorec/ubuntu.sh | 2 +- luci-app-unifi/Makefile | 2 +- .../root/usr/libexec/istorec/unifi.sh | 2 +- luci-app-vaultwarden/Makefile | 2 +- .../root/usr/libexec/istorec/vaultwarden.sh | 2 +- luci-app-webvirtcloud/Makefile | 2 +- .../root/usr/libexec/istorec/webvirtcloud.sh | 2 +- luci-app-wxedge/Makefile | 2 +- .../root/usr/libexec/istorec/wxedge.sh | 2 +- luci-app-xteve/Makefile | 2 +- .../root/usr/libexec/istorec/xteve.sh | 2 +- v2ray-geodata/Makefile | 6 +-- 54 files changed, 150 insertions(+), 62 deletions(-) diff --git a/luci-app-bmtedge/Makefile b/luci-app-bmtedge/Makefile index 0e28bf6a7..0f5f46efa 100644 --- a/luci-app-bmtedge/Makefile +++ b/luci-app-bmtedge/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.1-20231020 +PKG_VERSION:=1.0.1-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for bmtedge diff --git a/luci-app-bmtedge/root/usr/libexec/istorec/bmtedge.sh b/luci-app-bmtedge/root/usr/libexec/istorec/bmtedge.sh index f3a6259df..f314ffe25 100755 --- a/luci-app-bmtedge/root/usr/libexec/istorec/bmtedge.sh +++ b/luci-app-bmtedge/root/usr/libexec/istorec/bmtedge.sh @@ -37,7 +37,7 @@ do_install() { -e ksc_net=\"$netdev\" \ -e ksc_machine_code=\"lsyK17032_$uid\" " - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd --name bmtedge \"$image_name\"" diff --git a/luci-app-chinesesubfinder/Makefile b/luci-app-chinesesubfinder/Makefile index efbd98a0a..b0160fa41 100644 --- a/luci-app-chinesesubfinder/Makefile +++ b/luci-app-chinesesubfinder/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.2-20230215 +PKG_VERSION:=1.0.2-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for ChineseSubFinder diff --git a/luci-app-chinesesubfinder/root/usr/libexec/istorec/chinesesubfinder.sh b/luci-app-chinesesubfinder/root/usr/libexec/istorec/chinesesubfinder.sh index 92b1b6205..4c1f7a9c5 100755 --- a/luci-app-chinesesubfinder/root/usr/libexec/istorec/chinesesubfinder.sh +++ b/luci-app-chinesesubfinder/root/usr/libexec/istorec/chinesesubfinder.sh @@ -29,7 +29,7 @@ do_install() { --log-driver \"json-file\" \ --log-opt \"max-size=100m\" " - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" [ -z "$media" ] || cmd="$cmd -v \"$media:/media\"" diff --git a/luci-app-codeserver/Makefile b/luci-app-codeserver/Makefile index 70649b3a9..f1fc4785e 100644 --- a/luci-app-codeserver/Makefile +++ b/luci-app-codeserver/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.1-20230108 +PKG_VERSION:=1.0.1-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for CodeServer diff --git a/luci-app-codeserver/root/usr/libexec/istorec/codeserver.sh b/luci-app-codeserver/root/usr/libexec/istorec/codeserver.sh index b38afcc1e..86543af33 100755 --- a/luci-app-codeserver/root/usr/libexec/istorec/codeserver.sh +++ b/luci-app-codeserver/root/usr/libexec/istorec/codeserver.sh @@ -31,7 +31,7 @@ do_install() { -e DEFAULT_WORKSPACE=/config/workspace \ -p $http_port:8443 " - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" [ -z "$env_password" ] || cmd="$cmd -e \"PASSWORD=$env_password\"" diff --git a/luci-app-emby/Makefile b/luci-app-emby/Makefile index 691d6b000..b047c0ff2 100644 --- a/luci-app-emby/Makefile +++ b/luci-app-emby/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.3-20231117 +PKG_VERSION:=1.0.3-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Emby diff --git a/luci-app-emby/root/usr/libexec/istorec/emby.sh b/luci-app-emby/root/usr/libexec/istorec/emby.sh index f2d87d79c..e5df501f3 100755 --- a/luci-app-emby/root/usr/libexec/istorec/emby.sh +++ b/luci-app-emby/root/usr/libexec/istorec/emby.sh @@ -43,7 +43,7 @@ do_install() { -p $http_port:8096 " fi - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" [ -z "$cache" ] || cmd="$cmd -v \"$cache:/config/cache\"" diff --git a/luci-app-gogs/Makefile b/luci-app-gogs/Makefile index 63aac84d8..a8a670101 100644 --- a/luci-app-gogs/Makefile +++ b/luci-app-gogs/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.1-20230108 +PKG_VERSION:=1.0.1-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Emby diff --git a/luci-app-gogs/root/usr/libexec/istorec/gogs.sh b/luci-app-gogs/root/usr/libexec/istorec/gogs.sh index e2f45858b..bc02c5c85 100755 --- a/luci-app-gogs/root/usr/libexec/istorec/gogs.sh +++ b/luci-app-gogs/root/usr/libexec/istorec/gogs.sh @@ -32,7 +32,7 @@ do_install() { -p $http_port:3000 \ -p $ssh_port:22 " - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd -v /mnt:/mnt" diff --git a/luci-app-heimdall/Makefile b/luci-app-heimdall/Makefile index e951a5766..b6a71bedd 100644 --- a/luci-app-heimdall/Makefile +++ b/luci-app-heimdall/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.1-20230108 +PKG_VERSION:=1.1.1-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for heimdall diff --git a/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh b/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh index 905043b23..b0fb63719 100755 --- a/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh +++ b/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh @@ -38,7 +38,7 @@ do_install_detail() { cmd="$cmd -v /mnt:/mnt" mountpoint -q /mnt && cmd="$cmd:rslave" - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd --name heimdall \"$IMAGE_NAME\"" diff --git a/luci-app-homeassistant/Makefile b/luci-app-homeassistant/Makefile index 9df134908..47dd1b095 100644 --- a/luci-app-homeassistant/Makefile +++ b/luci-app-homeassistant/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.2-20230312 +PKG_VERSION:=1.1.2-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for homeassistant diff --git a/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh b/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh index d23c1ced5..2fe6a992a 100755 --- a/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh +++ b/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh @@ -24,7 +24,7 @@ do_install() { --dns=127.0.0.1 " if [ -z "$tz" ]; then - tz="`uci get system.@system[0].zonename`" + tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" fi [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" diff --git a/luci-app-jackett/Makefile b/luci-app-jackett/Makefile index 427f6b350..7ed29d615 100644 --- a/luci-app-jackett/Makefile +++ b/luci-app-jackett/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.1-20230108 +PKG_VERSION:=1.1.1-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for jackett diff --git a/luci-app-jackett/root/usr/libexec/istorec/jackett.sh b/luci-app-jackett/root/usr/libexec/istorec/jackett.sh index 81edb46ad..b4210071d 100755 --- a/luci-app-jackett/root/usr/libexec/istorec/jackett.sh +++ b/luci-app-jackett/root/usr/libexec/istorec/jackett.sh @@ -32,7 +32,7 @@ do_install() { --dns=172.17.0.1 \ -p $port:9117 " - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" if [ -n "$auto_update" ]; then diff --git a/luci-app-jellyfin/Makefile b/luci-app-jellyfin/Makefile index 8fedb7702..27c0f2b61 100644 --- a/luci-app-jellyfin/Makefile +++ b/luci-app-jellyfin/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.8-20230619 +PKG_VERSION:=1.1.8-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for jellyfin diff --git a/luci-app-jellyfin/luasrc/model/cbi/jellyfin.lua b/luci-app-jellyfin/luasrc/model/cbi/jellyfin.lua index ae47771fa..e46af04eb 100644 --- a/luci-app-jellyfin/luasrc/model/cbi/jellyfin.lua +++ b/luci-app-jellyfin/luasrc/model/cbi/jellyfin.lua @@ -12,7 +12,7 @@ m = taskd.docker_map("jellyfin", "jellyfin", "/usr/libexec/istorec/jellyfin.sh", .. translate("Official website:") .. ' https://jellyfin.org/' .. "
" .. translate("The following models support hardware transcoding without configuration in Jellyfin:") .. "
" .. "
- Easepi ARS2
" - .. "
- " .. translate("RK3568 series (e.g. R5S, R68s, R66s, etc.) with iStoreOS firmware (version 20221123 and above). Other firmwares require MPP and RGA to be turned on, and are not guaranteed to be available.") .. "
" + .. "
- " .. translate("RK35xx series (e.g. R6S, R5S, R68s, R66s, H28K, etc.) with iStoreOS firmware (version 20221123 and above). Other firmwares require MPP and RGA to be turned on, and are not guaranteed to be available.") .. "
" .. "
" .. translate("The following models may support hardware transcoding by referring to the official Jellyfin documentation:") .. "
" .. "
- " .. translate("x86 series") .. "
" .. "
- " .. translate("Raspberry Pi series") .. "
" diff --git a/luci-app-jellyfin/po/zh-cn/jellyfin.po b/luci-app-jellyfin/po/zh-cn/jellyfin.po index 1249de0a0..1ed052119 100644 --- a/luci-app-jellyfin/po/zh-cn/jellyfin.po +++ b/luci-app-jellyfin/po/zh-cn/jellyfin.po @@ -10,8 +10,8 @@ msgstr "Jellyfin 是志愿者构建的媒体解决方案，可让您控制自己 msgid "The following models support hardware transcoding without configuration in Jellyfin:" msgstr "以下机型无需在Jellyfin配置即支持硬件转码：" -msgid "RK3568 series (e.g. R5S, R68s, R66s, etc.) with iStoreOS firmware (version 20221123 and above). Other firmwares require MPP and RGA to be turned on, and are not guaranteed to be available." -msgstr "RK3568 系列（例如R5S，R68s，R66s等）并使用 iStoreOS 固件（版本20221123及以上）。其他固件需开启MPP和RGA，不保证可用。" +msgid "RK35xx series (e.g. R6S, R5S, R68s, R66s, H28K, etc.) with iStoreOS firmware (version 20221123 and above). Other firmwares require MPP and RGA to be turned on, and are not guaranteed to be available." +msgstr "RK35xx 系列（例如R6S，R5S，R68s，R66s，H28K等）并使用 iStoreOS 固件（版本20221123及以上）。其他固件需开启MPP和RGA，不保证可用。" msgid "The following models may support hardware transcoding by referring to the official Jellyfin documentation:" msgstr "以下机型参考 Jellyfin 官方文档配置可能支持硬件转码：" diff --git a/luci-app-jellyfin/root/etc/config/jellyfin b/luci-app-jellyfin/root/etc/config/jellyfin index daff1dbeb..4990f3319 100644 --- a/luci-app-jellyfin/root/etc/config/jellyfin +++ b/luci-app-jellyfin/root/etc/config/jellyfin @@ -2,6 +2,6 @@ config jellyfin option 'hostnet' '0' option 'port' '8096' option 'image' 'default' - option 'media_path' '' - option 'config_path' '' - option 'cache_path' '' +# option 'media_path' '' +# option 'config_path' '' +# option 'cache_path' '' diff --git a/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh b/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh index 65a302695..74fb47d1b 100755 --- a/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh +++ b/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh @@ -100,7 +100,7 @@ do_install_detail() { -p $port:8096 " fi - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" [ -z "$cache" ] || cmd="$cmd -v \"$cache:/config/transcodes\"" diff --git a/luci-app-lanraragi/Makefile b/luci-app-lanraragi/Makefile index f156e0118..0a99be551 100644 --- a/luci-app-lanraragi/Makefile +++ b/luci-app-lanraragi/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.1-20230108 +PKG_VERSION:=1.0.1-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for LANraragi diff --git a/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh b/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh index 6647d9134..76d661298 100755 --- a/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh +++ b/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh @@ -28,7 +28,7 @@ do_install() { --dns=172.17.0.1 \ -p $http_port:3000 " - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd -v /mnt:/mnt" diff --git a/luci-app-memos/Makefile b/luci-app-memos/Makefile index 9bac7e38b..1d256c6e9 100644 --- a/luci-app-memos/Makefile +++ b/luci-app-memos/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.2-20230412 +PKG_VERSION:=1.0.2-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Memos diff --git a/luci-app-memos/root/usr/libexec/istorec/memos.sh b/luci-app-memos/root/usr/libexec/istorec/memos.sh index 629143ea9..8b72b06f4 100755 --- a/luci-app-memos/root/usr/libexec/istorec/memos.sh +++ b/luci-app-memos/root/usr/libexec/istorec/memos.sh @@ -27,7 +27,7 @@ do_install() { --dns=172.17.0.1 \ -p $http_port:5230 " - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd -v /mnt:/mnt" diff --git a/luci-app-nastools/Makefile b/luci-app-nastools/Makefile index d3e5a7e64..afff11d95 100644 --- a/luci-app-nastools/Makefile +++ b/luci-app-nastools/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.3-20230215 +PKG_VERSION:=1.1.3-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for nastools diff --git a/luci-app-nastools/root/usr/libexec/istorec/nastools.sh b/luci-app-nastools/root/usr/libexec/istorec/nastools.sh index 7ad977c74..d46018240 100755 --- a/luci-app-nastools/root/usr/libexec/istorec/nastools.sh +++ b/luci-app-nastools/root/usr/libexec/istorec/nastools.sh @@ -32,7 +32,7 @@ do_install() { -p $port:3000 \ -e UMASK=000" - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" if [ -n "$auto_update" ]; then diff --git a/luci-app-navidrome/Makefile b/luci-app-navidrome/Makefile index b79c72a1f..198b9950f 100644 --- a/luci-app-navidrome/Makefile +++ b/luci-app-navidrome/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.1-20230108 +PKG_VERSION:=1.0.1-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Navidrome diff --git a/luci-app-navidrome/root/usr/libexec/istorec/navidrome.sh b/luci-app-navidrome/root/usr/libexec/istorec/navidrome.sh index 984ea8c5d..1c079c8ab 100755 --- a/luci-app-navidrome/root/usr/libexec/istorec/navidrome.sh +++ b/luci-app-navidrome/root/usr/libexec/istorec/navidrome.sh @@ -28,7 +28,7 @@ do_install() { --dns=172.17.0.1 \ -p $http_port:4533 " - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd -v /mnt:/mnt" diff --git a/luci-app-nextcloud/Makefile b/luci-app-nextcloud/Makefile index abd2b1d88..ab1d3f46e 100644 --- a/luci-app-nextcloud/Makefile +++ b/luci-app-nextcloud/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.1-20230108 +PKG_VERSION:=1.1.1-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for nextcloud diff --git a/luci-app-nextcloud/root/usr/libexec/istorec/nextcloud.sh b/luci-app-nextcloud/root/usr/libexec/istorec/nextcloud.sh index a04c802be..4e7f8e827 100755 --- a/luci-app-nextcloud/root/usr/libexec/istorec/nextcloud.sh +++ b/luci-app-nextcloud/root/usr/libexec/istorec/nextcloud.sh @@ -38,7 +38,7 @@ do_install() { cmd="$cmd -v /mnt:/mnt" mountpoint -q /mnt && cmd="$cmd:rslave" - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd --name nextcloud \"$IMAGE_NAME\"" diff --git a/luci-app-owntone/Makefile b/luci-app-owntone/Makefile index d4f2313a1..43d58b9ca 100644 --- a/luci-app-owntone/Makefile +++ b/luci-app-owntone/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.2-20230619 +PKG_VERSION:=1.0.2-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Owntone diff --git a/luci-app-owntone/root/usr/libexec/istorec/owntone.sh b/luci-app-owntone/root/usr/libexec/istorec/owntone.sh index 31d7352f1..89e46fcd8 100755 --- a/luci-app-owntone/root/usr/libexec/istorec/owntone.sh +++ b/luci-app-owntone/root/usr/libexec/istorec/owntone.sh @@ -25,7 +25,7 @@ do_install() { --dns=127.0.0.1 \ --network=host " - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd -v /mnt:/mnt" diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile index 8eb425a8b..79b607356 100644 --- a/luci-app-passwall2/Makefile +++ b/luci-app-passwall2/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall2 -PKG_VERSION:=1.21-3 +PKG_VERSION:=1.21-4 PKG_RELEASE:= PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/sing-box.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/sing-box.lua index 977d452ad..662a6c49c 100644 --- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/sing-box.lua +++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/sing-box.lua @@ -438,6 +438,7 @@ o = s:option(ListValue, option_name("transport"), translate("Transport")) o:value("tcp", "TCP") o:value("http", "HTTP") o:value("ws", "WebSocket") +o:value("httpupgrade", "HTTPUpgrade") if singbox_tags:find("with_quic") then o:value("quic", "QUIC") end @@ -509,6 +510,14 @@ o:depends({ [option_name("ws_enableEarlyData")] = true }) o = s:option(Value, option_name("ws_earlyDataHeaderName"), translate("Early data header name"), translate("Recommended value: Sec-WebSocket-Protocol")) o:depends({ [option_name("ws_enableEarlyData")] = true }) +-- [[ HTTPUpgrade部分 ]]-- +o = s:option(Value, option_name("httpupgrade_host"), translate("HTTPUpgrade Host")) +o:depends({ [option_name("transport")] = "httpupgrade" }) + +o = s:option(Value, option_name("httpupgrade_path"), translate("HTTPUpgrade Path")) +o.placeholder = "/" +o:depends({ [option_name("transport")] = "httpupgrade" }) + -- [[ gRPC部分 ]]-- o = s:option(Value, option_name("grpc_serviceName"), "ServiceName") o:depends({ [option_name("transport")] = "grpc" }) @@ -533,8 +542,6 @@ o = s:option(Flag, option_name("mux"), translate("Mux")) o.rmempty = false o:depends({ [option_name("protocol")] = "vmess" }) o:depends({ [option_name("protocol")] = "vless", [option_name("flow")] = "" }) -o:depends({ [option_name("protocol")] = "http" }) -o:depends({ [option_name("protocol")] = "socks" }) o:depends({ [option_name("protocol")] = "shadowsocks", [option_name("uot")] = "" }) o:depends({ [option_name("protocol")] = "trojan" }) @@ -545,13 +552,26 @@ o:value("h2mux") o:depends({ [option_name("mux")] = true }) o = s:option(Value, option_name("mux_concurrency"), translate("Mux concurrency")) -o.default = 8 -o:depends({ [option_name("mux")] = true }) +o.default = 4 +o:depends({ [option_name("mux")] = true, [option_name("tcpbrutal")] = false }) o = s:option(Flag, option_name("mux_padding"), translate("Padding")) o.default = 0 o:depends({ [option_name("mux")] = true }) +-- [[ TCP Brutal ]]-- +o = s:option(Flag, option_name("tcpbrutal"), translate("TCP Brutal")) +o.default = 0 +o:depends({ [option_name("mux")] = true }) + +o = s:option(Value, option_name("tcpbrutal_up_mbps"), translate("Max upload Mbps")) +o.default = "10" +o:depends({ [option_name("tcpbrutal")] = true }) + +o = s:option(Value, option_name("tcpbrutal_down_mbps"), translate("Max download Mbps")) +o.default = "50" +o:depends({ [option_name("tcpbrutal")] = true }) + o = s:option(Flag, option_name("shadowtls"), "ShadowTLS") o.default = 0 o:depends({ [option_name("protocol")] = "vmess", [option_name("tls")] = false }) diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/sing-box.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/sing-box.lua index 25119500e..dd9b3e87c 100644 --- a/luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/sing-box.lua +++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/sing-box.lua @@ -310,6 +310,7 @@ o = s:option(ListValue, option_name("transport"), translate("Transport")) o:value("tcp", "TCP") o:value("http", "HTTP") o:value("ws", "WebSocket") +o:value("httpupgrade", "HTTPUpgrade") o:value("quic", "QUIC") o:value("grpc", "gRPC") o:depends({ [option_name("protocol")] = "shadowsocks" }) @@ -333,10 +334,39 @@ o:depends({ [option_name("transport")] = "ws" }) o = s:option(Value, option_name("ws_path"), translate("WebSocket Path")) o:depends({ [option_name("transport")] = "ws" }) +-- [[ HTTPUpgrade部分 ]]-- + +o = s:option(Value, option_name("httpupgrade_host"), translate("HTTPUpgrade Host")) +o:depends({ [option_name("transport")] = "httpupgrade" }) + +o = s:option(Value, option_name("httpupgrade_path"), translate("HTTPUpgrade Path")) +o:depends({ [option_name("transport")] = "httpupgrade" }) + -- [[ gRPC部分 ]]-- o = s:option(Value, option_name("grpc_serviceName"), "ServiceName") o:depends({ [option_name("transport")] = "grpc" }) +-- [[ Mux ]]-- +o = s:option(Flag, option_name("mux"), translate("Mux")) +o.rmempty = false +o:depends({ [option_name("protocol")] = "vmess" }) +o:depends({ [option_name("protocol")] = "vless", [option_name("flow")] = "" }) +o:depends({ [option_name("protocol")] = "shadowsocks" }) +o:depends({ [option_name("protocol")] = "trojan" }) + +-- [[ TCP Brutal ]]-- +o = s:option(Flag, option_name("tcpbrutal"), translate("TCP Brutal")) +o.default = 0 +o:depends({ [option_name("mux")] = true }) + +o = s:option(Value, option_name("tcpbrutal_up_mbps"), translate("Max upload Mbps")) +o.default = "10" +o:depends({ [option_name("tcpbrutal")] = true }) + +o = s:option(Value, option_name("tcpbrutal_down_mbps"), translate("Max download Mbps")) +o.default = "50" +o:depends({ [option_name("tcpbrutal")] = true }) + o = s:option(Flag, option_name("bind_local"), translate("Bind Local"), translate("When selected, it can only be accessed locally, It is recommended to turn on when using reverse proxies or be fallback.")) o.default = "0" diff --git a/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua b/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua index cdfd2f1df..64602abc1 100644 --- a/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua +++ b/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua @@ -117,10 +117,28 @@ function gen_outbound(flag, node, tag, proxy_table) mux = { enabled = true, protocol = node.mux_type or "h2mux", - max_connections = tonumber(node.mux_concurrency) or 4, - padding = (node.mux_padding == "1") and true or false + max_connections = ( (node.tcpbrutal == "1") and 1 ) or tonumber(node.mux_concurrency) or 4, + padding = (node.mux_padding == "1") and true or false, --min_streams = 4, --max_streams = 0, + brutal = { + enabled = (node.tcpbrutal == "1") and true or false, + up_mbps = tonumber(node.tcpbrutal_up_mbps) or 10, + down_mbps = tonumber(node.tcpbrutal_down_mbps) or 50, + }, + } + end + + local mux = nil + if node.mux == "1" then + mux = { + enabled = true, + padding = (node.mux_padding == "1") and true or false, + brutal = { + enabled = (node.tcpbrutal == "1") and true or false, + up_mbps = tonumber(node.tcpbrutal_up_mbps) or 10, + down_mbps = tonumber(node.tcpbrutal_down_mbps) or 50, + }, } end @@ -147,6 +165,14 @@ function gen_outbound(flag, node, tag, proxy_table) } end + if node.transport == "httpupgrade" then + v2ray_transport = { + type = "httpupgrade", + host = node.httpupgrade_host, + path = node.httpupgrade_path or "/", + } + end + if node.transport == "quic" then v2ray_transport = { type = "quic" @@ -422,6 +448,14 @@ function gen_config_server(node) } end + if node.transport == "httpupgrade" then + v2ray_transport = { + type = "httpupgrade", + host = node.httpupgrade_host, + path = node.httpupgrade_path or "/", + } + end + if node.transport == "quic" then v2ray_transport = { type = "quic" @@ -484,6 +518,7 @@ function gen_config_server(node) protocol_table = { method = node.method, password = node.password, + multiplex = mux, } end @@ -500,6 +535,7 @@ function gen_config_server(node) protocol_table = { users = users, tls = (node.tls == "1") and tls or nil, + multiplex = mux, transport = v2ray_transport, } end @@ -518,6 +554,7 @@ function gen_config_server(node) protocol_table = { users = users, tls = (node.tls == "1") and tls or nil, + multiplex = mux, transport = v2ray_transport, } end @@ -537,6 +574,7 @@ function gen_config_server(node) tls = (node.tls == "1") and tls or nil, fallback = nil, fallback_for_alpn = nil, + multiplex = mux, transport = v2ray_transport, } end diff --git a/luci-app-photoprism/Makefile b/luci-app-photoprism/Makefile index 3126ef3a2..3a676ae79 100644 --- a/luci-app-photoprism/Makefile +++ b/luci-app-photoprism/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.3-20230804 +PKG_VERSION:=1.0.3-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for PhotoPrism diff --git a/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh b/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh index 9194458a1..cef19acef 100755 --- a/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh +++ b/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh @@ -27,7 +27,7 @@ do_install() { -e PHOTOPRISM_UPLOAD_NSFW=\"true\" \ -e PHOTOPRISM_ADMIN_PASSWORD=\"$password\" " - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" [ -z "$picture" ] || cmd="$cmd -v \"$picture:/photoprism/originals\"" diff --git a/luci-app-plex/Makefile b/luci-app-plex/Makefile index 53adb41fc..8b4ea61e6 100644 --- a/luci-app-plex/Makefile +++ b/luci-app-plex/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.2-20230619 +PKG_VERSION:=1.0.2-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Plex diff --git a/luci-app-plex/root/usr/libexec/istorec/plex.sh b/luci-app-plex/root/usr/libexec/istorec/plex.sh index c782067f8..29561a228 100755 --- a/luci-app-plex/root/usr/libexec/istorec/plex.sh +++ b/luci-app-plex/root/usr/libexec/istorec/plex.sh @@ -54,7 +54,7 @@ do_install() { -p $port:32400 " fi - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" [ -z "$claim_token" ] || cmd="$cmd -e \"PLEX_CLAIM=$claim_token\"" diff --git a/luci-app-ubuntu/Makefile b/luci-app-ubuntu/Makefile index 3c72fb625..3a605076b 100644 --- a/luci-app-ubuntu/Makefile +++ b/luci-app-ubuntu/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.1-20230108 +PKG_VERSION:=1.1.1-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for ubuntu diff --git a/luci-app-ubuntu/root/usr/libexec/istorec/ubuntu.sh b/luci-app-ubuntu/root/usr/libexec/istorec/ubuntu.sh index c66bf2401..12ef5053d 100755 --- a/luci-app-ubuntu/root/usr/libexec/istorec/ubuntu.sh +++ b/luci-app-ubuntu/root/usr/libexec/istorec/ubuntu.sh @@ -44,7 +44,7 @@ do_install() { -e VNC_PW=${password} \ -e VNC_USE_HTTP=0 " - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd -v /mnt:/mnt" diff --git a/luci-app-unifi/Makefile b/luci-app-unifi/Makefile index 057101363..d9f1850e9 100644 --- a/luci-app-unifi/Makefile +++ b/luci-app-unifi/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.2-20230619 +PKG_VERSION:=1.0.2-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for UnifiController diff --git a/luci-app-unifi/root/usr/libexec/istorec/unifi.sh b/luci-app-unifi/root/usr/libexec/istorec/unifi.sh index c490395d4..9fd3308da 100755 --- a/luci-app-unifi/root/usr/libexec/istorec/unifi.sh +++ b/luci-app-unifi/root/usr/libexec/istorec/unifi.sh @@ -37,7 +37,7 @@ do_install() { -p $http_port:8443 " fi - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd -v /mnt:/mnt" diff --git a/luci-app-vaultwarden/Makefile b/luci-app-vaultwarden/Makefile index c646f1d11..d73b09834 100644 --- a/luci-app-vaultwarden/Makefile +++ b/luci-app-vaultwarden/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.1-20230108 +PKG_VERSION:=1.0.1-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Vaultwarden diff --git a/luci-app-vaultwarden/root/usr/libexec/istorec/vaultwarden.sh b/luci-app-vaultwarden/root/usr/libexec/istorec/vaultwarden.sh index ea3fc8a32..2de54320d 100755 --- a/luci-app-vaultwarden/root/usr/libexec/istorec/vaultwarden.sh +++ b/luci-app-vaultwarden/root/usr/libexec/istorec/vaultwarden.sh @@ -37,7 +37,7 @@ do_install() { cmd="$cmd -e \"SIGNUPS_ALLOWED=false\"" fi - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd -v /mnt:/mnt" diff --git a/luci-app-webvirtcloud/Makefile b/luci-app-webvirtcloud/Makefile index 0d81c0d0b..ac45fb33b 100644 --- a/luci-app-webvirtcloud/Makefile +++ b/luci-app-webvirtcloud/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=0.3.8-20231208 +PKG_VERSION:=0.3.8-20231208-1 PKG_RELEASE:= LUCI_TITLE:=LuCI support for webvirtcloud diff --git a/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh b/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh index 2e57c7098..6bc3408ce 100755 --- a/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh +++ b/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh @@ -39,7 +39,7 @@ do_install() { --dns=223.5.5.5 " if [ -z "$tz" ]; then - tz="`uci get system.@system[0].zonename`" + tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" fi [ -z "$tz" ] || cmd="$cmd -e TZ=\"$tz\"" diff --git a/luci-app-wxedge/Makefile b/luci-app-wxedge/Makefile index 624e9cbc2..32d69569f 100644 --- a/luci-app-wxedge/Makefile +++ b/luci-app-wxedge/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.3-20230614 +PKG_VERSION:=1.1.3-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for wxedge diff --git a/luci-app-wxedge/root/usr/libexec/istorec/wxedge.sh b/luci-app-wxedge/root/usr/libexec/istorec/wxedge.sh index aa28f7ea5..f615d35c7 100755 --- a/luci-app-wxedge/root/usr/libexec/istorec/wxedge.sh +++ b/luci-app-wxedge/root/usr/libexec/istorec/wxedge.sh @@ -27,7 +27,7 @@ do_install() { -v \"$path/containerd:/var/lib/containerd\" \ -e PLACE=CTKS" - local tz="`uci get system.@system[0].zonename`" + local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd --name wxedge \"$image_name\"" diff --git a/luci-app-xteve/Makefile b/luci-app-xteve/Makefile index d3d1d9298..3f8e7bcc3 100644 --- a/luci-app-xteve/Makefile +++ b/luci-app-xteve/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.2-20230619 +PKG_VERSION:=1.0.2-20231208 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Xteve diff --git a/luci-app-xteve/root/usr/libexec/istorec/xteve.sh b/luci-app-xteve/root/usr/libexec/istorec/xteve.sh index aa95d8e20..fda794fb1 100755 --- a/luci-app-xteve/root/usr/libexec/istorec/xteve.sh +++ b/luci-app-xteve/root/usr/libexec/istorec/xteve.sh @@ -37,7 +37,7 @@ do_install() { -p $port:34400 " if [ -z "$tz" ]; then - tz="`uci get system.@system[0].zonename`" + tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`" fi [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index 002215f4f..91a0108b4 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -12,7 +12,7 @@ PKG_MAINTAINER:=Tianling Shen include $(INCLUDE_DIR)/package.mk -GEOIP_VER:=202312070040 +GEOIP_VER:=202312071808 GEOIP_FILE:=geoip.dat.$(GEOIP_VER) define Download/geoip URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/ @@ -21,13 +21,13 @@ define Download/geoip HASH:=1c8d8bd5e8966a115d2ba16739660ef8ea1ebbb812fec4f87c699df479721652 endef -GEOSITE_VER:=20231207180922 +GEOSITE_VER:=20231208065009 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=7a6cfbb0164fc6ad2b772cbccc6b8f3dea5a0743055228392d5da40f2260305d + HASH:=a989634ca9ef02d9f345b9de1c2bacf4a20a4f3227c83c80b896e2795cf32501 endef GEOSITE_IRAN_VER:=202312061428