py-psutil: updated to 5.9.2

5.9.2
=====

**Bug fixes**

- 2093_, [FreeBSD], **[critical]**: `pids()`_ may fail with ENOMEM. Dynamically
  increase the ``malloc()`` buffer size until it's big enough.
- 2095_, [Linux]: `net_if_stats()`_ returns incorrect interface speed for
  100GbE network cards.
- 2113_, [FreeBSD], **[critical]**: `virtual_memory()`_ may raise ENOMEM due to
  missing ``#include <sys/param.h>`` directive.  (patch by Peter Jeremy)
- 2128_, [NetBSD]: `swap_memory()`_ was miscalculated.  (patch by Thomas Klausner)
This commit is contained in:
adam 2022-09-05 08:31:14 +00:00
parent f105754e38
commit f944bad219
4 changed files with 7 additions and 40 deletions

View file

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.45 2022/08/02 17:13:10 wiz Exp $ # $NetBSD: Makefile,v 1.46 2022/09/05 08:31:14 adam Exp $
DISTNAME= psutil-5.9.1 DISTNAME= psutil-5.9.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME} PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
PKGREVISION= 1
CATEGORIES= sysutils python CATEGORIES= sysutils python
MASTER_SITES= ${MASTER_SITE_PYPI:=p/psutil/} MASTER_SITES= ${MASTER_SITE_PYPI:=p/psutil/}

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.15 2022/07/07 11:54:53 adam Exp $ @comment $NetBSD: PLIST,v 1.16 2022/09/05 08:31:14 adam Exp $
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@ -43,9 +43,6 @@ ${PYSITELIB}/psutil/tests/__init__.pyo
${PYSITELIB}/psutil/tests/__main__.py ${PYSITELIB}/psutil/tests/__main__.py
${PYSITELIB}/psutil/tests/__main__.pyc ${PYSITELIB}/psutil/tests/__main__.pyc
${PYSITELIB}/psutil/tests/__main__.pyo ${PYSITELIB}/psutil/tests/__main__.pyo
${PYSITELIB}/psutil/tests/foo.py
${PYSITELIB}/psutil/tests/foo.pyc
${PYSITELIB}/psutil/tests/foo.pyo
${PYSITELIB}/psutil/tests/runner.py ${PYSITELIB}/psutil/tests/runner.py
${PYSITELIB}/psutil/tests/runner.pyc ${PYSITELIB}/psutil/tests/runner.pyc
${PYSITELIB}/psutil/tests/runner.pyo ${PYSITELIB}/psutil/tests/runner.pyo

View file

@ -1,7 +1,5 @@
$NetBSD: distinfo,v 1.46 2022/08/02 17:13:10 wiz Exp $ $NetBSD: distinfo,v 1.47 2022/09/05 08:31:14 adam Exp $
BLAKE2s (psutil-5.9.1.tar.gz) = 5aae9fa5a4e596f3074bddead9b0cd0e49aa164b8fc4507a95c4c04569a2e53f BLAKE2s (psutil-5.9.2.tar.gz) = 56ff8ae7f1bb0dcc5f7ff4cff4969f70c2aac055093128ae619ae3389f21e711
SHA512 (psutil-5.9.1.tar.gz) = 1ddb119a10243d17d808417817ec8659d22447f12a4bbc0366c13f6587a4b0b59f4e74f6ac5d1e1a908bb5fd287be630466d32beabcb5008f6a19c24a1557c27 SHA512 (psutil-5.9.2.tar.gz) = 431c0209e9a27176ea570699b3e23a88fccaded4bfbad9cd9c02e110c00eb613bdefae447b4b967e6cadc3291d0d4404e4525de5ee3d7f7f9ae26c7876bff8b4
Size (psutil-5.9.1.tar.gz) = 479090 bytes Size (psutil-5.9.2.tar.gz) = 479757 bytes
SHA1 (patch-psutil___psbsd.py) = ae69cf5f7ce590c34ef4e770b2fb0386425f33b6
SHA1 (patch-psutil_arch_netbsd_specific.c) = ce7c91a1f7de0cbc443435fcb1e34af96bff4a3e

View file

@ -1,27 +0,0 @@
$NetBSD: patch-psutil_arch_netbsd_specific.c,v 1.6 2022/08/02 17:13:10 wiz Exp $
Fix swap code.
https://github.com/giampaolo/psutil/pull/2128
--- psutil/arch/netbsd/specific.c.orig 2022-02-01 21:23:36.000000000 +0000
+++ psutil/arch/netbsd/specific.c
@@ -459,7 +459,7 @@ psutil_virtual_mem(PyObject *self, PyObj
(unsigned long long) uv.active << uv.pageshift, // active
(unsigned long long) uv.inactive << uv.pageshift, // inactive
(unsigned long long) uv.wired << uv.pageshift, // wired
- (unsigned long long) uv.filepages + uv.execpages * pagesize, // cached
+ (unsigned long long) (uv.filepages + uv.execpages) * pagesize, // cached
// These are determined from /proc/meminfo in Python.
(unsigned long long) 0, // buffers
(unsigned long long) 0 // shared
@@ -495,8 +495,8 @@ psutil_swap_mem(PyObject *self, PyObject
swap_total = swap_free = 0;
for (i = 0; i < nswap; i++) {
if (swdev[i].se_flags & SWF_ENABLE) {
- swap_total += swdev[i].se_nblks * DEV_BSIZE;
- swap_free += (swdev[i].se_nblks - swdev[i].se_inuse) * DEV_BSIZE;
+ swap_total += (uint64_t)swdev[i].se_nblks * DEV_BSIZE;
+ swap_free += (uint64_t)(swdev[i].se_nblks - swdev[i].se_inuse) * DEV_BSIZE;
}
}
free(swdev);