CVS commit: pkgsrc/sysutils/py-psutil

["Santhosh Raju" <fox%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fox
Date:           Sat Apr 18 10:25:08 UTC 2026

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

Log Message:
sysutils/py-psutil: Handle EFAULT correctly in NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/sysutils/py-psutil/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/sysutils/py-psutil/distinfo
cvs rdiff -u -r1.9 -r1.10 \
    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.69 pkgsrc/sysutils/py-psutil/Makefile:1.70
--- pkgsrc/sysutils/py-psutil/Makefile:1.69     Tue Apr  7 05:49:12 2026
+++ pkgsrc/sysutils/py-psutil/Makefile  Sat Apr 18 10:25:07 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2026/04/07 05:49:12 fox Exp $
+# $NetBSD: Makefile,v 1.70 2026/04/18 10:25:07 fox Exp $
 
 DISTNAME=      psutil-7.2.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=    2
+PKGREVISION=    3
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/psutil/}
 

Index: pkgsrc/sysutils/py-psutil/distinfo
diff -u pkgsrc/sysutils/py-psutil/distinfo:1.67 pkgsrc/sysutils/py-psutil/distinfo:1.68
--- pkgsrc/sysutils/py-psutil/distinfo:1.67     Tue Apr  7 06:01:23 2026
+++ pkgsrc/sysutils/py-psutil/distinfo  Sat Apr 18 10:25:07 2026
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.67 2026/04/07 06:01:23 fox Exp $
+$NetBSD: distinfo,v 1.68 2026/04/18 10:25:07 fox Exp $
 
 BLAKE2s (psutil-7.2.2.tar.gz) = 21da95acab2183abcd1363b4adbd71899b2901afa3253e12fe424276a7b35dd9
 SHA512 (psutil-7.2.2.tar.gz) = 2de05c69d152a8582a4d8f1f02233cae5927baaa35f8797e4b0745f33e6b3c7239b9a54b719b0582b0b6c5b4bbc86d2e1e226c3e9854e4e5be9c5e349c704961
 Size (psutil-7.2.2.tar.gz) = 493740 bytes
-SHA1 (patch-psutil___psbsd.py) = b747e338433aec67195163d3bbb0b559f0cfacde
+SHA1 (patch-psutil___psbsd.py) = 21ac2042b41669e15aad27e78ee70133a7d5dac0
 SHA1 (patch-psutil_arch_netbsd_cpu.c) = 4c8e4f8bad3c0f00a36985ffe7657969b6c3879d
 SHA1 (patch-psutil_arch_netbsd_mem.c) = e1fbdc49451f8931a579d78b7de852967e096d49
 SHA1 (patch-psutil_arch_netbsd_proc.c) = e1298ef850ce59bed47edf8e6d2b604148ceb92c

Index: pkgsrc/sysutils/py-psutil/patches/patch-psutil___psbsd.py
diff -u pkgsrc/sysutils/py-psutil/patches/patch-psutil___psbsd.py:1.9 pkgsrc/sysutils/py-psutil/patches/patch-psutil___psbsd.py:1.10
--- pkgsrc/sysutils/py-psutil/patches/patch-psutil___psbsd.py:1.9       Mon Apr  6 16:53:12 2026
+++ pkgsrc/sysutils/py-psutil/patches/patch-psutil___psbsd.py   Sat Apr 18 10:25:08 2026
@@ -1,8 +1,10 @@
-$NetBSD: patch-psutil___psbsd.py,v 1.9 2026/04/06 16:53:12 fox Exp $
+$NetBSD: patch-psutil___psbsd.py,v 1.10 2026/04/18 10:25:08 fox Exp $
 
 Remove dependency on procfs.
 
-Upstream: https://github.com/giampaolo/psutil/pull/2805
+Upstream:
+- https://github.com/giampaolo/psutil/pull/2805
+- https://github.com/giampaolo/psutil/pull/2822
 
 --- psutil/_psbsd.py.orig      2026-01-20 14:38:58.000000000 +0000
 +++ psutil/_psbsd.py
@@ -63,3 +65,12 @@ Upstream: https://github.com/giampaolo/p
          # Note: the C ext is returning some metrics we are not exposing:
          # traps, faults and forks.
          ctxsw, intrs, soft_intrs, syscalls, _traps, _faults, _forks = (
+@@ -651,7 +618,7 @@ class Process:
+             try:
+                 return cext.proc_cmdline(self.pid)
+             except OSError as err:
+-                if err.errno == errno.EINVAL:
++                if err.errno in (errno.EINVAL, errno.EFAULT):
+                     pid, name, ppid = self.pid, self._name, self._ppid
+                     if cext.proc_is_zombie(self.pid):
+                         raise ZombieProcess(pid, name, ppid) from err