From e56960b81e820dd1dbcd78ab3fbdb68619c3f70b Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Thu, 26 Aug 2021 21:13:59 +0800
Subject: [PATCH 01/12] v2rayA: add new package

v2rayA is a Linux web GUI client of Project V which supports V2Ray,
Xray, Shadowsocks, ShadowsocksR, Trojan and Pingtunnel.

Wiki: https://github.com/v2rayA/v2rayA/wiki

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 90ec599f9ef7aa011febe5528ba8b0b2016bfe02)
---
 net/v2raya/Makefile            | 75 ++++++++++++++++++++++++++++++++++
 net/v2raya/files/v2raya.config | 25 ++++++++++++
 net/v2raya/files/v2raya.init   | 59 ++++++++++++++++++++++++++
 net/v2raya/test.sh             |  3 ++
 4 files changed, 162 insertions(+)
 create mode 100644 net/v2raya/Makefile
 create mode 100644 net/v2raya/files/v2raya.config
 create mode 100755 net/v2raya/files/v2raya.init
 create mode 100644 net/v2raya/test.sh

diff --git a/net/v2raya/Makefile b/net/v2raya/Makefile
new file mode 100644
index 0000000000000..d06f5fedaac14
--- /dev/null
+++ b/net/v2raya/Makefile
@@ -0,0 +1,75 @@
+# SPDX-License-Identifier: GPL-3.0-only
+#
+# Copyright (C) 2021 ImmortalWrt.org
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=v2rayA
+PKG_VERSION:=1.5.1
+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:=232e61b76a03f28ab48cddc314ddf445ea3c625d7983679428a1328e8e84858e
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service
+
+PKG_LICENSE:=GPL-3.0-only
+PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
+
+PKG_BUILD_DEPENDS:=golang/host node/host node-yarn/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+
+GO_PKG:=github.com/v2rayA/v2rayA
+GO_PKG_LDFLAGS:=-s -w
+GO_PKG_LDFLAGS_X:=$(GO_PKG)/global.Version=$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include ../../lang/golang/golang-package.mk
+
+TAR_OPTIONS+= --strip-components 1
+TAR_CMD=$(HOST_TAR) -C $(1)/.. $(TAR_OPTIONS)
+
+define Package/v2rayA
+  TITLE:=A Linux web GUI client of Project V
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Web Servers/Proxies
+  DEPENDS:=$(GO_ARCH_DEPENDS) \
+    +ca-bundle \
+    +iptables-mod-filter \
+    +iptables-mod-tproxy \
+    +kmod-ipt-nat6 \
+    +xray-core
+  URL:=https://v2raya.org
+endef
+
+define Package/v2rayA/description
+  v2rayA is a V2Ray Linux client supporting global transparent proxy,
+  compatible with SS, SSR, Trojan(trojan-go), PingTunnel protocols.
+endef
+
+define Build/Compile
+	( \
+		pushd $(PKG_BUILD_DIR)/../gui ; \
+		yarn ; \
+		OUTPUT_DIR=../service/server/router/web yarn build ; \
+		popd ; \
+		$(call GoPackage/Build/Compile) ; \
+	)
+endef
+
+define Package/v2rayA/install
+	$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
+	$(INSTALL_DIR) $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/v2rayA $(1)/usr/bin/v2raya
+
+	$(INSTALL_DIR) $(1)/etc/config/
+	$(INSTALL_CONF) $(CURDIR)/files/v2raya.config $(1)/etc/config/v2raya
+	$(INSTALL_DIR) $(1)/etc/init.d/
+	$(INSTALL_BIN) $(CURDIR)/files/v2raya.init $(1)/etc/init.d/v2raya
+endef
+
+$(eval $(call GoBinPackage,v2rayA))
+$(eval $(call BuildPackage,v2rayA))
diff --git a/net/v2raya/files/v2raya.config b/net/v2raya/files/v2raya.config
new file mode 100644
index 0000000000000..7a7926873f0ca
--- /dev/null
+++ b/net/v2raya/files/v2raya.config
@@ -0,0 +1,25 @@
+
+config v2raya 'config'
+	option enabled '0'
+
+	# Listening address
+	option address '0.0.0.0:2017'
+
+	# v2rayA configuration directory
+	option config '/etc/v2raya'
+
+	# force open ipv6
+	option force_ipv6_on '0'
+
+	# ssr, pingTunnel, etc.
+	option plugin_listen_port '32346'
+
+	# Executable v2ray binary path. Auto-detect if put it empty
+	option v2ray_bin ''
+
+	# Additional v2ray config directory, files in it will be combined with config generated by v2rayA
+	option v2ray_config ''
+
+	# Print detailed v2ray-core log to stdout
+	option verbose '0'
+
diff --git a/net/v2raya/files/v2raya.init b/net/v2raya/files/v2raya.init
new file mode 100755
index 0000000000000..e98ad5cd9a321
--- /dev/null
+++ b/net/v2raya/files/v2raya.init
@@ -0,0 +1,59 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2021 Tianling Shen <cnsztl@immortalwrt.org>
+
+USE_PROCD=1
+START=99
+
+CONF="v2raya"
+PROG="/usr/bin/v2raya"
+
+is_enabled() {
+	local enabled
+	config_get enabled "$1" "$2" "${3:-0}"
+	if [ "$enabled" -eq "1" ]; then
+		return 0
+	else
+		return 1
+	fi
+}
+
+append_param() {
+	procd_append_param command "$1" $2
+}
+
+append_param_arg() {
+	local value
+	config_get value "$1" "$2" $4
+	[ -n "$value" ] && append_param "$3" "$value"
+}
+
+start_service() {
+	config_load "$CONF"
+
+	is_enabled "config" "enabled" || exit 1
+
+	procd_open_instance "$CONF"
+	procd_set_param command "$PROG"
+
+	append_param_arg "config" "address" "--address" "0.0.0.0:2017"
+	append_param_arg "config" "config" "--config" "/etc/v2raya"
+	append_param_arg "config" "plugin_listen_port" "--pluginlistenport" "32346"
+	append_param_arg "config" "v2ray_bin" "--v2ray-bin"
+	append_param_arg "config" "v2ray_config" "--v2ray-config"
+	is_enabled "config" "force_ipv6_on" && append_param "--force_ipv6_on"
+	is_enabled "config" "verbose" && append_param "--verbose"
+
+	procd_set_param limits core="unlimited"
+	procd_set_param respawn
+
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger "$CONF"
+}
diff --git a/net/v2raya/test.sh b/net/v2raya/test.sh
new file mode 100644
index 0000000000000..2c53d5fe14f9d
--- /dev/null
+++ b/net/v2raya/test.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+v2raya --version | grep "$PKG_VERSION"

