Summary: | net-mgmt/zabbix{6,62}-agent: Build broken by latest update to server | ||||||
---|---|---|---|---|---|---|---|
Product: | Ports & Packages | Reporter: | Christian Ullrich <chris> | ||||
Component: | Individual Port(s) | Assignee: | Juraj Lutter <otis> | ||||
Status: | Closed FIXED | ||||||
Severity: | Affects Some People | CC: | chris | ||||
Priority: | --- | Flags: | bugzilla:
maintainer-feedback?
(otis) |
||||
Version: | Latest | ||||||
Hardware: | Any | ||||||
OS: | Any | ||||||
Attachments: |
|
Description
Christian Ullrich
2022-11-28 07:10:52 UTC
Created attachment 238391 [details]
Patch.
Possible patch attached. It does three things:
1. It moves all option definitions out of the !agent block (and sorts them
alphabetically, hence the amount of changes)
2. It adds the PCRE option set to the existing agent-specific section
3. It adds the default for PCRE2 to the zabbix62-agent port
The patch does not touch the zabbix6-* ports; they need similar changes.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=80a2fce1d2b6071173203e7ee1c8eb09edb46663 commit 80a2fce1d2b6071173203e7ee1c8eb09edb46663 Author: Juraj Lutter <otis@FreeBSD.org> AuthorDate: 2022-11-28 21:00:44 +0000 Commit: Juraj Lutter <otis@FreeBSD.org> CommitDate: 2022-11-28 21:12:41 +0000 net-mgmt/zabbix6-server: Update to 6.0.11 - Update to 6.0.11 - Fix build of agent with pcre2 - Small makefile cleanups - Fix LogFile path in configs - Fix pkg-message dates PR: 268032 PR: 267925 PR: 267943 net-mgmt/zabbix6-proxy/Makefile | 2 - net-mgmt/zabbix6-server/Makefile | 74 ++++++++++++++++------------ net-mgmt/zabbix6-server/distinfo | 6 +-- net-mgmt/zabbix6-server/files/pkg-message.in | 23 +++++---- net-mgmt/zabbix6-server/pkg-plist.frontend | 1 - 5 files changed, 57 insertions(+), 49 deletions(-) A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=76f20363dcfcedacbb80224d4b752d27fa887f5b commit 76f20363dcfcedacbb80224d4b752d27fa887f5b Author: Juraj Lutter <otis@FreeBSD.org> AuthorDate: 2022-11-29 09:58:25 +0000 Commit: Juraj Lutter <otis@FreeBSD.org> CommitDate: 2022-11-29 12:29:27 +0000 net-mgmt/zabbix62-server: Update to 6.2.5 - Update to 6.2.5 - Fix build of agent with pcre2 - Small makefile cleanups - Fix LogFile path in configs PR: 268032 PR: 267943 net-mgmt/zabbix62-proxy/Makefile | 2 - net-mgmt/zabbix62-server/Makefile | 79 +++++++++++++++++------------ net-mgmt/zabbix62-server/distinfo | 6 +-- net-mgmt/zabbix62-server/pkg-plist.frontend | 1 - 4 files changed, 49 insertions(+), 39 deletions(-) Committed (based on your patch), thanks. Reopening for a bit of fallout from the fix: Both zabbix6-proxy and zabbix62-proxy have lost the SQLITE option. You are right, SQLITE was set in -proxy port's Makefile and after moving the DB selection to -server Makefile, a change to OPTIONS_SINGLE_DB slipped through my fingers. Fixed in commits 1f82326030db0865b515baa6793276c2d7002bcb and 41496b8dd394c55ffce79f7a9b39919f018300a5. |