From f06652bc117bb5af42db5f87fe5371a071a38064 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 3 Mar 2023 11:52:58 +0800 Subject: [PATCH] v2raya: drop wrong patches These patches should not be backported to OpenWrt, otherwise tproxy won't work for devices connected to br-lan (bypassed by the fw rules). We have introduced a new compile-time flag for new version (which is not released yet), but it's unnecessray to backport redudant patches as here is still at the old version. Signed-off-by: Tianling Shen (cherry picked from commit 40669c4135d829254ba66b0f1a6827f94d229c96) --- net/v2raya/Makefile | 2 +- .../010-fixed-for-Docker-Compose.patch | 46 ------------------- net/v2raya/patches/011-cleaned-up.patch | 37 --------------- net/v2raya/patches/012-improved.patch | 38 --------------- ...-interface-ppp-to-avoid-to-break-net.patch | 12 ++--- 5 files changed, 7 insertions(+), 128 deletions(-) delete mode 100644 net/v2raya/patches/010-fixed-for-Docker-Compose.patch delete mode 100644 net/v2raya/patches/011-cleaned-up.patch delete mode 100644 net/v2raya/patches/012-improved.patch diff --git a/net/v2raya/Makefile b/net/v2raya/Makefile index 17ab5e01c6..18b81d15c0 100644 --- a/net/v2raya/Makefile +++ b/net/v2raya/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2rayA PKG_VERSION:=1.5.9.1698.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2rayA/v2rayA/tar.gz/v$(PKG_VERSION)? diff --git a/net/v2raya/patches/010-fixed-for-Docker-Compose.patch b/net/v2raya/patches/010-fixed-for-Docker-Compose.patch deleted file mode 100644 index 8461660f7b..0000000000 --- a/net/v2raya/patches/010-fixed-for-Docker-Compose.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 78336e55a31db578c139a5bb472aa0fc219c169d Mon Sep 17 00:00:00 2001 -From: Xiaoxu Guo -Date: Thu, 4 Aug 2022 16:24:04 +0800 -Subject: [PATCH] fixed for Docker Compose - ---- - service/core/iptables/tproxy.go | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- a/core/iptables/tproxy.go -+++ b/core/iptables/tproxy.go -@@ -65,6 +65,7 @@ iptables -w 2 -t mangle -A TP_PRE -p udp - - iptables -w 2 -t mangle -A TP_RULE -j CONNMARK --restore-mark - iptables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN -+iptables -w 2 -t mangle -A TP_RULE -i br+ -j RETURN - iptables -w 2 -t mangle -A TP_RULE -i docker+ -j RETURN - iptables -w 2 -t mangle -A TP_RULE -i veth+ -j RETURN - ` -@@ -123,6 +124,8 @@ ip6tables -w 2 -t mangle -A TP_PRE -p ud - - ip6tables -w 2 -t mangle -A TP_RULE -j CONNMARK --restore-mark - ip6tables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN -+ip6tables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN -+ip6tables -w 2 -t mangle -A TP_RULE -i br+ -j RETURN - ip6tables -w 2 -t mangle -A TP_RULE -i docker+ -j RETURN - ip6tables -w 2 -t mangle -A TP_RULE -i veth+ -j RETURN - ` -@@ -156,7 +159,7 @@ ip6tables -w 2 -t mangle -A TP_MARK -j C - - func (t *tproxy) GetCleanCommands() Setter { - commands := ` --ip rule del fwmark 0x40/0xc0 table 100 -+ip rule del fwmark 0x40/0xc0 table 100 - ip route del local 0.0.0.0/0 dev lo table 100 - - iptables -w 2 -t mangle -F TP_OUT -@@ -172,7 +175,7 @@ iptables -w 2 -t mangle -X TP_MARK - ` - if IsIPv6Supported() { - commands += ` --ip -6 rule del fwmark 0x40/0xc0 table 100 -+ip -6 rule del fwmark 0x40/0xc0 table 100 - ip -6 route del local ::/0 dev lo table 100 - - ip6tables -w 2 -t mangle -F TP_OUT diff --git a/net/v2raya/patches/011-cleaned-up.patch b/net/v2raya/patches/011-cleaned-up.patch deleted file mode 100644 index 74dc502ec4..0000000000 --- a/net/v2raya/patches/011-cleaned-up.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0db405f50fd652d494f2066fc5e47c41666c96db Mon Sep 17 00:00:00 2001 -From: Xiaoxu Guo -Date: Thu, 4 Aug 2022 16:32:42 +0800 -Subject: [PATCH] cleaned up - ---- - service/core/iptables/tproxy.go | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - ---- a/core/iptables/tproxy.go -+++ b/core/iptables/tproxy.go -@@ -124,7 +124,6 @@ ip6tables -w 2 -t mangle -A TP_PRE -p ud - - ip6tables -w 2 -t mangle -A TP_RULE -j CONNMARK --restore-mark - ip6tables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN --ip6tables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN - ip6tables -w 2 -t mangle -A TP_RULE -i br+ -j RETURN - ip6tables -w 2 -t mangle -A TP_RULE -i docker+ -j RETURN - ip6tables -w 2 -t mangle -A TP_RULE -i veth+ -j RETURN -@@ -159,7 +158,7 @@ ip6tables -w 2 -t mangle -A TP_MARK -j C - - func (t *tproxy) GetCleanCommands() Setter { - commands := ` --ip rule del fwmark 0x40/0xc0 table 100 -+ip rule del fwmark 0x40/0xc0 table 100 - ip route del local 0.0.0.0/0 dev lo table 100 - - iptables -w 2 -t mangle -F TP_OUT -@@ -175,7 +174,7 @@ iptables -w 2 -t mangle -X TP_MARK - ` - if IsIPv6Supported() { - commands += ` --ip -6 rule del fwmark 0x40/0xc0 table 100 -+ip -6 rule del fwmark 0x40/0xc0 table 100 - ip -6 route del local ::/0 dev lo table 100 - - ip6tables -w 2 -t mangle -F TP_OUT diff --git a/net/v2raya/patches/012-improved.patch b/net/v2raya/patches/012-improved.patch deleted file mode 100644 index 1c755d0153..0000000000 --- a/net/v2raya/patches/012-improved.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4a87a6fc9a17939cc0fc54058b2128b1f688045a Mon Sep 17 00:00:00 2001 -From: Xiaoxu Guo -Date: Thu, 4 Aug 2022 22:56:46 +0800 -Subject: [PATCH] improved - ---- - service/core/iptables/tproxy.go | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/core/iptables/tproxy.go -+++ b/core/iptables/tproxy.go -@@ -16,7 +16,7 @@ var Tproxy tproxy - func (t *tproxy) AddIPWhitelist(cidr string) { - // avoid duplication - t.RemoveIPWhitelist(cidr) -- pos := 5 -+ pos := 6 - if configure.GetSettingNotNil().AntiPollution != configure.AntipollutionClosed { - pos += 3 - } -@@ -65,7 +65,7 @@ iptables -w 2 -t mangle -A TP_PRE -p udp - - iptables -w 2 -t mangle -A TP_RULE -j CONNMARK --restore-mark - iptables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN --iptables -w 2 -t mangle -A TP_RULE -i br+ -j RETURN -+iptables -w 2 -t mangle -A TP_RULE -i br-+ -j RETURN - iptables -w 2 -t mangle -A TP_RULE -i docker+ -j RETURN - iptables -w 2 -t mangle -A TP_RULE -i veth+ -j RETURN - ` -@@ -124,7 +124,7 @@ ip6tables -w 2 -t mangle -A TP_PRE -p ud - - ip6tables -w 2 -t mangle -A TP_RULE -j CONNMARK --restore-mark - ip6tables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN --ip6tables -w 2 -t mangle -A TP_RULE -i br+ -j RETURN -+ip6tables -w 2 -t mangle -A TP_RULE -i br-+ -j RETURN - ip6tables -w 2 -t mangle -A TP_RULE -i docker+ -j RETURN - ip6tables -w 2 -t mangle -A TP_RULE -i veth+ -j RETURN - ` diff --git a/net/v2raya/patches/013-fix-we-should-skip-interface-ppp-to-avoid-to-break-net.patch b/net/v2raya/patches/013-fix-we-should-skip-interface-ppp-to-avoid-to-break-net.patch index 0ff5f6a541..5de1a86aaf 100644 --- a/net/v2raya/patches/013-fix-we-should-skip-interface-ppp-to-avoid-to-break-net.patch +++ b/net/v2raya/patches/013-fix-we-should-skip-interface-ppp-to-avoid-to-break-net.patch @@ -13,13 +13,13 @@ Subject: [PATCH] fix: we should skip interface ppp+ to avoid to break net func (t *tproxy) AddIPWhitelist(cidr string) { // avoid duplication t.RemoveIPWhitelist(cidr) -- pos := 6 -+ pos := 8 +- pos := 5 ++ pos := 7 if configure.GetSettingNotNil().AntiPollution != configure.AntipollutionClosed { pos += 3 } -@@ -68,6 +68,8 @@ iptables -w 2 -t mangle -A TP_RULE -m ma - iptables -w 2 -t mangle -A TP_RULE -i br-+ -j RETURN +@@ -67,6 +67,8 @@ iptables -w 2 -t mangle -A TP_RULE -j CO + iptables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN iptables -w 2 -t mangle -A TP_RULE -i docker+ -j RETURN iptables -w 2 -t mangle -A TP_RULE -i veth+ -j RETURN +iptables -w 2 -t mangle -A TP_RULE -i ppp+ -j RETURN @@ -27,8 +27,8 @@ Subject: [PATCH] fix: we should skip interface ppp+ to avoid to break net ` if configure.GetSettingNotNil().AntiPollution != configure.AntipollutionClosed { commands += ` -@@ -127,6 +129,8 @@ ip6tables -w 2 -t mangle -A TP_RULE -m m - ip6tables -w 2 -t mangle -A TP_RULE -i br-+ -j RETURN +@@ -125,6 +127,8 @@ ip6tables -w 2 -t mangle -A TP_RULE -j C + ip6tables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN ip6tables -w 2 -t mangle -A TP_RULE -i docker+ -j RETURN ip6tables -w 2 -t mangle -A TP_RULE -i veth+ -j RETURN +ip6tables -w 2 -t mangle -A TP_RULE -i ppp+ -j RETURN -- 2.30.2