git: 76f20363dcfc - main - net-mgmt/zabbix62-server: Update to 6.2.5
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 29 Nov 2022 12:29:42 UTC
The branch main has been updated by otis:
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(-)
diff --git a/net-mgmt/zabbix62-proxy/Makefile b/net-mgmt/zabbix62-proxy/Makefile
index 3881a833c6a7..850ada0d3728 100644
--- a/net-mgmt/zabbix62-proxy/Makefile
+++ b/net-mgmt/zabbix62-proxy/Makefile
@@ -4,6 +4,4 @@ PKGNAMESUFFIX= -proxy
MASTERDIR= ${.CURDIR}/../${PORTNAME}-server
-OPTIONS_SINGLE_DB= MYSQL MYSQLDV PGSQL SQLITE ORACLE
-
.include "${MASTERDIR}/Makefile"
diff --git a/net-mgmt/zabbix62-server/Makefile b/net-mgmt/zabbix62-server/Makefile
index a394b8517792..fd6d3a273293 100644
--- a/net-mgmt/zabbix62-server/Makefile
+++ b/net-mgmt/zabbix62-server/Makefile
@@ -1,6 +1,5 @@
PORTNAME= zabbix62
-DISTVERSION= 6.2.4
-PORTREVISION= 1
+DISTVERSION= 6.2.5
CATEGORIES= net-mgmt
MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/
PKGNAMESUFFIX?= -server
@@ -13,8 +12,9 @@ WWW= https://www.zabbix.com/
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-CONFLICTS_INSTALL= zabbix5[0-9]${PKGNAMESUFFIX} \
- zabbix[0-9]${PKGNAMESUFFIX}
+CONFLICTS_INSTALL= ${PORTNAME}[0-9]${PKGNAMESUFFIX} \
+ zabbix5[0-9]${PKGNAMESUFFIX} \
+ zabbix[0-57-9]${PKGNAMESUFFIX}
ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//:S/-$//}
@@ -55,38 +55,55 @@ CONFIGURE_ARGS+= --datadir=${ETCDIR} \
--sysconfdir=${ETCDIR} \
--with-iconv=${ICONV_PREFIX}
-.if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
+PORTSCOUT= limit:^6\.2\.
+
+.if ${ZABBIX_BUILD} != "java"
+OPTIONS_DEFAULT+= PCRE2
+OPTIONS_SINGLE+= PCRE
+OPTIONS_SINGLE_PCRE= PCRE1 PCRE2
+PCRE_DESC= PCRE library to use
+PCRE1_DESC= Use PCRE v1 library
+PCRE2_DESC= Use PCRE v2 library
+
+PCRE1_LIB_DEPENDS= libpcre.so:devel/pcre
+PCRE1_CONFIGURE_WITH= libpcre
+PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2
+PCRE2_CONFIGURE_WITH= libpcre2
+
+.if ${ZABBIX_BUILD} != "agent"
LIB_DEPENDS+= libnetsnmp.so:net-mgmt/net-snmp
CPPFLAGS+= -I${LOCALBASE}/include
-PORTSCOUT= limit:^6\.2\.
-
SUB_FILES= pkg-message
CONFIGURE_ARGS+= --with-net-snmp
+OPTIONS_DEFAULT+= CURL FPING MYSQL OPENSSL UNIXODBC
OPTIONS_DEFINE= CURL FPING IPMI IPV6 LDAP LIBXML2 NMAP SSH UNIXODBC
-OPTIONS_DEFAULT= CURL FPING MYSQL OPENSSL PCRE2 UNIXODBC
-OPTIONS_SUB= yes
-OPTIONS_SINGLE= DB PCRE SSL
+OPTIONS_SINGLE+= DB SSL
OPTIONS_SINGLE_DB?= MDB5 MDB6 MYSQL MYSQLDV ORACLE PGSQL
OPTIONS_SINGLE_SSL= GNUTLS OPENSSL
-OPTIONS_SINGLE_PCRE= PCRE1 PCRE2
+OPTIONS_SUB= yes
FPING_DESC= Build/install fping for ping checks
IPMI_DESC= Support for IPMI checks
LDAP_DESC= Support for LDAP server checks
NMAP_DESC= Build/install nmap for o/s detection
-PCRE_DESC= PCRE library to use
-PCRE1_DESC= Use PCRE v1 library
-PCRE2_DESC= Use PCRE v2 library
SSH_DESC= Support for SSH-based checks
UNIXODBC_DESC= Support for database checks via ODBC
LIBXML2_DESC= Support for libxml2 (required by monitoring VMware)
MYSQL_DESC= MySQL 8.0 database support
MYSQLDV_DESC= MYSQL DEFAULT_VERSIONS= (poudriere)
+FPING_RUN_DEPENDS= fping:net/fping
+
+IPMI_CONFIGURE_WITH= openipmi
+IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi
+
+LDAP_CONFIGURE_WITH= ldap
+LDAP_USE= OPENLDAP=yes
+
MYSQL_CONFIGURE_ON= --with-mysql
MYSQL_USES+= compiler:c11 mysql:80
@@ -101,10 +118,7 @@ MDB6_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config
MDB6_USES+= compiler:c11 mysql:106m
MDB6_DESC= Mariadb 10.6 database support
-PCRE1_LIB_DEPENDS= libpcre.so:devel/pcre
-PCRE1_CONFIGURE_WITH= libpcre
-PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2
-PCRE2_CONFIGURE_WITH= libpcre2
+ORACLE_CONFIGURE_WITH= oracle
PGSQL_CONFIGURE_WITH= postgresql
PGSQL_USES+= pgsql
@@ -112,25 +126,16 @@ PGSQL_USES+= pgsql
SQLITE_CONFIGURE_WITH= sqlite3
SQLITE_USES+= sqlite:3
-ORACLE_CONFIGURE_WITH= oracle
-
-LDAP_CONFIGURE_WITH= ldap
-LDAP_USE= OPENLDAP=yes
-
-IPMI_CONFIGURE_WITH= openipmi
-IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi
-
-FPING_RUN_DEPENDS= fping:net/fping
-
SSH_CONFIGURE_WITH= ssh2
SSH_LIB_DEPENDS= libssh2.so:security/libssh2
UNIXODBC_CONFIGURE_WITH= unixodbc
UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
.elif ${ZABBIX_BUILD} == "agent"
-OPTIONS_SINGLE= SSL
+OPTOINS_DEFINE+= PCRE
+OPTIONS_SINGLE+= SSL
OPTIONS_SINGLE_SSL= GNUTLS OPENSSL
-.endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
+.endif # if ${ZABBIX_BUILD} != "agent"
CURL_DESC= Support for web monitoring
CURL_CONFIGURE_WITH= libcurl
@@ -138,9 +143,6 @@ CURL_LIB_DEPENDS= libcurl.so:ftp/curl
IPV6_CONFIGURE_ENABLE= ipv6
-NMAP_RUN_DEPENDS= nmap:security/nmap \
- sudo:security/sudo
-
LIBXML2_CONFIGURE_WITH= libxml2=${LOCALBASE}
LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2
@@ -148,6 +150,9 @@ MODBUS_DESC= Support for Modbus checks
MODBUS_CONFIGURE_WITH= libmodbus
MODBUS_LIB_DEPENDS= libmodbus.so:comms/libmodbus
+NMAP_RUN_DEPENDS= nmap:security/nmap \
+ sudo:security/sudo
+
OPENSSL_CONFIGURE_WITH= openssl
OPENSSL_USES= ssl
OPENSSL_VARS= BROKEN_SSL="libressl libressl-devel" \
@@ -156,6 +161,8 @@ OPENSSL_VARS= BROKEN_SSL="libressl libressl-devel" \
GNUTLS_CONFIGURE_WITH= gnutls
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
+.endif # if ${ZABBIX_BUILD} != "java"
+
.include <bsd.port.pre.mk>
post-patch:
@@ -171,18 +178,24 @@ post-patch:
@${REINPLACE_CMD} -e 's#/tmp/zabbix_server.pid#/var/run/zabbix/zabbix_server.pid#g' \
${WRKSRC}/conf/zabbix_server.conf \
${WRKSRC}/src/zabbix_server/server.c
+ @${REINPLACE_CMD} -e 's#/tmp/zabbix_server.log#/var/log/zabbix/zabbix_server.log#g' \
+ ${WRKSRC}/conf/zabbix_server.conf
.endif
.if ${ZABBIX_BUILD} == "proxy"
@${REINPLACE_CMD} -e 's#/tmp/zabbix_proxy.pid#/var/run/zabbix/zabbix_proxy.pid#g' \
${WRKSRC}/conf/zabbix_proxy.conf \
${WRKSRC}/src/zabbix_proxy/proxy.c
+ @${REINPLACE_CMD} -e 's#/tmp/zabbix_proxy.log#/var/log/zabbix/zabbix_proxy.log#g' \
+ ${WRKSRC}/conf/zabbix_proxy.conf
.endif
.if ${ZABBIX_BUILD} == "agent"
@${REINPLACE_CMD} -e 's#/tmp/zabbix_agentd.pid#/var/run/zabbix/zabbix_agentd.pid#g' \
${WRKSRC}/conf/zabbix_agentd.conf \
${WRKSRC}/src/zabbix_agent/zabbix_agentd.c
+ @${REINPLACE_CMD} -e 's#/tmp/zabbix_agentd.log#/var/log/zabbix/zabbix_agentd.log#g' \
+ ${WRKSRC}/conf/zabbix_agentd.conf
.endif
.if ${ZABBIX_BUILD} == "java"
diff --git a/net-mgmt/zabbix62-server/distinfo b/net-mgmt/zabbix62-server/distinfo
index 3fdeef60b2a9..4b11be161fcd 100644
--- a/net-mgmt/zabbix62-server/distinfo
+++ b/net-mgmt/zabbix62-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667767075
-SHA256 (zabbix-6.2.4.tar.gz) = e2526603d9b487a26046de3022e1722b66f4b25542886b3e40a8e2b3bbdbd3b5
-SIZE (zabbix-6.2.4.tar.gz) = 40299367
+TIMESTAMP = 1669670656
+SHA256 (zabbix-6.2.5.tar.gz) = 457e129b3cca47f90fcb33b84dd5a215a24bd10fc74c8048f47839f71db7336b
+SIZE (zabbix-6.2.5.tar.gz) = 41020695
diff --git a/net-mgmt/zabbix62-server/pkg-plist.frontend b/net-mgmt/zabbix62-server/pkg-plist.frontend
index 4bb70602e899..f390ed113093 100644
--- a/net-mgmt/zabbix62-server/pkg-plist.frontend
+++ b/net-mgmt/zabbix62-server/pkg-plist.frontend
@@ -851,7 +851,6 @@
%%WWWDIR%%/include/classes/html/CSelectOption.php
%%WWWDIR%%/include/classes/html/CSelectOptionGroup.php
%%WWWDIR%%/include/classes/html/CSeverity.php
-%%WWWDIR%%/include/classes/html/CSeverityCheckBoxList.php
%%WWWDIR%%/include/classes/html/CSimpleButton.php
%%WWWDIR%%/include/classes/html/CSortable.php
%%WWWDIR%%/include/classes/html/CSpan.php