Mon Nov 20 08:09:46 2017 UTC ()
I'm sorry, should call res_ndestroy() instead of res_nclose() to
avoid an fd leak.
Bump PKGREVISION.


(he)
diff -r1.5 -r1.6 pkgsrc/sysutils/zabbix/Makefile
diff -r1.5 -r1.6 pkgsrc/sysutils/zabbix/distinfo
diff -r1.1 -r1.2 pkgsrc/sysutils/zabbix/patches/patch-src_libs_zbxsysinfo_common_net.c
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/zabbix/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/zabbix/Makefile 2017/11/16 12:50:34 1.5
+++ pkgsrc/sysutils/zabbix/Makefile 2017/11/20 08:09:46 1.6
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.5 2017/11/16 12:50:34 he Exp $ 1# $NetBSD: Makefile,v 1.6 2017/11/20 08:09:46 he Exp $
2 2
3# PKGREVISION= 1 3PKGREVISION= 1
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6COMMENT= Enterprise-class Monitoring Solution for Everyone 6COMMENT= Enterprise-class Monitoring Solution for Everyone
7 7
8DEPENDS+= fping-[0-9]*:../../net/fping 8DEPENDS+= fping-[0-9]*:../../net/fping
9 9
10USE_TOOLS+= pax pkg-config 10USE_TOOLS+= pax pkg-config
11GNU_CONFIGURE= yes 11GNU_CONFIGURE= yes
12CONFIGURE_ARGS+= --enable-agent 12CONFIGURE_ARGS+= --enable-agent
13CONFIGURE_ARGS+= --enable-proxy 13CONFIGURE_ARGS+= --enable-proxy
14CONFIGURE_ARGS+= --enable-server 14CONFIGURE_ARGS+= --enable-server
15CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 15CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
16CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv} 16CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/zabbix/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/zabbix/distinfo 2017/11/16 12:50:34 1.5
+++ pkgsrc/sysutils/zabbix/distinfo 2017/11/20 08:09:46 1.6
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.5 2017/11/16 12:50:34 he Exp $ 1$NetBSD: distinfo,v 1.6 2017/11/20 08:09:46 he Exp $
2 2
3SHA1 (zabbix-3.2.10.tar.gz) = 18b99e4df74009a9971d600ea785d4429b312f26 3SHA1 (zabbix-3.2.10.tar.gz) = 18b99e4df74009a9971d600ea785d4429b312f26
4RMD160 (zabbix-3.2.10.tar.gz) = d8b5f4e19480d58adcf9918b0d7bdd9adee52471 4RMD160 (zabbix-3.2.10.tar.gz) = d8b5f4e19480d58adcf9918b0d7bdd9adee52471
5SHA512 (zabbix-3.2.10.tar.gz) = 6413247ea0f47f410eadd970599dc4a0bfef4202b6f88bcb1636d1fad270a2d5545a90870052af5445a5219dab3b58867c23f3afaddb5d78e200fecbd987e545 5SHA512 (zabbix-3.2.10.tar.gz) = 6413247ea0f47f410eadd970599dc4a0bfef4202b6f88bcb1636d1fad270a2d5545a90870052af5445a5219dab3b58867c23f3afaddb5d78e200fecbd987e545
6Size (zabbix-3.2.10.tar.gz) = 16089723 bytes 6Size (zabbix-3.2.10.tar.gz) = 16089723 bytes
7SHA1 (patch-frontends_php_locale_add__new__language.sh) = c187e2b4ae8dd9e409f5c32469cb7b0f02647d8b 7SHA1 (patch-frontends_php_locale_add__new__language.sh) = c187e2b4ae8dd9e409f5c32469cb7b0f02647d8b
8SHA1 (patch-frontends_php_locale_make__mo.sh) = 2f0aaa63e80fcd5d4fa8c507fd764f80070b7864 8SHA1 (patch-frontends_php_locale_make__mo.sh) = 2f0aaa63e80fcd5d4fa8c507fd764f80070b7864
9SHA1 (patch-src_libs_zbxsysinfo_common_net.c) = 235abaa1c93e6a2953fdec765f01de846ee4572b 9SHA1 (patch-src_libs_zbxsysinfo_common_net.c) = 29d0d81b100eb65ea6e96dde08f930e3b834fb3c
10SHA1 (patch-src_zabbix__agent_Makefile.in) = a591c3e831eb34dc10cb5b1078891b5cad53b756 10SHA1 (patch-src_zabbix__agent_Makefile.in) = a591c3e831eb34dc10cb5b1078891b5cad53b756
11SHA1 (patch-src_zabbix__proxy_Makefile.in) = 535eccd707a8947903fbec41028b127a3bbbeffc 11SHA1 (patch-src_zabbix__proxy_Makefile.in) = 535eccd707a8947903fbec41028b127a3bbbeffc
12SHA1 (patch-src_zabbix__server_Makefile.in) = d297b8c4a940867d0a3eaff7bcb3b178a87dfd49 12SHA1 (patch-src_zabbix__server_Makefile.in) = d297b8c4a940867d0a3eaff7bcb3b178a87dfd49
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/zabbix/patches/Attic/patch-src_libs_zbxsysinfo_common_net.c (expand / switch to unified diff)

