From 4ba0d2d3111240fc6263ab1f4bfe99fae638f1f9 Mon Sep 17 00:00:00 2001 From: Mattraks <16359027+Mattraks@users.noreply.github.com> Date: Sun, 6 Dec 2020 21:13:42 +0800 Subject: [PATCH] Use canonical path (#5855) * Use canonical path * xray: add V2ray Compatibility mode * x/v2ray: remove custom options --- package/lean/v2ray/Config.in | 136 -------------------- package/lean/v2ray/Makefile | 232 +++++----------------------------- package/lean/xray/Config.in | 128 ------------------- package/lean/xray/Makefile | 235 ++++++----------------------------- 4 files changed, 73 insertions(+), 658 deletions(-) delete mode 100644 package/lean/v2ray/Config.in delete mode 100644 package/lean/xray/Config.in diff --git a/package/lean/v2ray/Config.in b/package/lean/v2ray/Config.in deleted file mode 100644 index 20bf55c99..000000000 --- a/package/lean/v2ray/Config.in +++ /dev/null @@ -1,136 +0,0 @@ -menu "V2Ray Configuration" - depends on PACKAGE_v2ray - -choice - prompt "JSON Config Support" - default V2RAY_JSON_INTERNAL - - config V2RAY_JSON_INTERNAL - bool "Load JSON Internally" - - config V2RAY_JSON_V2CTL - bool "Load JSON from V2Ctl" - - config V2RAY_JSON_NONE - bool "None" - -endchoice - -config V2RAY_COMPRESS_GOPROXY - bool "Compiling with GOPROXY proxy" - default y - -config V2RAY_EXCLUDE_V2CTL - bool "Exclude V2Ctl" - depends on V2RAY_JSON_INTERNAL || V2RAY_JSON_NONE - default y - -config V2RAY_EXCLUDE_ASSETS - bool "Exclude geoip.dat & geosite.dat" - default y - -config V2RAY_COMPRESS_UPX - bool "Compress executable files with UPX" - default y - -config V2RAY_CUSTOM_FEATURES - bool "Custom Features" - default n - -menu "Features Configuration" - depends on V2RAY_CUSTOM_FEATURES - -config V2RAY_WITHOUT_DNS - bool "Without Internal DNS Support" - default n - -config V2RAY_WITHOUT_LOG - bool "Without Log Support" - default n - -config V2RAY_WITHOUT_TLS - bool "Without TLS Support" - default n - -config V2RAY_WITHOUT_UDP - bool "Without UDP Support" - default n - -config V2RAY_WITHOUT_POLICY - bool "Without Local Policy Support" - default n - -config V2RAY_WITHOUT_REVERSE - bool "Without Reverse Proxy Support" - default n - -config V2RAY_WITHOUT_ROUTING - bool "Without Internal Routing Support" - default n - -config V2RAY_WITHOUT_STATISTICS - bool "Without Statistics Support" - default n - -config V2RAY_WITHOUT_BLACKHOLE_PROTO - bool "Without Blackhole Protocol" - default n - -config V2RAY_WITHOUT_DNS_PROXY - bool "Without DNS Proxy" - default n - -config V2RAY_WITHOUT_DOKODEMO_PROTO - bool "Without Dokodemo-door Protocol" - default n - -config V2RAY_WITHOUT_FREEDOM_PROTO - bool "Without Freedom Protocol" - default n - -config V2RAY_WITHOUT_MTPROTO_PROXY - bool "Without MTProto Proxy" - default n - -config V2RAY_WITHOUT_HTTP_PROTO - bool "Without HTTP Protocol" - default n - -config V2RAY_WITHOUT_SHADOWSOCKS_PROTO - bool "Without Shadowsocks Protocol" - default n - -config V2RAY_WITHOUT_SOCKS_PROTO - bool "Without Socks Protocol" - default n - -config V2RAY_WITHOUT_VMESS_PROTO - bool "Without VMess Protocol" - default n - -config V2RAY_WITHOUT_TCP_TRANS - bool "Without TCP Transport" - default n - -config V2RAY_WITHOUT_MKCP_TRANS - bool "Without mKCP Transport" - default n - -config V2RAY_WITHOUT_WEBSOCKET_TRANS - bool "Without WebSocket Transport" - default n - -config V2RAY_WITHOUT_HTTP2_TRANS - bool "Without HTTP/2 Transport" - default n - -config V2RAY_WITHOUT_DOMAIN_SOCKET_TRANS - bool "Without Domain Socket Transport" - default n - -config V2RAY_WITHOUT_QUIC_TRANS - bool "Without QUIC Transport" - default n - -endmenu -endmenu diff --git a/package/lean/v2ray/Makefile b/package/lean/v2ray/Makefile index 4cb6cea21..12cb9ce64 100644 --- a/package/lean/v2ray/Makefile +++ b/package/lean/v2ray/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2019-2020 Xingwang Liao -# Copyright (C) 2019-2020 Mattraks +# Copyright (C) 2019-2021 Mattraks # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -22,37 +22,10 @@ PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Xingwang Liao PKG_CONFIG_DEPENDS:= \ - CONFIG_V2RAY_JSON_V2CTL \ - CONFIG_V2RAY_JSON_INTERNAL \ - CONFIG_V2RAY_JSON_NONE \ CONFIG_V2RAY_EXCLUDE_V2CTL \ CONFIG_V2RAY_EXCLUDE_ASSETS \ CONFIG_V2RAY_COMPRESS_GOPROXY \ - CONFIG_V2RAY_COMPRESS_UPX \ - CONFIG_V2RAY_CUSTOM_FEATURES \ - CONFIG_V2RAY_WITHOUT_DNS \ - CONFIG_V2RAY_WITHOUT_LOG \ - CONFIG_V2RAY_WITHOUT_TLS \ - CONFIG_V2RAY_WITHOUT_UDP \ - CONFIG_V2RAY_WITHOUT_POLICY \ - CONFIG_V2RAY_WITHOUT_REVERSE \ - CONFIG_V2RAY_WITHOUT_ROUTING \ - CONFIG_V2RAY_WITHOUT_STATISTICS \ - CONFIG_V2RAY_WITHOUT_BLACKHOLE_PROTO \ - CONFIG_V2RAY_WITHOUT_DNS_PROXY \ - CONFIG_V2RAY_WITHOUT_DOKODEMO_PROTO \ - CONFIG_V2RAY_WITHOUT_FREEDOM_PROTO \ - CONFIG_V2RAY_WITHOUT_MTPROTO_PROXY \ - CONFIG_V2RAY_WITHOUT_HTTP_PROTO \ - CONFIG_V2RAY_WITHOUT_SHADOWSOCKS_PROTO \ - CONFIG_V2RAY_WITHOUT_SOCKS_PROTO \ - CONFIG_V2RAY_WITHOUT_VMESS_PROTO \ - CONFIG_V2RAY_WITHOUT_TCP_TRANS \ - CONFIG_V2RAY_WITHOUT_MKCP_TRANS \ - CONFIG_V2RAY_WITHOUT_WEBSOCKET_TRANS \ - CONFIG_V2RAY_WITHOUT_HTTP2_TRANS \ - CONFIG_V2RAY_WITHOUT_DOMAIN_SOCKET_TRANS \ - CONFIG_V2RAY_WITHOUT_QUIC_TRANS + CONFIG_V2RAY_COMPRESS_UPX PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 @@ -61,9 +34,8 @@ PKG_USE_MIPS16:=0 GO_PKG:=v2ray.com/core GO_PKG_LDFLAGS:=-s -w GO_PKG_LDFLAGS_X:= \ - v2ray.com/core.version=$(PKG_VERSION) \ - v2ray.com/core.build=Lean \ - v2ray.com/core.codename=OpenWrt + $(GO_PKG).version=$(PKG_VERSION) \ + $(GO_PKG).codename=OpenWrt include $(INCLUDE_DIR)/package.mk include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk @@ -78,7 +50,25 @@ define Package/$(PKG_NAME) endef define Package/$(PKG_NAME)/config - source "$(SOURCE)/Config.in" +menu "V2Ray Configuration" + depends on PACKAGE_v2ray + +config V2RAY_COMPRESS_GOPROXY + bool "Compiling with GOPROXY proxy" + default n + +config V2RAY_EXCLUDE_V2CTL + bool "Exclude V2Ctl" + default y + +config V2RAY_EXCLUDE_ASSETS + bool "Exclude geoip.dat & geosite.dat" + default y + +config V2RAY_COMPRESS_UPX + bool "Compress executable files with UPX" + default y +endmenu endef define Package/$(PKG_NAME)/description @@ -94,150 +84,6 @@ export GOPROXY=https://goproxy.io #export GOPROXY=https://mirrors.aliyun.com/goproxy/ endif -V2RAY_SED_ARGS:= - -ifeq ($(CONFIG_V2RAY_JSON_INTERNAL),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/main/json",// &,; \ - s,// \(_ "v2ray.com/core/main/jsonem"\),\1,; -else ifeq ($(CONFIG_V2RAY_JSON_NONE),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/main/json",// &,; -endif - -ifeq ($(CONFIG_V2RAY_CUSTOM_FEATURES),y) - -ifeq ($(CONFIG_V2RAY_WITHOUT_DNS),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/app/dns",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_LOG),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/app/log",// &,; \ - s,_ "v2ray.com/core/app/log/command",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_TLS),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/transport/internet/tls",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_UDP),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/transport/internet/udp",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_POLICY),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/app/policy",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_REVERSE),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/app/reverse",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_ROUTING),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/app/router",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_STATISTICS),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/app/stats",// &,; \ - s,_ "v2ray.com/core/app/stats/command",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_BLACKHOLE_PROTO),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/proxy/blackhole",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_DNS_PROXY),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/proxy/dns",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_DOKODEMO_PROTO),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/proxy/dokodemo",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_FREEDOM_PROTO),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/proxy/freedom",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_MTPROTO_PROXY),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/proxy/mtproto",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_HTTP_PROTO),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/proxy/http",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_SHADOWSOCKS_PROTO),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/proxy/shadowsocks",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_SOCKS_PROTO),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/proxy/socks",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_VMESS_PROTO),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/proxy/vmess/inbound",// &,; \ - s,_ "v2ray.com/core/proxy/vmess/outbound",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_TCP_TRANS),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/transport/internet/tcp",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_MKCP_TRANS),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/transport/internet/kcp",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_WEBSOCKET_TRANS),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/transport/internet/websocket",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_HTTP2_TRANS),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/transport/internet/http",// &,; \ - s,_ "v2ray.com/core/transport/internet/headers/http",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_DOMAIN_SOCKET_TRANS),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/transport/internet/domainsocket",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_QUIC_TRANS),y) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/transport/internet/quic",// &,; -endif - -ifeq ($(CONFIG_V2RAY_WITHOUT_MKCP_TRANS)$(CONFIG_V2RAY_WITHOUT_QUIC_TRANS),yy) -V2RAY_SED_ARGS += \ - s,_ "v2ray.com/core/transport/internet/headers/noop",// &,; \ - s,_ "v2ray.com/core/transport/internet/headers/srtp",// &,; \ - s,_ "v2ray.com/core/transport/internet/headers/tls",// &,; \ - s,_ "v2ray.com/core/transport/internet/headers/utp",// &,; \ - s,_ "v2ray.com/core/transport/internet/headers/wechat",// &,; \ - s,_ "v2ray.com/core/transport/internet/headers/wireguard",// &,; -endif - -endif # custom features - GEOIP_VER:=latest GEOIP_FILE:=geoip-$(GEOIP_VER).dat @@ -260,36 +106,24 @@ endef define Build/Prepare $(call Build/Prepare/Default) - ifneq ($(CONFIG_V2RAY_EXCLUDE_ASSETS),y) # move file to make sure download new file every build - mv -f $(DL_DIR)/$(GEOIP_FILE) $(PKG_BUILD_DIR)/release/config/geoip.dat - mv -f $(DL_DIR)/$(GEOSITE_FILE) $(PKG_BUILD_DIR)/release/config/geosite.dat -endif - -ifneq ($(V2RAY_SED_ARGS),) - ( \ - $(SED) \ - '$(V2RAY_SED_ARGS)' \ - $(PKG_BUILD_DIR)/main/distro/all/all.go ; \ - ) + mv -f $(DL_DIR)/$(GEOIP_FILE) $(PKG_BUILD_DIR)/geoip.dat + mv -f $(DL_DIR)/$(GEOSITE_FILE) $(PKG_BUILD_DIR)/geosite.dat endif endef define Build/Compile - $(eval GO_PKG_BUILD_PKG:=v2ray.com/core/main) + $(eval GO_PKG_BUILD_PKG:=$(GO_PKG)/main) $(call GoPackage/Build/Compile) mv -f $(GO_PKG_BUILD_BIN_DIR)/main $(GO_PKG_BUILD_BIN_DIR)/v2ray - ifeq ($(CONFIG_V2RAY_COMPRESS_UPX),y) $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/v2ray || true endif - ifneq ($(CONFIG_V2RAY_EXCLUDE_V2CTL),y) - $(eval GO_PKG_BUILD_PKG:=v2ray.com/core/infra/control/main) + $(eval GO_PKG_BUILD_PKG:=$(GO_PKG)/infra/control/main) $(call GoPackage/Build/Compile) mv -f $(GO_PKG_BUILD_BIN_DIR)/main $(GO_PKG_BUILD_BIN_DIR)/v2ctl - ifeq ($(CONFIG_V2RAY_COMPRESS_UPX),y) $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/v2ctl || true endif @@ -297,16 +131,14 @@ endif endef define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/bin/v2ray - - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/v2ray $(1)/usr/bin/v2ray - + $(INSTALL_DIR) $(1)/usr/bin/ + $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/v2ray $(1)/usr/bin ifneq ($(CONFIG_V2RAY_EXCLUDE_V2CTL),y) - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/v2ctl $(1)/usr/bin/v2ray + $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/v2ctl $(1)/usr/bin endif - ifneq ($(CONFIG_V2RAY_EXCLUDE_ASSETS),y) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/release/config/{geoip,geosite}.dat $(1)/usr/bin/v2ray + $(INSTALL_DIR) $(1)/usr/share/v2ray + $(INSTALL_DATA) $(PKG_BUILD_DIR)/{geoip,geosite}.dat $(1)/usr/share/v2ray endif endef diff --git a/package/lean/xray/Config.in b/package/lean/xray/Config.in deleted file mode 100644 index 9e0d4ae57..000000000 --- a/package/lean/xray/Config.in +++ /dev/null @@ -1,128 +0,0 @@ -menu "Xray Configuration" - depends on PACKAGE_xray - -choice - prompt "JSON Config Support" - default XRAY_JSON_INTERNAL - - config XRAY_JSON_INTERNAL - bool "Load JSON Internally" - - config XRAY_JSON_NONE - bool "None" - -endchoice - -config XRAY_COMPRESS_GOPROXY - bool "Compiling with GOPROXY proxy" - default n - -config XRAY_EXCLUDE_ASSETS - bool "Exclude geoip.dat & geosite.dat" - default y - -config XRAY_COMPRESS_UPX - bool "Compress executable files with UPX" - default y - -config XRAY_CUSTOM_FEATURES - bool "Custom Features" - default n - -menu "Features Configuration" - depends on XRAY_CUSTOM_FEATURES - -config XRAY_WITHOUT_DNS - bool "Without Internal DNS Support" - default n - -config XRAY_WITHOUT_LOG - bool "Without Log Support" - default n - -config XRAY_WITHOUT_TLS - bool "Without TLS Support" - default n - -config XRAY_WITHOUT_UDP - bool "Without UDP Support" - default n - -config XRAY_WITHOUT_POLICY - bool "Without Local Policy Support" - default n - -config XRAY_WITHOUT_REVERSE - bool "Without Reverse Proxy Support" - default n - -config XRAY_WITHOUT_ROUTING - bool "Without Internal Routing Support" - default n - -config XRAY_WITHOUT_STATISTICS - bool "Without Statistics Support" - default n - -config XRAY_WITHOUT_BLACKHOLE_PROTO - bool "Without Blackhole Protocol" - default n - -config XRAY_WITHOUT_DNS_PROXY - bool "Without DNS Proxy" - default n - -config XRAY_WITHOUT_DOKODEMO_PROTO - bool "Without Dokodemo-door Protocol" - default n - -config XRAY_WITHOUT_FREEDOM_PROTO - bool "Without Freedom Protocol" - default n - -config XRAY_WITHOUT_MTPROTO_PROXY - bool "Without MTProto Proxy" - default n - -config XRAY_WITHOUT_HTTP_PROTO - bool "Without HTTP Protocol" - default n - -config XRAY_WITHOUT_SHADOWSOCKS_PROTO - bool "Without Shadowsocks Protocol" - default n - -config XRAY_WITHOUT_SOCKS_PROTO - bool "Without Socks Protocol" - default n - -config XRAY_WITHOUT_VMESS_PROTO - bool "Without VMess Protocol" - default n - -config XRAY_WITHOUT_TCP_TRANS - bool "Without TCP Transport" - default n - -config XRAY_WITHOUT_MKCP_TRANS - bool "Without mKCP Transport" - default n - -config XRAY_WITHOUT_WEBSOCKET_TRANS - bool "Without WebSocket Transport" - default n - -config XRAY_WITHOUT_HTTP2_TRANS - bool "Without HTTP/2 Transport" - default n - -config XRAY_WITHOUT_DOMAIN_SOCKET_TRANS - bool "Without Domain Socket Transport" - default n - -config XRAY_WITHOUT_QUIC_TRANS - bool "Without QUIC Transport" - default n - -endmenu -endmenu diff --git a/package/lean/xray/Makefile b/package/lean/xray/Makefile index 4442e247c..835ce7b91 100644 --- a/package/lean/xray/Makefile +++ b/package/lean/xray/Makefile @@ -1,7 +1,6 @@ # # Copyright (C) 2019-2020 Xingwang Liao -# Copyright (C) 2019-2020 Mattraks -# Copyright (C) 2020 xiaorouji +# Copyright (C) 2020-2021 Mattraks # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,57 +9,31 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xray -PKG_VERSION:=1.0.0 +PKG_VERSION:=1.1.1 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/Xray-core-$(PKG_VERSION) PKG_SOURCE:=xray-core-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/XTLS/xray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=9f0e8f7a885f082780419ac7211a6e6150529d58fa5317ae4dfb61d3a7ba218c +PKG_HASH:=321efd6949a58615fb023b70677780d89914efe9e8f766e4df9051453b3ed5a3 PKG_LICENSE:=MPL PKG_LICENSE_FILES:=LICENSE PKG_CONFIG_DEPENDS:= \ - CONFIG_XRAY_JSON_INTERNAL \ - CONFIG_XRAY_JSON_NONE \ CONFIG_XRAY_EXCLUDE_ASSETS \ CONFIG_XRAY_COMPRESS_GOPROXY \ CONFIG_XRAY_COMPRESS_UPX \ - CONFIG_XRAY_CUSTOM_FEATURES \ - CONFIG_XRAY_WITHOUT_DNS \ - CONFIG_XRAY_WITHOUT_LOG \ - CONFIG_XRAY_WITHOUT_TLS \ - CONFIG_XRAY_WITHOUT_UDP \ - CONFIG_XRAY_WITHOUT_POLICY \ - CONFIG_XRAY_WITHOUT_REVERSE \ - CONFIG_XRAY_WITHOUT_ROUTING \ - CONFIG_XRAY_WITHOUT_STATISTICS \ - CONFIG_XRAY_WITHOUT_BLACKHOLE_PROTO \ - CONFIG_XRAY_WITHOUT_DNS_PROXY \ - CONFIG_XRAY_WITHOUT_DOKODEMO_PROTO \ - CONFIG_XRAY_WITHOUT_FREEDOM_PROTO \ - CONFIG_XRAY_WITHOUT_MTPROTO_PROXY \ - CONFIG_XRAY_WITHOUT_HTTP_PROTO \ - CONFIG_XRAY_WITHOUT_SHADOWSOCKS_PROTO \ - CONFIG_XRAY_WITHOUT_SOCKS_PROTO \ - CONFIG_XRAY_WITHOUT_VMESS_PROTO \ - CONFIG_XRAY_WITHOUT_TCP_TRANS \ - CONFIG_XRAY_WITHOUT_MKCP_TRANS \ - CONFIG_XRAY_WITHOUT_WEBSOCKET_TRANS \ - CONFIG_XRAY_WITHOUT_HTTP2_TRANS \ - CONFIG_XRAY_WITHOUT_DOMAIN_SOCKET_TRANS \ - CONFIG_XRAY_WITHOUT_QUIC_TRANS + CONFIG_XRAY_COMPATIBILITY_MODE PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 -GO_PKG:=github.com/xtls/xray-core/v1 +GO_PKG:=github.com/xtls/xray-core GO_PKG_LDFLAGS:=-s -w GO_PKG_LDFLAGS_X:= \ $(GO_PKG)/core.version=$(PKG_VERSION) \ - $(GO_PKG)/core.build=Lean \ $(GO_PKG)/core.codename=OpenWrt include $(INCLUDE_DIR)/package.mk @@ -72,10 +45,36 @@ define Package/$(PKG_NAME) CATEGORY:=Network SUBMENU:=Project X DEPENDS:=$(GO_ARCH_DEPENDS) +ca-certificates + PROVIDES:=v2ray +endef + +define Package/$(PKG_NAME)/description +Project X originates from XTLS protocol, provides a set of network tools such as Xray-core and Xray-flutter. +It secures your network connections and thus protects your privacy. + + This package contains Xray, geoip.dat and geosite.dat. endef define Package/$(PKG_NAME)/config - source "$(SOURCE)/Config.in" +menu "Xray Configuration" + depends on PACKAGE_xray + +config XRAY_COMPRESS_GOPROXY + bool "Compiling with GOPROXY proxy" + default n + +config XRAY_EXCLUDE_ASSETS + bool "Exclude geoip.dat & geosite.dat" + default y + +config XRAY_COMPRESS_UPX + bool "Compress executable files with UPX" + default y + +config XRAY_COMPATIBILITY_MODE + bool "V2ray Compatibility mode(v2ray soft connection Xray)" + default n +endmenu endef ifeq ($(CONFIG_XRAY_COMPRESS_GOPROXY),y) @@ -84,150 +83,6 @@ export GOPROXY=https://goproxy.io #export GOPROXY=https://mirrors.aliyun.com/goproxy/ endif -XRAY_SED_ARGS:= - -ifeq ($(CONFIG_XRAY_JSON_INTERNAL),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/main/json",// &,; \ - s,// \(_ "$(GO_PKG)/core/main/jsonem"\),\1,; -else ifeq ($(CONFIG_XRAY_JSON_NONE),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/main/json",// &,; -endif - -ifeq ($(CONFIG_XRAY_CUSTOM_FEATURES),y) - -ifeq ($(CONFIG_XRAY_WITHOUT_DNS),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/app/dns",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_LOG),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/app/log",// &,; \ - s,_ "$(GO_PKG)/core/app/log/command",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_TLS),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/transport/internet/tls",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_UDP),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/transport/internet/udp",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_POLICY),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/app/policy",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_REVERSE),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/app/reverse",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_ROUTING),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/app/router",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_STATISTICS),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/app/stats",// &,; \ - s,_ "$(GO_PKG)/core/app/stats/command",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_BLACKHOLE_PROTO),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/proxy/blackhole",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_DNS_PROXY),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/proxy/dns",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_DOKODEMO_PROTO),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/proxy/dokodemo",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_FREEDOM_PROTO),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/proxy/freedom",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_MTPROTO_PROXY),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/proxy/mtproto",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_HTTP_PROTO),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/proxy/http",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_SHADOWSOCKS_PROTO),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/proxy/shadowsocks",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_SOCKS_PROTO),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/proxy/socks",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_VMESS_PROTO),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/proxy/vmess/inbound",// &,; \ - s,_ "$(GO_PKG)/core/proxy/vmess/outbound",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_TCP_TRANS),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/transport/internet/tcp",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_MKCP_TRANS),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/transport/internet/kcp",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_WEBSOCKET_TRANS),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/transport/internet/websocket",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_HTTP2_TRANS),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/transport/internet/http",// &,; \ - s,_ "$(GO_PKG)/core/transport/internet/headers/http",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_DOMAIN_SOCKET_TRANS),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/transport/internet/domainsocket",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_QUIC_TRANS),y) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/transport/internet/quic",// &,; -endif - -ifeq ($(CONFIG_XRAY_WITHOUT_MKCP_TRANS)$(CONFIG_XRAY_WITHOUT_QUIC_TRANS),yy) -XRAY_SED_ARGS += \ - s,_ "$(GO_PKG)/core/transport/internet/headers/noop",// &,; \ - s,_ "$(GO_PKG)/core/transport/internet/headers/srtp",// &,; \ - s,_ "$(GO_PKG)/core/transport/internet/headers/tls",// &,; \ - s,_ "$(GO_PKG)/core/transport/internet/headers/utp",// &,; \ - s,_ "$(GO_PKG)/core/transport/internet/headers/wechat",// &,; \ - s,_ "$(GO_PKG)/core/transport/internet/headers/wireguard",// &,; -endif - -endif # custom features - GEOIP_VER:=latest GEOIP_FILE:=geoip-$(GEOIP_VER).dat @@ -250,19 +105,10 @@ endef define Build/Prepare $(call Build/Prepare/Default) - ifneq ($(CONFIG_XRAY_EXCLUDE_ASSETS),y) # move file to make sure download new file every build - mv -f $(DL_DIR)/$(GEOIP_FILE) $(PKG_BUILD_DIR)/release/config/geoip.dat - mv -f $(DL_DIR)/$(GEOSITE_FILE) $(PKG_BUILD_DIR)/release/config/geosite.dat -endif - -ifneq ($(XRAY_SED_ARGS),) - ( \ - $(SED) \ - '$(XRAY_SED_ARGS)' \ - $(PKG_BUILD_DIR)/main/distro/all/all.go ; \ - ) + mv -f $(DL_DIR)/$(GEOIP_FILE) $(PKG_BUILD_DIR)/geoip.dat + mv -f $(DL_DIR)/$(GEOSITE_FILE) $(PKG_BUILD_DIR)/geosite.dat endif endef @@ -270,19 +116,20 @@ define Build/Compile $(eval GO_PKG_BUILD_PKG:=$(GO_PKG)/main) $(call GoPackage/Build/Compile) mv -f $(GO_PKG_BUILD_BIN_DIR)/main $(GO_PKG_BUILD_BIN_DIR)/xray - ifeq ($(CONFIG_XRAY_COMPRESS_UPX),y) $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/xray || true endif endef define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/bin/xray - - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/xray $(1)/usr/bin/xray - + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/xray $(1)/usr/bin +ifeq ($(CONFIG_XRAY_COMPATIBILITY_MODE),y) + $(LN) xray $(1)/usr/bin/v2ray +endif ifneq ($(CONFIG_XRAY_EXCLUDE_ASSETS),y) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/release/config/{geoip,geosite}.dat $(1)/usr/bin/xray + $(INSTALL_DIR) $(1)/usr/share/xray + $(INSTALL_DATA) $(PKG_BUILD_DIR)/{geoip,geosite}.dat $(1)/usr/share/xray endif endef