Attachment 238391 Details for Bug 268032 – Patch.

[patch] Patch.

zabbix62-agent.diff (text/plain), 5.16 KB, created by Christian Ullrich on 2022-11-28 07:57:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Ullrich

Created: 2022-11-28 07:57:01 UTC

Size: 5.16 KB

patch

obsolete

>commit 2c62e88acae1867cbdaffe3a04d12f15ffaa6431
>Author: Christian Ullrich <chris@chrullrich.net>
>Date:   Mon Nov 28 08:45:45 2022 +0100
>
>    net-mgmt/zabbix62-agent: Local fix for #268032
>
>diff --git a/net-mgmt/zabbix62-agent/Makefile b/net-mgmt/zabbix62-agent/Makefile
>index 00840fa63f5f..2247f64a3981 100644
>--- a/net-mgmt/zabbix62-agent/Makefile
>+++ b/net-mgmt/zabbix62-agent/Makefile
>@@ -6,6 +6,6 @@ MASTERDIR=	${.CURDIR}/../${PORTNAME}-server
> PLIST=		${PKGDIR}/pkg-plist.agent
> 
> OPTIONS_DEFINE=		CURL IPV6 MODBUS
>-OPTIONS_DEFAULT=	CURL OPENSSL
>+OPTIONS_DEFAULT=	CURL OPENSSL PCRE2
> 
> .include "${MASTERDIR}/Makefile"
>diff --git a/net-mgmt/zabbix62-server/Makefile b/net-mgmt/zabbix62-server/Makefile
>index a394b8517792..1ac7abebf130 100644
>--- a/net-mgmt/zabbix62-server/Makefile
>+++ b/net-mgmt/zabbix62-server/Makefile
>@@ -74,87 +74,90 @@ OPTIONS_SINGLE_DB?=	MDB5 MDB6 MYSQL MYSQLDV ORACLE PGSQL
> OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
> OPTIONS_SINGLE_PCRE=	PCRE1 PCRE2
> 
>+.elif ${ZABBIX_BUILD} == "agent"
>+OPTIONS_SINGLE=			SSL PCRE
>+OPTIONS_SINGLE_SSL=		GNUTLS OPENSSL
>+OPTIONS_SINGLE_PCRE=		PCRE1 PCRE2
>+.endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
>+
> FPING_DESC=	Build/install fping for ping checks
> IPMI_DESC=	Support for IPMI checks
> LDAP_DESC=	Support for LDAP server checks
>+LIBXML2_DESC=	Support for libxml2 (required by monitoring VMware)
>+MYSQL_DESC=	MySQL 8.0 database support
>+MYSQLDV_DESC=	MYSQL DEFAULT_VERSIONS= (poudriere)
> 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)
>-
>-MYSQL_CONFIGURE_ON=	--with-mysql
>-MYSQL_USES+=		compiler:c11 mysql:80
> 
>-MYSQLDV_CONFIGURE_ON=	--with-mysql
>-MYSQLDV_USES+=		compiler:c11 mysql
>-
>-MDB5_CONFIGURE_ON=	--with-mysql=${LOCALBASE}/bin/mysql_config
>-MDB5_USES+=		compiler:c11 mysql:105m
>-MDB5_DESC=		Mariadb 10.5 database support
>-
>-MDB6_CONFIGURE_ON=	--with-mysql=${LOCALBASE}/bin/mysql_config
>-MDB6_USES+=		compiler:c11 mysql:106m
>-MDB6_DESC=		Mariadb 10.6 database support
>+CURL_CONFIGURE_WITH=	libcurl
>+CURL_DESC=		Support for web monitoring
>+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
> 
>-PCRE1_LIB_DEPENDS=	libpcre.so:devel/pcre
>-PCRE1_CONFIGURE_WITH=	libpcre
>-PCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
>-PCRE2_CONFIGURE_WITH=	libpcre2
>+FPING_RUN_DEPENDS=	fping:net/fping
> 
>-PGSQL_CONFIGURE_WITH=	postgresql
>-PGSQL_USES+=		pgsql
>+GNUTLS_CONFIGURE_WITH=	gnutls
>+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
> 
>-SQLITE_CONFIGURE_WITH=	sqlite3
>-SQLITE_USES+=		sqlite:3
>+IPMI_CONFIGURE_WITH=	openipmi
>+IPMI_LIB_DEPENDS=	libOpenIPMI.so:sysutils/openipmi
> 
>-ORACLE_CONFIGURE_WITH=	oracle
>+IPV6_CONFIGURE_ENABLE=	ipv6
> 
> LDAP_CONFIGURE_WITH=	ldap
> LDAP_USE=		OPENLDAP=yes
> 
>-IPMI_CONFIGURE_WITH=	openipmi
>-IPMI_LIB_DEPENDS=	libOpenIPMI.so:sysutils/openipmi
>+LIBXML2_CONFIGURE_WITH=	libxml2=${LOCALBASE}
>+LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
> 
>-FPING_RUN_DEPENDS=	fping:net/fping
>+MDB5_CONFIGURE_ON=	--with-mysql=${LOCALBASE}/bin/mysql_config
>+MDB5_DESC=		Mariadb 10.5 database support
>+MDB5_USES+=		compiler:c11 mysql:105m
> 
>-SSH_CONFIGURE_WITH=	ssh2
>-SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
>+MDB6_CONFIGURE_ON=	--with-mysql=${LOCALBASE}/bin/mysql_config
>+MDB6_DESC=		Mariadb 10.6 database support
>+MDB6_USES+=		compiler:c11 mysql:106m
> 
>-UNIXODBC_CONFIGURE_WITH=	unixodbc
>-UNIXODBC_LIB_DEPENDS=		libodbc.so:databases/unixODBC
>-.elif ${ZABBIX_BUILD} == "agent"
>-OPTIONS_SINGLE=			SSL
>-OPTIONS_SINGLE_SSL=		GNUTLS OPENSSL
>-.endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
>+MODBUS_CONFIGURE_WITH=	libmodbus
>+MODBUS_DESC=		Support for Modbus checks
>+MODBUS_LIB_DEPENDS=	libmodbus.so:comms/libmodbus
> 
>-CURL_DESC=		Support for web monitoring
>-CURL_CONFIGURE_WITH=	libcurl
>-CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
>+MYSQL_CONFIGURE_ON=	--with-mysql
>+MYSQL_USES+=		compiler:c11 mysql:80
> 
>-IPV6_CONFIGURE_ENABLE=	ipv6
>+MYSQLDV_CONFIGURE_ON=	--with-mysql
>+MYSQLDV_USES+=		compiler:c11 mysql
> 
> NMAP_RUN_DEPENDS=	nmap:security/nmap \
> 			sudo:security/sudo
> 
>-LIBXML2_CONFIGURE_WITH=	libxml2=${LOCALBASE}
>-LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
>-
>-MODBUS_DESC=		Support for Modbus checks
>-MODBUS_CONFIGURE_WITH=	libmodbus
>-MODBUS_LIB_DEPENDS=	libmodbus.so:comms/libmodbus
>-
> OPENSSL_CONFIGURE_WITH=	openssl
> OPENSSL_USES=		ssl
> OPENSSL_VARS=		BROKEN_SSL="libressl libressl-devel" \
> 			BROKEN_SSL_REASON="PSK is not provided by LibreSSL"
> 
>-GNUTLS_CONFIGURE_WITH=	gnutls
>-GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
>+ORACLE_CONFIGURE_WITH=	oracle
>+
>+PCRE1_CONFIGURE_WITH=	libpcre
>+PCRE1_LIB_DEPENDS=	libpcre.so:devel/pcre
>+
>+PCRE2_CONFIGURE_WITH=	libpcre2
>+PCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
>+
>+PGSQL_CONFIGURE_WITH=	postgresql
>+PGSQL_USES+=		pgsql
>+
>+SQLITE_CONFIGURE_WITH=	sqlite3
>+SQLITE_USES+=		sqlite:3
>+
>+SSH_CONFIGURE_WITH=	ssh2
>+SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
>+
>+UNIXODBC_CONFIGURE_WITH=	unixodbc
>+UNIXODBC_LIB_DEPENDS=		libodbc.so:databases/unixODBC
> 
> .include <bsd.port.pre.mk>
>

Flags:

chris: maintainer-approval?

Actions: View | Diff

Attachments on bug 268032: 238391