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

Compare commits

base: zhao:54ea577c2ddb9b90cff9af47465ff0c9e008552c
Branches Tags
zhao:v5
...
compare: zhao:321573fa35139995a857c08225fc68718fef5543
Branches Tags
zhao:v5

3 Commits
54ea577c2d ... 321573fa35

Author SHA1 Message Date
gitea-action
321573fa35 luci-app-passwall: sync upstream 
last commit: a998426839
 2025-03-27 23:30:26 +08:00
gitea-action
af0082f674 chinadns-ng: update to 2025.03.27 2025-03-27 21:02:56 +08:00
gitea-action
d926e58385 sing-box: update to 1.11.6 2025-03-27 20:30:34 +08:00
16 changed files with 28 additions and 28 deletions
Show Stats Expand all files Collapse all files

24
chinadns-ng/Makefile
View File

@ -1,47 +1,47 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=chinadns-ng
PKG_VERSION:=2024.12.22
PKG_VERSION:=2025.03.27
PKG_RELEASE:=1
ifeq ($(ARCH),aarch64)
ifeq ($(BOARD),rockchip)
PKG_ARCH:=chinadns-ng+wolfssl@aarch64-linux-musl@generic+v8a@fast+lto
PKG_HASH:=2e17092170abf989c5333a021cdb6789059069a24cf06856a5805336b99fd1a7
PKG_HASH:=2b3f77f1526da452c1884119dd01176a7964e0d3544b9fc624f67b2a7760613d
else
PKG_ARCH:=chinadns-ng+wolfssl_noasm@aarch64-linux-musl@generic+v8a@fast+lto
PKG_HASH:=a4d58dc9f9a6d49133f008b4f3941486396934ae2b3f9ebf9b8bf5e3d1cf656b
PKG_HASH:=0d6f5f742a3c81f907639b5e1ef2b727870f7aafc67010728e88a7968079b9c0
endif
else ifeq ($(ARCH),arm)
ARM_CPU_FEATURES:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE))))
ifeq ($(ARM_CPU_FEATURES),)
PKG_ARCH:=chinadns-ng+wolfssl@arm-linux-musleabi@generic+v6+soft_float@fast+lto
PKG_HASH:=e0af25ed7516b4e2bffd8cfb22b45cc1dbdeb47bce02f6495ca8ea1c407fd75c
PKG_HASH:=2d972e864a90d1c5e7c874e8ff1f1229fddc03e869c7be9f3b4bf4347a7f150a
else
PKG_ARCH:=chinadns-ng+wolfssl@arm-linux-musleabihf@generic+v7a@fast+lto
PKG_HASH:=e7a42ed517c73c56bdd7ddf52b5e1263b7aea488ceb82c303278fc7760353b90
PKG_HASH:=77faf3fea926752e2ab54a4d32b3de1c29ada8e075921a0e5bb219285d34d938
endif
else ifeq ($(ARCH),mips)
PKG_ARCH:=chinadns-ng+wolfssl@mips-linux-musl@mips32+soft_float@fast+lto
PKG_HASH:=926811e55d46ed275f678b62d9fe67e35a053243475306c391b1c3c6a61d9710
PKG_HASH:=b8ae32305069cccf01ef2704633ab326d69bd8ef7cfb71a30722d71e9cd6787e
else ifeq ($(ARCH),mipsel)
PKG_ARCH:=chinadns-ng+wolfssl@mipsel-linux-musl@mips32+soft_float@fast+lto
PKG_HASH:=071ed28e06f9306b4f25c2b9a9bb83ddcfb4dde0cc08d0b232efd772f8a8792a
PKG_HASH:=f12ce9b5227fefbf82401bd22379a52f2ec157c7cbe7e7dbdd2c0b2599e3a323
else ifeq ($(ARCH),mips64)
PKG_ARCH:=chinadns-ng+wolfssl@mips64-linux-musl@mips64+soft_float@fast+lto
PKG_HASH:=b79090caee28ce266829ae82edb97ac18c65c6c570625912533d46753def0515
PKG_HASH:=658d2f46caad44ba731193380b06faaeaa82501766584a6208ec4ff54d9b16e5
else ifeq ($(ARCH),mips64el)
PKG_ARCH:=chinadns-ng+wolfssl@mips64el-linux-musl@mips64+soft_float@fast+lto
PKG_HASH:=bafed35c8e081d8781651180bd3929542704e098ef5fbcf92a6aa7a75e5498b0
PKG_HASH:=f2f5617e0348ef621e2cb41ed6c56d6911ae5d21e68cc9063b69ce99c1f54938
else ifeq ($(ARCH),i386)
PKG_ARCH:=chinadns-ng+wolfssl@i386-linux-musl@i686@fast+lto
PKG_HASH:=1149d9fdcf0ca798c63624e62e6c76314aa7b0940e782cc0d064e618772c4b22
PKG_HASH:=d9d0c3c38ca5b3ac266ae5753a0d87b37f571a6e2a8806699f858ad348afbf5e
else ifeq ($(ARCH),riscv64)
PKG_ARCH:=chinadns-ng+wolfssl@riscv64-linux-musl@baseline_rv64@fast+lto
PKG_HASH:=202eeb3f9a9a404defdc10b55ace25f4b2cbc82ff80d3cdf5f7274aa0c804213
PKG_HASH:=8bf3e88c78f537595651cb1ad40196c36d4bf5c1796ff70990523784409f8155
else ifeq ($(ARCH),x86_64)
PKG_ARCH:=chinadns-ng+wolfssl@x86_64-linux-musl@x86_64@fast+lto
PKG_HASH:=4b9548191b856690182f98b721512b9a50004986ecebf6eeed71cb709acbd1f5
PKG_HASH:=37b337f1006b85176840f1b82508731a292751d1ee94bb3791578d04d63f856f
else
PKG_HASH:=dummy
endif

