From 19297feced172d5c4a833e1a9b08a13dc7c25815 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 00:22:06 +0800 Subject: [PATCH] update 2024-02-28 00:22:06 --- .../resources/view/homeproxy/client.js | 2 +- luci-app-homeproxy/po/templates/homeproxy.pot | 5 +--- luci-app-homeproxy/po/zh_Hans/homeproxy.po | 7 ++---- luci-app-passwall/Makefile | 5 ++-- .../luasrc/view/passwall/global/status.htm | 12 +++++----- .../root/usr/share/passwall/iptables.sh | 10 ++++---- .../core/root/usr/share/xray/gen_config.uc | 2 +- .../luci-static/resources/view/xray/core.js | 2 +- mosdns/Makefile | 2 -- quickstart/Makefile | 4 ++-- v2dat/Makefile | 2 -- xray-core/patches/010-go1.21.patch | 10 ++++++++ .../0001-fix-go-1.21-build-error.patch | 24 +++++++++++++++++++ 13 files changed, 54 insertions(+), 33 deletions(-) create mode 100644 xray-core/patches/010-go1.21.patch create mode 100644 xray-plugin/patches/0001-fix-go-1.21-build-error.patch diff --git a/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js b/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js index dcfdfd255..73ec40602 100644 --- a/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js +++ b/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js @@ -198,7 +198,7 @@ return view.extend({ var ipv6_support = this.map.lookupOption('ipv6_support', section_id)[0].formvalue(section_id); if (dns_servers.length > 2) - return _('You can only have 2 servers set at maximum.'); + return _('You can only have two servers set at maximum.'); for (var i of dns_servers) if (!stubValidator.apply((ipv6_support === '1') ? 'ipaddr' : 'ip4addr', i)) diff --git a/luci-app-homeproxy/po/templates/homeproxy.pot b/luci-app-homeproxy/po/templates/homeproxy.pot index 193dd40d3..bfb372408 100644 --- a/luci-app-homeproxy/po/templates/homeproxy.pot +++ b/luci-app-homeproxy/po/templates/homeproxy.pot @@ -2316,15 +2316,12 @@ msgstr "" msgid "Xudp (Xray-core)" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:201 -msgid "You can only have 2 servers set at maximum." -msgstr "" - #: htdocs/luci-static/resources/view/homeproxy/client.js:159 msgid "You can only have one server set. It MUST support TCP query." msgstr "" #: htdocs/luci-static/resources/view/homeproxy/client.js:186 +#: htdocs/luci-static/resources/view/homeproxy/client.js:201 msgid "You can only have two servers set at maximum." msgstr "" diff --git a/luci-app-homeproxy/po/zh_Hans/homeproxy.po b/luci-app-homeproxy/po/zh_Hans/homeproxy.po index e465dec04..6b8789223 100644 --- a/luci-app-homeproxy/po/zh_Hans/homeproxy.po +++ b/luci-app-homeproxy/po/zh_Hans/homeproxy.po @@ -2375,17 +2375,14 @@ msgstr "信风公共 DNS（114.114.114.114）" msgid "Xudp (Xray-core)" msgstr "Xudp (Xray-core)" -#: htdocs/luci-static/resources/view/homeproxy/client.js:201 -msgid "You can only have 2 servers set at maximum." -msgstr "您最多只能设置两个服务器。" - #: htdocs/luci-static/resources/view/homeproxy/client.js:159 msgid "You can only have one server set. It MUST support TCP query." msgstr "您只能设置一个服务器。它必须支持 TCP 查询。" #: htdocs/luci-static/resources/view/homeproxy/client.js:186 +#: htdocs/luci-static/resources/view/homeproxy/client.js:201 msgid "You can only have two servers set at maximum." -msgstr "" +msgstr "您最多只能设置两个服务器。" #: htdocs/luci-static/resources/homeproxy.js:228 msgid "Your %s was successfully uploaded. Size: %sB." diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index 4ff6e386d..7f8da6392 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall -PKG_VERSION:=4.75-1 +PKG_VERSION:=4.75-2 PKG_RELEASE:= PKG_CONFIG_DEPENDS:= \ @@ -38,6 +38,7 @@ LUCI_DEPENDS:=+coreutils +coreutils-base64 +coreutils-nohup +curl \ define Package/$(PKG_NAME)/config menu "Configuration" + depends on PACKAGE_$(PKG_NAME) config PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy bool "Iptables Transparent Proxy" @@ -51,7 +52,6 @@ config PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy select PACKAGE_iptables-mod-socket select PACKAGE_iptables-mod-tproxy select PACKAGE_kmod-ipt-nat - depends on PACKAGE_$(PKG_NAME) default y if ! PACKAGE_firewall4 config PACKAGE_$(PKG_NAME)_Nftables_Transparent_Proxy @@ -62,7 +62,6 @@ config PACKAGE_$(PKG_NAME)_Nftables_Transparent_Proxy select PACKAGE_kmod-nft-socket select PACKAGE_kmod-nft-tproxy select PACKAGE_kmod-nft-nat - depends on PACKAGE_$(PKG_NAME) default y if PACKAGE_firewall4 config PACKAGE_$(PKG_NAME)_INCLUDE_Haproxy diff --git a/luci-app-passwall/luasrc/view/passwall/global/status.htm b/luci-app-passwall/luasrc/view/passwall/global/status.htm index a94131218..e6b804c11 100644 --- a/luci-app-passwall/luasrc/view/passwall/global/status.htm +++ b/luci-app-passwall/luasrc/view/passwall/global/status.htm @@ -117,7 +117,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
- +
@@ -129,7 +129,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
- +
@@ -165,8 +165,8 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
- -
+ +

<%:GitHub Connection%>
<%:Touch Check%>

@@ -177,8 +177,8 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
- -
+ +

<%:Instagram Connection%>
<%:Touch Check%>

diff --git a/luci-app-passwall/root/usr/share/passwall/iptables.sh b/luci-app-passwall/root/usr/share/passwall/iptables.sh index f11269f03..5da284050 100755 --- a/luci-app-passwall/root/usr/share/passwall/iptables.sh +++ b/luci-app-passwall/root/usr/share/passwall/iptables.sh @@ -255,9 +255,8 @@ load_acl() { [ "${use_direct_list}" = "1" ] && $ipt_m -A PSW $(comment "$remarks") ${_ipt_source} $(dst $IPSET_WHITELIST) -j RETURN [ "${use_block_list}" = "1" ] && $ipt_m -A PSW $(comment "$remarks") ${_ipt_source} $(dst $IPSET_BLOCKLIST) -j DROP [ "$PROXY_IPV6" == "1" ] && { - [ "${use_direct_list}" = "1" ] && $ipt6_n -A PSW $(comment "$remarks") ${_ipt_source} $(dst $IPSET_WHITELIST6) -j RETURN - [ "${use_direct_list}" = "1" ] && $ipt6_m -A PSW $(comment "$remarks") ${_ipt_source} $(dst $IPSET_WHITELIST6) -j RETURN - [ "${use_block_list}" = "1" ] && $ipt6_m -A PSW $(comment "$remarks") ${_ipt_source} $(dst $IPSET_BLOCKLIST6) -j DROP + [ "${use_direct_list}" = "1" ] && $ip6t_m -A PSW $(comment "$remarks") ${_ipt_source} $(dst $IPSET_WHITELIST6) -j RETURN 2>/dev/null + [ "${use_block_list}" = "1" ] && $ip6t_m -A PSW $(comment "$remarks") ${_ipt_source} $(dst $IPSET_BLOCKLIST6) -j DROP 2>/dev/null } [ -n "$tcp_port" ] && { @@ -408,9 +407,8 @@ load_acl() { [ "${USE_DIRECT_LIST}" = "1" ] && $ipt_m -A PSW $(comment "默认") $(dst $IPSET_WHITELIST) -j RETURN [ "${USE_BLOCK_LIST}" = "1" ] && $ipt_m -A PSW $(comment "默认") $(dst $IPSET_BLOCKLIST) -j DROP [ "$PROXY_IPV6" == "1" ] && { - [ "${USE_DIRECT_LIST}" = "1" ] && $ipt6_n -A PSW $(comment "默认") $(dst $IPSET_WHITELIST6) -j RETURN - [ "${USE_DIRECT_LIST}" = "1" ] && $ipt6_m -A PSW $(comment "默认") $(dst $IPSET_WHITELIST6) -j RETURN - [ "${USE_BLOCK_LIST}" = "1" ] && $ipt6_m -A PSW $(comment "默认") $(dst $IPSET_BLOCKLIST6) -j DROP + [ "${USE_DIRECT_LIST}" = "1" ] && $ip6t_m -A PSW $(comment "默认") $(dst $IPSET_WHITELIST6) -j RETURN 2>/dev/null + [ "${USE_BLOCK_LIST}" = "1" ] && $ip6t_m -A PSW $(comment "默认") $(dst $IPSET_BLOCKLIST6) -j DROP 2>/dev/null } # 加载TCP默认代理模式 [ "$TCP_PROXY_DROP_PORTS" != "disable" ] && { diff --git a/luci-app-xray/core/root/usr/share/xray/gen_config.uc b/luci-app-xray/core/root/usr/share/xray/gen_config.uc index 1c0605c12..61a41da89 100644 --- a/luci-app-xray/core/root/usr/share/xray/gen_config.uc +++ b/luci-app-xray/core/root/usr/share/xray/gen_config.uc @@ -60,8 +60,8 @@ function inbounds(proxy, config, extra_inbound) { function outbounds(proxy, config, manual_tproxy, bridge, extra_inbound, fakedns) { let result = [ - direct_outbound("direct", null), blackhole_outbound(), + direct_outbound("direct", null), ...dns_server_outbounds(proxy), ...manual_tproxy_outbounds(config, manual_tproxy), ...bridge_outbounds(config, bridge) diff --git a/luci-app-xray/core/root/www/luci-static/resources/view/xray/core.js b/luci-app-xray/core/root/www/luci-static/resources/view/xray/core.js index 59ecde180..fe3f83153 100644 --- a/luci-app-xray/core/root/www/luci-static/resources/view/xray/core.js +++ b/luci-app-xray/core/root/www/luci-static/resources/view/xray/core.js @@ -223,7 +223,7 @@ return view.extend({ o.value("tcp+local", _("TCP (direct)")); o.value("https", _("DNS over HTTPS")); o.value("https+local", _("DNS over HTTPS (direct)")); - o.default = "UseIP"; + o.default = "udp"; o.modalonly = true; ss.tab('protocol', _('Protocol Settings')); diff --git a/mosdns/Makefile b/mosdns/Makefile index 6e68bc7a7..7d1f6ff76 100644 --- a/mosdns/Makefile +++ b/mosdns/Makefile @@ -36,8 +36,6 @@ define Package/mosdns DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle endef -GO_PKG_TARGET_VARS:=$(filter-out CGO_ENABLED=%,$(GO_PKG_TARGET_VARS)) CGO_ENABLED=1 - define Package/mosdns/install $(call GoPackage/Package/Install/Bin,$(1)) endef diff --git a/quickstart/Makefile b/quickstart/Makefile index 42986c9b3..6374570f7 100644 --- a/quickstart/Makefile +++ b/quickstart/Makefile @@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk PKG_ARCH_quickstart:=$(ARCH) PKG_NAME:=quickstart -PKG_VERSION:=0.8.7 +PKG_VERSION:=0.8.8 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/linkease/istore-packages/releases/download/prebuilt/ -PKG_HASH:=994ea38fcc4002e9dffd1ffe2d7cdf828e9365b6a2ba61c61c257f7c2af131a5 +PKG_HASH:=51678ee23e84eeed4be6cbdb957450c00bb2863a75f2cd072f4552743e3e5488 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-binary-$(PKG_VERSION) diff --git a/v2dat/Makefile b/v2dat/Makefile index a9fabfa08..cbf9aea3d 100644 --- a/v2dat/Makefile +++ b/v2dat/Makefile @@ -38,8 +38,6 @@ define Package/v2dat DEPENDS:=$(GO_ARCH_DEPENDS) endef -GO_PKG_TARGET_VARS:=$(filter-out CGO_ENABLED=%,$(GO_PKG_TARGET_VARS)) CGO_ENABLED=1 - define Package/v2dat/install $(call GoPackage/Package/Install/Bin,$(1)) endef diff --git a/xray-core/patches/010-go1.21.patch b/xray-core/patches/010-go1.21.patch new file mode 100644 index 000000000..a95d41811 --- /dev/null +++ b/xray-core/patches/010-go1.21.patch @@ -0,0 +1,10 @@ +--- a/go.mod ++++ b/go.mod +@@ -1,6 +1,6 @@ + module github.com/xtls/xray-core + +-go 1.22 ++go 1.21.5 + + require ( + github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344 diff --git a/xray-plugin/patches/0001-fix-go-1.21-build-error.patch b/xray-plugin/patches/0001-fix-go-1.21-build-error.patch new file mode 100644 index 000000000..d214f0089 --- /dev/null +++ b/xray-plugin/patches/0001-fix-go-1.21-build-error.patch @@ -0,0 +1,24 @@ +From 45368856980e030ddd95221289304c33e2749aa6 Mon Sep 17 00:00:00 2001 +From: Beginner-Go <70857188+Beginner-Go@users.noreply.github.com> +Date: Mon, 26 Feb 2024 15:45:35 +0000 +Subject: [PATCH] fix go 1.21 build error + +--- + go.mod | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/go.mod b/go.mod +index 71a9a02..077ac79 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,6 +1,6 @@ + module github.com/teddysun/xray-plugin + +-go 1.22 ++go 1.21.5 + + require ( + github.com/xtls/xray-core v1.8.8 +-- +2.34.1 +