From 6bca9cc98e4a9311d9709e257886aaea4fd38257 Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Mon, 30 Aug 2021 13:31:37 +0800
Subject: [PATCH 02/12] v2rayA: Update to 1.5.2

Refreshed init script to adapt new arguments accepted by the program.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 60c917089fb616d9c071023091e40bdb1f4c12f0)
---
 net/v2raya/Makefile            |  4 ++--
 net/v2raya/files/v2raya.config |  6 +++++-
 net/v2raya/files/v2raya.init   | 17 +++++++++--------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/net/v2raya/Makefile b/net/v2raya/Makefile
index d06f5fedaac14..58dbb0e78b3a0 100644
--- a/net/v2raya/Makefile
+++ b/net/v2raya/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2rayA
-PKG_VERSION:=1.5.1
+PKG_VERSION:=1.5.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:=232e61b76a03f28ab48cddc314ddf445ea3c625d7983679428a1328e8e84858e
+PKG_HASH:=3611b9fa5a6e0421007f2a3ce9671847ffc39e82e1caa6782eff5db470e92fe0
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service
 
 PKG_LICENSE:=GPL-3.0-only
diff --git a/net/v2raya/files/v2raya.config b/net/v2raya/files/v2raya.config
index 7a7926873f0ca..04b1a3f81eef7 100644
--- a/net/v2raya/files/v2raya.config
+++ b/net/v2raya/files/v2raya.config
@@ -18,7 +18,11 @@ config v2raya 'config'
 	option v2ray_bin ''
 
 	# Additional v2ray config directory, files in it will be combined with config generated by v2rayA
-	option v2ray_config ''
+	option v2ray_confdir ''
+
+	# Specify the certification path instead of automatically generating a self-signed certificate.
+	# Example: /etc/v2raya/grpc_certificate.crt,/etc/v2raya/grpc_private.key
+	option vless_grpc_inbound_cert_key ''
 
 	# Print detailed v2ray-core log to stdout
 	option verbose '0'
