security/xray-core: Update to 1.8.8, config re-write fix

ChangeLog: https://github.com/XTLS/Xray-core/releases/tag/v1.8.8

PR:		277798
Reported by:	kirill@drlebedev.com (maintainer)

13 files changed, 27 insertions, 27 deletions

diff --git a/security/xray-core/Makefile b/security/xray-core/Makefile
index 71141c685d6e..6589f35d0997 100644
--- a/security/xray-core/Makefile
+++ b/security/xray-core/Makefile
@@ -1,10 +1,10 @@
 PORTNAME=	xray-core
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.8.7
-PORTREVISION=	2
+DISTVERSION=	1.8.8
+PORTREVISION=	1
 CATEGORIES=	security
-MASTER_SITES=	https://github.com/v2fly/geoip/releases/download/202401250041/:geoip \
-		https://github.com/v2fly/domain-list-community/releases/download/20240123112230/:geosite
+MASTER_SITES=	https://github.com/v2fly/geoip/releases/download/202403070031/:geoip \
+		https://github.com/v2fly/domain-list-community/releases/download/20240301033006/:geosite
 DISTFILES=	geoip.dat:geoip \
 		dlc.dat:geosite
 EXTRACT_ONLY=	v${DISTVERSION}.zip \
@@ -17,7 +17,7 @@ WWW=		https://github.com/XTLS/Xray-core
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go:modules,1.21
+USES=		go:modules,1.22
 
 USE_RC_SUBR=	xray
 SUB_FILES=	pkg-message
