mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-21 00:25:50 +00:00
- update to 1.8.8
- remove obsolete patch - add new sql patch PR: ports/161460 Submitted by: Jim Riggs <ports@christianserving.org> (maintainer) Approved by: sahil (mentor)
This commit is contained in:
Eitan Adler
parent
4ed9440d08
commit
a62c6c0394
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=283552
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
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 @@ SUB_LIST= ZABBIX_BUILD=${ZABBIX_BUILD} ZABBIX_REQUIRE=${ZABBIX_REQUIRE}
|
||||
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 @@ CONFIGURE_ARGS+= --enable-ipv6
|
||||
|
||||
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
|
||||
|
||||
@ -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
|
||||
|
||||
13
net-mgmt/zabbix-server/files/patch-create-data-data.sql
Normal file
13
net-mgmt/zabbix-server/files/patch-create-data-data.sql
Normal file
@ -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`
|
||||
@ -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))
|
||||
{
|
||||
@ -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
|
||||
|
||||
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
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 @@ SUB_LIST= ZABBIX_BUILD=${ZABBIX_BUILD} ZABBIX_REQUIRE=${ZABBIX_REQUIRE}
|
||||
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 @@ CONFIGURE_ARGS+= --enable-ipv6
|
||||
|
||||
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
|
||||
|
||||
@ -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
|
||||
|
||||
13
net-mgmt/zabbix2-server/files/patch-create-data-data.sql
Normal file
13
net-mgmt/zabbix2-server/files/patch-create-data-data.sql
Normal file
@ -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`
|
||||
@ -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))
|
||||
{
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user