Created attachment 258749 [details] patch - fixes CVE-2024-45338 and CVE-2024-51744 - requires at least go 1.23, so use latest stable - adds sub folder support
===> Applying FreeBSD patches for xapsd-g20241228 from /usr/ports/net/xapsd/files 3 out of 3 hunks failed--saving rejects to pkg/apple_xserver_certs/http.go.rej ===> FAILED Applying FreeBSD patch-pkg_apple__xserver__certs_http.go ===> Cleanly applied FreeBSD patch(es) patch-internal_apns.go patch-internal_socket.go ===> FAILED to apply cleanly FreeBSD patch(es) patch-pkg_apple__xserver__certs_http.go *** Error code 1
Created attachment 258801 [details] patch updated to correctly delete an upstreamed patch
(In reply to Henry from comment #2) Just delete it - ok.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=2d98b8845826a914ff74af01c30f69ae456705d6 commit 2d98b8845826a914ff74af01c30f69ae456705d6 Author: Henry <PopularMoment@protonmail.com> AuthorDate: 2025-03-20 14:26:54 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-03-20 14:42:33 +0000 net/xapsd: Update g20240326 => g20241228 - fixes CVE-2024-45338 and CVE-2024-51744 - requires at least go 1.23, so use latest stable - adds sub folder support Commit log: https://github.com/freswa/dovecot-xaps-daemon/compare/1e589be...8cf4e49 PR: 285485 net/xapsd/Makefile | 35 +++++---- net/xapsd/distinfo | 62 ++++++++-------- net/xapsd/files/patch-internal_apns.go (new) | 63 ++++++++++++++++ net/xapsd/files/patch-internal_socket.go (new) | 44 ++++++++++++ .../patch-pkg_apple__xserver__certs_http.go (gone) | 83 ---------------------- 5 files changed, 152 insertions(+), 135 deletions(-)
Thanks.