@@ -41,6 +41,6 @@ post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/geoip.dat ${STAGEDIR}${DATADIR}/geoip.dat
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/dlc.dat ${STAGEDIR}${DATADIR}/geosite.dat
-	${INSTALL_DATA} ${FILESDIR}/*.json ${STAGEDIR}${ETCDIR}/
+	${INSTALL_DATA} ${FILESDIR}/*.json.sample ${STAGEDIR}${ETCDIR}/
 
 .include <bsd.port.mk>
diff --git a/security/xray-core/distinfo b/security/xray-core/distinfo
index b76c10751e81..3343ec306d5c 100644
--- a/security/xray-core/distinfo
+++ b/security/xray-core/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1706247088
-SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.7_GH0/geoip.dat) = cb005854fd16474df068a3a5ce78c845ae6cb53cbce80f6a7ad84b6f52f28a84
-SIZE (go/security_xray-core/xtls-Xray-core-v1.8.7_GH0/geoip.dat) = 10721986
-SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.7_GH0/dlc.dat) = 7c2efd90b7e3137e6bc68a78e641b5d9d5790330aa1de129510eeb432f020ec5
-SIZE (go/security_xray-core/xtls-Xray-core-v1.8.7_GH0/dlc.dat) = 1670530
-SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.7_GH0/v1.8.7.mod) = 987bd8d2f20bd23f51cae222c70bf5f1a79bffa5956e353ea8b4724edf13b37d
-SIZE (go/security_xray-core/xtls-Xray-core-v1.8.7_GH0/v1.8.7.mod) = 2581
-SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.7_GH0/v1.8.7.zip) = 87bf52105b924e156012435d21906388caf1d5a50752f75acc2a7495dc9fca15
-SIZE (go/security_xray-core/xtls-Xray-core-v1.8.7_GH0/v1.8.7.zip) = 995773
-SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.7_GH0/xtls-Xray-core-v1.8.7_GH0.tar.gz) = e8f46177d792b89700f164ca28fbf1a3c7d95a3ecf98871cb0dd5e474b46a859
-SIZE (go/security_xray-core/xtls-Xray-core-v1.8.7_GH0/xtls-Xray-core-v1.8.7_GH0.tar.gz) = 599617
+TIMESTAMP = 1710549679
+SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.8_GH0/geoip.dat) = 80bd161f963d38146702434ecffb21771282674003165e95f3c6a5c4be8dff41
+SIZE (go/security_xray-core/xtls-Xray-core-v1.8.8_GH0/geoip.dat) = 10621839
+SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.8_GH0/dlc.dat) = 9df541a638027d9ae4c08507c1e71d543d57af067542f455a207c6d8dac7e0f6
+SIZE (go/security_xray-core/xtls-Xray-core-v1.8.8_GH0/dlc.dat) = 1675781
+SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.8_GH0/v1.8.8.mod) = ff4c94398ecc8d177f459e7a0d22ecfe2396f82c7c5d5eb8fd3e4942bed2efee
+SIZE (go/security_xray-core/xtls-Xray-core-v1.8.8_GH0/v1.8.8.mod) = 2533
+SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.8_GH0/v1.8.8.zip) = 9b7fabfb822d08f680d3c330138a2c069437105846a358be1948a82b530814b5
+SIZE (go/security_xray-core/xtls-Xray-core-v1.8.8_GH0/v1.8.8.zip) = 1023972
+SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.8_GH0/xtls-Xray-core-v1.8.8_GH0.tar.gz) = 156105b89465ca948971a774c0bc7e56ee68e764bdfde58923037dc837aab4be
+SIZE (go/security_xray-core/xtls-Xray-core-v1.8.8_GH0/xtls-Xray-core-v1.8.8_GH0.tar.gz) = 619702
diff --git a/security/xray-core/files/00_log.json b/security/xray-core/files/00_log.json.sample
index b118b36b44f4..b118b36b44f4 100644..100755
--- a/security/xray-core/files/00_log.json
+++ b/security/xray-core/files/00_log.json.sample
diff --git a/security/xray-core/files/01_api.json b/security/xray-core/files/01_api.json.sample
index 81d8ee9b37e1..81d8ee9b37e1 100644..100755
--- a/security/xray-core/files/01_api.json
+++ b/security/xray-core/files/01_api.json.sample
diff --git a/security/xray-core/files/02_dns.json b/security/xray-core/files/02_dns.json.sample
index 822fb4dc0be5..822fb4dc0be5 100644..100755
--- a/security/xray-core/files/02_dns.json
+++ b/security/xray-core/files/02_dns.json.sample
diff --git a/security/xray-core/files/03_routing.json b/security/xray-core/files/03_routing.json.sample
index 2ea3ab998d27..2ea3ab998d27 100644..100755
--- a/security/xray-core/files/03_routing.json
+++ b/security/xray-core/files/03_routing.json.sample
diff --git a/security/xray-core/files/04_policy.json b/security/xray-core/files/04_policy.json.sample
index f422ab94c261..f422ab94c261 100644..100755
--- a/security/xray-core/files/04_policy.json
+++ b/security/xray-core/files/04_policy.json.sample
diff --git a/security/xray-core/files/05_inbounds.json b/security/xray-core/files/05_inbounds.json.sample
index 19eb93544313..19eb93544313 100644..100755
--- a/security/xray-core/files/05_inbounds.json
+++ b/security/xray-core/files/05_inbounds.json.sample
diff --git a/security/xray-core/files/06_outbounds.json b/security/xray-core/files/06_outbounds.json.sample
index 106026c78f8f..106026c78f8f 100644..100755
--- a/security/xray-core/files/06_outbounds.json
+++ b/security/xray-core/files/06_outbounds.json.sample
diff --git a/security/xray-core/files/07_transport.json b/security/xray-core/files/07_transport.json.sample
index c9bc7497ff50..c9bc7497ff50 100644..100755
--- a/security/xray-core/files/07_transport.json
+++ b/security/xray-core/files/07_transport.json.sample
diff --git a/security/xray-core/files/08_stats.json b/security/xray-core/files/08_stats.json.sample
index 8721468fc28f..8721468fc28f 100644..100755
--- a/security/xray-core/files/08_stats.json
+++ b/security/xray-core/files/08_stats.json.sample
diff --git a/security/xray-core/files/09_reverse.json b/security/xray-core/files/09_reverse.json.sample
index 5a6b7dcc3e2b..5a6b7dcc3e2b 100644..100755
--- a/security/xray-core/files/09_reverse.json
+++ b/security/xray-core/files/09_reverse.json.sample
diff --git a/security/xray-core/pkg-plist b/security/xray-core/pkg-plist
index e342835985fa..78101a2857a4 100644
--- a/security/xray-core/pkg-plist
+++ b/security/xray-core/pkg-plist
@@ -1,13 +1,13 @@
 bin/xray
-%%ETCDIR%%/00_log.json
-%%ETCDIR%%/01_api.json
-%%ETCDIR%%/02_dns.json
-%%ETCDIR%%/03_routing.json
-%%ETCDIR%%/04_policy.json
-%%ETCDIR%%/05_inbounds.json
-%%ETCDIR%%/06_outbounds.json
-%%ETCDIR%%/07_transport.json
-%%ETCDIR%%/08_stats.json
-%%ETCDIR%%/09_reverse.json
+@sample %%ETCDIR%%/00_log.json.sample
+@sample %%ETCDIR%%/01_api.json.sample
+@sample %%ETCDIR%%/02_dns.json.sample
+@sample %%ETCDIR%%/03_routing.json.sample
+@sample %%ETCDIR%%/04_policy.json.sample
+@sample %%ETCDIR%%/05_inbounds.json.sample
+@sample %%ETCDIR%%/06_outbounds.json.sample
+@sample %%ETCDIR%%/07_transport.json.sample
+@sample %%ETCDIR%%/08_stats.json.sample
+@sample %%ETCDIR%%/09_reverse.json.sample
 %%DATADIR%%/geoip.dat
 %%DATADIR%%/geosite.dat