v2raya: Update to 2.2.1

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit a86c47044d302c925bd3eec87fe3d83856b50f7d)
[added a patch to fix build with Go 1.20]
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

diff --git a/net/v2raya/Makefile b/net/v2raya/Makefile
index 5f548d1e75263a75aba8297523b46cdd14c39fa5..f290183e80982e5b3efbf0215fc6c12bfb394e06 100644 (file)
--- a/net/v2raya/Makefile
+++ b/net/v2raya/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2rayA
-PKG_VERSION:=2.1.3
+PKG_VERSION:=2.2.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/v2rayA/v2rayA/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=65958a02d91f849e264e409536d2fb3e4c7d2a8d3a6b82fed1b90cfaff3d6dc9
+PKG_HASH:=97ae3d41ddd649dd07cfecf2bbe06a513d71186ef2620ca44af12e7956be5650
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service
 
 PKG_LICENSE:=AGPL-3.0-only
@@ -54,12 +54,12 @@ define Package/v2raya/conffiles
 /etc/config/v2raya
 endef
 
-WEB_FILE:=$(PKG_NAME)-web-$(PKG_VERSION).tar.gz
+WEB_FILE:=$(PKG_NAME)-web-$(PKG_VERSION).zip
 define Download/v2raya-web
-       URL:=https://codeload.github.com/v2rayA/v2raya-web/tar.gz/v$(PKG_VERSION)?
-       URL_FILE:=$(WEB_FILE)
+       URL:=https://github.com/v2rayA/v2rayA/releases/download/v$(PKG_VERSION)/
+       URL_FILE:=web.zip
        FILE:=$(WEB_FILE)
-       HASH:=f262efe46b5377ceed0450f519ba8562a0e7553ec2cc34a4e62f95749b19be01
+       HASH:=b7769b287b6e2ecdf8823142d126bf9b981a8d3af4cb73c8f798ed483bcc988c
 endef
 
 define Build/Prepare
@@ -67,7 +67,7 @@ define Build/Prepare
 
        ( \
                mkdir -p $(PKG_BUILD_DIR)/server/router/web ; \
-               gzip -dc $(DL_DIR)/$(WEB_FILE) | $(HOST_TAR) -C $(PKG_BUILD_DIR)/server/router/web $(TAR_OPTIONS) ; \
+               unzip -q -d $(PKG_BUILD_DIR)/server/router/web $(DL_DIR)/$(WEB_FILE) ; \
        )
 endef
 

diff --git a/net/v2raya/patches/010-go-version.patch b/net/v2raya/patches/010-go-version.patch
new file mode 100644 (file)
index 0000000..f9b2ba9
--- /dev/null
+++ b/net/v2raya/patches/010-go-version.patch
@@ -0,0 +1,10 @@
+--- a/go.mod
++++ b/go.mod
+@@ -1,6 +1,6 @@
+ module github.com/v2rayA/v2rayA
+ 
+-go 1.21.0
++go 1.21
+ 
+ require (
+       github.com/daeuniverse/outbound v0.0.0-20230819151251-3ce60883d337