Attachment 203066 Details for Bug 234831 – zabbix-agent-cURL.patch

[patch] zabbix-agent-cURL.patch

zabbix-agent-cURL.patch (text/plain), 7.30 KB, created by Danilo G. Baio on 2019-03-23 11:30:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Danilo G. Baio

Created: 2019-03-23 11:30:56 UTC

Size: 7.30 KB

patch

obsolete

>Index: net-mgmt/zabbix22-agent/Makefile
>===================================================================
>--- net-mgmt/zabbix22-agent/Makefile	(revision 496581)
>+++ net-mgmt/zabbix22-agent/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	zabbix22
>+PORTREVISION=	1
> CATEGORIES=	net-mgmt
> PKGNAMESUFFIX=	-agent
> 
>@@ -9,6 +10,7 @@
> 
> PLIST=		${PKGDIR}/pkg-plist.agent
> 
>-OPTIONS_DEFINE=	IPV6
>+OPTIONS_DEFINE=		CURL IPV6
>+OPTIONS_DEFAULT=	CURL
> 
> .include "${MASTERDIR}/Makefile"
>Index: net-mgmt/zabbix22-server/Makefile
>===================================================================
>--- net-mgmt/zabbix22-server/Makefile	(revision 496581)
>+++ net-mgmt/zabbix22-server/Makefile	(working copy)
>@@ -64,7 +64,6 @@
> 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 @@
> 
> 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 @@
> 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
> 
>Index: net-mgmt/zabbix3-agent/Makefile
>===================================================================
>--- net-mgmt/zabbix3-agent/Makefile	(revision 496581)
>+++ net-mgmt/zabbix3-agent/Makefile	(working copy)
>@@ -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"
>Index: net-mgmt/zabbix3-server/Makefile
>===================================================================
>--- net-mgmt/zabbix3-server/Makefile	(revision 496581)
>+++ net-mgmt/zabbix3-server/Makefile	(working copy)
>@@ -67,7 +67,6 @@
> 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 @@
> 
> 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 @@
> 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
> 
>Index: net-mgmt/zabbix32-agent/Makefile
>===================================================================
>--- net-mgmt/zabbix32-agent/Makefile	(revision 496581)
>+++ net-mgmt/zabbix32-agent/Makefile	(working copy)
>@@ -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"
>Index: net-mgmt/zabbix32-server/Makefile
>===================================================================
>--- net-mgmt/zabbix32-server/Makefile	(revision 496581)
>+++ net-mgmt/zabbix32-server/Makefile	(working copy)
>@@ -71,7 +71,6 @@
> 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 @@
> 
> 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 @@
> 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
> 
>Index: net-mgmt/zabbix34-agent/Makefile
>===================================================================
>--- net-mgmt/zabbix34-agent/Makefile	(revision 496581)
>+++ net-mgmt/zabbix34-agent/Makefile	(working copy)
>@@ -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"
>Index: net-mgmt/zabbix34-server/Makefile
>===================================================================
>--- net-mgmt/zabbix34-server/Makefile	(revision 496581)
>+++ net-mgmt/zabbix34-server/Makefile	(working copy)
>@@ -73,7 +73,6 @@
> 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 @@
> 
> 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 @@
> 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
> 
>Index: net-mgmt/zabbix4-agent/Makefile
>===================================================================
>--- net-mgmt/zabbix4-agent/Makefile	(revision 496581)
>+++ net-mgmt/zabbix4-agent/Makefile	(working copy)
>@@ -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"
>Index: net-mgmt/zabbix4-server/Makefile
>===================================================================
>--- net-mgmt/zabbix4-server/Makefile	(revision 496581)
>+++ net-mgmt/zabbix4-server/Makefile	(working copy)
>@@ -71,7 +71,6 @@
> 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 @@
> 
> 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 @@
> 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
>

Flags:

pg: maintainer-approval+

Actions: View | Diff

Attachments on bug 234831: 202838 | 203066