From f8e7991142b27f407d9bfc5fb0d903e99a1c3b3a Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 13 Mar 2022 16:11:57 +0800 Subject: [PATCH] v2rayA: fix path in patches We're at ./service/ by default. Signed-off-by: Tianling Shen --- ...01-fix-failed-to-clean-iptables-rules-in-some-cases.patch | 6 +++--- ...ix-resolving-subscription-for-line-breaked-base64-s.patch | 6 +++--- ...hore-upgrade-routingA-to-fix-the-quote-and-colon-co.patch | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/v2raya/patches/001-fix-failed-to-clean-iptables-rules-in-some-cases.patch b/v2raya/patches/001-fix-failed-to-clean-iptables-rules-in-some-cases.patch index 82d10cd..4ba35d5 100644 --- a/v2raya/patches/001-fix-failed-to-clean-iptables-rules-in-some-cases.patch +++ b/v2raya/patches/001-fix-failed-to-clean-iptables-rules-in-some-cases.patch @@ -7,10 +7,10 @@ Subject: [PATCH] fix: failed to clean iptables rules in some cases service/core/v2ray/transparent.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -diff --git a/service/core/v2ray/transparent.go b/service/core/v2ray/transparent.go +diff --git a/core/v2ray/transparent.go b/core/v2ray/transparent.go index 5480660..07b01a0 100644 ---- a/service/core/v2ray/transparent.go -+++ b/service/core/v2ray/transparent.go +--- a/core/v2ray/transparent.go ++++ b/core/v2ray/transparent.go @@ -12,12 +12,14 @@ import ( ) diff --git a/v2raya/patches/002-fix-resolving-subscription-for-line-breaked-base64-s.patch b/v2raya/patches/002-fix-resolving-subscription-for-line-breaked-base64-s.patch index 1fb9a4d..a730a0c 100644 --- a/v2raya/patches/002-fix-resolving-subscription-for-line-breaked-base64-s.patch +++ b/v2raya/patches/002-fix-resolving-subscription-for-line-breaked-base64-s.patch @@ -9,10 +9,10 @@ Subject: [PATCH] fix: resolving subscription for line-breaked base64 string service/common/crypto.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/service/common/crypto.go b/service/common/crypto.go +diff --git a/common/crypto.go b/common/crypto.go index b9e5173..4a067e8 100644 ---- a/service/common/crypto.go -+++ b/service/common/crypto.go +--- a/common/crypto.go ++++ b/common/crypto.go @@ -44,10 +44,11 @@ func Base64StdDecode(s string) (string, error) { return string(raw), err } diff --git a/v2raya/patches/003-chore-upgrade-routingA-to-fix-the-quote-and-colon-co.patch b/v2raya/patches/003-chore-upgrade-routingA-to-fix-the-quote-and-colon-co.patch index f12b2af..6916166 100644 --- a/v2raya/patches/003-chore-upgrade-routingA-to-fix-the-quote-and-colon-co.patch +++ b/v2raya/patches/003-chore-upgrade-routingA-to-fix-the-quote-and-colon-co.patch @@ -8,10 +8,10 @@ Subject: [PATCH] chore: upgrade routingA to fix the quote and colon conflict service/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/service/go.mod b/service/go.mod +diff --git a/go.mod b/go.mod index 128845c..8627a09 100644 ---- a/service/go.mod -+++ b/service/go.mod +--- a/go.mod ++++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/tidwall/gjson v1.10.2 github.com/tidwall/sjson v1.2.3 @@ -21,10 +21,10 @@ index 128845c..8627a09 100644 github.com/v2rayA/beego/v2 v2.0.4 github.com/v2rayA/shadowsocksR v1.0.4 github.com/v2rayA/v2ray-lib v0.0.0-20211227083129-d4f59fbf62b8 -diff --git a/service/go.sum b/service/go.sum +diff --git a/go.sum b/go.sum index e6088a2..8aa379d 100644 ---- a/service/go.sum -+++ b/service/go.sum +--- a/go.sum ++++ b/go.sum @@ -213,8 +213,8 @@ github.com/v2fly/VSign v0.0.0-20201108000810-e2adc24bf848 h1:p1UzXK6VAutXFFQMnre github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e h1:5QefA066A1tF8gHIiADmOVOV5LS43gt3ONnlEl3xkwI= github.com/v2fly/v2ray-core/v4 v4.42.2-0.20210928173456-a9979057dcaa h1:MyrHPDN4JhKoOvBOK8UUVoXd4Pd9AoIfbLClTPEbKt4= -- 2.11.0