Bug 268032 - net-mgmt/zabbix{6,62}-agent: Build broken by latest update to server
Summary: net-mgmt/zabbix{6,62}-agent: Build broken by latest update to server
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Juraj Lutter
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-11-28 07:10 UTC by Christian Ullrich
Modified: 2022-11-30 11:21 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (otis)


Attachments
Patch. (5.16 KB, patch)
2022-11-28 07:57 UTC, Christian Ullrich
chris: maintainer-approval?
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Christian Ullrich 2022-11-28 07:10:52 UTC
Bug #267957 added support for pcre2 to the Zabbix 6 and 6.2 ports. This update broke the build of the Zabbix agent ports in both versions; they fail in configure because libpcre is not installed.

This in turn is because while the Zabbix ports previously had an unconditional dependency on devel/pcre, the update changed this to a dependency on either devel/pcre or devel/pcre2 depending on the PCRE1/PCRE2 options.

While this works for the server and proxy ports, the agent port breaks because it cannot see the new option set, which is declared in net-mgmt/zabbix62-server/Makefile within

    .if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"

.
Comment 1 Christian Ullrich 2022-11-28 07:57:01 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.
Comment 2 commit-hook freebsd_committer freebsd_triage 2022-11-28 21:13:35 UTC
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(-)
Comment 3 commit-hook freebsd_committer freebsd_triage 2022-11-29 12:30:23 UTC
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(-)
Comment 4 Juraj Lutter freebsd_committer freebsd_triage 2022-11-29 12:31:38 UTC
Committed (based on your patch), thanks.
Comment 5 Christian Ullrich 2022-11-30 08:21:03 UTC
Reopening for a bit of fallout from the fix: Both zabbix6-proxy and zabbix62-proxy have lost the SQLITE option.
Comment 6 Juraj Lutter freebsd_committer freebsd_triage 2022-11-30 08:52:21 UTC
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.
Comment 7 Juraj Lutter freebsd_committer freebsd_triage 2022-11-30 11:21:20 UTC
Fixed in commits 1f82326030db0865b515baa6793276c2d7002bcb and 41496b8dd394c55ffce79f7a9b39919f018300a5.