From 7d945637fa4f8e9fe31409fb608156c147c3d511 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 12 Dec 2022 05:04:47 +0800 Subject: [PATCH] v2ray-core: Update to 5.1.0 Signed-off-by: Tianling Shen --- v2ray-core/Makefile | 42 ++++---------------------- v2ray-v5-core/Makefile | 82 -------------------------------------------------- v2ray-v5-core/test.sh | 7 ----- v2raya2/Makefile | 2 +- 4 files changed, 7 insertions(+), 126 deletions(-) delete mode 100644 v2ray-v5-core/Makefile delete mode 100644 v2ray-v5-core/test.sh diff --git a/v2ray-core/Makefile b/v2ray-core/Makefile index 9c3cc35..153b5d2 100644 --- a/v2ray-core/Makefile +++ b/v2ray-core/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray-core -PKG_VERSION:=4.45.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=5.1.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=7a126bac7df32f627f34331778cb39ac99db18d7edcd45628db06e123fa0694b +PKG_HASH:=b3dbd2bbee9486999b81d1968545c5a6caa7b0f4726a7259939f1bda54fcf5ea PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE @@ -20,8 +20,8 @@ PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 -GO_PKG:=github.com/v2fly/v2ray-core/v4 -GO_PKG_BUILD_PKG:=github.com/v2fly/v2ray-core/v4/main +GO_PKG:=github.com/v2fly/v2ray-core/v5 +GO_PKG_BUILD_PKG:=$(GO_PKG)/main GO_PKG_LDFLAGS_X:= \ $(GO_PKG).build=OpenWrt \ $(GO_PKG).version=$(PKG_VERSION) @@ -43,11 +43,6 @@ define Package/v2ray-core DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle endef -define Package/v2ray-ctl - $(call Package/v2ray/template) - DEPENDS:=v2ray-core -endef - define Package/v2ray-extra $(call Package/v2ray/template) TITLE+= (extra resources) @@ -64,40 +59,16 @@ define Package/v2ray-core/description $(call Package/v2ray/description) endef -define Package/v2ray-ctl/description - $(call Package/v2ray/description) - - This includes configuration tool for v2ray-core. -endef - define Package/v2ray-extra/description $(call Package/v2ray/description) This includes extra resources for v2ray-core. endef -define Build/Compile - $(call GoPackage/Build/Compile) - mv $(GO_PKG_BUILD_BIN_DIR)/main $(GO_PKG_BUILD_BIN_DIR)/v2ray - -ifneq ($(CONFIG_PACKAGE_v2ray-ctl),) - $(eval GO_PKG_BUILD_PKG:=$(GO_PKG)/infra/control/main) - $(call GoPackage/Build/Compile) - mv $(GO_PKG_BUILD_BIN_DIR)/main $(GO_PKG_BUILD_BIN_DIR)/v2ctl -endif -endef - define Package/v2ray-core/install $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/v2ray $(1)/usr/bin/ -endef - -define Package/v2ray-ctl/install - $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) - - $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/v2ctl $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/main $(1)/usr/bin/v2ray endef define Package/v2ray-extra/install @@ -106,5 +77,4 @@ define Package/v2ray-extra/install endef $(eval $(call BuildPackage,v2ray-core)) -$(eval $(call BuildPackage,v2ray-ctl)) $(eval $(call BuildPackage,v2ray-extra)) diff --git a/v2ray-v5-core/Makefile b/v2ray-v5-core/Makefile deleted file mode 100644 index ee5d0b8..0000000 --- a/v2ray-v5-core/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-only -# -# Copyright (C) 2021 ImmortalWrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=v2ray-core -PKG_VERSION:=5.1.0 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=b3dbd2bbee9486999b81d1968545c5a6caa7b0f4726a7259939f1bda54fcf5ea - -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Tianling Shen - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -GO_PKG:=github.com/v2fly/v2ray-core/v5 -GO_PKG_BUILD_PKG:=$(GO_PKG)/main -GO_PKG_LDFLAGS_X:= \ - $(GO_PKG).build=OpenWrt \ - $(GO_PKG).version=$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -GO_PKG_TARGET_VARS:=$(filter-out CGO_ENABLED=%,$(GO_PKG_TARGET_VARS)) CGO_ENABLED=0 - -define Package/v2ray-v5/template - TITLE:=A platform for building proxies to bypass network restrictions - SECTION:=net - CATEGORY:=Network - URL:=https://www.v2fly.org -endef - -define Package/v2ray-v5-core - $(call Package/v2rayv-5/template) - DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle - CONFLICTS:=v2ray-core -endef - -define Package/v2ray-v5-extra - $(call Package/v2ray-v5/template) - TITLE+= (extra resources) - DEPENDS:=v2ray-core - PKGARCH:=all - CONFLICTS:=v2ray-extra -endef - -define Package/v2ray-v5/description - Project V is a set of network tools that help you to build your own computer network. - It secures your network connections and thus protects your privacy. -endef - -define Package/v2ray-v5-core/description - $(call Package/v2ray-v5/description) -endef - -define Package/v2ray-v5-extra/description - $(call Package/v2ray-v5/description) - - This includes extra resources for v2ray-core. -endef - -define Package/v2ray-v5-core/install - $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) - $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/main $(1)/usr/bin/v2ray -endef - -define Package/v2ray-v5-extra/install - $(INSTALL_DIR) $(1)/usr/share/v2ray/ - $(CP) $(PKG_BUILD_DIR)/release/extra/* $(1)/usr/share/v2ray/ -endef - -$(eval $(call BuildPackage,v2ray-v5-core)) -$(eval $(call BuildPackage,v2ray-v5-extra)) diff --git a/v2ray-v5-core/test.sh b/v2ray-v5-core/test.sh deleted file mode 100644 index ef751a9..0000000 --- a/v2ray-v5-core/test.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -case "$1" in - "v2ray-core") - v2ray version 2>&1 | grep "$PKG_VERSION" - ;; -esac diff --git a/v2raya2/Makefile b/v2raya2/Makefile index 08f008f..dff240b 100644 --- a/v2raya2/Makefile +++ b/v2raya2/Makefile @@ -44,7 +44,7 @@ define Package/v2raya2 +iptables-mod-filter \ +iptables-mod-tproxy \ +kmod-ipt-nat6 \ - +v2ray-v5-core + +v2ray-core CONFLICTS:=v2raya URL:=https://v2raya.org endef -- 2.11.0