Attachment 190895 Details for Bug 225956 – zabbix-fping.patch

[patch] zabbix-fping.patch

zabbix-fping.patch (text/plain), 4.47 KB, created by Danilo G. Baio on 2018-02-22 13:53:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Danilo G. Baio

Created: 2018-02-22 13:53:28 UTC

Size: 4.47 KB

patch

obsolete

>Index: net-mgmt/zabbix2-server/Makefile
>===================================================================
>--- net-mgmt/zabbix2-server/Makefile	(revisÃ£o 462587)
>+++ net-mgmt/zabbix2-server/Makefile	(cÃ³pia de trabalho)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	zabbix2
> PORTVERSION=	2.0.20
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
> PKGNAMESUFFIX?=	-server
>@@ -125,7 +125,11 @@
> post-patch:
> 	@${GREP} -rl "/etc/zabbix" ${WRKSRC} \
> 	  | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g'
>-	@${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' ${WRKSRC}/conf/zabbix_*.conf
>+	@${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' \
>+		${WRKSRC}/conf/zabbix_*.conf \
>+		${WRKSRC}/src/zabbix_proxy/proxy.c \
>+		${WRKSRC}/src/zabbix_server/server.c
>+
> 
> .if ${ZABBIX_BUILD} != "agent"
> .for d in mysql oracle postgresql sqlite3
>Index: net-mgmt/zabbix22-server/Makefile
>===================================================================
>--- net-mgmt/zabbix22-server/Makefile	(revisÃ£o 462587)
>+++ net-mgmt/zabbix22-server/Makefile	(cÃ³pia de trabalho)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	zabbix22
> PORTVERSION=	2.2.21
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
> PKGNAMESUFFIX?=	-server
>@@ -130,7 +130,10 @@
> post-patch:
> 	@${GREP} -rl "/etc/zabbix" ${WRKSRC} \
> 	  | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g'
>-	@${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' ${WRKSRC}/conf/zabbix_*.conf
>+	@${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' \
>+		${WRKSRC}/conf/zabbix_*.conf \
>+		${WRKSRC}/src/zabbix_proxy/proxy.c \
>+		${WRKSRC}/src/zabbix_server/server.c
> 
> .if ${ZABBIX_BUILD} != "agent"
> .if ! ${PORT_OPTIONS:MFPING}
>Index: net-mgmt/zabbix3-server/Makefile
>===================================================================
>--- net-mgmt/zabbix3-server/Makefile	(revisÃ£o 462587)
>+++ net-mgmt/zabbix3-server/Makefile	(cÃ³pia de trabalho)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	zabbix3
> PORTVERSION=	3.0.14
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
> PKGNAMESUFFIX?=	-server
>@@ -152,7 +152,9 @@
> 	@${GREP} -rl "/etc/zabbix" ${WRKSRC} \
> 	  | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g'
> 	@${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' \
>-		${WRKSRC}/conf/zabbix_*.conf
>+		${WRKSRC}/conf/zabbix_*.conf \
>+		${WRKSRC}/src/zabbix_proxy/proxy.c \
>+		${WRKSRC}/src/zabbix_server/server.c
> 
> .if ${ZABBIX_BUILD} == "server"
> 	@${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_server.pid#PidFile=/var/run/zabbix/zabbix_server.pid#g' \
>Index: net-mgmt/zabbix32-server/Makefile
>===================================================================
>--- net-mgmt/zabbix32-server/Makefile	(revisÃ£o 462587)
>+++ net-mgmt/zabbix32-server/Makefile	(cÃ³pia de trabalho)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	zabbix32
> PORTVERSION=	3.2.11
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
> PKGNAMESUFFIX?=	-server
>@@ -154,7 +154,10 @@
> 	@${GREP} -rl "/etc/zabbix" ${WRKSRC} \
> 	  | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g'
> 	@${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' \
>-		${WRKSRC}/conf/zabbix_*.conf
>+		${WRKSRC}/conf/zabbix_*.conf \
>+		${WRKSRC}/src/zabbix_proxy/proxy.c \
>+		${WRKSRC}/src/zabbix_server/server.c
>+
> 
> .if ${ZABBIX_BUILD} == "server"
> 	@${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_server.pid#PidFile=/var/run/zabbix/zabbix_server.pid#g' \
>Index: net-mgmt/zabbix34-server/Makefile
>===================================================================
>--- net-mgmt/zabbix34-server/Makefile	(revisÃ£o 462587)
>+++ net-mgmt/zabbix34-server/Makefile	(cÃ³pia de trabalho)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	zabbix34
> PORTVERSION=	3.4.7
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
> PKGNAMESUFFIX?=	-server
>@@ -157,7 +157,9 @@
> 	@${GREP} -rl "/etc/zabbix" ${WRKSRC} \
> 	  | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g'
> 	@${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' \
>-		${WRKSRC}/conf/zabbix_*.conf
>+		${WRKSRC}/conf/zabbix_*.conf \
>+		${WRKSRC}/src/zabbix_proxy/proxy.c \
>+		${WRKSRC}/src/zabbix_server/server.c
> 
> .if ${ZABBIX_BUILD} == "server"
> 	@${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_server.pid#PidFile=/var/run/zabbix/zabbix_server.pid#g' \

Flags:

pg: maintainer-approval+

Actions: View | Diff

Attachments on bug 225956: 190895