Attachment 119008 Details for Bug 161460 – zabbix-server-1.8.8,2.patch

[patch] zabbix-server-1.8.8,2.patch

zabbix-server-1.8.8,2.patch (text/plain), 6.09 KB, created by Jim Riggs on 2011-10-10 14:10:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jim Riggs

Created: 2011-10-10 14:10:06 UTC

Size: 6.09 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/Makefile /usr/jails/zabbixbu/root/zabbix-server/Makefile
>--- /usr/ports/net-mgmt/zabbix-server/Makefile	2011-09-23 17:24:50.000000000 -0500
>+++ /usr/jails/zabbixbu/root/zabbix-server/Makefile	2011-09-29 13:32:08.317987836 -0500
>@@ -2,12 +2,11 @@
> # Date created:		2009-12-09
> # Whom:			Jim Riggs <ports@christianserving.org>
> #
>-# $FreeBSD: ports/net-mgmt/zabbix-server/Makefile,v 1.14 2011/09/23 22:24:50 amdmi3 Exp $
>+# $FreeBSD: ports/net-mgmt/zabbix-server/Makefile,v 1.13 2011/07/28 12:43:19 sylvio Exp $
> #
> 
> PORTNAME=	zabbix
>-PORTVERSION=	1.8.5
>-PORTREVISION=	1
>+PORTVERSION=	1.8.8
> PORTEPOCH=	2
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
>@@ -47,10 +46,10 @@
> MAKE_ARGS+=	ARCH=freebsd
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD}
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
> 
> .if ${ZABBIX_BUILD} != "agent"
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
> LIB_DEPENDS=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
> 		execinfo:${PORTSDIR}/devel/libexecinfo
> 
>@@ -140,9 +139,9 @@
> 
> post-patch:
> 	@${GREP} -rl "/etc/zabbix" ${WRKSRC} \
>-	  | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g' \
>-	  && ${FIND} ${WRKSRC} -type f -name '*.bak' -exec ${RM} -f {} +
>+	  | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g'
> 	@${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' ${WRKSRC}/misc/conf/${PORTNAME}_*.conf
>+	@${FIND} ${WRKSRC} -type f $ -name '*.bak' -or -name '*.orig' $ -exec ${RM} -f {} +
> 
> .if ${ZABBIX_BUILD} != "agent"
> .ifdef WITHOUT_FPING
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/distinfo /usr/jails/zabbixbu/root/zabbix-server/distinfo
>--- /usr/ports/net-mgmt/zabbix-server/distinfo	2011-04-22 10:07:36.000000000 -0500
>+++ /usr/jails/zabbixbu/root/zabbix-server/distinfo	2011-09-29 13:32:40.169590772 -0500
>@@ -1,2 +1,2 @@
>-SHA256 (zabbix-1.8.5.tar.gz) = 885b9f1953c3f6aa1f13760340b3d23d6e01287dc46e6e241c964aec7a38ef32
>-SIZE (zabbix-1.8.5.tar.gz) = 4184672
>+SHA256 (zabbix-1.8.8.tar.gz) = 25eded2536213cf1c75631f2becf46349b915dd8782698f5b2936f5abb7eeb99
>+SIZE (zabbix-1.8.8.tar.gz) = 4213181
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/files/patch-create:data:data.sql /usr/jails/zabbixbu/root/zabbix-server/files/patch-create:data:data.sql
>--- /usr/ports/net-mgmt/zabbix-server/files/patch-create:data:data.sql	1969-12-31 18:00:00.000000000 -0600
>+++ /usr/jails/zabbixbu/root/zabbix-server/files/patch-create:data:data.sql	2011-08-04 09:50:05.000000000 -0500
>@@ -0,0 +1,13 @@
>+--- create/data/data.sql.orig	2011-08-04 09:48:23.785558036 -0500
>++++ create/data/data.sql	2011-08-04 09:48:41.277736192 -0500
>+@@ -27,8 +27,8 @@
>+ -- Dumping data for table `scripts`
>+ --
>+ 
>+-INSERT INTO scripts VALUES (1,'Ping','/bin/ping -c 3 {HOST.CONN}',2,0,0);
>+-INSERT INTO scripts VALUES (2,'Traceroute','/usr/bin/traceroute {HOST.CONN}',2,0,0);
>++INSERT INTO scripts VALUES (1,'Ping','/sbin/ping -c 3 {HOST.CONN}',2,0,0);
>++INSERT INTO scripts VALUES (2,'Traceroute','/usr/sbin/traceroute {HOST.CONN}',2,0,0);
>+ 
>+ --
>+ -- Dumping data for table `users`
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/files/patch-src_libs_zbxcomms_comms.c /usr/jails/zabbixbu/root/zabbix-server/files/patch-src_libs_zbxcomms_comms.c
>--- /usr/ports/net-mgmt/zabbix-server/files/patch-src_libs_zbxcomms_comms.c	2011-04-22 10:07:36.000000000 -0500
>+++ /usr/jails/zabbixbu/root/zabbix-server/files/patch-src_libs_zbxcomms_comms.c	1969-12-31 18:00:00.000000000 -0600
>@@ -1,24 +0,0 @@
>---- src/libs/zbxcomms/comms.c.orig	2011-04-15 14:17:29.000000000 -0500
>-+++ src/libs/zbxcomms/comms.c	2011-04-22 09:47:38.403907930 -0500
>-@@ -756,19 +756,14 @@
>- 						ip ? ip : "-", port, zbx_sock_last_error(), strerror_from_system(zbx_sock_last_error()));
>- 			}
>- 
>--#if defined(IPV6_V6ONLY)
>--#ifdef _WINDOWS
>-+#if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY)
>- 			if (PF_INET6 == current_ai->ai_family &&
>- 				ZBX_TCP_ERROR == setsockopt(s->sockets[s->num_socks], IPPROTO_IPV6, IPV6_V6ONLY, (void *)&on, sizeof(on)))
>--#else
>--			if (PF_INET6 == current_ai->ai_family &&
>--				ZBX_TCP_ERROR == setsockopt(s->sockets[s->num_socks], SOL_IPV6, IPV6_V6ONLY, (void *)&on, sizeof(on)))
>--#endif
>- 			{
>- 				zbx_set_tcp_strerror("setsockopt() with IPV6_V6ONLY for [[%s]:%s] failed with error %d: %s",
>- 						ip ? ip : "-", port, zbx_sock_last_error(), strerror_from_system(zbx_sock_last_error()));
>- 			}
>--#endif	/* IPV6_V6ONLY */
>-+#endif
>- 
>- 			if (ZBX_TCP_ERROR == bind(s->sockets[s->num_socks], current_ai->ai_addr, current_ai->ai_addrlen))
>- 			{
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/pkg-plist /usr/jails/zabbixbu/root/zabbix-server/pkg-plist
>--- /usr/ports/net-mgmt/zabbix-server/pkg-plist	2011-04-22 10:07:36.000000000 -0500
>+++ /usr/jails/zabbixbu/root/zabbix-server/pkg-plist	2011-10-10 07:40:11.072716288 -0500
>@@ -56,3 +56,4 @@
> @dirrm %%DATADIR%%/%%ZABBIX_BUILD%%
> @dirrmtry %%DATADIR%%
> @dirrmtry %%ETCDIR%%
>+@dirrmtry www
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/pkg-plist.agent /usr/jails/zabbixbu/root/zabbix-server/pkg-plist.agent
>--- /usr/ports/net-mgmt/zabbix-server/pkg-plist.agent	2009-12-13 16:30:17.000000000 -0600
>+++ /usr/jails/zabbixbu/root/zabbix-server/pkg-plist.agent	2011-10-10 07:40:00.944344215 -0500
>@@ -6,3 +6,4 @@
> sbin/zabbix_agent
> sbin/zabbix_agentd
> @dirrmtry %%ETCDIR%%
>+@dirrmtry www
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/pkg-plist.frontend /usr/jails/zabbixbu/root/zabbix-server/pkg-plist.frontend
>--- /usr/ports/net-mgmt/zabbix-server/pkg-plist.frontend	2011-04-22 10:07:36.000000000 -0500
>+++ /usr/jails/zabbixbu/root/zabbix-server/pkg-plist.frontend	2011-10-10 07:39:54.965221871 -0500
>@@ -19,6 +19,7 @@
> %%WWWDIR%%/api/classes/class.chostgroup.php
> %%WWWDIR%%/api/classes/class.cimage.php
> %%WWWDIR%%/api/classes/class.citem.php
>+%%WWWDIR%%/api/classes/class.citemkey.php
> %%WWWDIR%%/api/classes/class.cmaintenance.php
> %%WWWDIR%%/api/classes/class.cmap.php
> %%WWWDIR%%/api/classes/class.cmediatype.php
>@@ -470,3 +471,4 @@
> @dirrm %%WWWDIR%%/api/classes
> @dirrm %%WWWDIR%%/api
> @dirrm %%WWWDIR%%
>+@dirrmtry www

Actions: View | Diff

Attachments on bug 161460: 119008