Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #14724 from 1715173329/xr-bump

Browse source 
xray-core: Update to 1.3.0
This commit is contained in:
Rosen Penev 2021-02-14 15:13:17 -08:00 committed by GitHub
commit abb5159089
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net/xray-core/Makefile
View file

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=xray-core PKG_NAME:=xray-core
PKG_VERSION:=1.2.4 PKG_VERSION:=1.3.0
PKG_RELEASE:=$(AUTORELEASE) PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=25f6c9edec0ac1f98328943cd2bb760ac7b69107582f9d27e43559da39dc01ed PKG_HASH:=1125af4411655abf47913af14a22fd7e2b13371e3566cc03676207519b0fe407
PKG_MAINTAINER:=Tianling Shen <cnsztl@project-openwrt.eu.org> PKG_MAINTAINER:=Tianling Shen <cnsztl@project-openwrt.eu.org>
PKG_LICENSE:=MPL-2.0 PKG_LICENSE:=MPL-2.0
@ -21,8 +21,8 @@ GO_PKG:=github.com/xtls/xray-core
GO_PKG_BUILD_PKG:=github.com/xtls/xray-core/main GO_PKG_BUILD_PKG:=github.com/xtls/xray-core/main
GO_PKG_LDFLAGS:=-s -w GO_PKG_LDFLAGS:=-s -w
GO_PKG_LDFLAGS_X:= \ GO_PKG_LDFLAGS_X:= \
$(GO_PKG)/core.version=$(PKG_VERSION) \ $(GO_PKG)/core.build=OpenWrt \
$(GO_PKG)/core.codename=OpenWrt $(GO_PKG)/core.version=$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include ../../lang/golang/golang-package.mk include ../../lang/golang/golang-package.mk
@ -80,24 +80,24 @@ define Package/xray-core/conffiles
/etc/config/xray /etc/config/xray
endef endef
GEOIP_VER:=202101280019 GEOIP_VER:=202102110014
GEOIP_FILE:=geoip.dat.$(GEOIP_VER) GEOIP_FILE:=geoip.dat.$(GEOIP_VER)
define Download/geoip define Download/geoip
URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/ URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/
URL_FILE:=geoip.dat URL_FILE:=geoip.dat
FILE:=$(GEOIP_FILE) FILE:=$(GEOIP_FILE)
HASH:=69bb1f820f416e4591a7b76bfabf9fde9cce6550cddcc1a99b2ccafeb2a8ebd3 HASH:=c80e61b251fd76b09df5624b12cc84d7e1d9a0492b9acb43e21f0a244b1f9fc3
endef endef
GEOSITE_VER:=20210130061540 GEOSITE_VER:=20210211141342
GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
define Download/geosite define Download/geosite
URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
URL_FILE:=dlc.dat URL_FILE:=dlc.dat
FILE:=$(GEOSITE_FILE) FILE:=$(GEOSITE_FILE)
HASH:=bc9748c95b0545376356174b005fccfbc21d647df46293d5197853ee06a9c0a2 HASH:=e71b4acf2918851dd56e7cda714abb4758deb57b91d716911f33c453b909e796
endef endef
define Build/Prepare define Build/Prepare

1
net/xray-core/files/xray.conf
View file

@ -1,6 +1,7 @@
config xray 'enabled' config xray 'enabled'
option enabled '0' option enabled '0'
option fullcone '1'
config xray 'config' config xray 'config'
option confdir '/etc/xray' option confdir '/etc/xray'

3
net/xray-core/files/xray.init
View file

@ -18,11 +18,13 @@ start_service() {
local conffiles local conffiles
local datadir local datadir
local format local format
local fullcone
config_get confdir "config" "confdir" config_get confdir "config" "confdir"
config_get conffiles "config" "conffiles" config_get conffiles "config" "conffiles"
config_get datadir "config" "datadir" "/usr/share/xray" config_get datadir "config" "datadir" "/usr/share/xray"
config_get format "config" "format" "json" config_get format "config" "format" "json"
config_get fullcone "enabled" "fullcone" "0"
procd_open_instance "$CONF" procd_open_instance "$CONF"
procd_set_param command "$PROG" run procd_set_param command "$PROG" run
@ -34,6 +36,7 @@ start_service() {
done done
} }
procd_append_param command -format "$format" procd_append_param command -format "$format"
[ "$fullcone" -eq "0" ] && procd_set_param env XRAY_CONE_DISABLED="true"
procd_set_param env XRAY_LOCATION_ASSET="$datadir" procd_set_param env XRAY_LOCATION_ASSET="$datadir"
procd_set_param file $conffiles procd_set_param file $conffiles

7
net/xray-core/test.sh Normal file
View file

@ -0,0 +1,7 @@
#!/bin/sh
case "$1" in
"xray-core")
xray version 2>&1 | grep "${2#*v}"
;;
esac