update 2023-09-01 23:36:16
This commit is contained in:
parent
d766f10d27
commit
d2410a0c71
|
@ -5,7 +5,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=luci-app-passwall2
|
PKG_NAME:=luci-app-passwall2
|
||||||
PKG_VERSION:=1.19-4
|
PKG_VERSION:=1.19-5
|
||||||
PKG_RELEASE:=
|
PKG_RELEASE:=
|
||||||
|
|
||||||
PKG_CONFIG_DEPENDS:= \
|
PKG_CONFIG_DEPENDS:= \
|
||||||
|
|
|
@ -2,7 +2,7 @@ local m, s = ...
|
||||||
|
|
||||||
local api = require "luci.passwall2.api"
|
local api = require "luci.passwall2.api"
|
||||||
|
|
||||||
if not api.is_finded("ss-redir") then
|
if not api.is_finded("ss-local") then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ local m, s = ...
|
||||||
|
|
||||||
local api = require "luci.passwall2.api"
|
local api = require "luci.passwall2.api"
|
||||||
|
|
||||||
if not api.is_finded("ssr-redir") then
|
if not api.is_finded("ssr-local") then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -100,8 +100,8 @@ add_v2ray_depends(o)
|
||||||
o = s:option(Flag, option_name("auth"), translate("Auth"))
|
o = s:option(Flag, option_name("auth"), translate("Auth"))
|
||||||
o.validate = function(self, value, t)
|
o.validate = function(self, value, t)
|
||||||
if value and value == "1" then
|
if value and value == "1" then
|
||||||
local user_v = s.fields["xray_username"]:formvalue(t) or ""
|
local user_v = s.fields[option_name("username")]:formvalue(t) or ""
|
||||||
local pass_v = s.fields["xray_password"]:formvalue(t) or ""
|
local pass_v = s.fields[option_name("password")]:formvalue(t) or ""
|
||||||
if user_v == "" or pass_v == "" then
|
if user_v == "" or pass_v == "" then
|
||||||
return nil, translate("Username and Password must be used together!")
|
return nil, translate("Username and Password must be used together!")
|
||||||
end
|
end
|
||||||
|
|
|
@ -234,7 +234,7 @@ do
|
||||||
|
|
||||||
for k, e in pairs(rules) do
|
for k, e in pairs(rules) do
|
||||||
local _node_id = node[e[".name"]] or nil
|
local _node_id = node[e[".name"]] or nil
|
||||||
if _node_id and (_node_id:find("socks://") == 1 or _node_id:find("http://") == 1) then
|
if _node_id and api.parseURL(_node_id) then
|
||||||
else
|
else
|
||||||
CONFIG[#CONFIG + 1] = {
|
CONFIG[#CONFIG + 1] = {
|
||||||
log = false,
|
log = false,
|
||||||
|
|
|
@ -160,7 +160,7 @@ function diy_send(){
|
||||||
|
|
||||||
# 清理临时文件
|
# 清理临时文件
|
||||||
function deltemp(){
|
function deltemp(){
|
||||||
unset title content ipAddress_logrow online_list online_mac mac_online_status gatewayinfo gateway_iplist
|
unset title content ipAddress_logrow online_list online_mac mac_online_status gateway_iplist
|
||||||
rm -f ${dir}title ${dir}content ${dir}tmp_downlist ${dir}send_enable.lock ${tempjsonpath} ${dir}cookies.txt ${dir}tmp_sort_file >/dev/null 2>&1
|
rm -f ${dir}title ${dir}content ${dir}tmp_downlist ${dir}send_enable.lock ${tempjsonpath} ${dir}cookies.txt ${dir}tmp_sort_file >/dev/null 2>&1
|
||||||
[ ! -f ${dir}ipAddress ] && rm -f ${dir}client/* >/dev/null 2>&1
|
[ ! -f ${dir}ipAddress ] && rm -f ${dir}client/* >/dev/null 2>&1
|
||||||
LockFile unlock
|
LockFile unlock
|
||||||
|
@ -1756,4 +1756,4 @@ while [ "$enable" -eq "1" ]; do
|
||||||
done
|
done
|
||||||
|
|
||||||
sleep $sleeptime
|
sleep $sleeptime
|
||||||
done
|
done
|
||||||
|
|
|
@ -6,12 +6,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=sing-box
|
PKG_NAME:=sing-box
|
||||||
PKG_VERSION:=1.4.0
|
PKG_VERSION:=1.4.1
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)?
|
PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)?
|
||||||
PKG_HASH:=ab6698545442e9197339f459553e241ff91396ba39a8e5d14e0a792e78d290a0
|
PKG_HASH:=5b8a576639e24640b76f5ee175aa83a54bf9a68f3a6de1650c3067f0f0405e7d
|
||||||
|
|
||||||
PKG_LICENSE:=GPL-3.0-or-later
|
PKG_LICENSE:=GPL-3.0-or-later
|
||||||
PKG_LICENSE_FILES:=LICENSE
|
PKG_LICENSE_FILES:=LICENSE
|
||||||
|
|
Loading…
Reference in New Issue