Attachment #119008 for bug #161460

View | Details | Raw Unified | Return to bug 161460
Collapse All | Expand All

Lines 2-13 Link Here

(-)/usr/jails/zabbixbu/root/zabbix-server/Makefile (-7 / +6 lines)
2	# Date created: 2009-12-09	2	# Date created: 2009-12-09
3	# Whom: Jim Riggs <ports@christianserving.org>	3	# Whom: Jim Riggs <ports@christianserving.org>
4	#	4	#
5	# $FreeBSD: ports/net-mgmt/zabbix-server/Makefile,v 1.14 2011/09/23 22:24:50 amdmi3 Exp $	5	# $FreeBSD: ports/net-mgmt/zabbix-server/Makefile,v 1.13 2011/07/28 12:43:19 sylvio Exp $
6	#	6	#
7		7
8	PORTNAME= zabbix	8	PORTNAME= zabbix
9	PORTVERSION= 1.8.5	9	PORTVERSION= 1.8.8
10	PORTREVISION= 1
11	PORTEPOCH= 2	10	PORTEPOCH= 2
12	CATEGORIES= net-mgmt	11	CATEGORIES= net-mgmt
13	MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}	12	MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
Lines 47-56 Link Here
47	MAKE_ARGS+= ARCH=freebsd	46	MAKE_ARGS+= ARCH=freebsd
48	GNU_CONFIGURE= yes	47	GNU_CONFIGURE= yes
49	CONFIGURE_ARGS+= --enable-${ZABBIX_BUILD}	48	CONFIGURE_ARGS+= --enable-${ZABBIX_BUILD}
50	CPPFLAGS+= -I${LOCALBASE}/include
51	LDFLAGS+= -L${LOCALBASE}/lib
52		49
53	.if ${ZABBIX_BUILD} != "agent"	50	.if ${ZABBIX_BUILD} != "agent"
		51	CPPFLAGS+= -I${LOCALBASE}/include
		52	CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
