From nobody Fri Mar 29 18:02:54 2024 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 4V5pCz1jtCz5FMJK; Fri, 29 Mar 2024 18:02: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 4V5pCz0yZJz4gFV; Fri, 29 Mar 2024 18:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711735375; 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=efeaQ1Mxz4G7Cytt2cesmqDszIvMtCiJsyu6anYFcgA=; b=S0Qs+qjd1zUVBvhtrBJMFGm63yzv+e4TAwSgxe05L2C+g2iFohmTUjCUzzx/cmv5f9Jcpo qty/wsvjqJdoVayxbg2+C+CpSsu0I0ddtpdQhDmnC5DDoDECOxrpor1yAoTF3zCa/8R3TX chrpOa7FURkMCIaaeE6vzTgv8TkiDA5DIb1uoPhnJv5H+GYJS2V6ptQ6RSn6LU0qbXJwR2 /Cq9T7vsEfULsfoWa8S+YiN6gjCjRaw/uRZ3jqoQyY2OIJsFqhtJZu11wQHJqr4EvQCJGy Za5Vj2kqD6KmEKUrO2qXUipZZIXIG/k9fYZ2RCVGW6g4LQywbpCj+3yP2e7ZjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711735375; a=rsa-sha256; cv=none; b=uZM1tKvZSMA4OfqXIWpuQdunbeSwVg6z0RK6AlA1qdXjuPQ1cwu/NsQ/xbogFdmeimQ5yz T+5w5XtaChRQlFRJ5QPEo9W7BrwJ27cKEdicyvMU9FyiKT2ipFtXgKG+hhvXxmcsCJ3MWV QDw0SixUpEhz6tdcXa2GAGIJdxWkwEUyIi3teVaH2+UK86Xcx6VY9ucrVCXrXhv+JCwHbn Fa8UmZgFuwO7WyPO4N/SjBSz7utAXLMPP49uligrnsD874bE92Y+jl86pYq/TwimH/h6w0 3AliPLgFn5vJBhMXnS/PjKBdkVfjpTX/KC/e/mcZuCfU8RHRLOTOCyjXYaSySg== 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=1711735375; 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=efeaQ1Mxz4G7Cytt2cesmqDszIvMtCiJsyu6anYFcgA=; b=J1YFBFsxu39du9B0VoB7Q4XC8Wmu5Ab9CvQ06w1n5agLpnA2DVY6HuJ0FKCa0gCaA9M23t CQX/DAl5waEqBQIPHf8w8et0PTBpb7JH1gc1GG/2okMSORCtBX/RHU+SG5hrZMbyjoVpRA 342kxkzxc7YJxhKEw7SRAnpAmnLkfv4LMpXLGQ7IhI3ZWSgbu3v9WRwMWSt+3CABal5Ef2 8G6ju8s7up5/1q2bny2/XLz34mDuanW/Xb8brBle63wI1CDNgEbrTELfBDU3OSVvEBLWcp 5Pmolk71TbX+Uz7bUV+TEb+MUPbfGoGb6yLML1mLgvYUqrqOva1dnZl7a66KEg== 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 4V5pCz0YpkzLlJ; Fri, 29 Mar 2024 18:02: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 42TI2s0a067169; Fri, 29 Mar 2024 18:02:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42TI2s25067166; Fri, 29 Mar 2024 18:02:54 GMT (envelope-from git) Date: Fri, 29 Mar 2024 18:02:54 GMT Message-Id: <202403291802.42TI2s25067166@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: 31fd3622834e - main - security/xray-core: Update to 1.8.8, config re-write fix 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31fd3622834ee27c7b24bb042e7e667db02c6c58 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=31fd3622834ee27c7b24bb042e7e667db02c6c58 commit 31fd3622834ee27c7b24bb042e7e667db02c6c58 Author: Kirill Lebedev AuthorDate: 2024-03-29 17:57:46 +0000 Commit: Fernando Apesteguía CommitDate: 2024-03-29 17:57:46 +0000 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) --- security/xray-core/Makefile | 12 ++++++------ security/xray-core/distinfo | 22 +++++++++++----------- .../files/{00_log.json => 00_log.json.sample} | 0 .../files/{01_api.json => 01_api.json.sample} | 0 .../files/{02_dns.json => 02_dns.json.sample} | 0 .../{03_routing.json => 03_routing.json.sample} | 0 .../{04_policy.json => 04_policy.json.sample} | 0 .../{05_inbounds.json => 05_inbounds.json.sample} | 0 ...{06_outbounds.json => 06_outbounds.json.sample} | 0 ...{07_transport.json => 07_transport.json.sample} | 0 .../files/{08_stats.json => 08_stats.json.sample} | 0 .../{09_reverse.json => 09_reverse.json.sample} | 0 security/xray-core/pkg-plist | 20 ++++++++++---------- 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 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 old mode 100644 new mode 100755 similarity index 100% rename from security/xray-core/files/00_log.json rename to 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 old mode 100644 new mode 100755 similarity index 100% rename from security/xray-core/files/01_api.json rename to 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 old mode 100644 new mode 100755 similarity index 100% rename from security/xray-core/files/02_dns.json rename to 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 old mode 100644 new mode 100755 similarity index 100% rename from security/xray-core/files/03_routing.json rename to 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 old mode 100644 new mode 100755 similarity index 100% rename from security/xray-core/files/04_policy.json rename to 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 old mode 100644 new mode 100755 similarity index 100% rename from security/xray-core/files/05_inbounds.json rename to 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 old mode 100644 new mode 100755 similarity index 100% rename from security/xray-core/files/06_outbounds.json rename to 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 old mode 100644 new mode 100755 similarity index 100% rename from security/xray-core/files/07_transport.json rename to 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 old mode 100644 new mode 100755 similarity index 100% rename from security/xray-core/files/08_stats.json rename to 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 old mode 100644 new mode 100755 similarity index 100% rename from security/xray-core/files/09_reverse.json rename to 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