Created attachment 249291 [details] Xray Core patch to 1.8.8 Changes done: 1. Xray updated to version 1.8.8 (latest stable) 2. Geodata and Site data files updated 3. Sample macro included to avoid config overwrite during update/reinstall Testing done 1. Manual test of config changes maintained 2. portlint is OK 3. make test is OK 4. poudriere tests are OK
Created attachment 249292 [details] Zray patch to 1.8.8
jbo@freebsd.org Can you review/merge?
^Triage: If there is a changelog or release notes URL available for this version, please add it to the URL field. ^Triage: Please set the maintainer-approval attachment flag (to +) on patches for ports you maintain to signify approval. -- Attachment -> Details -> maintainer-approval [+] Q/A: PORTREVISION should be removed Thanks!
This fails to install. Maybe some missing entries in files/ ? ===> Installing xray as /wrkdirs/usr/ports/security/xray-core/work/stage/usr/local/bin/xray /bin/mkdir -p /wrkdirs/usr/ports/security/xray-core/work/stage/usr/local/etc/xray-core /bin/mkdir -p /wrkdirs/usr/ports/security/xray-core/work/stage/usr/local/share/xray-core install -m 0644 /portdistfiles/go/security_xray-core/xtls-Xray-core-v1.8.8_GH0/geoip.dat /wrkdirs/usr/ports/security/xray-core/work/stage/usr/local/share/xray-core/geoip.dat install -m 0644 /portdistfiles/go/security_xray-core/xtls-Xray-core-v1.8.8_GH0/dlc.dat /wrkdirs/usr/ports/security/xray-core/work/stage/usr/local/share/xray-core/geosite.dat install -m 0644 /usr/ports/security/xray-core/files/*.json.sample /wrkdirs/usr/ports/security/xray-core/work/stage/usr/local/etc/xray-core/ install: /usr/ports/security/xray-core/files/*.json.sample: No such file or directory *** Error code 71 Would you have a look at it?
fernape@freebsd.org. I will take a look. Did you fully apply patch? I renames json files to *.json.sample. This is must for install to succeed.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=31fd3622834ee27c7b24bb042e7e667db02c6c58 commit 31fd3622834ee27c7b24bb042e7e667db02c6c58 Author: Kirill Lebedev <kirill@drlebedev.com> AuthorDate: 2024-03-29 17:57:46 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> 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 +++++++++++----------- .../{00_log.json => 00_log.json.sample} (mode +x) | 0 .../{01_api.json => 01_api.json.sample} (mode +x) | 0 .../{02_dns.json => 02_dns.json.sample} (mode +x) | 0 ...uting.json => 03_routing.json.sample} (mode +x) | 0 ...policy.json => 04_policy.json.sample} (mode +x) | 0 ...unds.json => 05_inbounds.json.sample} (mode +x) | 0 ...nds.json => 06_outbounds.json.sample} (mode +x) | 0 ...ort.json => 07_transport.json.sample} (mode +x) | 0 ...8_stats.json => 08_stats.json.sample} (mode +x) | 0 ...verse.json => 09_reverse.json.sample} (mode +x) | 0 security/xray-core/pkg-plist | 20 ++++++++++---------- 13 files changed, 27 insertions(+), 27 deletions(-)
You're right, I made a mistake when applying the patch. Thanks!