--- pkgsrc/sysutils/zabbix/patches/Attic/patch-src_libs_zbxsysinfo_common_net.c 2017/11/16 11:01:12 1.1
+++ pkgsrc/sysutils/zabbix/patches/Attic/patch-src_libs_zbxsysinfo_common_net.c 2017/11/20 08:09:46 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-src_libs_zbxsysinfo_common_net.c,v 1.1 2017/11/16 11:01:12 he Exp $ 1$NetBSD: patch-src_libs_zbxsysinfo_common_net.c,v 1.2 2017/11/20 08:09:46 he Exp $
2 2
3Can't portably use _res in a threaded program(!) 3Can't portably use _res in a threaded program(!)
4Convert to using res_nsend(). 4Convert to using res_nsend().
5 5
6--- src/libs/zbxsysinfo/common/net.c.orig 2017-07-18 10:41:07.000000000 +0000 6--- src/libs/zbxsysinfo/common/net.c.orig 2017-07-18 10:41:07.000000000 +0000
7+++ src/libs/zbxsysinfo/common/net.c 7+++ src/libs/zbxsysinfo/common/net.c
8@@ -236,6 +236,7 @@ static int dns_query(AGENT_REQUEST *requ 8@@ -236,6 +236,7 @@ static int dns_query(AGENT_REQUEST *requ
9 struct servent *s; 9 struct servent *s;
10 HEADER *hp; 10 HEADER *hp;
11 struct protoent *pr; 11 struct protoent *pr;
12+ struct __res_state res_state; 12+ struct __res_state res_state;
13 #if PACKETSZ > 1024 13 #if PACKETSZ > 1024
14 unsigned char buf[PACKETSZ]; 14 unsigned char buf[PACKETSZ];
@@ -59,17 +59,17 @@ Convert to using res_nsend(). @@ -59,17 +59,17 @@ Convert to using res_nsend().
59  59
60- _res.options = saved_options; 60- _res.options = saved_options;
61- _res.retrans = saved_retrans; 61- _res.retrans = saved_retrans;
62- _res.retry = saved_retry; 62- _res.retry = saved_retry;
63+ res_state.retrans = retrans; 63+ res_state.retrans = retrans;
64+ res_state.retry = retry; 64+ res_state.retry = retry;
65  65
66- if (NULL != ip && '\0' != *ip) 66- if (NULL != ip && '\0' != *ip)
67- { 67- {
68- memcpy(&(_res.nsaddr_list[0]), &saved_ns, sizeof(struct sockaddr_in)); 68- memcpy(&(_res.nsaddr_list[0]), &saved_ns, sizeof(struct sockaddr_in));
69- _res.nscount = saved_nscount; 69- _res.nscount = saved_nscount;
70- } 70- }
71+ res = res_nsend(&res_state, buf, res, answer.buffer, sizeof(answer.buffer)); 71+ res = res_nsend(&res_state, buf, res, answer.buffer, sizeof(answer.buffer));
72+ res_nclose(&res_state); 72+ res_ndestroy(&res_state);
73  73
74 hp = (HEADER *)answer.buffer; 74 hp = (HEADER *)answer.buffer;
75  75