diff --git a/net/v2raya/files/v2raya.init b/net/v2raya/files/v2raya.init
index e98ad5cd9a321..3a41479aeba90 100755
--- a/net/v2raya/files/v2raya.init
+++ b/net/v2raya/files/v2raya.init
@@ -18,7 +18,7 @@ is_enabled() {
 }
 
 append_param() {
-	procd_append_param command "$1" $2
+	procd_append_param command "--$1" $2
 }
 
 append_param_arg() {
@@ -35,13 +35,14 @@ start_service() {
 	procd_open_instance "$CONF"
 	procd_set_param command "$PROG"
 
-	append_param_arg "config" "address" "--address" "0.0.0.0:2017"
-	append_param_arg "config" "config" "--config" "/etc/v2raya"
-	append_param_arg "config" "plugin_listen_port" "--pluginlistenport" "32346"
-	append_param_arg "config" "v2ray_bin" "--v2ray-bin"
-	append_param_arg "config" "v2ray_config" "--v2ray-config"
-	is_enabled "config" "force_ipv6_on" && append_param "--force_ipv6_on"
-	is_enabled "config" "verbose" && append_param "--verbose"
+	append_param_arg "config" "address" "address" "0.0.0.0:2017"
+	append_param_arg "config" "config" "config" "/etc/v2raya"
+	append_param_arg "config" "plugin_listen_port" "pluginlistenport" "32346"
+	append_param_arg "config" "v2ray_bin" "v2ray-bin"
+	append_param_arg "config" "v2ray_confdir" "v2ray-confdir"
+	append_param_arg "config" "vless_grpc_inbound_cert_key" "vless-grpc-inbound-cert-key"
+	is_enabled "config" "force_ipv6_on" && append_param "force-ipv6-on"
+	is_enabled "config" "verbose" && append_param "verbose"
 
 	procd_set_param limits core="unlimited"
 	procd_set_param respawn

From 20bfd00c357b7e79f22d9970a70f8cb5e4a514f4 Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Thu, 16 Sep 2021 03:15:04 +0800
Subject: [PATCH 03/12] v2raya: Update to 1.5.3

- Added missing conffiles
- Refreshed init srcipt to adapt the new arguments
- Renamed package name to lowercase (suggestion from upstream)
- Updated dependencies and license

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 16e453e4acc39eb0a3bc403f37697cd4083cdf14)
---
 net/v2raya/Makefile            | 26 ++++++++++++++++----------
 net/v2raya/files/v2raya.config | 22 +++++++++++++++-------
 net/v2raya/files/v2raya.init   | 33 +++++++++++++++++++++------------
 3 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/net/v2raya/Makefile b/net/v2raya/Makefile
index 58dbb0e78b3a0..f19259f3e9eb8 100644
--- a/net/v2raya/Makefile
+++ b/net/v2raya/Makefile
@@ -5,15 +5,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2rayA
-PKG_VERSION:=1.5.2
+PKG_VERSION:=1.5.3
 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:=3611b9fa5a6e0421007f2a3ce9671847ffc39e82e1caa6782eff5db470e92fe0
+PKG_HASH:=0f6faeb297279dba138c2afc8525f090f965a0141a4f9d071165ea8500921a55
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service
 
-PKG_LICENSE:=GPL-3.0-only
+PKG_LICENSE:=AGPL-3.0-only
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 
@@ -22,8 +22,7 @@ PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 
 GO_PKG:=github.com/v2rayA/v2rayA
-GO_PKG_LDFLAGS:=-s -w
-GO_PKG_LDFLAGS_X:=$(GO_PKG)/global.Version=$(PKG_VERSION)
+GO_PKG_LDFLAGS_X:=$(GO_PKG)/conf.Version=$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 include ../../lang/golang/golang-package.mk
@@ -31,13 +30,15 @@ include ../../lang/golang/golang-package.mk
 TAR_OPTIONS+= --strip-components 1
 TAR_CMD=$(HOST_TAR) -C $(1)/.. $(TAR_OPTIONS)
 
-define Package/v2rayA
+define Package/v2raya
   TITLE:=A Linux web GUI client of Project V
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Web Servers/Proxies
   DEPENDS:=$(GO_ARCH_DEPENDS) \
     +ca-bundle \
+    +iptables-mod-conntrack-extra \
+    +iptables-mod-extra \
     +iptables-mod-filter \
     +iptables-mod-tproxy \
     +kmod-ipt-nat6 \
@@ -45,11 +46,16 @@ define Package/v2rayA
   URL:=https://v2raya.org
 endef
 
-define Package/v2rayA/description
+define Package/v2raya/description
   v2rayA is a V2Ray Linux client supporting global transparent proxy,
   compatible with SS, SSR, Trojan(trojan-go), PingTunnel protocols.
 endef
 
+define Package/v2raya/conffiles
+/etc/v2raya/
+/etc/config/v2raya
+endef
+
 define Build/Compile
 	( \
 		pushd $(PKG_BUILD_DIR)/../gui ; \
@@ -60,7 +66,7 @@ define Build/Compile
 	)
 endef
 
-define Package/v2rayA/install
+define Package/v2raya/install
 	$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
 	$(INSTALL_DIR) $(1)/usr/bin/
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/v2rayA $(1)/usr/bin/v2raya
@@ -71,5 +77,5 @@ define Package/v2rayA/install
 	$(INSTALL_BIN) $(CURDIR)/files/v2raya.init $(1)/etc/init.d/v2raya
 endef
 
-$(eval $(call GoBinPackage,v2rayA))
-$(eval $(call BuildPackage,v2rayA))
+$(eval $(call GoBinPackage,v2raya))
+$(eval $(call BuildPackage,v2raya))
diff --git a/net/v2raya/files/v2raya.config b/net/v2raya/files/v2raya.config
index 04b1a3f81eef7..841b90a2aa849 100644
--- a/net/v2raya/files/v2raya.config
+++ b/net/v2raya/files/v2raya.config
@@ -8,11 +8,22 @@ config v2raya 'config'
 	# v2rayA configuration directory
 	option config '/etc/v2raya'
 
-	# force open ipv6
-	option force_ipv6_on '0'
+	# Make sure your IPv6 network works fine before you turn it on.
+	# Optional values: auto, on, off.
+	option ipv6_support 'auto'
 
-	# ssr, pingTunnel, etc.
-	option plugin_listen_port '32346'
+	# Optional values: trace, debug, info, warn or error
+	option log_level 'info'
+
+	# The path of log file
+	option log_file '/tmp/v2raya.log'
+
+	# Maximum number of days to keep log files
+	option log_max_days '3'
+
+	option log_disable_color '1'
+
+	option log_disable_timestamp '0'
 
 	# Executable v2ray binary path. Auto-detect if put it empty
 	option v2ray_bin ''
@@ -24,6 +35,3 @@ config v2raya 'config'
 	# Example: /etc/v2raya/grpc_certificate.crt,/etc/v2raya/grpc_private.key
 	option vless_grpc_inbound_cert_key ''
 
-	# Print detailed v2ray-core log to stdout
-	option verbose '0'
-
diff --git a/net/v2raya/files/v2raya.init b/net/v2raya/files/v2raya.init
index 3a41479aeba90..cb8173711105d 100755
--- a/net/v2raya/files/v2raya.init
+++ b/net/v2raya/files/v2raya.init
@@ -9,7 +9,7 @@ PROG="/usr/bin/v2raya"
 
 is_enabled() {
 	local enabled
-	config_get enabled "$1" "$2" "${3:-0}"
+	config_get_bool enabled "$1" "$2" "${3:-0}"
 	if [ "$enabled" -eq "1" ]; then
 		return 0
 	else
@@ -18,13 +18,17 @@ is_enabled() {
 }
 
 append_param() {
-	procd_append_param command "--$1" $2
+	procd_append_param command "$1" $2
 }
 
 append_param_arg() {
 	local value
-	config_get value "$1" "$2" $4
-	[ -n "$value" ] && append_param "$3" "$value"
+	config_get value "$1" "$2" $3
+	[ -n "$value" ] && append_param "--${2//_/-}" "$value"
+}
+
+append_param_bool() {
+	is_enabled "$1" "$2" && append_param "--${2//_/-}"
 }
 
 start_service() {
@@ -35,17 +39,22 @@ start_service() {
 	procd_open_instance "$CONF"
 	procd_set_param command "$PROG"
 
-	append_param_arg "config" "address" "address" "0.0.0.0:2017"
-	append_param_arg "config" "config" "config" "/etc/v2raya"
-	append_param_arg "config" "plugin_listen_port" "pluginlistenport" "32346"
-	append_param_arg "config" "v2ray_bin" "v2ray-bin"
-	append_param_arg "config" "v2ray_confdir" "v2ray-confdir"
-	append_param_arg "config" "vless_grpc_inbound_cert_key" "vless-grpc-inbound-cert-key"
-	is_enabled "config" "force_ipv6_on" && append_param "force-ipv6-on"
-	is_enabled "config" "verbose" && append_param "verbose"
+	append_param_arg "config" "address" "0.0.0.0:2017"
+	append_param_arg "config" "config" "/etc/v2raya"
+	append_param_arg "config" "ipv6_support" "auto"
+	append_param_arg "config" "log_level" "info"
+	append_param_arg "config" "log_file" "/tmp/v2raya.log"
+	append_param_arg "config" "log_max_days" "3"
+	append_param_arg "config" "v2ray_bin"
+	append_param_arg "config" "v2ray_confdir"
+	append_param_arg "config" "vless_grpc_inbound_cert_key"
+	append_param_bool "config" "log_disable_color"
+	append_param_bool "config" "log_disable_timestamp"
 
 	procd_set_param limits core="unlimited"
 	procd_set_param respawn
+	procd_set_param stdout 1
+	procd_set_param stderr 1
 
 	procd_close_instance
 }

From 07a54c6a860f0cac4a07e9a4dc65b7279f26bad6 Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Sat, 2 Oct 2021 10:48:24 +0800
Subject: [PATCH 04/12] v2raya: Update to 1.5.4

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit d48b22fb9011311e78dc71b1a09b7219aecaba1d)
---
 net/v2raya/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/v2raya/Makefile b/net/v2raya/Makefile
index f19259f3e9eb8..55cf458d68dce 100644
--- a/net/v2raya/Makefile
+++ b/net/v2raya/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2rayA
-PKG_VERSION:=1.5.3
+PKG_VERSION:=1.5.4
 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:=0f6faeb297279dba138c2afc8525f090f965a0141a4f9d071165ea8500921a55
+PKG_HASH:=5ec7f4103e07fd4f3750284dc396823fcfccab73b0d101098771d419c9d836ac
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service
 
 PKG_LICENSE:=AGPL-3.0-only

From 28b5968ab58d772cf5838b297f55cc5add741030 Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Fri, 10 Dec 2021 18:56:00 +0800
Subject: [PATCH 05/12] v2rayA: Update to 1.5.5

Breaking changes:
The database has been replaced with boltdb to try to solve the problem
of database corruption.

Note that the data will not be migrated, but the previous data will be
retained. If you need the previous data, just downgrade v2rayA (v1.5.4).

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 21e98e952f5c03a590b30c65c2419e4dc8e5910f)
---
 net/v2raya/Makefile                           |   4 +-
 .../patches/010-chore-re-support-mips.patch   | 154 ++++++++++++++++++
 2 files changed, 156 insertions(+), 2 deletions(-)
 create mode 100644 net/v2raya/patches/010-chore-re-support-mips.patch

diff --git a/net/v2raya/Makefile b/net/v2raya/Makefile
index 55cf458d68dce..459c97eb1aecd 100644
--- a/net/v2raya/Makefile
+++ b/net/v2raya/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2rayA
-PKG_VERSION:=1.5.4
+PKG_VERSION:=1.5.5
 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:=5ec7f4103e07fd4f3750284dc396823fcfccab73b0d101098771d419c9d836ac
+PKG_HASH:=7844cb4cddca0a4831925c38039226813a61ceaf24a19e471654d278387b8368
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service
 
 PKG_LICENSE:=AGPL-3.0-only
diff --git a/net/v2raya/patches/010-chore-re-support-mips.patch b/net/v2raya/patches/010-chore-re-support-mips.patch
new file mode 100644
index 0000000000000..b94d3349d6d43
--- /dev/null
+++ b/net/v2raya/patches/010-chore-re-support-mips.patch
@@ -0,0 +1,154 @@
+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=

From 21f7aef99199cb3448666c23ac2e2b817aa0d7ce Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Fri, 4 Feb 2022 18:12:09 +0800
Subject: [PATCH 06/12] v2raya: init: convert arguments into env variables

Suggested by upstream, to provide forward compatibility.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 8465053a58ce6efcdfe59f834e9d373496d02f64)
---
 net/v2raya/files/v2raya.init | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/net/v2raya/files/v2raya.init b/net/v2raya/files/v2raya.init