54	LIB_DEPENDS= netsnmp:${PORTSDIR}/net-mgmt/net-snmp \	53	LIB_DEPENDS= netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
55	execinfo:${PORTSDIR}/devel/libexecinfo	54	execinfo:${PORTSDIR}/devel/libexecinfo
56		55
Lines 140-148 Link Here
140		139
141	post-patch:	140	post-patch:
142	@${GREP} -rl "/etc/zabbix" ${WRKSRC} \	141	@${GREP} -rl "/etc/zabbix" ${WRKSRC} \
143	\| ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g' \	142	\| ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g'
144	&& ${FIND} ${WRKSRC} -type f -name '*.bak' -exec ${RM} -f {} +
145	@${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' ${WRKSRC}/misc/conf/${PORTNAME}_*.conf	143	@${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' ${WRKSRC}/misc/conf/${PORTNAME}_*.conf
		144	@${FIND} ${WRKSRC} -type f $ -name '.bak' -or -name '.orig' $ -exec ${RM} -f {} +
146		145
147	.if ${ZABBIX_BUILD} != "agent"	146	.if ${ZABBIX_BUILD} != "agent"
148	.ifdef WITHOUT_FPING	147	.ifdef WITHOUT_FPING

Lines 1-2 Link Here

(-)/usr/jails/zabbixbu/root/zabbix-server/distinfo (-2 / +2 lines)
1	SHA256 (zabbix-1.8.5.tar.gz) = 885b9f1953c3f6aa1f13760340b3d23d6e01287dc46e6e241c964aec7a38ef32	1	SHA256 (zabbix-1.8.8.tar.gz) = 25eded2536213cf1c75631f2becf46349b915dd8782698f5b2936f5abb7eeb99
2	SIZE (zabbix-1.8.5.tar.gz) = 4184672	2	SIZE (zabbix-1.8.8.tar.gz) = 4213181




--- 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`




--- 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))
 			{

Lines 56-58 Link Here

(-)/usr/jails/zabbixbu/root/zabbix-server/pkg-plist (+1 lines)
56	@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%	56	@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%
57	@dirrmtry %%DATADIR%%	57	@dirrmtry %%DATADIR%%
58	@dirrmtry %%ETCDIR%%	58	@dirrmtry %%ETCDIR%%
		59	@dirrmtry www

Lines 6-8 Link Here

(-)/usr/jails/zabbixbu/root/zabbix-server/pkg-plist.agent (+1 lines)
6	sbin/zabbix_agent	6	sbin/zabbix_agent
7	sbin/zabbix_agentd	7	sbin/zabbix_agentd
8	@dirrmtry %%ETCDIR%%	8	@dirrmtry %%ETCDIR%%
		9	@dirrmtry www

Lines 19-24 Link Here

(-)/usr/jails/zabbixbu/root/zabbix-server/pkg-plist.frontend (+2 lines)
19	%%WWWDIR%%/api/classes/class.chostgroup.php	19	%%WWWDIR%%/api/classes/class.chostgroup.php
20	%%WWWDIR%%/api/classes/class.cimage.php	20	%%WWWDIR%%/api/classes/class.cimage.php
21	%%WWWDIR%%/api/classes/class.citem.php	21	%%WWWDIR%%/api/classes/class.citem.php
		22	%%WWWDIR%%/api/classes/class.citemkey.php
22	%%WWWDIR%%/api/classes/class.cmaintenance.php	23	%%WWWDIR%%/api/classes/class.cmaintenance.php
23	%%WWWDIR%%/api/classes/class.cmap.php	24	%%WWWDIR%%/api/classes/class.cmap.php
24	%%WWWDIR%%/api/classes/class.cmediatype.php	25	%%WWWDIR%%/api/classes/class.cmediatype.php
Lines 470-472 Link Here
470	@dirrm %%WWWDIR%%/api/classes	471	@dirrm %%WWWDIR%%/api/classes
471	@dirrm %%WWWDIR%%/api	472	@dirrm %%WWWDIR%%/api
472	@dirrm %%WWWDIR%%	473	@dirrm %%WWWDIR%%
		474	@dirrmtry www

Return to bug 161460

Line 0 Link Here

(-)/usr/jails/zabbixbu/root/zabbix-server/files/patch-create:data:data.sql (+13 lines)
	1	--- create/data/data.sql.orig 2011-08-04 09:48:23.785558036 -0500
	2	+++ create/data/data.sql 2011-08-04 09:48:41.277736192 -0500
	3	@@ -27,8 +27,8 @@
	4	-- Dumping data for table `scripts`
	5	--
	6
	7	-INSERT INTO scripts VALUES (1,'Ping','/bin/ping -c 3 {HOST.CONN}',2,0,0);
	8	-INSERT INTO scripts VALUES (2,'Traceroute','/usr/bin/traceroute {HOST.CONN}',2,0,0);
	9	+INSERT INTO scripts VALUES (1,'Ping','/sbin/ping -c 3 {HOST.CONN}',2,0,0);
	10	+INSERT INTO scripts VALUES (2,'Traceroute','/usr/sbin/traceroute {HOST.CONN}',2,0,0);
	11
	12	--
	13	-- Dumping data for table `users`

Lines 1-24 Link Here

(-)/usr/jails/zabbixbu/root/zabbix-server/files/patch-src_libs_zbxcomms_comms.c (-24 lines)
1	--- src/libs/zbxcomms/comms.c.orig 2011-04-15 14:17:29.000000000 -0500
2	+++ src/libs/zbxcomms/comms.c 2011-04-22 09:47:38.403907930 -0500
3	@@ -756,19 +756,14 @@
4	ip ? ip : "-", port, zbx_sock_last_error(), strerror_from_system(zbx_sock_last_error()));
5	}
6
7	-#if defined(IPV6_V6ONLY)
8	-#ifdef _WINDOWS
9	+#if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY)
10	if (PF_INET6 == current_ai->ai_family &&
11	ZBX_TCP_ERROR == setsockopt(s->sockets[s->num_socks], IPPROTO_IPV6, IPV6_V6ONLY, (void *)&on, sizeof(on)))
12	-#else
13	- if (PF_INET6 == current_ai->ai_family &&
14	- ZBX_TCP_ERROR == setsockopt(s->sockets[s->num_socks], SOL_IPV6, IPV6_V6ONLY, (void *)&on, sizeof(on)))
15	-#endif
16	{
17	zbx_set_tcp_strerror("setsockopt() with IPV6_V6ONLY for [[%s]:%s] failed with error %d: %s",
18	ip ? ip : "-", port, zbx_sock_last_error(), strerror_from_system(zbx_sock_last_error()));
19	}
20	-#endif /* IPV6_V6ONLY */
21	+#endif
22
23	if (ZBX_TCP_ERROR == bind(s->sockets[s->num_socks], current_ai->ai_addr, current_ai->ai_addrlen))
24	{