OSDN Git Service

(root) / v2raya / v2raya-openwrt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f3ed76f)
v2rayA: Update to 1.5.6.2
authorTianling Shen <cnsztl@immortalwrt.org>
Fri, 4 Feb 2022 09:26:22 +0000 (17:26 +0800)
committerTianling Shen <cnsztl@immortalwrt.org>
Fri, 4 Feb 2022 11:03:35 +0000 (19:03 +0800)
Manually added new env variable `XDG_DATA_HOME` which won't be passed
by procd by default.

Removed upstreamed patch.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
v2raya/Makefile patch | blob | history
v2raya/files/v2raya.init patch | blob | history
v2raya/patches/010-chore-re-support-mips.patch [deleted file] patch | blob | history
v2raya/patches/020-fix-when-no-addr-found-lookup-again.patch [deleted file] patch | blob | history
v2raya/patches/030-fix-incorrect-ipv6-routing.patch [deleted file] patch | blob | history
v2raya/patches/040-fix-a-problem-that-REDIRECT-must-work-with-port-sharing-f.patch [deleted file] patch | blob | history

diff --git a/v2raya/Makefile b/v2raya/Makefile
index feef4b0..1fad19e 100644 (file)
--- a/v2raya/Makefile
+++ b/v2raya/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2rayA
-PKG_VERSION:=1.5.5
+PKG_VERSION:=1.5.6.2
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/v2rayA/v2rayA/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=7844cb4cddca0a4831925c38039226813a61ceaf24a19e471654d278387b8368
+PKG_HASH:=d949246aa9fe80aa9cb8fb4d80cb470f508bb44d4ac23e84e28e3b9abd30b67c
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service
 
 PKG_LICENSE:=AGPL-3.0-only
