update-09.16

This commit is contained in:
github-actions[bot] 2021-09-16 00:59:27 +08:00
parent f69ce67495
commit d2553e5a3d
12 changed files with 13 additions and 13 deletions

View File

@ -174,14 +174,15 @@ EOF
ruby -ryaml -E UTF-8 -e " ruby -ryaml -E UTF-8 -e "
begin begin
Value = YAML.load_file('$1'); Value = YAML.load_file('$1');
reg = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/; reg = /^((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])(?::(?:[0-9]|[1-9][0-9]{1,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5]))?$/;
reg6 = /^(?:(?:(?:[0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))|\[(?:(?:(?:[0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))\](?::(?:[0-9]|[1-9][0-9]{1,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5]))?$/i;
if Value['dns'].has_key?('fallback') then if Value['dns'].has_key?('fallback') then
Value_1=Value['dns']['nameserver'] | Value['dns']['fallback'] Value_1=Value['dns']['nameserver'] | Value['dns']['fallback']
else else
Value_1=Value['dns']['nameserver'] Value_1=Value['dns']['nameserver']
end; end;
Value_1.each{|x| Value_1.each{|x|
if x =~ reg then if x =~ reg or x =~ reg6 then
if Value['dns'].has_key?('default-nameserver') then if Value['dns'].has_key?('default-nameserver') then
Value['dns']['default-nameserver']=Value['dns']['default-nameserver'].to_a.insert(-1,x).uniq Value['dns']['default-nameserver']=Value['dns']['default-nameserver'].to_a.insert(-1,x).uniq
else else

View File

@ -2,9 +2,9 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-pushbot PKG_NAME:=luci-app-pushbot
PKG_VERSION:=3.55 PKG_VERSION:=3.55
PKG_RELEASE:=15 PKG_RELEASE:=16
PKG_MAINTAINER:=tty228 zzsj0928 PKG_MAINTAINER:=tty228 <tty228@yeah.net> zzsj0928
LUCI_TITLE:=LuCI support for Pushbot LUCI_TITLE:=LuCI support for Pushbot
LUCI_PKGARCH:=all LUCI_PKGARCH:=all

View File

@ -2,5 +2,5 @@ f = SimpleForm("pushbot")
luci.sys.call("/usr/bin/pushbot/pushbot client") luci.sys.call("/usr/bin/pushbot/pushbot client")
f.reset = false f.reset = false
f.submit = false f.submit = false
f:append(Template("pushbot/client")) f:append(Template("pushbot/pushbot_client"))
return f return f

View File

@ -1,5 +1,5 @@
f = SimpleForm("pushbot") f = SimpleForm("pushbot")
f.reset = false f.reset = false
f.submit = false f.submit = false
f:append(Template("pushbot/log")) f:append(Template("pushbot/pushbot_log"))
return f return f

View File

@ -8,4 +8,3 @@ config pushbot 'pushbot'
option cpuload_enable '1' option cpuload_enable '1'
option cpuload '2' option cpuload '2'
option temperature_enable '0' option temperature_enable '0'

View File

@ -3,4 +3,4 @@ ipv4.ddnspod.com
ifcfg.cn ifcfg.cn
speed.neu.edu.cn/getIP.php speed.neu.edu.cn/getIP.php
ddns.oray.com/checkip ddns.oray.com/checkip
www.net.cn/static/customercare/yourip.asp www.net.cn/static/customercare/yourip.asp

View File

@ -2,4 +2,4 @@ ip.sb
ipv6.ddnspod.com ipv6.ddnspod.com
api-ipv6.ip.sb/ip api-ipv6.ip.sb/ip
speed.neu6.edu.cn/getIP.php speed.neu6.edu.cn/getIP.php
v6.myip.la/json v6.myip.la/json

View File

@ -519,7 +519,7 @@ function get_client(){
local js_str="${js_str}<div class='th'><%:${tmp_uptime}%></div></div>" local js_str="${js_str}<div class='th'><%:${tmp_uptime}%></div></div>"
done < ${dir}ipAddress done < ${dir}ipAddress
fi fi
cat>/usr/lib/lua/luci/view/pushbot/client.htm<<EOF cat>/usr/lib/lua/luci/view/pushbot/pushbot_client.htm<<EOF
<h2><%:在线设备列表%></h2><div class="table" id="traffic"><div class="tr table-titles"><div class="th" id="thClient" style="width:17%"><%:客户端名%></div><div class="th" id="thMAC" style="width:10%"><%:MAC%></div><div class="th" id="thIP" style="width:17%"><%:IP%></div><div class="th" id="thTotal" style="width:9%"><%:总计流量%></div><div class="th" id="thFirstSeen" style="width:15%"><%:在线时间%></div></div> <h2><%:在线设备列表%></h2><div class="table" id="traffic"><div class="tr table-titles"><div class="th" id="thClient" style="width:17%"><%:客户端名%></div><div class="th" id="thMAC" style="width:10%"><%:MAC%></div><div class="th" id="thIP" style="width:17%"><%:IP%></div><div class="th" id="thTotal" style="width:9%"><%:总计流量%></div><div class="th" id="thFirstSeen" style="width:15%"><%:在线时间%></div></div>
$js_str $js_str
</div> </div>

View File

View File

@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=naiveproxy PKG_NAME:=naiveproxy
PKG_VERSION:=93.0.4577.63-1 PKG_VERSION:=93.0.4577.63-2
PKG_RELEASE:=$(AUTORELEASE) PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/klzgrad/naiveproxy/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/klzgrad/naiveproxy/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=dc2e76f8ad5b92931deb0db799e35d9a74975f625d568bebda84a63d3274bb01 PKG_HASH:=091fa8129f390cc90530f92b0e9c90f1e7bb131f3f9e5bcda192a782bf7af19e
PKG_LICENSE:=BSD 3-Clause PKG_LICENSE:=BSD 3-Clause
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE

View File

@ -87,6 +87,6 @@ case "${target_arch}" in
;; ;;
"mips"|"mips64"|"mipsel"|"mips64el") "mips"|"mips64"|"mipsel"|"mips64el")
naive_flags+=" use_gold=false is_cfi=false use_cfi_icall=false use_thin_lto=false mips_arch_variant=\"r2\"" naive_flags+=" use_gold=false is_cfi=false use_cfi_icall=false use_thin_lto=false mips_arch_variant=\"r2\""
[[ "${target_arch}" =~ ^"mips"$|^"mipsel"$ ]] && naive_flags+=" mips_float_abi=\"soft\" mips_tune=\"${cpu_type}\"" [[ "${target_arch}" =~ ^"mips"$|^"mipsel"$ ]] && naive_flags+=" mips_float_abi=\"soft\" mips_tune=\"${cpu_type}\" chrome_pgo_phase=0"
;; ;;
esac esac