first commit

Makefile

@@ -0,0 +1,86 @@
+# SPDX-License-Identifier: GPL-3.0-only
+#
+# Copyright (C) 2021-2023 ImmortalWrt.org
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=v2rayA
+PKG_VERSION:=2.2.4
+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:=844da2a4c1ac1f7eae02519a0833255a63938f08a554cbea043606b28ee6ebed
+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
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+
+GO_PKG:=github.com/v2rayA/v2rayA
+GO_PKG_LDFLAGS_X:= \
+	$(GO_PKG)/conf.Version=$(PKG_VERSION) \
+	$(GO_PKG)/core/iptables.TproxyNotSkipBr=true
+
+include $(INCLUDE_DIR)/package.mk
+include $(TOPDIR)/feeds/packages/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
+  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 Package/v2raya/conffiles
+/etc/v2raya/
+/etc/config/v2raya
+endef
+
+WEB_FILE:=$(PKG_NAME)-web-$(PKG_VERSION).zip
+define Download/v2raya-web
+	URL:=https://github.com/v2rayA/v2rayA/releases/download/v$(PKG_VERSION)/
+	URL_FILE:=web.zip
+	FILE:=$(WEB_FILE)
+	HASH:=2699dacdf39137af408a9ffcb91734e5af487bef4dccaa51f1bb3de6c4d3e8fe
+endef
+
+GO_PKG_TARGET_VARS:=$(filter-out CGO_ENABLED=%,$(GO_PKG_TARGET_VARS)) CGO_ENABLED=0
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+
+	( \
+		mkdir -p $(PKG_BUILD_DIR)/server/router/web ; \
+		unzip -q -d $(PKG_BUILD_DIR)/server/router/web $(DL_DIR)/$(WEB_FILE) ; \
+	)
+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 Download,v2raya-web))
+$(eval $(call GoBinPackage,v2raya))
+$(eval $(call BuildPackage,v2raya))

Makefile.rej

@@ -0,0 +1,26 @@
+--- net/v2raya/Makefile
++++ net/v2raya/Makefile
+@@ -5,12 +5,12 @@
+ include $(TOPDIR)/rules.mk
+ 
+ PKG_NAME:=v2rayA
+-PKG_VERSION:=2.2.2
++PKG_VERSION:=2.2.4
+ 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:=fc32ac028efdd3cac0f482a765ee6e7383b4a8d9be7a343898e64235536cb235
++PKG_HASH:=844da2a4c1ac1f7eae02519a0833255a63938f08a554cbea043606b28ee6ebed
+ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service
+ 
+ PKG_LICENSE:=AGPL-3.0-only
+@@ -59,7 +59,7 @@ define Download/v2raya-web
+ 	URL:=https://github.com/v2rayA/v2rayA/releases/download/v$(PKG_VERSION)/
+ 	URL_FILE:=web.zip
+ 	FILE:=$(WEB_FILE)
+-	HASH:=24e5b61aedb6439f16264be55f50802e1198b87be2d456fc08c44945b67d736b
++	HASH:=2699dacdf39137af408a9ffcb91734e5af487bef4dccaa51f1bb3de6c4d3e8fe
+ endef
+ 
+ define Build/Prepare

files/v2raya.config

@@ -0,0 +1,50 @@
+
+config v2raya 'config'
+	option enabled '0'
+
+	# Listening address
+	option address '0.0.0.0:2017'
+
+	# v2rayA configuration directory
+	option config '/etc/v2raya'
+
+	# Make sure your IPv6 network works fine before you turn it on.
+	# Optional values: auto, on, off.
+	option ipv6_support 'auto'
+
+	# Experimental feature. Make sure you have installed nftables.
+	# Optional values: auto, on, off.
+	option nftables_support 'auto'
+
+	# Optional values: trace, debug, info, warn or error
+	option log_level 'info'
+
+	# The path of log file
+	option log_file '/var/log/v2raya/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 ''
+
+	# Additional v2ray config directory, files in it will be combined with config generated by v2rayA
+	option v2ray_confdir ''
+
+	# The executable file to run in the transparent proxy life-cycle.
+	# v2rayA will pass in the --transparent-type (tproxy, redirect)
+	#   and --stage (pre-start, post-start, pre-stop, post-stop) arguments.
+	option transparent_hook ''
+
+	# The executable file to run in the v2ray-core life-cycle.
+	# v2rayA will pass in the --stage (pre-start, post-start, pre-stop, post-stop) argument.
+	option core_hook ''
+
+	# The executable file to run in the v2ray-core life-cycle.
+	# v2rayA will pass in the --stage (pre-start, post-start, pre-stop, post-stop) argument.
+	option plugin_manager ''
+

files/v2raya.init

@@ -0,0 +1,74 @@
+#!/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_bool enabled "$1" "$2" "${3:-0}"
+	if [ "$enabled" -eq "1" ]; then
+		return 0
+	else
+		return 1
+	fi
+}
+
+append_env() {
+	procd_append_param env "V2RAYA_$(echo "$1" | tr "[a-z]" "[A-Z]")"="$2"
+}
+
+append_env_arg() {
+	local value
+	config_get value "$1" "$2" $3
+	[ -n "$value" ] && append_env "$2" "$value"
+}
+
+append_env_bool() {
+	is_enabled "$1" "$2" && append_env "$2" "true"
+}
+
+start_service() {
+	config_load "$CONF"
+
+	is_enabled "config" "enabled" || return 1
+
+	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"
+	append_env_arg "config" "ipv6_support" "auto"
+	append_env_arg "config" "nftables_support" "auto"
+	append_env_arg "config" "log_level" "info"
+	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"
+	append_env_arg "config" "transparent_hook"
+	append_env_arg "config" "core_hook"
+	append_env_arg "config" "plugin_manager"
+	append_env_bool "config" "log_disable_color"
+	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
+
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger "$CONF"
+}

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

test.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+v2raya --version | grep "$PKG_VERSION"