OpenWrt
/
small-package
mirror of https://github.com/kenzok8/small-package
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update 04-27 16:50:25

This commit is contained in:
github-actions[bot] 2022-04-27 16:50:25 +08:00
parent 35fb873d36
commit f7326b35a2
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-amlogic/Makefile
View File

@ -18,7 +18,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-amlogic PKG_NAME:=luci-app-amlogic
PKG_VERSION:=3.1.84 PKG_VERSION:=3.1.85
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0 License PKG_LICENSE:=GPL-2.0 License

1
luci-app-amlogic/root/usr/sbin/openwrt-install-amlogic
View File

@ -144,6 +144,7 @@ else
5a:TX3 BZ (OverClock):s905x3:meson-sm1-tx3-bz-oc.dtb:u-boot-tx3-bz.bin:/lib/u-boot/x96maxplus-u-boot.bin.sd.bin::4C@2208Mhz,4GB Mem,100Mb Nic,bcm4330 wifi 5a:TX3 BZ (OverClock):s905x3:meson-sm1-tx3-bz-oc.dtb:u-boot-tx3-bz.bin:/lib/u-boot/x96maxplus-u-boot.bin.sd.bin::4C@2208Mhz,4GB Mem,100Mb Nic,bcm4330 wifi
5b:TX3 QZ:s905x3:meson-sm1-tx3-qz.dtb:u-boot-tx3-qz.bin:/lib/u-boot/x96maxplus-u-boot.bin.sd.bin::4C@2100Mhz,4GB Mem,1Gb Nic,bcm4330 wifi 5b:TX3 QZ:s905x3:meson-sm1-tx3-qz.dtb:u-boot-tx3-qz.bin:/lib/u-boot/x96maxplus-u-boot.bin.sd.bin::4C@2100Mhz,4GB Mem,1Gb Nic,bcm4330 wifi
5c:TX3 QZ (OverClock):s905x3:meson-sm1-tx3-qz-oc.dtb:u-boot-tx3-qz.bin:/lib/u-boot/x96maxplus-u-boot.bin.sd.bin::4C@2208Mhz,4GB Mem,1Gb Nic,bcm4330 wifi 5c:TX3 QZ (OverClock):s905x3:meson-sm1-tx3-qz-oc.dtb:u-boot-tx3-qz.bin:/lib/u-boot/x96maxplus-u-boot.bin.sd.bin::4C@2208Mhz,4GB Mem,1Gb Nic,bcm4330 wifi
5d:X96 Max+ (IP1001M phy):s905x3:meson-sm1-x96-max-plus-ip1001m.dtb:u-boot-x96maxplus.bin:/lib/u-boot/x96maxplus-u-boot.bin.sd.bin:NA:4C@2208Mhz,4GB Mem,1Gb Nic (IP1001M phy),bcm4354 wifi
# Other # Other
0:Other::NA:NA:NA:NA:Enter the dtb file name of your box 0:Other::NA:NA:NA:NA:Enter the dtb file name of your box

2
luci-app-passwall2/Makefile
View File

@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall2 PKG_NAME:=luci-app-passwall2
PKG_VERSION:=1.3 PKG_VERSION:=1.3
PKG_RELEASE:=20 PKG_RELEASE:=21
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_$(PKG_NAME)_Transparent_Proxy \ CONFIG_PACKAGE_$(PKG_NAME)_Transparent_Proxy \

9
luci-app-passwall2/luasrc/model/cbi/passwall2/api/gen_v2ray.lua
View File

@ -566,6 +566,7 @@ end
if remote_dns_server or remote_dns_doh_url or remote_dns_fake then if remote_dns_server or remote_dns_doh_url or remote_dns_fake then
local rules = {} local rules = {}
local _remote_dns_proto
if not routing then if not routing then
routing = { routing = {
@ -619,11 +620,13 @@ if remote_dns_server or remote_dns_doh_url or remote_dns_fake then
if remote_dns_udp_server then if remote_dns_udp_server then
_remote_dns.address = remote_dns_udp_server _remote_dns.address = remote_dns_udp_server
_remote_dns.port = tonumber(remote_dns_port) or 53 _remote_dns.port = tonumber(remote_dns_port) or 53
_remote_dns_proto = "udp"
end end
if remote_dns_tcp_server then if remote_dns_tcp_server then
_remote_dns.address = remote_dns_tcp_server _remote_dns.address = remote_dns_tcp_server
_remote_dns.port = tonumber(remote_dns_port) or 53 _remote_dns.port = tonumber(remote_dns_port) or 53
_remote_dns_proto = "tcp"
end end
if remote_dns_doh_url and remote_dns_doh_host then if remote_dns_doh_url and remote_dns_doh_host then
@ -632,6 +635,7 @@ if remote_dns_server or remote_dns_doh_url or remote_dns_fake then
end end
_remote_dns.address = remote_dns_doh_url _remote_dns.address = remote_dns_doh_url
_remote_dns.port = tonumber(remote_dns_port) or 443 _remote_dns.port = tonumber(remote_dns_port) or 443
_remote_dns_proto = "tcp"
end end
if remote_dns_fake then if remote_dns_fake then
@ -673,6 +677,8 @@ if remote_dns_server or remote_dns_doh_url or remote_dns_fake then
ip = { ip = {
direct_dns_udp_server direct_dns_udp_server
}, },
port = tonumber(direct_dns_port) or 53,
network = "udp",
outboundTag = "direct" outboundTag = "direct"
}) })
end end
@ -711,7 +717,8 @@ if remote_dns_server or remote_dns_doh_url or remote_dns_fake then
protocol = "dns", protocol = "dns",
settings = { settings = {
address = remote_dns_server or "1.1.1.1", address = remote_dns_server or "1.1.1.1",
network = "tcp" port = tonumber(remote_dns_port) or 53,
network = _remote_dns_proto or "tcp",
} }
}) })