CVS commit: pkgsrc/sysutils/zabbix

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Sat Nov 16 10:57:22 UTC 2019

Modified Files:
        pkgsrc/sysutils/zabbix: Makefile distinfo
Added Files:
        pkgsrc/sysutils/zabbix/patches: patch-src_libs_zbxsysinfo_netbsd_proc.c

Log Message:
Use P_ZOMBIE() macro instead of testing against LSDEAD, which is
gone in later versions.
Thanks to Yuuki Enomoto for the patch.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/sysutils/zabbix/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/sysutils/zabbix/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_proc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/zabbix/Makefile
diff -u pkgsrc/sysutils/zabbix/Makefile:1.28 pkgsrc/sysutils/zabbix/Makefile:1.29
--- pkgsrc/sysutils/zabbix/Makefile:1.28        Mon Nov  4 21:28:59 2019
+++ pkgsrc/sysutils/zabbix/Makefile     Sat Nov 16 10:57:22 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2019/11/04 21:28:59 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2019/11/16 10:57:22 he Exp $
 
-PKGREVISION= 3
+PKGREVISION= 4
 .include "Makefile.common"
 
 COMMENT=       Enterprise-class Monitoring Solution for Everyone

Index: pkgsrc/sysutils/zabbix/distinfo
diff -u pkgsrc/sysutils/zabbix/distinfo:1.17 pkgsrc/sysutils/zabbix/distinfo:1.18
--- pkgsrc/sysutils/zabbix/distinfo:1.17        Thu Jun 20 12:03:28 2019
+++ pkgsrc/sysutils/zabbix/distinfo     Sat Nov 16 10:57:22 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2019/06/20 12:03:28 he Exp $
+$NetBSD: distinfo,v 1.18 2019/11/16 10:57:22 he Exp $
 
 SHA1 (zabbix-4.0.9.tar.gz) = 865eb4d9cbb7c53b942c4a538314ebf9d8400099
 RMD160 (zabbix-4.0.9.tar.gz) = c586e0b55ed8d6569889df7494379266dd67ef31
@@ -6,6 +6,7 @@ SHA512 (zabbix-4.0.9.tar.gz) = 4e04d8049
 Size (zabbix-4.0.9.tar.gz) = 17118478 bytes
 SHA1 (patch-frontends_php_locale_add__new__language.sh) = 71be94363ee58490d2ee3ef4bc6b800cfc99e90a
 SHA1 (patch-frontends_php_locale_make__mo.sh) = c44c8996ffc5c1fa31eebaa766edb430e03004de
+SHA1 (patch-src_libs_zbxsysinfo_netbsd_proc.c) = fde4e78373d7f10e015dae8a15bab74633560093
 SHA1 (patch-src_zabbix__agent_Makefile.in) = 55149e2969d0e6e54c537750ca1bde11c9b690d7
 SHA1 (patch-src_zabbix__proxy_Makefile.in) = 2e7dbe6e8554bbe2c1cb1074a308661ae44bb977
 SHA1 (patch-src_zabbix__server_Makefile.in) = bfcb02e8450df163a038adbae83a7e17fda0a9a9

Added files:

Index: pkgsrc/sysutils/zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_proc.c
diff -u /dev/null pkgsrc/sysutils/zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_proc.c:1.1
--- /dev/null   Sat Nov 16 10:57:22 2019
+++ pkgsrc/sysutils/zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_proc.c      Sat Nov 16 10:57:22 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_libs_zbxsysinfo_netbsd_proc.c,v 1.1 2019/11/16 10:57:22 he Exp $
+
+Use P_ZOMBIE() macro instead of testing against LSDEAD, which is
+gone in later versions.
+Thanks to Yuuki Enomoto for the patch.
+
+--- src/libs/zbxsysinfo/netbsd/proc.c.orig     2019-06-07 07:18:53.000000000 +0000
++++ src/libs/zbxsysinfo/netbsd/proc.c
+@@ -298,7 +298,7 @@ int        PROC_NUM(AGENT_REQUEST *request, AGE
+                                               stat_ok = 1;
+                                       break;
+                               case ZBX_PROC_STAT_ZOMB:
+-                                      if (SZOMB == pproc->p_stat || LSDEAD == pproc->p_stat)
++                                      if (P_ZOMBIE(pproc))
+                                               stat_ok = 1;
+                                       break;
+                               case ZBX_PROC_STAT_DISK: