CVS commit: pkgsrc/sysutils/py-psutil

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Fri Oct 11 20:01:51 UTC 2019

Modified Files:
        pkgsrc/sysutils/py-psutil: Makefile distinfo
        pkgsrc/sysutils/py-psutil/patches: patch-psutil___psbsd.py

Log Message:
py-psutil: Stop using SDEAD on NetBSD

Fixes usage on recent NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/sysutils/py-psutil/Makefile \
    pkgsrc/sysutils/py-psutil/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/sysutils/py-psutil/patches/patch-psutil___psbsd.py

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

Modified files:

Index: pkgsrc/sysutils/py-psutil/Makefile
diff -u pkgsrc/sysutils/py-psutil/Makefile:1.32 pkgsrc/sysutils/py-psutil/Makefile:1.33
--- pkgsrc/sysutils/py-psutil/Makefile:1.32     Sat Jun 29 18:00:49 2019
+++ pkgsrc/sysutils/py-psutil/Makefile  Fri Oct 11 20:01:50 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2019/06/29 18:00:49 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2019/10/11 20:01:50 kamil Exp $
 
 DISTNAME=      psutil-5.6.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/psutil/}
 
Index: pkgsrc/sysutils/py-psutil/distinfo
diff -u pkgsrc/sysutils/py-psutil/distinfo:1.32 pkgsrc/sysutils/py-psutil/distinfo:1.33
--- pkgsrc/sysutils/py-psutil/distinfo:1.32     Sat Jun 29 18:00:49 2019
+++ pkgsrc/sysutils/py-psutil/distinfo  Fri Oct 11 20:01:50 2019
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.32 2019/06/29 18:00:49 wiz Exp $
+$NetBSD: distinfo,v 1.33 2019/10/11 20:01:50 kamil Exp $
 
 SHA1 (psutil-5.6.3.tar.gz) = dc596577226eba6f5382a3ed9816d6d340837068
 RMD160 (psutil-5.6.3.tar.gz) = bf7bdc047d8ca5e912602152bb3bd890869789b2
 SHA512 (psutil-5.6.3.tar.gz) = 62cf120c9391705bd393d6554afa32d672470b61ebb3c0e7458bad26134b784175ba64d3eff119ace6def2aebc97df73cd0c9d213776176ce39c3d47da3f3d9c
 Size (psutil-5.6.3.tar.gz) = 435374 bytes
-SHA1 (patch-psutil___psbsd.py) = f8888b8f386a1928446c7d588a7a46f2674c69f6
+SHA1 (patch-psutil___psbsd.py) = 204349da5b07d817e546184757b058fa4dff5d3e
 SHA1 (patch-psutil___psutil__bsd.c) = cb98d2c4a734e4ccaa82d9d741167540f5708afc
 SHA1 (patch-psutil_arch_netbsd_specific.c) = b44e3aca5a221cd38482a16b013edb170818905a
 SHA1 (patch-psutil_arch_netbsd_specific.h) = 4d6b3c96eefeec4908e1006b96ab175d64714dd2

Index: pkgsrc/sysutils/py-psutil/patches/patch-psutil___psbsd.py
diff -u pkgsrc/sysutils/py-psutil/patches/patch-psutil___psbsd.py:1.3 pkgsrc/sysutils/py-psutil/patches/patch-psutil___psbsd.py:1.4
--- pkgsrc/sysutils/py-psutil/patches/patch-psutil___psbsd.py:1.3       Sat Jun  1 01:11:57 2019
+++ pkgsrc/sysutils/py-psutil/patches/patch-psutil___psbsd.py   Fri Oct 11 20:01:51 2019
@@ -1,9 +1,20 @@
-$NetBSD: patch-psutil___psbsd.py,v 1.3 2019/06/01 01:11:57 kamil Exp $
+$NetBSD: patch-psutil___psbsd.py,v 1.4 2019/10/11 20:01:51 kamil Exp $
 
 Use proc_cwd on NetBSD >= 8.99.42.
 
+Stop using SDEAD as it is no longer available.
+
 --- psutil/_psbsd.py.orig      2019-04-11 21:10:12.000000000 +0000
 +++ psutil/_psbsd.py
+@@ -57,7 +57,7 @@ elif OPENBSD or NETBSD:
+         # equivalent. Also it appears there's no equivalent of
+         # psutil.STATUS_DEAD. SDEAD really means STATUS_ZOMBIE.
+         # cext.SZOMB: _common.STATUS_ZOMBIE,
+-        cext.SDEAD: _common.STATUS_ZOMBIE,
++        # cext.SDEAD: _common.STATUS_ZOMBIE,
+         cext.SZOMB: _common.STATUS_ZOMBIE,
+         # From http://www.eecs.harvard.edu/~margo/cs161/videos/proc.h.txt
+         # OpenBSD has SRUN and SONPROC: SRUN indicates that a process
 @@ -105,6 +105,7 @@ HAS_PER_CPU_TIMES = hasattr(cext, "per_c
  HAS_PROC_NUM_THREADS = hasattr(cext, "proc_num_threads")
  HAS_PROC_OPEN_FILES = hasattr(cext, 'proc_open_files')