From nobody Mon Sep 25 19:22:55 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RvXp75wclz4txr8; Mon, 25 Sep 2023 19:22:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RvXp75LXQz3RKl; Mon, 25 Sep 2023 19:22:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695669775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=drZ38Satbss3CYmgCf+ndrOWFaxho1JuYBlDtqid1EY=; b=KRWMsdyFLAO3gIxbO4bs+yuFgViLbc/8pdVOukTjRovjWlpTf6afcJ8kFJlNUwcTHdxaDq pbKA5CGy7iZ9QqDn9zr2WAVsv9ET1epXgRuSB0p8KbTplHGMwlZAaaSZSR8LcWiG93H+Br ItYlQ1MsJxtPH7+qHQSF+uhV4z/3/n1oxzpijCbZuZOe6VIAGQVG0KqJztnnSeBTpml4v0 u7zoC1GRjwEQjkRCYVLVHJ2EA4+y7PM7devslb0TjXNazSShwhmu+xuh32CsGxoqSFsoOB qh/bVzcqr650Xo+65KzbfcxqW3MJuOC18P39MUTSDVJHYJ7xKVE2pXLVl61zIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695669775; a=rsa-sha256; cv=none; b=U/2VMQIfmAJpUFufPGGik3h1vm4zbphT88ojJXyOX69iT80CCaMMmSMgXwaky2KK4KGe4F vrVLaoxxog+WAIrPdzbPMy4/vufAoVd79MhKhepq4aW9XdMTlWWmnLuqd0T+GqX5xcLHt1 rbHJX+3q7QlWZV+3sjIvcSKbkqa4aFQ7HuBtC3y/8bptatwmjAfUMdWTqnnpJlICq+mEba hzwgMooag5M3tyswWQdR/NiDC5yU7zP6/G8TvkBB1yUMVOZvxJhjj39eP+1pDE3IHQJrKn dHT8nSQxmHly5LXX28So572+GN1rI93PFcuBoniCm7SRdDmW/jYV2o6Iwd/WOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695669775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=drZ38Satbss3CYmgCf+ndrOWFaxho1JuYBlDtqid1EY=; b=AMAW3GotT/JS+EqS82edb256qzf6h1w0z7meBBwxszPXfOZ9pyNYhyAAOe7R7PHQMp9aP9 MjlVT8V+dPOjxCCPdCQ14lvBhJqIa2+cd56Ia9VV6uTFA07rKwR6X+0VJ+a5BtIMVBjZ7i vslKgU+3RF1ryZd59MkWIhXJwtB0XmW0CgI1JblW7zDxg/co6a5n5aCRnFfXuolyij6MOn xyiqpUllRbamFTE4iiqN75apr5FUY0N3dPbRgTLeakVb9PCuJ9J58xg/lWKDCJvGhFWOss flFFwIMTxLBGAIi6GLQXA6u+ri5uAf+BA9WlBihspxoNX4K6XCyPmsYy9sU4IA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RvXp74N89zBFT; Mon, 25 Sep 2023 19:22:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38PJMtIu094089; Mon, 25 Sep 2023 19:22:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38PJMtAw094086; Mon, 25 Sep 2023 19:22:55 GMT (envelope-from git) Date: Mon, 25 Sep 2023 19:22:55 GMT Message-Id: <202309251922.38PJMtAw094086@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joel Bodenmann Subject: git: 7ec52b3838f0 - main - security/xray-core: Update to 1.8.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ec52b3838f07e6fad4943c2fe2dde1f5d961f00 Auto-Submitted: auto-generated The branch main has been updated by jbo: URL: https://cgit.FreeBSD.org/ports/commit/?id=7ec52b3838f07e6fad4943c2fe2dde1f5d961f00 commit 7ec52b3838f07e6fad4943c2fe2dde1f5d961f00 Author: Kirill Lebedev AuthorDate: 2023-09-25 11:24:05 +0000 Commit: Joel Bodenmann CommitDate: 2023-09-25 19:18:39 +0000 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 92c1cf0e302e..c65ff2fc71cc 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 diff --git a/security/xray-core/distinfo b/security/xray-core/distinfo index b08b5cf10059..3ea844c208b2 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 48ef6089ac67..e342835985fa 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