diff options
| author | he <he@pkgsrc.org> | 2015-08-25 16:19:49 +0000 |
|---|---|---|
| committer | he <he@pkgsrc.org> | 2015-08-25 16:19:49 +0000 |
| commit | 03efcc4d3ea78ea2ddb6f866f913584eb4e66b5e (patch) | |
| tree | 41a17a2cb3ef1e5c28725a2e23c3932cacfdf5ce /sysutils/collectd | |
| parent | 954777e05c96ba2b505066bcfdd79f1df08cd505 (diff) | |
| download | pkgsrc-03efcc4d3ea78ea2ddb6f866f913584eb4e66b5e.tar.gz | |
Fix a bug (of my own making) in NetBSD's process plugin which could
lead to null pointer de-reference and crash of collectd.
Bump PKGREVISION.
Diffstat (limited to 'sysutils/collectd')
| -rw-r--r-- | sysutils/collectd/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/collectd/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/collectd/patches/patch-src_processes.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sysutils/collectd/Makefile b/sysutils/collectd/Makefile index 6c9325109a6..2cdef3edc61 100644 --- a/sysutils/collectd/Makefile +++ b/sysutils/collectd/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2015/08/18 07:47:46 he Exp $ +# $NetBSD: Makefile,v 1.11 2015/08/25 16:19:49 he Exp $ -PKGREVISION= 5 +PKGREVISION= 6 .include "../../sysutils/collectd/Makefile.common" COMMENT= Statistics collection daemon base diff --git a/sysutils/collectd/distinfo b/sysutils/collectd/distinfo index 400f3ce2d5a..93bdba5a9bb 100644 --- a/sysutils/collectd/distinfo +++ b/sysutils/collectd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2015/08/18 07:52:20 he Exp $ +$NetBSD: distinfo,v 1.17 2015/08/25 16:19:49 he Exp $ SHA1 (collectd-5.5.0.tar.gz) = d24e284c1eae20c5e75b846c8b2612ab65bd5565 RMD160 (collectd-5.5.0.tar.gz) = 2197758942a5fe56e4eabda3786f09d4138e943a @@ -18,7 +18,7 @@ SHA1 (patch-src_entropy.c) = 7a522a6849d39bf4ed4704204a084790d27950ef SHA1 (patch-src_irq.c) = 6b621474de35a5879105025d1a2848e4896b8479 SHA1 (patch-src_libcollectclient_network__buffer.c) = e07d403d299613fa0885a0e7285849eb85510253 SHA1 (patch-src_memory.c) = f48d50245176426e26af7fa1b1f4ff6fbf0b1d95 -SHA1 (patch-src_processes.c) = 32ca0414efaf57cb0b95b51d98b904008b5fe306 +SHA1 (patch-src_processes.c) = 46d50f952947991b09fc1f818fe47dc11f3dd4d8 SHA1 (patch-src_swap.c) = e7602eb83eed6b90752b8293b9666b94bdd42493 SHA1 (patch-src_tcpconns.c) = 712af1b821d62217283df884dd283d5b1218ab7c SHA1 (patch-src_utils__dns.c) = c3782dc9127f42da30e3142b853aa2cb2259af94 diff --git a/sysutils/collectd/patches/patch-src_processes.c b/sysutils/collectd/patches/patch-src_processes.c index 85b48401eb1..b9185d9e3b6 100644 --- a/sysutils/collectd/patches/patch-src_processes.c +++ b/sysutils/collectd/patches/patch-src_processes.c @@ -1,4 +1,4 @@ -$NetBSD: patch-src_processes.c,v 1.1 2015/08/14 15:39:28 he Exp $ +$NetBSD: patch-src_processes.c,v 1.2 2015/08/25 16:19:49 he Exp $ Add a port to NetBSD. @@ -200,7 +200,7 @@ Add a port to NetBSD. + kl = kvm_getlwps(kd, p->p_pid, (u_long)p->p_paddr, + sizeof(struct kinfo_lwp), &nlwps); + -+ for (l = 0; l < nlwps; l++) { ++ for (l = 0; kl && l < nlwps; l++) { + switch (kl[l].l_stat) { + case LSONPROC: + case LSRUN: |