From 7ec52b3838f07e6fad4943c2fe2dde1f5d961f00 Mon Sep 17 00:00:00 2001
From: Kirill Lebedev <kirill@drlebedev.com>
Date: Mon, 25 Sep 2023 13:24:05 +0200
Subject: [PATCH] security/xray-core: Update to 1.8.4

Changelogs:
  1.8.4: https://github.com/XTLS/Xray-core/releases/tag/v1.8.4
  1.8.3: https://github.com/XTLS/Xray-core/releases/tag/v1.8.3
  1.8.1: https://github.com/XTLS/Xray-core/releases/tag/v1.8.1
  1.8.0: https://github.com/XTLS/Xray-core/releases/tag/v1.8.0

PR: 			273637
Approved by: 		zirias (mentor)
Differential Revision:	https://reviews.freebsd.org/D41972
---
 security/xray-core/Makefile  | 15 +++++----------
 security/xray-core/distinfo  | 22 +++++++++++-----------
 security/xray-core/pkg-plist |  1 -
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/security/xray-core/Makefile b/security/xray-core/Makefile
index 92c1cf0e302e6..c65ff2fc71cc6 100644
--- a/security/xray-core/Makefile
+++ b/security/xray-core/Makefile
@@ -1,10 +1,9 @@
 PORTNAME=	xray-core
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.7.5
-PORTREVISION=	1
+DISTVERSION=	1.8.4
 CATEGORIES=	security
-MASTER_SITES=	https://github.com/v2ray/geoip/releases/download/202308310037/:geoip \
-		https://github.com/v2ray/domain-list-community/releases/download/20230825070717/:geosite
+MASTER_SITES=	https://github.com/v2fly/geoip/releases/download/202309080643/:geoip \
+		https://github.com/v2fly/domain-list-community/releases/download/20230911142809/:geosite
 DISTFILES=	geoip.dat:geoip \
 		dlc.dat:geosite
 EXTRACT_ONLY=	v${DISTVERSION}.zip \
@@ -36,15 +35,11 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	xtls
 GH_PROJECT=	Xray-core
 
-post-extract:
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/geoip.dat ${WRKSRC}/geoip.dat
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/dlc.dat ${WRKSRC}/geosite.dat
-
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/geoip.dat ${STAGEDIR}${DATADIR}/geoip.dat
-	${INSTALL_DATA} ${WRKSRC}/geosite.dat ${STAGEDIR}${DATADIR}/geosite.dat
+	${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}/
 
 .include <bsd.port.mk>
diff --git a/security/xray-core/distinfo b/security/xray-core/distinfo
index b08b5cf10059b..3ea844c208b2a 100644
--- a/security/xray-core/distinfo
+++ b/security/xray-core/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1693528419
-SHA256 (go/security_xray-core/xtls-Xray-core-v1.7.5_GH0/geoip.dat) = 536d7aa9f54af747153d4f982adaa3181025dd72faaba8f532b3f514b467eff8
-SIZE (go/security_xray-core/xtls-Xray-core-v1.7.5_GH0/geoip.dat) = 10591274
-SHA256 (go/security_xray-core/xtls-Xray-core-v1.7.5_GH0/dlc.dat) = 231a6fb4915f7652ad9b2027965fbbb27435ffa9b3a0734ad2b69693e95d6604
-SIZE (go/security_xray-core/xtls-Xray-core-v1.7.5_GH0/dlc.dat) = 1594785
-SHA256 (go/security_xray-core/xtls-Xray-core-v1.7.5_GH0/v1.7.5.mod) = 6d45a243922836e2422095192b0bd4948745147aef4cfc7883d440307bfbde1b
-SIZE (go/security_xray-core/xtls-Xray-core-v1.7.5_GH0/v1.7.5.mod) = 2480
-SHA256 (go/security_xray-core/xtls-Xray-core-v1.7.5_GH0/v1.7.5.zip) = e2c2338ce24ba15d9f7cc93686e06e1fb15a33a345e5fa5d4f28a345dffb9014
-SIZE (go/security_xray-core/xtls-Xray-core-v1.7.5_GH0/v1.7.5.zip) = 970336
-SHA256 (go/security_xray-core/xtls-Xray-core-v1.7.5_GH0/xtls-Xray-core-v1.7.5_GH0.tar.gz) = a5fc936136a57a463bf9a895d068fdfa895b168ae6093c58a10208e098b6b2d3
-SIZE (go/security_xray-core/xtls-Xray-core-v1.7.5_GH0/xtls-Xray-core-v1.7.5_GH0.tar.gz) = 579098
+TIMESTAMP = 1694485506
+SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.4_GH0/geoip.dat) = 8629a9ee8c5bf7b9eb85393841b88050cfbf44d291f1ef8760195173964e8b73
+SIZE (go/security_xray-core/xtls-Xray-core-v1.8.4_GH0/geoip.dat) = 10647982
+SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.4_GH0/dlc.dat) = 611360974651710966f5e4a5755fbe0a2c29fb824c256a8d7254f29ade33ee4f
+SIZE (go/security_xray-core/xtls-Xray-core-v1.8.4_GH0/dlc.dat) = 1596950
+SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.4_GH0/v1.8.4.mod) = 16d746081094c455a61ed29db9ded0b4d83d3c0ddc75a1aa76d1c4a84457c417
+SIZE (go/security_xray-core/xtls-Xray-core-v1.8.4_GH0/v1.8.4.mod) = 2391
+SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.4_GH0/v1.8.4.zip) = 16defb1d9114613e2e2c4f6a7fa36ac08569c84a7782c3fbcf6d4533e7a535d9
+SIZE (go/security_xray-core/xtls-Xray-core-v1.8.4_GH0/v1.8.4.zip) = 973031
+SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.4_GH0/xtls-Xray-core-v1.8.4_GH0.tar.gz) = 89f73107abba9bd438111edfe921603ddb3c2b631b2716fbdc6be78552f0d322
+SIZE (go/security_xray-core/xtls-Xray-core-v1.8.4_GH0/xtls-Xray-core-v1.8.4_GH0.tar.gz) = 583305
diff --git a/security/xray-core/pkg-plist b/security/xray-core/pkg-plist
index 48ef6089ac671..e342835985fa8 100644
--- a/security/xray-core/pkg-plist
+++ b/security/xray-core/pkg-plist
@@ -1,5 +1,4 @@
 bin/xray
-etc/rc.d/xray
 %%ETCDIR%%/00_log.json
 %%ETCDIR%%/01_api.json
 %%ETCDIR%%/02_dns.json