cwx/op-packages
1
0 Fork 0
mirror of https://github.com/kiddin9/op-packages.git synced 2026-10-31 20:55:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🏅 Sync 2026-04-14 23:55:21

Browse Source
This commit is contained in:
github-actions[bot] committed 2026-04-14 23:55:21 +08:00
1 parent 22da0434fc
commit 123b217f2e
19 files changed
+100 -82
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ddns-go/Makefile
+2 -2
View File
@@ -5,8 +5,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=ddns-go PKG_NAME:=ddns-go
PKG_VERSION:=6.16.4 PKG_VERSION:=6.16.6
PKG_RELEASE:=4 PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/jeessy2/ddns-go/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/jeessy2/ddns-go/tar.gz/v$(PKG_VERSION)?
hickory-dns/Makefile
+2 -2
View File
@@ -1,8 +1,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=hickory-dns PKG_NAME:=hickory-dns
PKG_VERSION:=0.26.0-beta.3 PKG_VERSION:=0.26.0-beta.4
PKG_RELEASE:=13 PKG_RELEASE:=14
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/hickory-dns/hickory-dns/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/hickory-dns/hickory-dns/tar.gz/v$(PKG_VERSION)?
luci-app-cpu-perf/Makefile
+1 -1
View File
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-cpu-perf PKG_NAME:=luci-app-cpu-perf
PKG_VERSION:=0.6.1 PKG_VERSION:=0.6.1
PKG_RELEASE:=1 PKG_RELEASE:=2
LUCI_TITLE:=CPU performance information and management for LuCI LUCI_TITLE:=CPU performance information and management for LuCI
LUCI_DEPENDS:=+ucode +ucode-mod-fs LUCI_DEPENDS:=+ucode +ucode-mod-fs
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
luci-app-cpu-perf/po/ru/cpu-perf.po
+1 -1
View File
@@ -103,7 +103,7 @@ msgid "Minimum scaling frequency"
msgstr "Минимальное масштабирование частоты" msgstr "Минимальное масштабирование частоты"
msgid "No CPU frequency data available..." msgid "No CPU frequency data available..."
msgstr "Нет данных о данных о частоте процессора..." msgstr "Нет данных о частоте процессора..."
msgid "No performance data..." msgid "No performance data..."
msgstr "Нет данных о производительности..." msgstr "Нет данных о производительности..."
luci-app-cpu-status/Makefile
+2 -2
View File
@@ -7,8 +7,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-cpu-status PKG_NAME:=luci-app-cpu-status
PKG_VERSION:=0.6.2 PKG_VERSION:=0.6.3
PKG_RELEASE:=1 PKG_RELEASE:=2
LUCI_TITLE:=CPU utilization info for the LuCI status page LUCI_TITLE:=CPU utilization info for the LuCI status page
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
luci-app-cpu-status/README.md
+12 -12
View File
@@ -9,29 +9,29 @@ Lite version: [luci-app-cpu-status-mini](https://github.com/gSpotx2f/luci-app-cp
**OpenWrt >= 25.12:** **OpenWrt >= 25.12:**
wget --no-check-certificate -O /tmp/luci-app-cpu-status-0.6.2-r1.apk https://github.com/gSpotx2f/packages-openwrt/raw/master/25.12/luci-app-cpu-status-0.6.2-r1.apk wget --no-check-certificate -O /tmp/luci-app-cpu-status-0.6.3-r1.apk https://github.com/gSpotx2f/packages-openwrt/raw/master/25.12/luci-app-cpu-status-0.6.3-r1.apk
apk --allow-untrusted add /tmp/luci-app-cpu-status-0.6.2-r1.apk apk --allow-untrusted add /tmp/luci-app-cpu-status-0.6.3-r1.apk
rm /tmp/luci-app-cpu-status-0.6.2-r1.apk rm /tmp/luci-app-cpu-status-0.6.3-r1.apk
service rpcd reload service rpcd reload
i18n-ru: i18n-ru:
wget --no-check-certificate -O /tmp/luci-i18n-cpu-status-ru-0.6.2-r1.apk https://github.com/gSpotx2f/packages-openwrt/raw/master/25.12/luci-i18n-cpu-status-ru-0.6.2-r1.apk wget --no-check-certificate -O /tmp/luci-i18n-cpu-status-ru-0.6.3-r1.apk https://github.com/gSpotx2f/packages-openwrt/raw/master/25.12/luci-i18n-cpu-status-ru-0.6.3-r1.apk
apk --allow-untrusted add /tmp/luci-i18n-cpu-status-ru-0.6.2-r1.apk apk --allow-untrusted add /tmp/luci-i18n-cpu-status-ru-0.6.3-r1.apk
rm /tmp/luci-i18n-cpu-status-ru-0.6.2-r1.apk rm /tmp/luci-i18n-cpu-status-ru-0.6.3-r1.apk
**OpenWrt <= 24.10:** **OpenWrt <= 24.10:**
wget --no-check-certificate -O /tmp/luci-app-cpu-status_0.6.2-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/24.10/luci-app-cpu-status_0.6.2-r1_all.ipk wget --no-check-certificate -O /tmp/luci-app-cpu-status_0.6.3-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/24.10/luci-app-cpu-status_0.6.3-r1_all.ipk
opkg install /tmp/luci-app-cpu-status_0.6.2-r1_all.ipk opkg install /tmp/luci-app-cpu-status_0.6.3-r1_all.ipk
rm /tmp/luci-app-cpu-status_0.6.2-r1_all.ipk rm /tmp/luci-app-cpu-status_0.6.3-r1_all.ipk
service rpcd reload service rpcd reload
i18n-ru: i18n-ru:
wget --no-check-certificate -O /tmp/luci-i18n-cpu-status-ru_0.6.2-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/24.10/luci-i18n-cpu-status-ru_0.6.2-r1_all.ipk wget --no-check-certificate -O /tmp/luci-i18n-cpu-status-ru_0.6.3-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/24.10/luci-i18n-cpu-status-ru_0.6.3-r1_all.ipk
opkg install /tmp/luci-i18n-cpu-status-ru_0.6.2-r1_all.ipk opkg install /tmp/luci-i18n-cpu-status-ru_0.6.3-r1_all.ipk
rm /tmp/luci-i18n-cpu-status-ru_0.6.2-r1_all.ipk rm /tmp/luci-i18n-cpu-status-ru_0.6.3-r1_all.ipk
## Screenshots: ## Screenshots:
luci-app-cpu-status/htdocs/luci-static/resources/view/status/include/18_cpu.js
+14 -4
View File
@@ -8,16 +8,27 @@ document.head.append(E('style', {'type': 'text/css'},
display: inline-block; display: inline-block;
cursor: pointer; cursor: pointer;
margin: 2px 4px 2px 0 !important; margin: 2px 4px 2px 0 !important;
padding: 2px 4px; padding: 3px 5px;
border: 1px dotted; border: 1px solid;
border-color: transparent;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
opacity: 0.7; opacity: 0.7;
background-color: rgba(100 100 100 / 0.2);
}
.cpu-status-view-mode-entry:hover {
opacity: 0.9;
}
.cpu-status-view-mode-entry:active {
opacity: 1.0;
} }
.cpu-status-view-mode-entry-checked { .cpu-status-view-mode-entry-checked {
border: 1px solid; border: 1px solid;
opacity: 1; opacity: 1.0;
}
.cpu-status-view-mode-entry-checked:hover {
opacity: 1.0;
} }
`)); `));
@@ -332,7 +343,6 @@ return baseclass.extend({
viewModeEntries.push( viewModeEntries.push(
E('span', { E('span', {
'class' : 'cpu-status-view-mode-entry', 'class' : 'cpu-status-view-mode-entry',
'href' : 'javascript:void(0)',
'data-value': i, 'data-value': i,
'click' : viewModeSelectOnClick, 'click' : viewModeSelectOnClick,
}, v[1]) }, v[1])
luci-app-openlist2/Makefile
+1 -1
View File
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-openlist2 PKG_NAME:=luci-app-openlist2
PKG_VERSION:=1.0.2 PKG_VERSION:=1.0.2
PKG_RELEASE:=1 PKG_RELEASE:=2
LUCI_TITLE:=LuCI support for openlist LUCI_TITLE:=LuCI support for openlist
LUCI_DEPENDS:=+openlist2 LUCI_DEPENDS:=+openlist2
luci-app-openlist2/po/zh_Hans/openlist2.po
+1 -1
View File
@@ -20,7 +20,7 @@ msgstr "一款支持多种存储的目录文件列表程序。"
msgid "Setting" msgid "Setting"
msgstr "设置" msgstr "设置"
msgid "Basic Setting" msgid "Basic Settings"
msgstr "基本设置" msgstr "基本设置"
msgid "Global Settings" msgid "Global Settings"
luci-app-passwall/Makefile
+1 -1
View File
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall PKG_NAME:=luci-app-passwall
PKG_VERSION:=26.4.6 PKG_VERSION:=26.4.6
PKG_RELEASE:=68 PKG_RELEASE:=69
PKG_PO_VERSION:=$(PKG_VERSION) PKG_PO_VERSION:=$(PKG_VERSION)
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
+1 -1
View File
@@ -862,7 +862,7 @@ for k, v in pairs(nodes_table) do
socks:value(v.id, v["remark"]) socks:value(v.id, v["remark"])
socks.group[#socks.group+1] = (v.group and v.group ~= "") and v.group or translate("default") socks.group[#socks.group+1] = (v.group and v.group ~= "") and v.group or translate("default")
end end
elseif v.protocol ~= "_shunt" then else
socks:value(v.id, v["remark"]) socks:value(v.id, v["remark"])
socks.group[#socks.group+1] = (v.group and v.group ~= "") and v.group or translate("default") socks.group[#socks.group+1] = (v.group and v.group ~= "") and v.group or translate("default")
end end
luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua
+3 -2
View File
@@ -105,9 +105,10 @@ for i, v in pairs(nodes_table) do
if v.protocol ~= "_shunt" then if v.protocol ~= "_shunt" then
o:value(v.id, v.remark) o:value(v.id, v.remark)
o.group[#o.group+1] = v.group or "" o.group[#o.group+1] = v.group or ""
socks_node:value(v.id, v["remark"]) s.fields["enable_autoswitch"]:depends({ node = v.id })
socks_node.group[#socks_node.group+1] = (v.group and v.group ~= "") and v.group or translate("default")
end end
socks_node:value(v.id, v["remark"])
socks_node.group[#socks_node.group+1] = (v.group and v.group ~= "") and v.group or translate("default")
end end
-- 读取旧 DynamicList -- 读取旧 DynamicList
function o.cfgvalue(self, section) function o.cfgvalue(self, section)
luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua
+8 -6
View File
@@ -379,8 +379,14 @@ if singbox_tags:find("with_quic") then
end end
-- [[ SSH config start ]] -- -- [[ SSH config start ]] --
o = s:option(Value, _n("ssh_priv_key"), translate("Private Key")) o = s:option(TextValue, _n("ssh_priv_key"), translate("Private Key"))
o.rows = 5
o.wrap = "off"
o:depends({ [_n("protocol")] = "ssh" }) o:depends({ [_n("protocol")] = "ssh" })
o.validate = function(self, value)
value = api.trim(value):gsub("\r\n", "\n"):gsub("[ \t]*\n[ \t]*", "\n"):gsub("\n+", "\n")
return value
end
o = s:option(Value, _n("ssh_priv_key_pp"), translate("Private Key Passphrase")) o = s:option(Value, _n("ssh_priv_key_pp"), translate("Private Key Passphrase"))
o.password = true o.password = true
@@ -472,11 +478,7 @@ o.rows = 5
o.wrap = "off" o.wrap = "off"
o:depends({ [_n("ech")] = true }) o:depends({ [_n("ech")] = true })
o.validate = function(self, value) o.validate = function(self, value)
value = value:gsub("^%s+", ""):gsub("%s+$","\n"):gsub("\r\n","\n"):gsub("[ \t]*\n[ \t]*", "\n") value = api.trim(value):gsub("\r\n", "\n"):gsub("[ \t]*\n[ \t]*", "\n"):gsub("\n+", "\n")
value = value:gsub("^%s*\n", "")
if value:sub(-1) == "\n" then
value = value:sub(1, -2)
end
return value return value
end end
luci-app-passwall/root/usr/share/passwall/app.sh
+23 -23
View File
@@ -754,8 +754,7 @@ run_redir() {
local v2ray_dns_mode=$(config_t_get global v2ray_dns_mode tcp) local v2ray_dns_mode=$(config_t_get global v2ray_dns_mode tcp)
[ "${DNS_MODE}" != "sing-box" ] && [ "$protocol" = "_shunt" ] && { [ "${DNS_MODE}" != "sing-box" ] && [ "$protocol" = "_shunt" ] && {
DNS_MODE="sing-box" DNS_MODE="sing-box"
v2ray_dns_mode="tcp" [ "$v2ray_dns_mode" != "udp" ] && [ "$v2ray_dns_mode" != "tcp" ] && v2ray_dns_mode="tcp"
echolog "* 当前 TCP 节点采用 Sing-Box 分流，远程 DNS 过滤模式将默认使用 Sing-Box(TCP)。！"
} }
[ "$protocol" = "_shunt" ] && { [ "$protocol" = "_shunt" ] && {
@@ -834,8 +833,7 @@ run_redir() {
local v2ray_dns_mode=$(config_t_get global v2ray_dns_mode tcp) local v2ray_dns_mode=$(config_t_get global v2ray_dns_mode tcp)
[ "${DNS_MODE}" != "xray" ] && [ "$protocol" = "_shunt" ] && { [ "${DNS_MODE}" != "xray" ] && [ "$protocol" = "_shunt" ] && {
DNS_MODE="xray" DNS_MODE="xray"
v2ray_dns_mode="tcp" [ "$v2ray_dns_mode" != "udp" ] && [ "$v2ray_dns_mode" != "tcp" ] && v2ray_dns_mode="tcp"
echolog "* 当前 TCP 节点采用 Xray 分流，远程 DNS 过滤模式将默认使用Xray(TCP)。"
} }
[ "$protocol" = "_shunt" ] && { [ "$protocol" = "_shunt" ] && {
@@ -1640,9 +1638,6 @@ acl_app() {
dns_mode=${dns_mode:-dns2socks} dns_mode=${dns_mode:-dns2socks}
remote_dns=${remote_dns:-1.1.1.1} remote_dns=${remote_dns:-1.1.1.1}
use_default_dns=${use_default_dns:-direct} use_default_dns=${use_default_dns:-direct}
[ "$dns_mode" = "sing-box" ] && {
[ "$v2ray_dns_mode" = "doh" ] && remote_dns=${remote_dns_doh:-https://1.1.1.1/dns-query}
}
fi fi
[ -n "$tcp_node" ] && { [ -n "$tcp_node" ] && {
@@ -1665,6 +1660,17 @@ acl_app() {
set_cache_var "ACL_${sid}_dns_port" "${GLOBAL_DNSMASQ_PORT}" set_cache_var "ACL_${sid}_dns_port" "${GLOBAL_DNSMASQ_PORT}"
set_cache_var "ACL_${sid}_tcp_default" "1" set_cache_var "ACL_${sid}_tcp_default" "1"
else else
local type=$(echo $(config_n_get $tcp_node type) | tr 'A-Z' 'a-z')
local protocol=$(config_n_get $tcp_node protocol)
([ "$type" = "sing-box" ] || [ "$type" = "xray" ]) && [ "$protocol" = "_shunt" ] && [ "$type" != "$dns_mode" ] && {
dns_mode=$type
([ "$type" = "xray" ] || [ "$type" = "sing-box" ]) && [ "$v2ray_dns_mode" != "udp" ] && [ "$v2ray_dns_mode" != "tcp" ] && v2ray_dns_mode="tcp"
}
dns_cache_key="${dns_mode}_${remote_dns}_${v2ray_dns_mode:-none}_${remote_dns_client_ip:-0}_${remote_fakedns:-0}"
[ "$dns_mode" = "sing-box" ] && [ "$v2ray_dns_mode" != "udp" ] && [ "$v2ray_dns_mode" != "tcp" ] && {
dns_cache_key="${dns_mode}_${remote_dns_doh:-https://1.1.1.1/dns-query}_${v2ray_dns_mode:-doh}_${remote_dns_client_ip:-0}_${remote_fakedns:-0}"
}
run_dns() { run_dns() {
local _dns_port local _dns_port
[ -n $1 ] && _dns_port=$1 [ -n $1 ] && _dns_port=$1
@@ -1683,7 +1689,7 @@ acl_app() {
[ "$filter_proxy_ipv6" = "1" ] && remote_dns_query_strategy="UseIPv4" [ "$filter_proxy_ipv6" = "1" ] && remote_dns_query_strategy="UseIPv4"
run_${type} flag=acl_${sid} type=$dns_mode dns_socks_address=127.0.0.1 dns_socks_port=$socks_port dns_listen_port=${_dns_port} remote_dns_protocol=${v2ray_dns_mode} remote_dns_udp_server=${remote_dns} remote_dns_tcp_server=${remote_dns} remote_dns_doh="${remote_dns_doh}" remote_dns_query_strategy=${remote_dns_query_strategy} remote_dns_client_ip=${remote_dns_client_ip} config_file=$config_file run_${type} flag=acl_${sid} type=$dns_mode dns_socks_address=127.0.0.1 dns_socks_port=$socks_port dns_listen_port=${_dns_port} remote_dns_protocol=${v2ray_dns_mode} remote_dns_udp_server=${remote_dns} remote_dns_tcp_server=${remote_dns} remote_dns_doh="${remote_dns_doh}" remote_dns_query_strategy=${remote_dns_query_strategy} remote_dns_client_ip=${remote_dns_client_ip} config_file=$config_file
fi fi
set_cache_var "node_${tcp_node}_$(echo -n "${remote_dns}" | md5sum | cut -d " " -f1)" "${_dns_port}" set_cache_var "node_${tcp_node}_$(echo -n "${dns_cache_key}" | md5sum | cut -d " " -f1)" "${_dns_port}"
} }
[ "$dns_shunt" = "chinadns-ng" ] && [ -n "$(first_type chinadns-ng)" ] && { [ "$dns_shunt" = "chinadns-ng" ] && [ -n "$(first_type chinadns-ng)" ] && {
@@ -1740,7 +1746,7 @@ acl_app() {
-NO_LOGIC_LOG 1 -NO_LOGIC_LOG 1
ln_run "$(first_type dnsmasq)" "dnsmasq_${sid}" "/dev/null" -C ${dnsmasq_conf} -x ${acl_path}/dnsmasq.pid ln_run "$(first_type dnsmasq)" "dnsmasq_${sid}" "/dev/null" -C ${dnsmasq_conf} -x ${acl_path}/dnsmasq.pid
set_cache_var "ACL_${sid}_dns_port" "${dnsmasq_port}" set_cache_var "ACL_${sid}_dns_port" "${dnsmasq_port}"
set_cache_var "node_${tcp_node}_$(echo -n "${tcp_proxy_mode}${remote_dns}" | md5sum | cut -d " " -f1)" "${dnsmasq_port}" set_cache_var "node_${tcp_node}_$(echo -n "${tcp_proxy_mode}_${dns_cache_key}" | md5sum | cut -d " " -f1)" "${dnsmasq_port}"
#dhcp.leases to hosts #dhcp.leases to hosts
$APP_PATH/lease2hosts.sh > /dev/null 2>&1 & $APP_PATH/lease2hosts.sh > /dev/null 2>&1 &
} }
@@ -1749,9 +1755,9 @@ acl_app() {
if [ -n "${_socks_port}" ] && [ -n "${_redir_port}" ]; then if [ -n "${_socks_port}" ] && [ -n "${_redir_port}" ]; then
socks_port=${_socks_port} socks_port=${_socks_port}
tcp_port=${_redir_port} tcp_port=${_redir_port}
_dnsmasq_port=$(get_cache_var "node_${tcp_node}_$(echo -n "${tcp_proxy_mode}${remote_dns}" | md5sum | cut -d " " -f1)") _dnsmasq_port=$(get_cache_var "node_${tcp_node}_$(echo -n "${tcp_proxy_mode}_${dns_cache_key}" | md5sum | cut -d " " -f1)")
if [ -z "${_dnsmasq_port}" ]; then if [ -z "${_dnsmasq_port}" ]; then
_dns_port=$(get_cache_var "node_${tcp_node}_$(echo -n "${remote_dns}" | md5sum | cut -d " " -f1)") _dns_port=$(get_cache_var "node_${tcp_node}_$(echo -n "${dns_cache_key}" | md5sum | cut -d " " -f1)")
run_dns ${_dns_port} run_dns ${_dns_port}
else else
[ -n "${_dnsmasq_port}" ] && set_cache_var "ACL_${sid}_dns_port" "${_dnsmasq_port}" [ -n "${_dnsmasq_port}" ] && set_cache_var "ACL_${sid}_dns_port" "${_dnsmasq_port}"
@@ -1763,17 +1769,10 @@ acl_app() {
set_cache_var "node_${tcp_node}_redir_port" "${redir_port}" set_cache_var "node_${tcp_node}_redir_port" "${redir_port}"
tcp_port=$redir_port tcp_port=$redir_port
local type=$(echo $(config_n_get $tcp_node type) | tr 'A-Z' 'a-z') if [ "${type}" = "sing-box" ] || [ "${type}" = "xray" ]; then
if [ -n "${type}" ] && ([ "${type}" = "sing-box" ] || [ "${type}" = "xray" ]); then
local protocol=$(config_n_get $tcp_node protocol)
[ "$protocol" = "_shunt" ] && [ "${type}" != "${dns_mode}" ] && {
dns_mode=${type}
v2ray_dns_mode="tcp"
remote_dns="1.1.1.1"
}
config_file="acl/${tcp_node}_TCP_${redir_port}.json" config_file="acl/${tcp_node}_TCP_${redir_port}.json"
_extra_param="socks_address=127.0.0.1 socks_port=$socks_port" _extra_param="socks_address=127.0.0.1 socks_port=$socks_port"
if ([ "$dns_mode" = "sing-box" ] || [ "$dns_mode" = "xray" ]) && [ "${type}" = "${dns_mode}" ]; then [ "${type}" = "${dns_mode}" ] && {
dns_port=$(get_new_port $(expr $dns_port + 1)) dns_port=$(get_new_port $(expr $dns_port + 1))
_dns_port=$dns_port _dns_port=$dns_port
config_file="${config_file//TCP_/DNS_${_dns_port}_TCP_}" config_file="${config_file//TCP_/DNS_${_dns_port}_TCP_}"
@@ -1781,8 +1780,9 @@ acl_app() {
remote_dns_query_strategy="UseIP" remote_dns_query_strategy="UseIP"
[ "$filter_proxy_ipv6" = "1" ] && remote_dns_query_strategy="UseIPv4" [ "$filter_proxy_ipv6" = "1" ] && remote_dns_query_strategy="UseIPv4"
remote_dns_doh=${remote_dns_doh:-https://1.1.1.1/dns-query} remote_dns_doh=${remote_dns_doh:-https://1.1.1.1/dns-query}
_extra_param="dns_listen_port=${_dns_port} remote_dns_protocol=${v2ray_dns_mode} remote_dns_udp_server=${remote_dns} remote_dns_tcp_server=${remote_dns} remote_dns_doh=${remote_dns_doh} remote_dns_query_strategy=${remote_dns_query_strategy} remote_dns_client_ip=${remote_dns_client_ip}" _extra_param="${_extra_param} dns_listen_port=${_dns_port} remote_dns_protocol=${v2ray_dns_mode} remote_dns_udp_server=${remote_dns} remote_dns_tcp_server=${remote_dns}"
fi _extra_param="${_extra_param} remote_dns_doh=${remote_dns_doh} remote_dns_query_strategy=${remote_dns_query_strategy} remote_dns_client_ip=${remote_dns_client_ip}"
}
_extra_param="${_extra_param} tcp_proxy_way=$TCP_PROXY_WAY" _extra_param="${_extra_param} tcp_proxy_way=$TCP_PROXY_WAY"
[ -n "$udp_node" ] && ([ "$udp_node" = "tcp" ] || [ "$udp_node" = "$tcp_node" ]) && { [ -n "$udp_node" ] && ([ "$udp_node" = "tcp" ] || [ "$udp_node" = "$tcp_node" ]) && {
config_file="${config_file//TCP_/TCP_UDP_}" config_file="${config_file//TCP_/TCP_UDP_}"
@@ -1868,7 +1868,7 @@ acl_app() {
fi fi
} }
unset enabled sid remarks sources interface tcp_no_redir_ports udp_no_redir_ports use_global_config tcp_node udp_node use_direct_list use_proxy_list use_block_list use_gfw_list chn_list tcp_proxy_mode udp_proxy_mode filter_proxy_ipv6 dns_mode remote_dns v2ray_dns_mode remote_dns_doh remote_dns_client_ip unset enabled sid remarks sources interface tcp_no_redir_ports udp_no_redir_ports use_global_config tcp_node udp_node use_direct_list use_proxy_list use_block_list use_gfw_list chn_list tcp_proxy_mode udp_proxy_mode filter_proxy_ipv6 dns_mode remote_dns v2ray_dns_mode remote_dns_doh remote_dns_client_ip
unset _ip _mac _iprange _ipset _ip_or_mac source_list tcp_port udp_port config_file _extra_param unset _ip _mac _iprange _ipset _ip_or_mac source_list tcp_port udp_port config_file _extra_param dns_cache_key
unset _china_ng_listen _chinadns_local_dns _direct_dns_mode chinadns_ng_default_tag dnsmasq_filter_proxy_ipv6 remote_fakedns force_https_soa unset _china_ng_listen _chinadns_local_dns _direct_dns_mode chinadns_ng_default_tag dnsmasq_filter_proxy_ipv6 remote_fakedns force_https_soa
done done
unset socks_port redir_port dns_port dnsmasq_port chinadns_port unset socks_port redir_port dns_port dnsmasq_port chinadns_port
luci-app-passwall2/Makefile
+1 -1
View File
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall2 PKG_NAME:=luci-app-passwall2
PKG_VERSION:=26.4.10 PKG_VERSION:=26.4.10
PKG_RELEASE:=24 PKG_RELEASE:=25
PKG_PO_VERSION:=$(PKG_VERSION) PKG_PO_VERSION:=$(PKG_VERSION)
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
luci-app-temp-status/Makefile
+2 -2
View File
@@ -7,8 +7,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-temp-status PKG_NAME:=luci-app-temp-status
PKG_VERSION:=0.8.0 PKG_VERSION:=0.8.1
PKG_RELEASE:=1 PKG_RELEASE:=2
LUCI_TITLE:=Temperature sensors data for the LuCI status page LUCI_TITLE:=Temperature sensors data for the LuCI status page
LUCI_DEPENDS:=+ucode +ucode-mod-fs LUCI_DEPENDS:=+ucode +ucode-mod-fs
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
luci-app-temp-status/README.md
+12 -12
View File
@@ -9,29 +9,29 @@ OpenWrt >= 22.03.
**OpenWrt >= 25.12:** **OpenWrt >= 25.12:**
wget --no-check-certificate -O /tmp/luci-app-temp-status-0.8.0-r1.apk https://github.com/gSpotx2f/packages-openwrt/raw/master/25.12/luci-app-temp-status-0.8.0-r1.apk wget --no-check-certificate -O /tmp/luci-app-temp-status-0.8.1-r1.apk https://github.com/gSpotx2f/packages-openwrt/raw/master/25.12/luci-app-temp-status-0.8.1-r1.apk
apk --allow-untrusted add /tmp/luci-app-temp-status-0.8.0-r1.apk apk --allow-untrusted add /tmp/luci-app-temp-status-0.8.1-r1.apk
rm /tmp/luci-app-temp-status-0.8.0-r1.apk rm /tmp/luci-app-temp-status-0.8.1-r1.apk
service rpcd restart service rpcd restart
i18n-ru: i18n-ru:
wget --no-check-certificate -O /tmp/luci-i18n-temp-status-ru-0.8.0-r1.apk https://github.com/gSpotx2f/packages-openwrt/raw/master/25.12/luci-i18n-temp-status-ru-0.8.0-r1.apk wget --no-check-certificate -O /tmp/luci-i18n-temp-status-ru-0.8.1-r1.apk https://github.com/gSpotx2f/packages-openwrt/raw/master/25.12/luci-i18n-temp-status-ru-0.8.1-r1.apk
apk --allow-untrusted add /tmp/luci-i18n-temp-status-ru-0.8.0-r1.apk apk --allow-untrusted add /tmp/luci-i18n-temp-status-ru-0.8.1-r1.apk
rm /tmp/luci-i18n-temp-status-ru-0.8.0-r1.apk rm /tmp/luci-i18n-temp-status-ru-0.8.1-r1.apk
**OpenWrt <= 24.10:** **OpenWrt <= 24.10:**
wget --no-check-certificate -O /tmp/luci-app-temp-status_0.8.0-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/24.10/luci-app-temp-status_0.8.0-r1_all.ipk wget --no-check-certificate -O /tmp/luci-app-temp-status_0.8.1-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/24.10/luci-app-temp-status_0.8.1-r1_all.ipk
opkg install /tmp/luci-app-temp-status_0.8.0-r1_all.ipk opkg install /tmp/luci-app-temp-status_0.8.1-r1_all.ipk
rm /tmp/luci-app-temp-status_0.8.0-r1_all.ipk rm /tmp/luci-app-temp-status_0.8.1-r1_all.ipk
service rpcd restart service rpcd restart
i18n-ru: i18n-ru:
wget --no-check-certificate -O /tmp/luci-i18n-temp-status-ru_0.8.0-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/24.10/luci-i18n-temp-status-ru_0.8.0-r1_all.ipk wget --no-check-certificate -O /tmp/luci-i18n-temp-status-ru_0.8.1-r1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/24.10/luci-i18n-temp-status-ru_0.8.1-r1_all.ipk
opkg install /tmp/luci-i18n-temp-status-ru_0.8.0-r1_all.ipk opkg install /tmp/luci-i18n-temp-status-ru_0.8.1-r1_all.ipk
rm /tmp/luci-i18n-temp-status-ru_0.8.0-r1_all.ipk rm /tmp/luci-i18n-temp-status-ru_0.8.1-r1_all.ipk
## Screenshots: ## Screenshots:
luci-app-temp-status/htdocs/luci-static/resources/view/status/include/27_temperature.js
+11 -6
View File
@@ -86,12 +86,14 @@ document.head.append(E('style', {'type': 'text/css'},
display: inline-block; display: inline-block;
cursor: pointer; cursor: pointer;
margin: 2px 4px 2px 0 !important; margin: 2px 4px 2px 0 !important;
padding: 2px 4px; padding: 3px 5px;
border: 1px dotted; border: 1px solid;
border-color: transparent;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
opacity: 0.7; opacity: 0.7;
background-color: rgba(100 100 100 / 0.2);
} }
.temp-status-button:hover { .temp-status-button:hover {
opacity: 0.9; opacity: 0.9;
@@ -103,14 +105,19 @@ document.head.append(E('style', {'type': 'text/css'},
display: inline-block; display: inline-block;
cursor: pointer; cursor: pointer;
margin: 0 0.5em 0 0 !important; margin: 0 0.5em 0 0 !important;
padding: 0 4px; padding: 1px 5px;
border: 1px dotted; border: 1px dotted;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
opacity: 0.7; opacity: 0.6;
background-color: rgba(100 100 100 / 0.2);
font-weight: bold;
} }
.temp-status-hide-item:hover { .temp-status-hide-item:hover {
opacity: 0.9;
}
.temp-status-hide-item:active {
opacity: 1.0; opacity: 1.0;
} }
`)); `));
@@ -443,14 +450,12 @@ return baseclass.extend({
E('div', { 'id': 'temp-status-buttons-wrapper' }, [ E('div', { 'id': 'temp-status-buttons-wrapper' }, [
E('span', { E('span', {
'class': 'temp-status-button', 'class': 'temp-status-button',
'href' : 'javascript:void(0)',
'click': () => this.switchView(), 'click': () => this.switchView(),
}, _('Switch view')), }, _('Switch view')),
E('span', { E('span', {
'id' : 'temp-status-unhide-all', 'id' : 'temp-status-unhide-all',
'class': 'temp-status-button', 'class': 'temp-status-button',
'style': `display:${(this.hiddenItems.size > 0) ? 'inline-block' : 'none'}`, 'style': `display:${(this.hiddenItems.size > 0) ? 'inline-block' : 'none'}`,
'href' : 'javascript:void(0)',
'click': () => this.unhideAllItems(), 'click': () => this.unhideAllItems(),
}, [ }, [
_('Show hidden sensors'), _('Show hidden sensors'),
netdata/Makefile
+2 -2
View File
@@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=netdata PKG_NAME:=netdata
PKG_VERSION:=2.10.1 PKG_VERSION:=2.10.2
PKG_RELEASE:=8 PKG_RELEASE:=9
PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>, Daniel Engberg <daniel.engberg.lists@pyret.net> PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>, Daniel Engberg <daniel.engberg.lists@pyret.net>
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later