2
luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua
View File

@ -11,7 +11,7 @@ end
local fs = api.fs
local sys = api.sys
local has_singbox = api.finded_com("singbox")
local has_singbox = api.finded_com("sing-box")
local has_xray = api.finded_com("xray")
local has_geoview = api.is_finded("geoview")
local has_gfwlist = fs.access("/usr/share/passwall/rules/gfwlist")

2
luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
View File

@ -2,7 +2,7 @@ local api = require "luci.passwall.api"
local appname = "passwall"
local datatypes = api.datatypes
local fs = api.fs
local has_singbox = api.finded_com("singbox")
local has_singbox = api.finded_com("sing-box")
local has_xray = api.finded_com("xray")
local has_geoview = api.is_finded("geoview")
local has_gfwlist = fs.access("/usr/share/passwall/rules/gfwlist")

2
luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua
View File

@ -4,7 +4,7 @@ local appname = "passwall"
local has_ss = api.is_finded("ss-redir")
local has_ss_rust = api.is_finded("sslocal")
local has_trojan_plus = api.is_finded("trojan-plus")
local has_singbox = api.finded_com("singbox")
local has_singbox = api.finded_com("sing-box")
local has_xray = api.finded_com("xray")
local has_hysteria2 = api.finded_com("hysteria")
local ss_type = {}

2
luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua
View File

@ -25,7 +25,7 @@ end
local has_ss = api.is_finded("ss-redir")
local has_ss_rust = api.is_finded("sslocal")
local has_trojan_plus = api.is_finded("trojan-plus")
local has_singbox = api.finded_com("singbox")
local has_singbox = api.finded_com("sing-box")
local has_xray = api.finded_com("xray")
local has_hysteria2 = api.finded_com("hysteria")
local ss_type = {}

2
luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua
View File

@ -1,7 +1,7 @@
local api = require "luci.passwall.api"
local appname = "passwall"
local fs = api.fs
local has_singbox = api.finded_com("singbox")
local has_singbox = api.finded_com("sing-box")
local has_xray = api.finded_com("xray")
local has_fw3 = api.is_finded("fw3")
local has_fw4 = api.is_finded("fw4")