index cb8173711105d..f1374914d42ff 100755
--- a/net/v2raya/files/v2raya.init
+++ b/net/v2raya/files/v2raya.init
@@ -17,18 +17,18 @@ is_enabled() {
 	fi
 }
 
-append_param() {
-	procd_append_param command "$1" $2
+append_env() {
+	procd_append_param env "V2RAYA_$(echo "$1" | tr "[a-z]" "[A-Z]")"="$2"
 }
 
-append_param_arg() {
+append_env_arg() {
 	local value
 	config_get value "$1" "$2" $3
-	[ -n "$value" ] && append_param "--${2//_/-}" "$value"
+	[ -n "$value" ] && append_env "$2" "$value"
 }
 
-append_param_bool() {
-	is_enabled "$1" "$2" && append_param "--${2//_/-}"
+append_env_bool() {
+	is_enabled "$1" "$2" && append_env "$2" "true"
 }
 
 start_service() {
@@ -39,17 +39,17 @@ start_service() {
 	procd_open_instance "$CONF"
 	procd_set_param command "$PROG"
 
-	append_param_arg "config" "address" "0.0.0.0:2017"
-	append_param_arg "config" "config" "/etc/v2raya"
-	append_param_arg "config" "ipv6_support" "auto"
-	append_param_arg "config" "log_level" "info"
-	append_param_arg "config" "log_file" "/tmp/v2raya.log"
-	append_param_arg "config" "log_max_days" "3"
-	append_param_arg "config" "v2ray_bin"
-	append_param_arg "config" "v2ray_confdir"
-	append_param_arg "config" "vless_grpc_inbound_cert_key"
-	append_param_bool "config" "log_disable_color"
-	append_param_bool "config" "log_disable_timestamp"
+	append_env_arg "config" "address" "0.0.0.0:2017"
+	append_env_arg "config" "config" "/etc/v2raya"
+	append_env_arg "config" "ipv6_support" "auto"
+	append_env_arg "config" "log_level" "info"
+	append_env_arg "config" "log_file" "/tmp/v2raya.log"
+	append_env_arg "config" "log_max_days" "3"
+	append_env_arg "config" "v2ray_bin"
+	append_env_arg "config" "v2ray_confdir"
+	append_env_arg "config" "vless_grpc_inbound_cert_key"
+	append_env_bool "config" "log_disable_color"
+	append_env_bool "config" "log_disable_timestamp"
 
 	procd_set_param limits core="unlimited"
 	procd_set_param respawn

From d52b6e2f1730179a997581b414811e1326200bd2 Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Fri, 4 Feb 2022 17:26:22 +0800
Subject: [PATCH 07/12] v2rayA: Update to 1.5.6.2

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>
(cherry picked from commit c7b5e7ed67e1465da775e59e96b872a69a0452f5)
---
 net/v2raya/Makefile                           |   4 +-
 net/v2raya/files/v2raya.init                  |   1 +
 .../patches/010-chore-re-support-mips.patch   | 154 ------------------
 3 files changed, 3 insertions(+), 156 deletions(-)
 delete mode 100644 net/v2raya/patches/010-chore-re-support-mips.patch

diff --git a/net/v2raya/Makefile b/net/v2raya/Makefile
index 459c97eb1aecd..5bdbebd36f062 100644
--- a/net/v2raya/Makefile
+++ b/net/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/net/v2raya/files/v2raya.init b/net/v2raya/files/v2raya.init
index f1374914d42ff..826935d5c3a18 100755
--- a/net/v2raya/files/v2raya.init
+++ b/net/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/net/v2raya/patches/010-chore-re-support-mips.patch b/net/v2raya/patches/010-chore-re-support-mips.patch
deleted file mode 100644
index b94d3349d6d43..0000000000000
--- a/net/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=

From 06ff8383bc8d4f4e1e7bf75b71f9daa505affffc Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Sat, 26 Mar 2022 22:16:03 +0800
Subject: [PATCH 08/12] v2raya: fix panic in go 1.18

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 7aa127e208262e44b81fbbf7fe023b9cfdc6fdf7)
---
 .../010-fix-panic-in-go-1.18-462.patch        | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 net/v2raya/patches/010-fix-panic-in-go-1.18-462.patch

diff --git a/net/v2raya/patches/010-fix-panic-in-go-1.18-462.patch b/net/v2raya/patches/010-fix-panic-in-go-1.18-462.patch
new file mode 100644
index 0000000000000..3461629e902a7
--- /dev/null
+++ b/net/v2raya/patches/010-fix-panic-in-go-1.18-462.patch
@@ -0,0 +1,32 @@
+From eb210b5e634b65838b50387891ad837590fb2b4e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E9=AB=98=E6=B8=90=E7=A6=BB?= <admin@gaojianli.me>
+Date: Tue, 22 Mar 2022 15:28:50 +0800
+Subject: [PATCH] fix: panic in go 1.18 (#462)
+
+---
+ service/go.mod | 2 +-
+ service/go.sum | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+--- a/go.mod
++++ b/go.mod
+@@ -50,7 +50,7 @@ require (
+ 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
+ 	github.com/mattn/go-isatty v0.0.12 // indirect
+ 	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
+-	github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
++	github.com/modern-go/reflect2 v1.0.2 // indirect
+ 	github.com/pelletier/go-toml v1.2.0 // indirect
+ 	github.com/pires/go-proxyproto v0.6.1 // indirect
+ 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+--- a/go.sum
++++ b/go.sum
+@@ -145,6 +145,8 @@ github.com/modern-go/concurrent v0.0.0-2
+ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
+ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
++github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
++github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
+ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
+ github.com/muhammadmuzzammil1998/jsonc v0.0.0-20201229145248-615b0916ca38 h1:0FrBxrkJ0hVembTb/e4EU5Ml6vLcOusAqymmYISg5Uo=

From 5bec58203fbacfe8bac0757eaffdd19954eb650b Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Thu, 21 Apr 2022 03:01:39 +0800
Subject: [PATCH 09/12] v2rayA: Update to 1.5.7

- Removed an upstreamed patch
- Move logs to /var/log in accordance with FHS 3.0

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit ff8f25cb98ce3117fac28020f96f3e7f49ff6106)
---
 net/v2raya/Makefile                           |  4 +--
 net/v2raya/files/v2raya.config                |  2 +-
 net/v2raya/files/v2raya.init                  |  2 +-
 .../010-fix-panic-in-go-1.18-462.patch        | 32 -------------------
 4 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100644 net/v2raya/patches/010-fix-panic-in-go-1.18-462.patch

diff --git a/net/v2raya/Makefile b/net/v2raya/Makefile
index 5bdbebd36f062..8be9ee4c29932 100644
--- a/net/v2raya/Makefile
+++ b/net/v2raya/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2rayA
-PKG_VERSION:=1.5.6.2
+PKG_VERSION:=1.5.7
 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:=d949246aa9fe80aa9cb8fb4d80cb470f508bb44d4ac23e84e28e3b9abd30b67c
+PKG_HASH:=6d203ef95ac2a48f6f1808b93fc1cd1a4f32a0419710d0c7a74169f27c38ed9c
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service
 
 PKG_LICENSE:=AGPL-3.0-only
diff --git a/net/v2raya/files/v2raya.config b/net/v2raya/files/v2raya.config
index 841b90a2aa849..fbda47431a0c1 100644
--- a/net/v2raya/files/v2raya.config
+++ b/net/v2raya/files/v2raya.config
@@ -16,7 +16,7 @@ config v2raya 'config'
 	option log_level 'info'
 
 	# The path of log file
-	option log_file '/tmp/v2raya.log'
+	option log_file '/var/log/v2raya/v2raya.log'
 
 	# Maximum number of days to keep log files
 	option log_max_days '3'
diff --git a/net/v2raya/files/v2raya.init b/net/v2raya/files/v2raya.init
index 826935d5c3a18..5c7a0ece47421 100755
--- a/net/v2raya/files/v2raya.init
+++ b/net/v2raya/files/v2raya.init
@@ -44,7 +44,7 @@ start_service() {
 	append_env_arg "config" "config" "/etc/v2raya"
 	append_env_arg "config" "ipv6_support" "auto"
 	append_env_arg "config" "log_level" "info"
-	append_env_arg "config" "log_file" "/tmp/v2raya.log"
+	append_env_arg "config" "log_file" "/var/log/v2raya/v2raya.log"
 	append_env_arg "config" "log_max_days" "3"
 	append_env_arg "config" "v2ray_bin"
 	append_env_arg "config" "v2ray_confdir"
diff --git a/net/v2raya/patches/010-fix-panic-in-go-1.18-462.patch b/net/v2raya/patches/010-fix-panic-in-go-1.18-462.patch
deleted file mode 100644
index 3461629e902a7..0000000000000
--- a/net/v2raya/patches/010-fix-panic-in-go-1.18-462.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From eb210b5e634b65838b50387891ad837590fb2b4e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=E9=AB=98=E6=B8=90=E7=A6=BB?= <admin@gaojianli.me>
-Date: Tue, 22 Mar 2022 15:28:50 +0800
-Subject: [PATCH] fix: panic in go 1.18 (#462)
-
----
- service/go.mod | 2 +-
- service/go.sum | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
---- a/go.mod
-+++ b/go.mod
-@@ -50,7 +50,7 @@ require (
- 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
- 	github.com/mattn/go-isatty v0.0.12 // indirect
- 	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
--	github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
-+	github.com/modern-go/reflect2 v1.0.2 // indirect
- 	github.com/pelletier/go-toml v1.2.0 // indirect
- 	github.com/pires/go-proxyproto v0.6.1 // indirect
- 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
---- a/go.sum
-+++ b/go.sum
-@@ -145,6 +145,8 @@ github.com/modern-go/concurrent v0.0.0-2
- github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
- github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
- github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
- github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
- github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
- github.com/muhammadmuzzammil1998/jsonc v0.0.0-20201229145248-615b0916ca38 h1:0FrBxrkJ0hVembTb/e4EU5Ml6vLcOusAqymmYISg5Uo=

From 2619b4dc1e78611e94f452c9be12bbffa9384ca5 Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Sun, 19 Jun 2022 02:02:08 +0800
Subject: [PATCH 10/12] v2raya: Update to 1.5.8.1

1. Switched to use prebuilt web files to get rid of massive Node.js.
2. Increased nofile limitation to avoid "too many open files" error.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit d629a6f8b2b3e37a98540b5ec043949d2069cb88)
---
 net/v2raya/Makefile          | 26 +++++++++++++++++---------
 net/v2raya/files/v2raya.init |  1 +
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/net/v2raya/Makefile b/net/v2raya/Makefile
index 8be9ee4c29932..429f2ee6edcdd 100644
--- a/net/v2raya/Makefile
+++ b/net/v2raya/Makefile
@@ -5,19 +5,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2rayA
-PKG_VERSION:=1.5.7
+PKG_VERSION:=1.5.8.1
 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:=6d203ef95ac2a48f6f1808b93fc1cd1a4f32a0419710d0c7a74169f27c38ed9c
+PKG_HASH:=822ec4a93933d93aed1bda6f9a3c08915135c0fc33bebe5e69b293cf30fe35c2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service
 
 PKG_LICENSE:=AGPL-3.0-only
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 
-PKG_BUILD_DEPENDS:=golang/host node/host node-yarn/host
+PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 
@@ -56,13 +56,20 @@ define Package/v2raya/conffiles
 /etc/config/v2raya
 endef
 
-define Build/Compile
+WEB_FILE:=$(PKG_NAME)-web-$(PKG_VERSION).tar.gz
+define Download/v2raya-web
+	URL:=https://codeload.github.com/v2rayA/v2raya-web/tar.gz/v$(PKG_VERSION)?
+	URL_FILE:=$(WEB_FILE)
+	FILE:=$(WEB_FILE)
+	HASH:=b13beac91d75c64af4ca6d7365716968702ce1be3f0c3e94d26e01daa07f223b
+endef
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+
 	( \
-		pushd $(PKG_BUILD_DIR)/../gui ; \
-		yarn ; \
-		OUTPUT_DIR=../service/server/router/web yarn build ; \
-		popd ; \
-		$(call GoPackage/Build/Compile) ; \
+		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) ; \
 	)
 endef
 
@@ -77,5 +84,6 @@ define Package/v2raya/install
 	$(INSTALL_BIN) $(CURDIR)/files/v2raya.init $(1)/etc/init.d/v2raya
 endef
 
+$(eval $(call Download,v2raya-web))
 $(eval $(call GoBinPackage,v2raya))
 $(eval $(call BuildPackage,v2raya))
diff --git a/net/v2raya/files/v2raya.init b/net/v2raya/files/v2raya.init
index 5c7a0ece47421..a8295b6f45076 100755
--- a/net/v2raya/files/v2raya.init
+++ b/net/v2raya/files/v2raya.init
@@ -53,6 +53,7 @@ start_service() {
 	append_env_bool "config" "log_disable_timestamp"
 
 	procd_set_param limits core="unlimited"
+	procd_set_param limits nofile="1000000 1000000"
 	procd_set_param respawn
 	procd_set_param stdout 1
 	procd_set_param stderr 1

From 73fdd5701a6448f9b91466d5679add13d3d380e4 Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Fri, 5 Aug 2022 21:58:06 +0800
Subject: [PATCH 11/12] v2raya: Update to 1.5.9.1698.1

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 3c43f65ae90fd7de6a5bb91d1560917db1b281dd)
---
 net/v2raya/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/v2raya/Makefile b/net/v2raya/Makefile
index 429f2ee6edcdd..7596861106749 100644
--- a/net/v2raya/Makefile
+++ b/net/v2raya/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2rayA
-PKG_VERSION:=1.5.8.1
+PKG_VERSION:=1.5.9.1698.1
 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:=822ec4a93933d93aed1bda6f9a3c08915135c0fc33bebe5e69b293cf30fe35c2
+PKG_HASH:=247a357230c616bf48309c61d119686e4ad56939c05afef584c45051e9dc6220
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service
 
 PKG_LICENSE:=AGPL-3.0-only
@@ -61,7 +61,7 @@ define Download/v2raya-web
 	URL:=https://codeload.github.com/v2rayA/v2raya-web/tar.gz/v$(PKG_VERSION)?
 	URL_FILE:=$(WEB_FILE)
 	FILE:=$(WEB_FILE)
-	HASH:=b13beac91d75c64af4ca6d7365716968702ce1be3f0c3e94d26e01daa07f223b
+	HASH:=149097a42c3e5fa6f5c3cd46d1bf7ec4546e79ad37c1446b759539e700bd75e2
 endef
 
 define Build/Prepare

From b45c3deae956e6c3529a7dc7d083f2953cfe714e Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Mon, 17 Oct 2022 20:46:28 +0800
Subject: [PATCH 12/12] treewide: fix procd service inactive

Exit directly will result procd service inactive and uci
configuration changes are no longer monitored.

Reported-by: Lvc Revincx <revincx233@gmail.com>
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit b1651c5d5444b990b58180a26d6e76779cbb88a9)
---
 net/v2raya/files/v2raya.init  | 2 +-
 net/xray-core/files/xray.init | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/v2raya/files/v2raya.init b/net/v2raya/files/v2raya.init
index a8295b6f45076..9c207f7d947a0 100755
--- a/net/v2raya/files/v2raya.init
+++ b/net/v2raya/files/v2raya.init
@@ -34,7 +34,7 @@ append_env_bool() {
 start_service() {
 	config_load "$CONF"
 
-	is_enabled "config" "enabled" || exit 1
+	is_enabled "config" "enabled" || return 1
 
 	procd_open_instance "$CONF"
 	procd_set_param command "$PROG"
diff --git a/net/xray-core/files/xray.init b/net/xray-core/files/xray.init
index a24255e9d56d1..7e4b8a7dbdb1e 100755
--- a/net/xray-core/files/xray.init
+++ b/net/xray-core/files/xray.init
@@ -10,8 +10,8 @@ start_service() {
 	config_load "$CONF"
 
 	local enabled
-	config_get enabled "enabled" "enabled" "0"
-	[ "$enabled" -eq "0" ] && exit 1
+	config_get_bool enabled "enabled" "enabled" "0"
+	[ "$enabled" -eq "1" ] || return 1
 
 	local confdir
 	local conffiles