fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Mainline

Browse Source
This commit is contained in:
CN_SZTL 2020-08-14 02:30:28 +08:00
commit b37fafcb78
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
8 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/libs/libselinux/Makefile
View File

@ -50,6 +50,7 @@ HOST_MAKE_FLAGS += \
MAKE_FLAGS += \
FTS_LDLIBS=-lfts \
SHLIBDIR=/usr/lib \
OS=Linux
define Build/Compile
$(call Build/Compile/Default,all)

3
package/libs/libsepol/Makefile
View File

@ -36,7 +36,8 @@ HOST_MAKE_FLAGS += \
SHLIBDIR=$(STAGING_DIR_HOSTPKG)/lib
MAKE_FLAGS += \
SHLIBDIR=/usr/lib
SHLIBDIR=/usr/lib \
OS=Linux
define Build/Compile
$(call Build/Compile/Default,all)

4
package/lienol/luci-app-passwall/Makefile
View File

@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall
PKG_VERSION:=3.9
PKG_RELEASE:=36
PKG_DATE:=20200812
PKG_RELEASE:=37
PKG_DATE:=20200813
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

2
package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_config.lua
View File

@ -85,9 +85,11 @@ end
if api.is_finded("brook") then
type:value("Brook", translate("Brook"))
end
--[[
if api.is_finded("trojan-plus") or api.is_finded("trojan") then
type:value("Trojan", translate("Trojan"))
end
]]--
if api.is_finded("trojan-plus") then
type:value("Trojan-Plus", translate("Trojan-Plus"))
end

4
package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua
View File

@ -69,9 +69,11 @@ end
if api.is_finded("brook") then
type:value("Brook", translate("Brook"))
end
--[[
if api.is_finded("trojan-plus") or api.is_finded("trojan") then
type:value("Trojan", translate("Trojan"))
end
]]--
if api.is_finded("trojan-plus") then
type:value("Trojan-Plus", translate("Trojan-Plus"))
end
@ -246,7 +248,7 @@ tls_sessionTicket:depends("stream_security", "tls")
tls_serverName = s:option(Value, "tls_serverName", translate("Domain"))
tls_serverName:depends("stream_security", "tls")
tls_allowInsecure = s:option(Flag, "tls_allowInsecure", translate("allowInsecure"), translate("Whether unsafe connections are allowed. When checked, V2Ray does not check the validity of the TLS certificate provided by the remote host."))
tls_allowInsecure = s:option(Flag, "tls_allowInsecure", translate("allowInsecure"), translate("Whether unsafe connections are allowed. When checked, Certificate validation will be skipped."))
tls_allowInsecure.default = "0"
tls_allowInsecure:depends("stream_security", "tls")

2
package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm
View File

@ -566,7 +566,7 @@ local dsp = require "luci.dispatcher"
opt.set('address', ssm.add);
opt.set('port', ssm.port);
opt.set('alter_id', ssm.aid);
opt.set('vmess_id', ssm.id);
opt.set('uuid', ssm.id);
opt.set('stream_security', ssm.tls === "tls" ? "tls" : "none");
opt.get('stream_security').dispatchEvent(event);
if (ssm.tls === "tls") {

4
package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh
View File

@ -289,9 +289,9 @@ load_config() {
else
process=$(config_t_get global_forwarding process)
fi
LOCAL_DNS=$(config_t_get global up_china_dns dnsbyisp | sed 's/:/#/g')
LOCAL_DNS=$(config_t_get global up_china_dns default | sed 's/:/#/g')
[ -f "${RESOLVFILE}" ] && [ -s "${RESOLVFILE}" ] || RESOLVFILE=/tmp/resolv.conf.auto
DEFAULT_DNS=$(sed -n 's/^nameserver[ \t]*\([^ ]*\)$/\1/p' "${RESOLVFILE}" | grep -v "0.0.0.0" | grep -v "127.0.0.1" | grep -v "^::$" | head -2 | tr '\n' ',')
DEFAULT_DNS=$(echo -n $(sed -n 's/^nameserver[ \t]*\([^ ]*\)$/\1/p' "${RESOLVFILE}" | grep -v "0.0.0.0" | grep -v "127.0.0.1" | grep -v "^::$" | head -2) | tr ' ' ',')
if [ "${LOCAL_DNS}" = "default" ]; then
IS_DEFAULT_DNS=1
LOCAL_DNS="${DEFAULT_DNS:-119.29.29.29}"

2
tools/coreutils/Makefile
View File

@ -16,7 +16,7 @@ PKG_HASH:=8891d349ee87b9ff7870f52b6d9312a9db672d2439d289bc57084771ca21656b
HOST_BUILD_PARALLEL := 1
BUILD_PROGRAMS = date readlink touch
BUILD_PROGRAMS = date readlink touch ln
include $(INCLUDE_DIR)/host-build.mk