2
luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua
View File

@ -1,7 +1,7 @@
local api = require "luci.passwall.api"
local appname = "passwall"
local has_xray = api.finded_com("xray")
local has_singbox = api.finded_com("singbox")
local has_singbox = api.finded_com("sing-box")
m = Map(appname)
api.set_apply_on_parse(m)

2
luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua
View File

@ -9,7 +9,7 @@ if not arg[1] or not m:get(arg[1]) then
luci.http.redirect(m.redirect)
end
local has_singbox = api.finded_com("singbox")
local has_singbox = api.finded_com("sing-box")
local has_xray = api.finded_com("xray")
local nodes_table = {}

2
luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua
View File

@ -2,7 +2,7 @@ local m, s = ...
local api = require "luci.passwall.api"
local singbox_bin = api.finded_com("singbox")
local singbox_bin = api.finded_com("sing-box")
local geoview_bin = api.is_finded("geoview")
if not singbox_bin then

2
luci-app-passwall/luasrc/model/cbi/passwall/server/type/sing-box.lua
View File

@ -2,7 +2,7 @@ local m, s = ...
local api = require "luci.passwall.api"
local singbox_bin = api.finded_com("singbox")
local singbox_bin = api.finded_com("sing-box")
if not singbox_bin then
return

2
luci-app-passwall/luasrc/passwall/com.lua
View File

@ -24,7 +24,7 @@ _M.hysteria = {
}
}
_M.singbox = {
_M["sing-box"] = {
name = "Sing-Box",
repo = "SagerNet/sing-box",
get_url = gh_release_url,

2
luci-app-passwall/luasrc/passwall/server_app.lua
View File

@ -142,7 +142,7 @@ local function start()
bin = ln_run("/usr/bin/ssserver", "ssserver", "-c " .. config_file, log_path)
elseif type == "sing-box" then
config = require(require_dir .. "util_sing-box").gen_config_server(user)
bin = ln_run(api.get_app_path("singbox"), "sing-box", "run -c " .. config_file, log_path)
bin = ln_run(api.get_app_path("sing-box"), "sing-box", "run -c " .. config_file, log_path)
elseif type == "Xray" then
config = require(require_dir .. "util_xray").gen_config_server(user)
bin = ln_run(api.get_app_path("xray"), "xray", "run -c " .. config_file, log_path)

2
luci-app-passwall/luasrc/passwall/util_sing-box.lua
View File

@ -7,7 +7,7 @@ local appname = "passwall"
local fs = api.fs
local split = api.split
local local_version = api.get_app_version("singbox")
local local_version = api.get_app_version("sing-box")
local version_ge_1_11_0 = api.compare_versions(local_version:match("[^v]+"), ">=", "1.11.0")
local geosite_all_tag = {}

2
luci-app-passwall/root/usr/share/passwall/subscribe.lua
View File

@ -24,7 +24,7 @@ uci:revert(appname)
local has_ss = api.is_finded("ss-redir")
local has_ss_rust = api.is_finded("sslocal")
local has_trojan_plus = api.is_finded("trojan-plus")
local has_singbox = api.finded_com("singbox")
local has_singbox = api.finded_com("sing-box")
local has_xray = api.finded_com("xray")
local has_hysteria2 = api.finded_com("hysteria")
local allowInsecure_default = nil

2
patch-luci-app-passwall.patch
View File

@ -20,7 +20,7 @@ index ae464ba..54b5f1a 100644
define Package/$(PKG_NAME)/postrm
diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
index 12adebe..fa97b4a 100644
index 7bdfb3e..4cf5159 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
@@ -509,6 +509,12 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9)")

4
sing-box/Makefile
View File

@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=sing-box
PKG_VERSION:=1.11.5
PKG_VERSION:=1.11.6
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=ac95287a65ae9297aa0b9f25934ead8468bf7ef3f9045e483659ddc400e758a1
PKG_HASH:=01b697683c2433d93e3a15a362241e5e709c01a8e4cc97c889f6d2c5f9db275e
PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=LICENSE