ports/159515: [MAINTAINER] net-mgmt/zabbix-server: update to 1.8.6

Jim Riggs ports at christianserving.org
Thu Aug 4 17:20:11 UTC 2011 

>Number:         159515
>Category:       ports
>Synopsis:       [MAINTAINER] net-mgmt/zabbix-server: update to 1.8.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 04 17:20:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Jim Riggs
>Release:        FreeBSD 8.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD portwork 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 02:41:51 UTC 2011
>Description:
- Update to 1.8.6

Added file(s):
- files/patch-create_data_data.sql

Removed file(s):
- files/patch-src_libs_zbxcomms_comms.c

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- zabbix-server-1.8.6,2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/Makefile /root/zabbix-server/Makefile
--- /usr/ports/net-mgmt/zabbix-server/Makefile	2011-07-28 07:43:19.000000000 -0500
+++ /root/zabbix-server/Makefile	2011-08-04 11:29:43.460018705 -0500
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	zabbix
-PORTVERSION=	1.8.5
-PORTREVISION=	1
+PORTVERSION=	1.8.6
 PORTEPOCH=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
@@ -47,9 +46,10 @@
 MAKE_ARGS+=	ARCH=freebsd
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD}
-CONFIGURE_ENV+=	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
 
@@ -139,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 /root/zabbix-server/distinfo
--- /usr/ports/net-mgmt/zabbix-server/distinfo	2011-04-22 10:07:36.000000000 -0500
+++ /root/zabbix-server/distinfo	2011-08-04 09:50:32.557871350 -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.6.tar.gz) = 9e1b778c17f98b816324332675b910c9ce6e4d184c955b9cee82b6b25371a729
+SIZE (zabbix-1.8.6.tar.gz) = 4204545
diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/files/patch-create_data_data.sql /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
+++ /root/zabbix-server/files/patch-create_data_data.sql	2011-08-04 09:50:05.004591396 -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 /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
+++ /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.frontend /root/zabbix-server/pkg-plist.frontend
--- /usr/ports/net-mgmt/zabbix-server/pkg-plist.frontend	2011-04-22 10:07:36.000000000 -0500
+++ /root/zabbix-server/pkg-plist.frontend	2011-08-04 11:59:15.873915162 -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
--- zabbix-server-1.8.6,2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list