Created attachment 260243 [details] data prepper update and fixes - updates OpenSearch Data Prepper 2.10.2 -> 2.11.0 - fixing rc script - fixing pkg-message Approved by: SvenRuediger (opensearch@ team)
pkg-message is not in patch.
2. What is the reason to use "?" here: SEARCHUSER?= opensearch SEARCHGROUP?= ${SEARCHUSER} ?
1. Typo in file name: files/pkg-messsage.in files/pkg-message.in
3. portlint warning: WARN: Makefile: COMMENT is not supposed to begin with 'A ', 'An ', or 'The '. -COMMENT= A server-side data collector for OpenSearch +COMMENT= Server-side data collector for OpenSearch
4. Add "NO_ARCH=yes": pkg-static: DEVELOPER_MODE: Notice: arch "FreeBSD:14:amd64" -- no architecture specific files found: **** could this package use a wildcard architecture?
Security fixes: * in 2.11.0: CVE-2024-49767 CVE-2024-49766 * in 2.10.3: CVE-2025-30065 If there are no objections, I will commit the patch with all my changes later this evening.
5. sysutils/data-prepper/files/pkg-message.in: -%%LOCALBASE%%/lib/data-prepper/pipelines +%%DATADIR%%/pipelines -Examples can be found in %%LOCALBASE%%/%%EXAMPLESDIR%% +Examples can be found in %%EXAMPLESDIR%% I'm committing now, if something is wrong, I can always fix it with the next commit or even revert. Will do "merge-quarterly" in several next days - let's give some time to check the correctness of the update.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=52f83bccb31c13d06662b8a1d03d27d9afc8ff20 commit 52f83bccb31c13d06662b8a1d03d27d9afc8ff20 Author: Sven Ruediger <admin@hackacad.net> AuthorDate: 2025-05-08 18:16:49 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-05-08 18:31:26 +0000 sysutils/data-prepper: Update 2.10.2 => 2.11.0 Changelogs: https://github.com/opensearch-project/data-prepper/releases/tag/2.10.3 https://github.com/opensearch-project/data-prepper/releases/tag/2.11.0 - Fix rc script. - Fix pkg-message. - Add NO_ARCH=yes. - Fix warnings from portlint and poudriere. PR: 286652 Security: CVE-2024-49767 Security: CVE-2024-49766 Security: CVE-2025-30065 MFH: 2025Q2 sysutils/data-prepper/Makefile | 13 +- sysutils/data-prepper/distinfo | 6 +- sysutils/data-prepper/files/data-prepper.in | 2 +- sysutils/data-prepper/files/pkg-message.in (new) | 10 + sysutils/data-prepper/files/pkg-messsage.in (gone) | 10 - sysutils/data-prepper/pkg-plist | 325 +++++++++++---------- 6 files changed, 193 insertions(+), 173 deletions(-)
A commit in branch 2025Q2 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=b54625158da1edf4e23e2ae95ba90a2bdc853960 commit b54625158da1edf4e23e2ae95ba90a2bdc853960 Author: Sven Ruediger <admin@hackacad.net> AuthorDate: 2025-05-08 18:16:49 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-05-11 19:54:46 +0000 sysutils/data-prepper: Update 2.10.2 => 2.11.0 Changelogs: https://github.com/opensearch-project/data-prepper/releases/tag/2.10.3 https://github.com/opensearch-project/data-prepper/releases/tag/2.11.0 - Fix rc script. - Fix pkg-message. - Add NO_ARCH=yes. - Fix warnings from portlint and poudriere. PR: 286652 Security: CVE-2024-49767 Security: CVE-2024-49766 Security: CVE-2025-30065 MFH: 2025Q2 (cherry picked from commit 52f83bccb31c13d06662b8a1d03d27d9afc8ff20) sysutils/data-prepper/Makefile | 13 +- sysutils/data-prepper/distinfo | 6 +- sysutils/data-prepper/files/data-prepper.in | 2 +- sysutils/data-prepper/files/pkg-message.in (new) | 10 + sysutils/data-prepper/files/pkg-messsage.in (gone) | 10 - sysutils/data-prepper/pkg-plist | 325 +++++++++++---------- 6 files changed, 193 insertions(+), 173 deletions(-)