Attachment 252053 Details for Bug 280263 – Updated patch to 1.8.17

[patch] Updated patch to 1.8.17

xray.patch (text/plain), 4.26 KB, created by Kirill Lebedev on 2024-07-14 20:39:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kirill Lebedev

Created: 2024-07-14 20:39:54 UTC

Size: 4.26 KB

patch

obsolete

>From 6f8a026a2c5a51d094bc7be5a9f683bd1757ff6b Mon Sep 17 00:00:00 2001
>From: Kirill Lebedev <kirill@drlebedev.com>
>Date: Sun, 14 Jul 2024 12:28:06 -0700
>Subject: [PATCH] xray-core update to v1.8.17. Geo and site databases updated
> to latests.
>
>---
> security/xray-core/Makefile | 27 ++++++++++++---------------
> security/xray-core/distinfo | 22 +++++++++++-----------
> 2 files changed, 23 insertions(+), 26 deletions(-)
>
>diff --git a/security/xray-core/Makefile b/security/xray-core/Makefile
>index 5d2e95279881..1ae5065bdfb2 100644
>--- a/security/xray-core/Makefile
>+++ b/security/xray-core/Makefile
>@@ -1,10 +1,9 @@
> PORTNAME=	xray-core
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	1.8.11
>-PORTREVISION=	2
>+DISTVERSION=	1.8.17
> CATEGORIES=	security
>-MASTER_SITES=	https://github.com/v2fly/geoip/releases/download/202404250042/:geoip \
>-		https://github.com/v2fly/domain-list-community/releases/download/20240426060244/:geosite
>+MASTER_SITES=	https://github.com/v2fly/geoip/releases/download/202407110044/:geoip \
>+		https://github.com/v2fly/domain-list-community/releases/download/20240713050854/:geosite
> DISTFILES=	geoip.dat:geoip \
> 		dlc.dat:geosite
> EXTRACT_ONLY=	v${DISTVERSION}.zip \
>@@ -18,23 +17,21 @@ LICENSE=	MPL20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> USES=		go:modules,1.22
>-
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	xtls
>+GH_PROJECT=	Xray-core
> USE_RC_SUBR=	xray
>-SUB_FILES=	pkg-message
> 
>-USERS=		v2ray
>-GROUPS=		v2ray
>+GO_MODULE=	github.com/${GH_ACCOUNT}/${PORTNAME}
>+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
>+GO_TARGET=	./main:xray
> 
>+SUB_FILES=	pkg-message
> SUB_LIST=	GROUP="${GROUPS}" \
> 		USER="${USERS}"
> 
>-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
>-GO_MODULE=	github.com/${GH_ACCOUNT}/${PORTNAME}
>-GO_TARGET=	./main:xray
>-
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	xtls
>-GH_PROJECT=	Xray-core
>+USERS=		v2ray
>+GROUPS=		v2ray
> 
> post-install:
> 	${MKDIR} ${STAGEDIR}${ETCDIR}
>diff --git a/security/xray-core/distinfo b/security/xray-core/distinfo
>index e41864f8b6e8..f675a410d087 100644
>--- a/security/xray-core/distinfo
>+++ b/security/xray-core/distinfo
>@@ -1,11 +1,11 @@
>-TIMESTAMP = 1714334480
>-SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.11_GH0/geoip.dat) = 8ad42be541dfa7c2e548ba94b6dcb3fe431a105ba14d3907299316a036723760
>-SIZE (go/security_xray-core/xtls-Xray-core-v1.8.11_GH0/geoip.dat) = 10734439
>-SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.11_GH0/dlc.dat) = 7aa19bb7fa5f99d62d3db87b632334caa356fb9b901f85f7168c064370973646
>-SIZE (go/security_xray-core/xtls-Xray-core-v1.8.11_GH0/dlc.dat) = 1694712
>-SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.11_GH0/v1.8.11.mod) = 193c3a3081a393bb6e62d678d7cce4d22012eeed3fd7b8aa10a738c76ed4eda5
>-SIZE (go/security_xray-core/xtls-Xray-core-v1.8.11_GH0/v1.8.11.mod) = 2540
>-SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.11_GH0/v1.8.11.zip) = 871777633a79b0bf9ca418585496a58332661164e710f17ca5b11c8c482a74d3
>-SIZE (go/security_xray-core/xtls-Xray-core-v1.8.11_GH0/v1.8.11.zip) = 1043901
>-SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.11_GH0/xtls-Xray-core-v1.8.11_GH0.tar.gz) = d99ee6008c508abbad6bbb242d058b22efb50fb35867d15447a2b4602ab4b283
>-SIZE (go/security_xray-core/xtls-Xray-core-v1.8.11_GH0/xtls-Xray-core-v1.8.11_GH0.tar.gz) = 628361
>+TIMESTAMP = 1720890237
>+SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.17_GH0/geoip.dat) = 83c8d38a4fff932fcbfe726c1f85c0debb1bf169afcfa18566c731a2f2c1f7b6
>+SIZE (go/security_xray-core/xtls-Xray-core-v1.8.17_GH0/geoip.dat) = 11079401
>+SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.17_GH0/dlc.dat) = dbaba085b1de1b8b875f3db78fb367aef080f24993af01abe21f4d4ba99048be
>+SIZE (go/security_xray-core/xtls-Xray-core-v1.8.17_GH0/dlc.dat) = 1752639
>+SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.17_GH0/v1.8.17.mod) = 3dfe4522f56feef03f8bbec0f5e5a993c0229d9f492cf7b43be00708781e7e9b
>+SIZE (go/security_xray-core/xtls-Xray-core-v1.8.17_GH0/v1.8.17.mod) = 2515
>+SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.17_GH0/v1.8.17.zip) = 95051f1889c17ef2d02bdeb5e819cc913f79f626d656c787730ce26149f7b968
>+SIZE (go/security_xray-core/xtls-Xray-core-v1.8.17_GH0/v1.8.17.zip) = 1039224
>+SHA256 (go/security_xray-core/xtls-Xray-core-v1.8.17_GH0/xtls-Xray-core-v1.8.17_GH0.tar.gz) = 390745e9f8afbd1cd584344a34709f13b9465bb887c7a4f993696ee8cf706b83
>+SIZE (go/security_xray-core/xtls-Xray-core-v1.8.17_GH0/xtls-Xray-core-v1.8.17_GH0.tar.gz) = 639017
>-- 
>2.43.0
>

Flags:

kirill: maintainer-approval+

Actions: View | Diff

Attachments on bug 280263: 252022 | 252053