OpenWrt/kenzok8-package
1
0
Fork 0
mirror of https://github.com/kenzok8/small-package synced 2025-01-05 11:36:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 2024-02-28 00:22:06

Browse Source
This commit is contained in:
github-actions[bot] 2024-02-28 00:22:06 +08:00
parent 3366491228
commit 19297feced
13 changed files with 54 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js
View File

@ -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))

5
luci-app-homeproxy/po/templates/homeproxy.pot
View File

@ -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 ""

7
luci-app-homeproxy/po/zh_Hans/homeproxy.po
View File

@ -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."

5
luci-app-passwall/Makefile
View File

@ -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

12
luci-app-passwall/luasrc/view/passwall/global/status.htm
View File

File diff suppressed because one or more lines are too long

10
luci-app-passwall/root/usr/share/passwall/iptables.sh
View File

@ -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" ] && {

2
luci-app-xray/core/root/usr/share/xray/gen_config.uc
View File

@ -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)

2
luci-app-xray/core/root/www/luci-static/resources/view/xray/core.js
View File

@ -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'));

2
mosdns/Makefile
View File

@ -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

4
quickstart/Makefile
View File

@ -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)

2
v2dat/Makefile
View File

@ -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

10
xray-core/patches/010-go1.21.patch Normal file
View File

@ -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

24
xray-plugin/patches/0001-fix-go-1.21-build-error.patch Normal file
View File

@ -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