diff --git a/v2raya/files/v2raya.init b/v2raya/files/v2raya.init
index f137491..826935d 100755 (executable)
--- a/v2raya/files/v2raya.init
+++ b/v2raya/files/v2raya.init
@@ -38,6 +38,7 @@ start_service() {
 
        procd_open_instance "$CONF"
        procd_set_param command "$PROG"
+       procd_set_param env XDG_DATA_HOME="/usr/share"
 
        append_env_arg "config" "address" "0.0.0.0:2017"
        append_env_arg "config" "config" "/etc/v2raya"
diff --git a/v2raya/patches/010-chore-re-support-mips.patch b/v2raya/patches/010-chore-re-support-mips.patch
deleted file mode 100644 (file)
index b94d334..0000000
--- a/v2raya/patches/010-chore-re-support-mips.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From 366ef30071dc8cc73cd8768f6a0a58fa1b9533ff Mon Sep 17 00:00:00 2001
-From: mzz2017 <mzz@tuta.io>
-Date: Fri, 10 Dec 2021 20:47:24 +0800
-Subject: [PATCH] chore: re-support mips
-
----
- service/go.mod | 11 +++--------
- service/go.sum | 29 ++++++++++++++++++-----------
- 2 files changed, 21 insertions(+), 19 deletions(-)
-
---- a/go.mod
-+++ b/go.mod
-@@ -3,7 +3,6 @@ module github.com/v2rayA/v2rayA
- go 1.16
- 
- require (
--      github.com/StackExchange/wmi v1.2.1 // indirect
-       github.com/beevik/ntp v0.3.0
-       github.com/boltdb/bolt v1.3.1
-       github.com/devfeel/mapper v0.7.5
-@@ -22,8 +21,7 @@ require (
-       github.com/mzz2017/go-engine v0.0.0-20200509094339-b56921189229
-       github.com/pkg/errors v0.9.1
-       github.com/shadowsocks/go-shadowsocks2 v0.1.5-0.20210421162817-acdbac05f5a5
--      github.com/shirou/gopsutil v3.21.8+incompatible // indirect
--      github.com/shirou/gopsutil/v3 v3.21.8
-+      github.com/shirou/gopsutil/v3 v3.21.11
-       github.com/stevenroose/gonfig v0.1.5
-       github.com/tidwall/gjson v1.10.2
-       github.com/tidwall/sjson v1.2.3
-@@ -33,7 +31,7 @@ require (
-       github.com/v2rayA/go-uci v0.0.0-20210907104827-4cf744297b41
-       github.com/v2rayA/shadowsocksR v1.0.3
-       golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
--      golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55
-+      golang.org/x/sys v0.0.0-20211013075003-97ac67df715c
-       google.golang.org/grpc v1.40.0
-       gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
- )
-@@ -44,7 +42,4 @@ require (
- //replace github.com/mzz2017/go-engine => ../../go-engine
- //replace github.com/v2rayA/beego/v2 => ../../beego
- 
--// windows/arm64 support
--replace github.com/go-ole/go-ole => github.com/go-ole/go-ole v0.0.0-20210915003542-8b1f7f90f6b1
--
--replace github.com/shirou/gopsutil/v3 => github.com/shirou/gopsutil v0.0.0-20210919144451-80d5b574053f
-+replace github.com/boltdb/bolt => github.com/go-gitea/bolt v0.0.0-20170420010917-ccd680d8c1a0
---- a/go.sum
-+++ b/go.sum
-@@ -23,8 +23,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod
- github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
- github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
- github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
--github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
--github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8=
- github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
- github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
- github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-@@ -41,8 +39,6 @@ github.com/beorn7/perks v0.0.0-201803211
- github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
- github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
- github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
--github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
--github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
- github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
- github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
- github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-@@ -112,12 +108,14 @@ github.com/gin-gonic/gin v1.7.1 h1:qC89G
- github.com/gin-gonic/gin v1.7.1/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
- github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
- github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
-+github.com/go-gitea/bolt v0.0.0-20170420010917-ccd680d8c1a0 h1:ZaoAEDzwmAhThOTX8xAsr2fqSFHjbZYAkd2/A4Ha1Sk=
-+github.com/go-gitea/bolt v0.0.0-20170420010917-ccd680d8c1a0/go.mod h1:rkz7AtkR0EmCCgcJRSvbsa5fW1VbxdcInaIKS7pvowU=
- github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
- github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
- github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
- github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
--github.com/go-ole/go-ole v0.0.0-20210915003542-8b1f7f90f6b1 h1:+EOKrBM9hIMe7nPoryEuVZfSC5avyLLFgvt4up790KM=
--github.com/go-ole/go-ole v0.0.0-20210915003542-8b1f7f90f6b1/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-+github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
-+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
- github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
- github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
- github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
-@@ -262,6 +260,8 @@ github.com/leodido/go-urn v1.2.0 h1:hpXL
- github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
- github.com/lucas-clemente/quic-go v0.23.0 h1:5vFnKtZ6nHDFsc/F3uuiF4T3y/AXaQdxjUqiVw26GZE=
- github.com/lucas-clemente/quic-go v0.23.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0=
-+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
-+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
- github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
- github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg=
- github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
-@@ -352,6 +352,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:b
- github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
- github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
- github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
-+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
- github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
- github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
- github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
-@@ -381,10 +383,8 @@ github.com/shadowsocks/go-shadowsocks2 v
- github.com/shadowsocks/go-shadowsocks2 v0.1.5-0.20210421162817-acdbac05f5a5/go.mod h1:AGGpIoek4HRno4xzyFiAtLHkOpcoznZEkAccaI/rplM=
- github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 h1:DAYUYH5869yV94zvCES9F51oYtN5oGlwjxJJz7ZCnik=
- github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg=
--github.com/shirou/gopsutil v0.0.0-20210919144451-80d5b574053f h1:oegEiaH/bXSZaHdU8tXsVjaStvoBEvn8kpTpnbSiSA8=
--github.com/shirou/gopsutil v0.0.0-20210919144451-80d5b574053f/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
--github.com/shirou/gopsutil v3.21.8+incompatible h1:sh0foI8tMRlCidUJR+KzqWYWxrkuuPIGiO6Vp+KXdCU=
--github.com/shirou/gopsutil v3.21.8+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-+github.com/shirou/gopsutil/v3 v3.21.11 h1:d5tOAP5+bmJ8Hf2+4bxOSkQ/64+sjEbjU9nSW9nJgG0=
-+github.com/shirou/gopsutil/v3 v3.21.11/go.mod h1:BToYZVTlSVlfazpDDYFnsVZLaoRG+g8ufT6fPQLdJzA=
- github.com/shiyanhui/dht v0.0.0-20190320084728-1b3b78ecf279/go.mod h1:BFWnSWg10ADimfxHLuCo6NcJ7hu2ghgk6X7KuO6svmQ=
- github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY=
- github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
-@@ -450,6 +450,8 @@ github.com/tidwall/pretty v1.2.0/go.mod
- github.com/tidwall/sjson v1.2.3 h1:5+deguEhHSEjmuICXZ21uSSsXotWMA0orU783+Z7Cp8=
- github.com/tidwall/sjson v1.2.3/go.mod h1:5WdjKx3AQMvCJ4RG6/2UYT7dLrGvJUV1x4jdTAyGvZs=
- github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w=
-+github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
-+github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
- github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
- github.com/u-root/u-root v7.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
- github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
-@@ -483,6 +485,8 @@ github.com/yuin/goldmark v1.1.27/go.mod
- github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
- github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
- github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-+github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
-+github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
- gitlab.com/yawning/chacha20.git v0.0.0-20190903091407-6d1cb28dc72c h1:yrfrd1u7MWIwWIulet2TZPEkeNQhQ/GcPLdPXgiEEr0=
- gitlab.com/yawning/chacha20.git v0.0.0-20190903091407-6d1cb28dc72c/go.mod h1:3x6b94nWCP/a2XB/joOPMiGYUBvqbLfeY/BkHLeDs6s=
- go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
-@@ -640,6 +644,7 @@ golang.org/x/sys v0.0.0-20201101102859-d
- golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-@@ -648,8 +653,10 @@ golang.org/x/sys v0.0.0-20210403161142-5
- golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
--golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55 h1:rw6UNGRMfarCepjI8qOepea/SXwIBVfTKjztZ5gBbq4=
-+golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-+golang.org/x/sys v0.0.0-20211013075003-97ac67df715c h1:taxlMj0D/1sOAuv/CbSD+MMDof2vbyPTqz5FNYKpXt8=
-+golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
- golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
- golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/v2raya/patches/020-fix-when-no-addr-found-lookup-again.patch b/v2raya/patches/020-fix-when-no-addr-found-lookup-again.patch
deleted file mode 100644 (file)
index c563198..0000000
--- a/v2raya/patches/020-fix-when-no-addr-found-lookup-again.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 0ca0898bec9c4b58a5cc6dcc062862e3573eed7d Mon Sep 17 00:00:00 2001
-From: mzz2017 <mzz@tuta.io>
-Date: Sat, 11 Dec 2021 15:34:17 +0800
-Subject: [PATCH] fix: when no addr found, lookup again
-
----
- service/common/resolv/resolver.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/common/resolv/resolver.go
-+++ b/common/resolv/resolver.go
-@@ -39,7 +39,7 @@ func init() {
- 
- func LookupHost(host string) (addrs []string, err error) {
-       addrs, err = net.LookupHost(host)
--      lookupAgain := err != nil
-+      lookupAgain := len(addrs) == 0 || err != nil
-       if !lookupAgain {
-               for _, addr := range addrs {
-                       if ip := net.ParseIP(addr); ip != nil && (ip.IsLoopback() || ip.IsUnspecified()) {
diff --git a/v2raya/patches/030-fix-incorrect-ipv6-routing.patch b/v2raya/patches/030-fix-incorrect-ipv6-routing.patch
deleted file mode 100644 (file)
index 8dda9b2..0000000
--- a/v2raya/patches/030-fix-incorrect-ipv6-routing.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From ce463911b8b480363cdf2b55518e4e7ac85ca6d7 Mon Sep 17 00:00:00 2001
-From: mzz2017 <mzz@tuta.io>
-Date: Thu, 16 Dec 2021 23:44:07 +0800
-Subject: [PATCH] fix: incorrect ipv6 routing. #329
-
----
- service/core/v2ray/v2rayTmpl.go | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
---- a/core/v2ray/v2rayTmpl.go
-+++ b/core/v2ray/v2rayTmpl.go
-@@ -516,7 +516,7 @@ func (t *Template) AppendRoutingRuleByMo
-                               coreObj.RoutingRule{
-                                       Type:        "field",
-                                       OutboundTag: firstOutboundTag,
--                                      InboundTag:  inbounds,
-+                                      InboundTag:  deepcopy.Copy(inbounds).([]string),
-                                       Domain:      []string{"ext:LoyalsoldierSite.dat:geolocation-!cn"},
-                               })
-               } else {
-@@ -524,7 +524,7 @@ func (t *Template) AppendRoutingRuleByMo
-                               coreObj.RoutingRule{
-                                       Type:        "field",
-                                       OutboundTag: firstOutboundTag,
--                                      InboundTag:  inbounds,
-+                                      InboundTag:  deepcopy.Copy(inbounds).([]string),
-                                       Domain:      []string{"geosite:geolocation-!cn"},
-                               })
-               }
-@@ -532,19 +532,19 @@ func (t *Template) AppendRoutingRuleByMo
-                       coreObj.RoutingRule{
-                               Type:        "field",
-                               OutboundTag: "direct",
--                              InboundTag:  inbounds,
-+                              InboundTag:  deepcopy.Copy(inbounds).([]string),
-                               Domain:      []string{"geosite:cn"},
-                       },
-                       coreObj.RoutingRule{
-                               Type:        "field",
-                               OutboundTag: "proxy",
--                              InboundTag:  inbounds,
-+                              InboundTag:  deepcopy.Copy(inbounds).([]string),
-                               IP:          []string{"geoip:hk", "geoip:mo"},
-                       },
-                       coreObj.RoutingRule{
-                               Type:        "field",
-                               OutboundTag: "direct",
--                              InboundTag:  inbounds,
-+                              InboundTag:  deepcopy.Copy(inbounds).([]string),
-                               IP:          []string{"geoip:private", "geoip:cn"},
-                       },
-               )
-@@ -554,13 +554,13 @@ func (t *Template) AppendRoutingRuleByMo
-                               coreObj.RoutingRule{
-                                       Type:        "field",
-                                       OutboundTag: firstOutboundTag,
--                                      InboundTag:  inbounds,
-+                                      InboundTag:  deepcopy.Copy(inbounds).([]string),
-                                       Domain:      []string{"ext:LoyalsoldierSite.dat:gfw"},
-                               },
-                               coreObj.RoutingRule{
-                                       Type:        "field",
-                                       OutboundTag: firstOutboundTag,
--                                      InboundTag:  inbounds,
-+                                      InboundTag:  deepcopy.Copy(inbounds).([]string),
-                                       Domain:      []string{"ext:LoyalsoldierSite.dat:greatfire"},
-                               })
-               } else {
-@@ -568,7 +568,7 @@ func (t *Template) AppendRoutingRuleByMo
-                               coreObj.RoutingRule{
-                                       Type:        "field",
-                                       OutboundTag: firstOutboundTag,
--                                      InboundTag:  inbounds,
-+                                      InboundTag:  deepcopy.Copy(inbounds).([]string),
-                                       Domain:      []string{"geosite:geolocation-!cn"},
-                               })
-               }
-@@ -576,11 +576,11 @@ func (t *Template) AppendRoutingRuleByMo
-                       coreObj.RoutingRule{
-                               Type:        "field",
-                               OutboundTag: "direct",
--                              InboundTag:  inbounds,
-+                              InboundTag:  deepcopy.Copy(inbounds).([]string),
-                       },
-               )
-       case configure.RoutingAMode:
--              if err := parseRoutingA(t, inbounds); err != nil {
-+              if err := parseRoutingA(t, deepcopy.Copy(inbounds).([]string)); err != nil {
-                       return err
-               }
-       }
diff --git a/v2raya/patches/040-fix-a-problem-that-REDIRECT-must-work-with-port-sharing-f.patch b/v2raya/patches/040-fix-a-problem-that-REDIRECT-must-work-with-port-sharing-f.patch
deleted file mode 100644 (file)
index f440ed8..0000000
--- a/v2raya/patches/040-fix-a-problem-that-REDIRECT-must-work-with-port-sharing-f.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 68c28fb85cf079a678ce5334a18b9d848faa9d06 Mon Sep 17 00:00:00 2001
-From: mzz2017 <mzz@tuta.io>
-Date: Sun, 19 Dec 2021 17:08:13 +0800
-Subject: [PATCH] fix: a problem that REDIRECT must work with port-sharing for
- intranet
-
----
- service/core/v2ray/v2rayTmpl.go | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/core/v2ray/v2rayTmpl.go
-+++ b/core/v2ray/v2rayTmpl.go
-@@ -878,6 +878,13 @@ func (t *Template) setDualStack() {
-       if !t.Setting.PortSharing {
-               // copy a group of ipv6 inbounds and set the tag
-               for i := range t.Inbounds {
-+                      if t.Inbounds[i].Tag == "transparent" && t.Setting.TransparentType == configure.TransparentRedirect {
-+                              // https://ipset.netfilter.org/iptables-extensions.man.html#lbDK
-+                              // REDIRECT redirects the packet to the machine itself by changing the destination IP to the primary address of the incoming interface.
-+                              // So we should listen at 0.0.0.0 instead of 127.0.0.1
-+                              inbounds6[i].Tag = "THIS_IS_A_DROPPED_TAG"
-+                              continue
-+                      }
-                       if t.Inbounds[i].Tag == "dns-in" {
-                               t.Inbounds[i].Listen = "127.2.0.17"
-                               inbounds6[i].Tag = "THIS_IS_A_DROPPED_TAG"
opkg feed of v2rayA for OpenWrt users
About OSDN
Find Software
Develop Software
Help