From 7b6c29773a04aa1de18290710865b28983b9384a Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Sat, 6 Mar 2021 00:27:32 +0800
Subject: [PATCH] v2ray-plugin: update to 4.35.0 (#6470)

---
 package/lean/v2ray-plugin/Makefile                  | 13 +++++--------
 .../patches/001-replace-incompatible.patch          | 10 ----------
 2 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 package/lean/v2ray-plugin/patches/001-replace-incompatible.patch

diff --git a/package/lean/v2ray-plugin/Makefile b/package/lean/v2ray-plugin/Makefile
index 42d28a36d..cc7753127 100644
--- a/package/lean/v2ray-plugin/Makefile
+++ b/package/lean/v2ray-plugin/Makefile
@@ -8,13 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2ray-plugin
-PKG_VERSION:=1.8.0
+PKG_VERSION:=4.35.0
 PKG_RELEASE:=1
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/teddysun/v2ray-plugin/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=1276bdc2f03e40219eed2894ff746e4ef5acb8a7f980c163b7a90b0b5b9058e2
+PKG_HASH:=ccd5e791150b2c822b179430350cb789d91e5d90d6776ea14abe02f5895fdadb
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
@@ -26,6 +25,8 @@ PKG_USE_MIPS16:=0
 
 GO_PKG:=github.com/shadowsocks/v2ray-plugin
 GO_PKG_LDFLAGS:=-s -w
+GO_PKG_LDFLAGS_X:=main.VERSION=v$(PKG_VERSION)
+
 PKG_CONFIG_DEPENDS := CONFIG_$(PKG_NAME)_INCLUDE_GOPROXY
 
 include $(INCLUDE_DIR)/package.mk
@@ -48,7 +49,7 @@ define Package/$(PKG_NAME)
 	CATEGORY:=Network
 	SUBMENU:=Project V
 	TITLE:=SIP003 plugin for shadowsocks, based on v2ray
-	URL:=https://github.com/shadowsocks/v2ray-plugin
+	URL:=https://github.com/teddysun/v2ray-plugin
 	DEPENDS:=$(GO_ARCH_DEPENDS) +ca-certificates
 endef
 
@@ -56,10 +57,6 @@ define Package/$(PKG_NAME)/description
 	Yet another SIP003 plugin for shadowsocks, based on v2ray
 endef
 
-define Build/Prepare
-	$(call Build/Prepare/Default)
-endef
-
 define Build/Compile
 	$(call GoPackage/Build/Compile)
 	$(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/v2ray-plugin || true
diff --git a/package/lean/v2ray-plugin/patches/001-replace-incompatible.patch b/package/lean/v2ray-plugin/patches/001-replace-incompatible.patch
deleted file mode 100644
index b684fdc39..000000000
--- a/package/lean/v2ray-plugin/patches/001-replace-incompatible.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/go.mod
-+++ b/go.mod
-@@ -5,6 +5,6 @@ require (
- 	v2ray.com/core v4.19.1+incompatible
- )
- 
--replace v2ray.com/core => github.com/v2fly/v2ray-core v4.34.0+incompatible
-+replace v2ray.com/core => github.com/v2fly/v2ray-core v0.0.0-20210104111944-a6efb4d60b86
- 
- go 1.13