zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: zhao:df8ffb89df74d92584d9ce97a1c3b2bea4892ac4
Branches Tags
zhao:v5
..
compare: zhao:2674e557e0c3012da03e6788b9fcfef917ad4323
Branches Tags
zhao:v5

2 Commits
df8ffb89df ... 2674e557e0

Author SHA1 Message Date
gitea-action
2674e557e0 luci-app-passwall: sync upstream 
last commit: 37933be15e
 2025-05-18 23:31:00 +08:00
gitea-action
80d2381325 sing-box: update to 1.11.11 2025-05-18 21:30:33 +08:00
2 changed files with 6 additions and 8 deletions
Show Stats Expand all files Collapse all files

10
luci-app-passwall/root/usr/share/passwall/helper_dnsmasq.lua
View File

@ -672,6 +672,10 @@ function add_rule(var)
if LISTEN_PORT then if LISTEN_PORT then
--Copy dnsmasq instance --Copy dnsmasq instance
conf_lines = copy_instance({["-LISTEN_PORT"] = LISTEN_PORT, ["-TMP_DNSMASQ_PATH"] = TMP_DNSMASQ_PATH, ["-return"] = "1"}) conf_lines = copy_instance({["-LISTEN_PORT"] = LISTEN_PORT, ["-TMP_DNSMASQ_PATH"] = TMP_DNSMASQ_PATH, ["-return"] = "1"})
--dhcp.leases to hosts
local hosts = "/tmp/etc/" .. appname .. "_tmp/dhcp-hosts"
sys.call("touch " .. hosts)
tinsert(conf_lines, "addn-hosts=" .. hosts)
else else
--Modify the default dnsmasq service --Modify the default dnsmasq service
end end
@ -693,12 +697,6 @@ function add_rule(var)
api.set_cache_var("DEFAULT_DNS", DEFAULT_DNS) api.set_cache_var("DEFAULT_DNS", DEFAULT_DNS)
end end
end end
--dhcp.leases to hosts
local hosts = "/tmp/etc/" .. appname .. "_tmp/dhcp-hosts"
sys.call("touch " .. hosts)
tinsert(conf_lines, "addn-hosts=" .. hosts)
if #conf_lines > 0 then if #conf_lines > 0 then
local conf_out = io.open(DNSMASQ_CONF_FILE, "a") local conf_out = io.open(DNSMASQ_CONF_FILE, "a")
conf_out:write(table.concat(conf_lines, "\n")) conf_out:write(table.concat(conf_lines, "\n"))

4
sing-box/Makefile
View File

@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=sing-box PKG_NAME:=sing-box
PKG_VERSION:=1.11.10 PKG_VERSION:=1.11.11
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:=b79281cbe1a9585bf53855ebc9513ccf2fe772983c4926554389ba0f5598da3e PKG_HASH:=31cc321efaa2fe9f3e3be9b065354552378f5a1dac49f6a24ce7e48d8a6c8979
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE