From ec18e93c48c2702ad5b3932283d5911a648d8e3f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 19:17:44 +0800 Subject: [PATCH] update 2023-02-01 19:17:44 --- v2ray-geodata/Makefile | 4 +- xray-core/Makefile | 51 +------- xray-core/files/config.json.example | 144 ---------------------- xray-core/files/vpoint_socks_vmess.json | 25 ---- xray-core/files/vpoint_vmess_freedom.json | 31 ----- xray-core/files/xray.conf | 11 -- xray-core/files/xray.init | 58 --------- 7 files changed, 8 insertions(+), 316 deletions(-) delete mode 100644 xray-core/files/config.json.example delete mode 100644 xray-core/files/vpoint_socks_vmess.json delete mode 100644 xray-core/files/vpoint_vmess_freedom.json delete mode 100644 xray-core/files/xray.conf delete mode 100755 xray-core/files/xray.init diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index 4a50bd9e..b891f572 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -21,13 +21,13 @@ define Download/geoip HASH:=a13a2ca90c15a85f4cc8169d12be24cb71f34bb75eb446000d9ec18ebefd2511 endef -GEOSITE_VER:=20230201034244 +GEOSITE_VER:=20230201094130 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=2074e929f3886f21366fa922b8ebb06bd4fd3c0640fdf06742f572c738e13d0b + HASH:=74ff46b6080f728a45806b1d98b196f5542247c58843dad905db7f0e362aafd1 endef define Package/v2ray-geodata/template diff --git a/xray-core/Makefile b/xray-core/Makefile index 0e36b091..2be74ec3 100644 --- a/xray-core/Makefile +++ b/xray-core/Makefile @@ -1,6 +1,6 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=Xray-core +PKG_NAME:=xray-core PKG_VERSION:=1.7.2 PKG_RELEASE:=1 @@ -12,11 +12,13 @@ PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MPL-2.0 PKG_LICENSE_FILES:=LICENSE +PKG_BUILD_DIR:=$(BUILD_DIR)/Xray-core-$(PKG_VERSION) PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 GO_PKG:=github.com/xtls/xray-core +GO_PKG_LDFLAGS:=-s -w GO_PKG_BUILD_PKG:=$(GO_PKG)/main GO_PKG_LDFLAGS_X:= \ $(GO_PKG)/core.build=OpenWrt \ @@ -25,64 +27,23 @@ GO_PKG_LDFLAGS_X:= \ include $(INCLUDE_DIR)/package.mk include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk -define Package/xray/template +define Package/xray-core TITLE:=A platform for building proxies to bypass network restrictions SECTION:=net CATEGORY:=Network URL:=https://xtls.github.io -endef - -define Package/xray-core - $(call Package/xray/template) DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle endef -define Package/xray-example - $(call Package/xray/template) - TITLE+= (example configs) - DEPENDS:=xray-core - PKGARCH:=all -endef - -define Package/xray/description +define Package/xray-core/description Xray, Penetrates Everything. It helps you to build your own computer network. It secures your network connections and thus protects your privacy. endef -define Package/xray-core/description - $(call Package/xray/description) -endef - -define Package/xray-example/description - $(call Package/xray/description) - - This includes example configuration files for xray-core. -endef - -define Package/xray-core/conffiles -/etc/xray/ -/etc/config/xray -endef - define Package/xray-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/xray - - $(INSTALL_DIR) $(1)/etc/xray/ - $(INSTALL_DATA) $(CURDIR)/files/config.json.example $(1)/etc/xray/ - - $(INSTALL_DIR) $(1)/etc/config/ - $(INSTALL_CONF) $(CURDIR)/files/xray.conf $(1)/etc/config/xray - $(INSTALL_DIR) $(1)/etc/init.d/ - $(INSTALL_BIN) $(CURDIR)/files/xray.init $(1)/etc/init.d/xray endef -define Package/xray-example/install - $(INSTALL_DIR) $(1)/etc/xray/ - $(INSTALL_DATA) $(CURDIR)/files/vpoint_socks_vmess.json $(1)/etc/xray/ - $(INSTALL_DATA) $(CURDIR)/files/vpoint_vmess_freedom.json $(1)/etc/xray/ -endef - -$(eval $(call BuildPackage,xray-core)) -$(eval $(call BuildPackage,xray-example)) +$(eval $(call BuildPackage,xray-core)) \ No newline at end of file diff --git a/xray-core/files/config.json.example b/xray-core/files/config.json.example deleted file mode 100644 index df76be16..00000000 --- a/xray-core/files/config.json.example +++ /dev/null @@ -1,144 +0,0 @@ -// Config file of Xray. This file follows standard JSON format, with comments support. -// Uncomment entries below to satisfy your needs. Also read our manual for more detail at -// https://xtls.github.io/en/config/ -{ - "log": { - // By default, Xray writes access log to stdout. - // "access": "/path/to/access/log/file", - - // By default, Xray write error log to stdout. - // "error": "/path/to/error/log/file", - - // Log level, one of "debug", "info", "warning", "error", "none" - "loglevel": "warning" - }, - // List of inbound proxy configurations. - "inbounds": [{ - // Port to listen on. You may need root access if the value is less than 1024. - "port": 1080, - - // IP address to listen on. Change to "0.0.0.0" to listen on all network interfaces. - "listen": "127.0.0.1", - - // Tag of the inbound proxy. May be used for routing. - "tag": "socks-inbound", - - // Protocol name of inbound proxy. - "protocol": "socks", - - // Settings of the protocol. Varies based on protocol. - "settings": { - "auth": "noauth", - "udp": false, - "ip": "127.0.0.1" - }, - - // Enable sniffing on TCP connection. - "sniffing": { - "enabled": true, - // Target domain will be overriden to the one carried by the connection, if the connection is HTTP or HTTPS. - "destOverride": ["http", "tls"] - } - }], - // List of outbound proxy configurations. - "outbounds": [{ - // Protocol name of the outbound proxy. - "protocol": "freedom", - - // Settings of the protocol. Varies based on protocol. - "settings": {}, - - // Tag of the outbound. May be used for routing. - "tag": "direct" - },{ - "protocol": "blackhole", - "settings": {}, - "tag": "blocked" - }], - - // Transport is for global transport settings. If you have multiple transports with same settings - // (say mKCP), you may put it here, instead of in each individual inbound/outbounds. - //"transport": {}, - - // Routing controls how traffic from inbounds are sent to outbounds. - "routing": { - "domainStrategy": "IPOnDemand", - "rules":[ - { - // Blocks access to private IPs. Remove this if you want to access your router. - "type": "field", - "ip": ["geoip:private"], - "outboundTag": "blocked" - }, - { - // Blocks major ads. - "type": "field", - "domain": ["geosite:category-ads"], - "outboundTag": "blocked" - } - ] - }, - - // Dns settings for domain resolution. - "dns": { - // Static hosts, similar to hosts file. - "hosts": { - // Match v2ray.com to another domain on CloudFlare. This domain will be used when querying IPs for v2ray.com. - "domain:v2ray.com": "www.vicemc.net", - - // The following settings help to eliminate DNS poisoning in mainland China. - // It is safe to comment these out if this is not the case for you. - "domain:github.io": "pages.github.com", - "domain:wikipedia.org": "www.wikimedia.org", - "domain:shadowsocks.org": "electronicsrealm.com" - }, - "servers": [ - "1.1.1.1", - { - "address": "114.114.114.114", - "port": 53, - // List of domains that use this DNS first. - "domains": [ - "geosite:cn" - ] - }, - "8.8.8.8", - "localhost" - ] - }, - - // Policy controls some internal behavior of how Xray handles connections. - // It may be on connection level by user levels in 'levels', or global settings in 'system.' - "policy": { - // Connection policys by user levels - "levels": { - "0": { - "uplinkOnly": 0, - "downlinkOnly": 0 - } - }, - "system": { - "statsInboundUplink": false, - "statsInboundDownlink": false, - "statsOutboundUplink": false, - "statsOutboundDownlink": false - } - }, - - // Stats enables internal stats counter. - // This setting can be used together with Policy and Api. - //"stats":{}, - - // Api enables gRPC APIs for external programs to communicate with Xray instance. - //"api": { - //"tag": "api", - //"services": [ - // "HandlerService", - // "LoggerService", - // "StatsService" - //] - //}, - - // You may add other entries to the configuration, but they will not be recognized by Xray. - "other": {} -} diff --git a/xray-core/files/vpoint_socks_vmess.json b/xray-core/files/vpoint_socks_vmess.json deleted file mode 100644 index 120c422c..00000000 --- a/xray-core/files/vpoint_socks_vmess.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "log": { - "loglevel": "warning" - }, - "inbounds": [{ - "port": 1080, - "listen": "127.0.0.1", - "protocol": "socks", - "settings": { - "auth": "noauth", - "udp": false, - "ip": "127.0.0.1" - } - }], - "outbounds": [{ - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }], - "policy": { - "levels": { - "0": {"uplinkOnly": 0} - } - } -} diff --git a/xray-core/files/vpoint_vmess_freedom.json b/xray-core/files/vpoint_vmess_freedom.json deleted file mode 100644 index d513341d..00000000 --- a/xray-core/files/vpoint_vmess_freedom.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "inbounds": [{ - "port": 10086, - "protocol": "vmess", - "settings": { - "clients": [ - { - "id": "23ad6b10-8d1a-40f7-8ad0-e3e35cd38297", - "level": 1 - } - ] - } - }], - "outbounds": [{ - "protocol": "freedom", - "settings": {} - },{ - "protocol": "blackhole", - "settings": {}, - "tag": "blocked" - }], - "routing": { - "rules": [ - { - "type": "field", - "ip": ["geoip:private"], - "outboundTag": "blocked" - } - ] - } -} diff --git a/xray-core/files/xray.conf b/xray-core/files/xray.conf deleted file mode 100644 index 298ee6a6..00000000 --- a/xray-core/files/xray.conf +++ /dev/null @@ -1,11 +0,0 @@ - -config xray 'enabled' - option enabled '0' - -config xray 'config' - option confdir '/etc/xray' - list conffiles '/etc/xray/config.json' - option datadir '/usr/share/v2ray' - option dialer '' - option format 'json' - diff --git a/xray-core/files/xray.init b/xray-core/files/xray.init deleted file mode 100755 index 014e635f..00000000 --- a/xray-core/files/xray.init +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh /etc/rc.common - -USE_PROCD=1 -START=99 - -CONF="xray" -PROG="/usr/bin/xray" - -start_service() { - config_load "$CONF" - - local enabled - config_get enabled "enabled" "enabled" "0" - [ "$enabled" -eq "0" ] && exit 1 - - local confdir - local conffiles - local datadir - local dialer - local format - - config_get confdir "config" "confdir" - config_get conffiles "config" "conffiles" - config_get datadir "config" "datadir" "/usr/share/v2ray" - config_get dialer "config" "dialer" - config_get format "config" "format" "json" - - procd_open_instance "$CONF" - procd_set_param command "$PROG" run - [ -n "$confdir" ] && procd_append_param command -confdir "$confdir" - [ -n "$conffiles" ] && { - for i in $conffiles - do - procd_append_param command -config "$i" - done - } - [ -n "$format" ] && procd_append_param command -format "$format" - [ -n "$dialer" ] && procd_set_param env XRAY_BROWSER_DIALER="$dialer" - procd_set_param env XRAY_LOCATION_ASSET="$datadir" - procd_set_param file $conffiles - - procd_set_param limits core="unlimited" - procd_set_param limits nofile="1000000 1000000" - procd_set_param stdout 1 - procd_set_param stderr 1 - procd_set_param respawn - - procd_close_instance -} - -reload_service() { - stop - start -} - -service_triggers() { - procd_add_reload_trigger "$CONF" -}