Date: Wed, 27 Mar 2019 11:37:10 +0000 (UTC) From: "Danilo G. Baio" <dbaio@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496943 - in head/net-mgmt: zabbix22-agent zabbix22-server zabbix3-agent zabbix3-server zabbix32-agent zabbix32-server zabbix34-agent zabbix34-server zabbix4-agent zabbix4-server Message-ID: <201903271137.x2RBbAl9024386@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbaio Date: Wed Mar 27 11:37:10 2019 New Revision: 496943 URL: https://svnweb.freebsd.org/changeset/ports/496943 Log: net-mgmt/zabbix*-agent: Add libcurl support This enables zabbix_agent simple_checks (net.tcp.service) for https. PR: 234831 Reported by: Marcin Gryszkalis <mg@fork.pl> Approved by: Pakhom Golynga <pg@pakhom.spb.ru> (maintainer) Modified: head/net-mgmt/zabbix22-agent/Makefile head/net-mgmt/zabbix22-server/Makefile head/net-mgmt/zabbix3-agent/Makefile head/net-mgmt/zabbix3-server/Makefile head/net-mgmt/zabbix32-agent/Makefile head/net-mgmt/zabbix32-server/Makefile head/net-mgmt/zabbix34-agent/Makefile head/net-mgmt/zabbix34-server/Makefile head/net-mgmt/zabbix4-agent/Makefile head/net-mgmt/zabbix4-server/Makefile Modified: head/net-mgmt/zabbix22-agent/Makefile ============================================================================== --- head/net-mgmt/zabbix22-agent/Makefile Wed Mar 27 11:16:30 2019 (r496942) +++ head/net-mgmt/zabbix22-agent/Makefile Wed Mar 27 11:37:10 2019 (r496943) @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= zabbix22 +PORTREVISION= 1 CATEGORIES= net-mgmt PKGNAMESUFFIX= -agent @@ -9,6 +10,8 @@ MASTERDIR= ${.CURDIR}/../zabbix22-server PLIST= ${PKGDIR}/pkg-plist.agent -OPTIONS_DEFINE= IPV6 +OPTIONS_DEFINE= CURL IPV6 +OPTIONS_DEFAULT= CURL + .include "${MASTERDIR}/Makefile" Modified: head/net-mgmt/zabbix22-server/Makefile ============================================================================== --- head/net-mgmt/zabbix22-server/Makefile Wed Mar 27 11:16:30 2019 (r496942) +++ head/net-mgmt/zabbix22-server/Makefile Wed Mar 27 11:37:10 2019 (r496943) @@ -28,7 +28,7 @@ USE_RC_SUBR= zabbix_${ZABBIX_BUILD} USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d .endif -USES= pkgconfig iconv +USES= pkgconfig iconv localbase USERS= zabbix GROUPS= zabbix @@ -64,7 +64,6 @@ OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH N OPTIONS_DEFAULT= MYSQL FPING JABBER CURL UNIXODBC OPTIONS_SUB= yes -CURL_DESC= Support for web monitoring FPING_DESC= Build/install fping for ping checks IPMI_DESC= Support for IPMI checks JABBER_DESC= Support for Jabber media type @@ -89,9 +88,6 @@ SQLITE_USES+= sqlite:3 ORACLE_CONFIGURE_WITH= oracle -CURL_CONFIGURE_WITH= libcurl -CURL_LIB_DEPENDS= libcurl.so:ftp/curl - LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes @@ -112,6 +108,10 @@ IODBC_LIB_DEPENDS= libiodbc.so:databases/libiodbc UNIXODBC_CONFIGURE_WITH= unixodbc UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC .endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java" + +CURL_DESC= Support for web monitoring +CURL_CONFIGURE_WITH= libcurl +CURL_LIB_DEPENDS= libcurl.so:ftp/curl IPV6_CONFIGURE_ENABLE= ipv6 Modified: head/net-mgmt/zabbix3-agent/Makefile ============================================================================== --- head/net-mgmt/zabbix3-agent/Makefile Wed Mar 27 11:16:30 2019 (r496942) +++ head/net-mgmt/zabbix3-agent/Makefile Wed Mar 27 11:37:10 2019 (r496943) @@ -2,13 +2,14 @@ # $FreeBSD$ PORTNAME= zabbix3 +PORTREVISION= 1 CATEGORIES= net-mgmt PKGNAMESUFFIX= -agent MASTERDIR= ${.CURDIR}/../zabbix3-server PLIST= ${PKGDIR}/pkg-plist.agent -OPTIONS_DEFINE= IPV6 -OPTIONS_DEFAULT= OPENSSL +OPTIONS_DEFINE= CURL IPV6 +OPTIONS_DEFAULT= CURL OPENSSL .include "${MASTERDIR}/Makefile" Modified: head/net-mgmt/zabbix3-server/Makefile ============================================================================== --- head/net-mgmt/zabbix3-server/Makefile Wed Mar 27 11:16:30 2019 (r496942) +++ head/net-mgmt/zabbix3-server/Makefile Wed Mar 27 11:37:10 2019 (r496943) @@ -67,7 +67,6 @@ OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL OPTIONS_SUB= yes -CURL_DESC= Support for web monitoring FPING_DESC= Build/install fping for ping checks IPMI_DESC= Support for IPMI checks JABBER_DESC= Support for Jabber media type @@ -93,9 +92,6 @@ SQLITE_USES+= sqlite:3 ORACLE_CONFIGURE_WITH= oracle -CURL_CONFIGURE_WITH= libcurl -CURL_LIB_DEPENDS= libcurl.so:ftp/curl - LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes @@ -119,6 +115,10 @@ UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= OPENSSL GNUTLS .endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java" + +CURL_DESC= Support for web monitoring +CURL_CONFIGURE_WITH= libcurl +CURL_LIB_DEPENDS= libcurl.so:ftp/curl IPV6_CONFIGURE_ENABLE= ipv6 Modified: head/net-mgmt/zabbix32-agent/Makefile ============================================================================== --- head/net-mgmt/zabbix32-agent/Makefile Wed Mar 27 11:16:30 2019 (r496942) +++ head/net-mgmt/zabbix32-agent/Makefile Wed Mar 27 11:37:10 2019 (r496943) @@ -2,13 +2,14 @@ # $FreeBSD$ PORTNAME= zabbix32 +PORTREVISION= 1 CATEGORIES= net-mgmt PKGNAMESUFFIX= -agent MASTERDIR= ${.CURDIR}/../zabbix32-server PLIST= ${PKGDIR}/pkg-plist.agent -OPTIONS_DEFINE= IPV6 -OPTIONS_DEFAULT= OPENSSL +OPTIONS_DEFINE= CURL IPV6 +OPTIONS_DEFAULT= CURL OPENSSL .include "${MASTERDIR}/Makefile" Modified: head/net-mgmt/zabbix32-server/Makefile ============================================================================== --- head/net-mgmt/zabbix32-server/Makefile Wed Mar 27 11:16:30 2019 (r496942) +++ head/net-mgmt/zabbix32-server/Makefile Wed Mar 27 11:37:10 2019 (r496943) @@ -71,7 +71,6 @@ OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL OPTIONS_SUB= yes -CURL_DESC= Support for web monitoring FPING_DESC= Build/install fping for ping checks IPMI_DESC= Support for IPMI checks JABBER_DESC= Support for Jabber media type @@ -97,9 +96,6 @@ SQLITE_USES+= sqlite:3 ORACLE_CONFIGURE_WITH= oracle -CURL_CONFIGURE_WITH= libcurl -CURL_LIB_DEPENDS= libcurl.so:ftp/curl - LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes @@ -123,6 +119,10 @@ UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= OPENSSL GNUTLS .endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java" + +CURL_DESC= Support for web monitoring +CURL_CONFIGURE_WITH= libcurl +CURL_LIB_DEPENDS= libcurl.so:ftp/curl IPV6_CONFIGURE_ENABLE= ipv6 Modified: head/net-mgmt/zabbix34-agent/Makefile ============================================================================== --- head/net-mgmt/zabbix34-agent/Makefile Wed Mar 27 11:16:30 2019 (r496942) +++ head/net-mgmt/zabbix34-agent/Makefile Wed Mar 27 11:37:10 2019 (r496943) @@ -2,13 +2,14 @@ # $FreeBSD$ PORTNAME= zabbix34 +PORTREVISION= 1 CATEGORIES= net-mgmt PKGNAMESUFFIX= -agent MASTERDIR= ${.CURDIR}/../zabbix34-server PLIST= ${PKGDIR}/pkg-plist.agent -OPTIONS_DEFINE= IPV6 -OPTIONS_DEFAULT= OPENSSL +OPTIONS_DEFINE= CURL IPV6 +OPTIONS_DEFAULT= CURL OPENSSL .include "${MASTERDIR}/Makefile" Modified: head/net-mgmt/zabbix34-server/Makefile ============================================================================== --- head/net-mgmt/zabbix34-server/Makefile Wed Mar 27 11:16:30 2019 (r496942) +++ head/net-mgmt/zabbix34-server/Makefile Wed Mar 27 11:37:10 2019 (r496943) @@ -73,7 +73,6 @@ OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL OPTIONS_SUB= yes -CURL_DESC= Support for web monitoring FPING_DESC= Build/install fping for ping checks IPMI_DESC= Support for IPMI checks JABBER_DESC= Support for Jabber media type @@ -99,9 +98,6 @@ SQLITE_USES+= sqlite:3 ORACLE_CONFIGURE_WITH= oracle -CURL_CONFIGURE_WITH= libcurl -CURL_LIB_DEPENDS= libcurl.so:ftp/curl - LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes @@ -125,6 +121,10 @@ UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= OPENSSL GNUTLS .endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java" + +CURL_DESC= Support for web monitoring +CURL_CONFIGURE_WITH= libcurl +CURL_LIB_DEPENDS= libcurl.so:ftp/curl IPV6_CONFIGURE_ENABLE= ipv6 Modified: head/net-mgmt/zabbix4-agent/Makefile ============================================================================== --- head/net-mgmt/zabbix4-agent/Makefile Wed Mar 27 11:16:30 2019 (r496942) +++ head/net-mgmt/zabbix4-agent/Makefile Wed Mar 27 11:37:10 2019 (r496943) @@ -2,13 +2,14 @@ # $FreeBSD$ PORTNAME= zabbix4 +PORTREVISION= 1 CATEGORIES= net-mgmt PKGNAMESUFFIX= -agent MASTERDIR= ${.CURDIR}/../zabbix4-server PLIST= ${PKGDIR}/pkg-plist.agent -OPTIONS_DEFINE= IPV6 -OPTIONS_DEFAULT= OPENSSL +OPTIONS_DEFINE= CURL IPV6 +OPTIONS_DEFAULT= CURL OPENSSL .include "${MASTERDIR}/Makefile" Modified: head/net-mgmt/zabbix4-server/Makefile ============================================================================== --- head/net-mgmt/zabbix4-server/Makefile Wed Mar 27 11:16:30 2019 (r496942) +++ head/net-mgmt/zabbix4-server/Makefile Wed Mar 27 11:37:10 2019 (r496943) @@ -71,7 +71,6 @@ OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL OPTIONS_SUB= yes -CURL_DESC= Support for web monitoring FPING_DESC= Build/install fping for ping checks IPMI_DESC= Support for IPMI checks JABBER_DESC= Support for Jabber media type @@ -96,9 +95,6 @@ SQLITE_USES+= sqlite:3 ORACLE_CONFIGURE_WITH= oracle -CURL_CONFIGURE_WITH= libcurl -CURL_LIB_DEPENDS= libcurl.so:ftp/curl - LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes @@ -119,6 +115,10 @@ UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= OPENSSL GNUTLS .endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java" + +CURL_DESC= Support for web monitoring +CURL_CONFIGURE_WITH= libcurl +CURL_LIB_DEPENDS= libcurl.so:ftp/curl IPV6_CONFIGURE_ENABLE= ipv6
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903271137.x2RBbAl9024386>