Update py-psutil to 4.1.0 4.1.0 - 2016-03-12 ================== **Enhancements** - #777: [Linux] Process.open_files() on Linux return 3 new fields: position, mode and flags. - #779: Process.cpu_times() returns two new fields, 'children_user' and 'children_system' (always set to 0 on OSX and Windows). - #789: [Windows] psutil.cpu_times() return two new fields: "interrupt" and "dpc". Same for psutil.cpu_times_percent(). - #792: new psutil.cpu_stats() function returning number of CPU ctx switches interrupts, soft interrupts and syscalls. **Bug fixes** - #774: [FreeBSD] net_io_counters() dropout is no longer set to 0 if the kernel provides it. - #776: [Linux] Process.cpu_affinity() may erroneously raise NoSuchProcess. (patch by wxwright) - #780: [OSX] psutil does not compile with some gcc versions. - #786: net_if_addrs() may report incomplete MAC addresses. - #788: [NetBSD] virtual_memory()'s buffers and shared values were set to 0. - #790: [OSX] psutil won't compile on OSX 10.4. 4.0.0 - 2016-02-17 ================== **Enhancements** - #523: [Linux, FreeBSD] disk_io_counters() return a new "busy_time" field. - #660: [Windows] make.bat is smarter in finding alternative VS install locations. (patch by mpderbec) - #732: Process.environ(). (patch by Frank Benkstein) - #753: [Linux, OSX, Windows] Process USS and PSS (Linux) "real" memory stats. (patch by Eric Rahm) - #755: Process.memory_percent() "memtype" parameter. - #758: tests now live in psutil namespace. - #760: expose OS constants (psutil.LINUX, psutil.OSX, etc.) - #756: [Linux] disk_io_counters() return 2 new fields: read_merged_count and write_merged_count. - #762: new scripts/procsmem.py script. **Bug fixes** - #685: [Linux] virtual_memory() provides wrong results on systems with a lot of physical memory. - #704: [Solaris] psutil does not compile on Solaris sparc. - #734: on Python 3 invalid UTF-8 data is not correctly handled for process name(), cwd(), exe(), cmdline() and open_files() methods resulting in UnicodeDecodeError exceptions. 'surrogateescape' error handler is now used as a workaround for replacing the corrupted data. - #737: [Windows] when the bitness of psutil and the target process was different cmdline() and cwd() could return a wrong result or incorrectly report an AccessDenied error. - #741: [OpenBSD] psutil does not compile on mips64. - #751: [Linux] fixed call to Py_DECREF on possible Null object. - #754: [Linux] cmdline() can be wrong in case of zombie process. - #759: [Linux] Process.memory_maps() may return paths ending with " (deleted)" - #761: [Windows] psutil.boot_time() wraps to 0 after 49 days. - #764: [NetBSD] fix compilation on NetBSD-6.x. - #766: [Linux] net_connections() can't handle malformed /proc/net/unix file. - #767: [Linux] disk_io_counters() may raise ValueError on 2.6 kernels and it's broken on 2.4 kernels. - #770: [NetBSD] disk_io_counters() metrics didn't update.diff -r1.17 -r1.18 pkgsrc/sysutils/py-psutil/Makefile
(prlw1)
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.17 2016/01/20 22:59:09 ryoon Exp $ | 1 | # $NetBSD: Makefile,v 1.18 2016/04/29 15:33:57 prlw1 Exp $ | |
2 | 2 | |||
3 | DISTNAME= psutil-release-3.4.2 | 3 | DISTNAME= psutil-release-4.1.0 | |
4 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-release//} | 4 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-release//} | |
5 | CATEGORIES= sysutils | 5 | CATEGORIES= sysutils | |
6 | MASTER_SITES= ${MASTER_SITE_GITHUB:=giampaolo/} | 6 | MASTER_SITES= ${MASTER_SITE_GITHUB:=giampaolo/} | |
7 | GITHUB_PROJECT= psutil | 7 | GITHUB_PROJECT= psutil | |
8 | GITHUB_TAG= release-${PKGVERSION_NOREV} | 8 | GITHUB_TAG= release-${PKGVERSION_NOREV} | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= https://github.com/giampaolo/psutil | 11 | HOMEPAGE= https://github.com/giampaolo/psutil | |
12 | COMMENT= Cross-platform process and system utilities module for Python | 12 | COMMENT= Cross-platform process and system utilities module for Python | |
13 | LICENSE= modified-bsd | 13 | LICENSE= modified-bsd | |
14 | 14 | |||
15 | REPLACE_PYTHON= psutil/*py | 15 | REPLACE_PYTHON= psutil/*py | |
16 | EGG_NAME= psutil-${PKGVERSION_NOREV} | 16 | EGG_NAME= psutil-${PKGVERSION_NOREV} |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.7 2015/12/14 22:58:20 ryoon Exp $ | 1 | @comment $NetBSD: PLIST,v 1.8 2016/04/29 15:33:57 prlw1 Exp $ | |
2 | ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO | 2 | ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO | |
3 | ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt | 3 | ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt | |
4 | ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt | 4 | ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt | |
5 | ${PYSITELIB}/${EGG_INFODIR}/top_level.txt | 5 | ${PYSITELIB}/${EGG_INFODIR}/top_level.txt | |
6 | ${PYSITELIB}/psutil/__init__.py | 6 | ${PYSITELIB}/psutil/__init__.py | |
7 | ${PYSITELIB}/psutil/__init__.pyc | 7 | ${PYSITELIB}/psutil/__init__.pyc | |
8 | ${PYSITELIB}/psutil/__init__.pyo | 8 | ${PYSITELIB}/psutil/__init__.pyo | |
9 | ${PYSITELIB}/psutil/_common.py | 9 | ${PYSITELIB}/psutil/_common.py | |
10 | ${PYSITELIB}/psutil/_common.pyc | 10 | ${PYSITELIB}/psutil/_common.pyc | |
11 | ${PYSITELIB}/psutil/_common.pyo | 11 | ${PYSITELIB}/psutil/_common.pyo | |
12 | ${PYSITELIB}/psutil/_compat.py | 12 | ${PYSITELIB}/psutil/_compat.py | |
13 | ${PYSITELIB}/psutil/_compat.pyc | 13 | ${PYSITELIB}/psutil/_compat.pyc | |
14 | ${PYSITELIB}/psutil/_compat.pyo | 14 | ${PYSITELIB}/psutil/_compat.pyo | |
@@ -22,13 +22,49 @@ ${PYSITELIB}/psutil/_psosx.py | @@ -22,13 +22,49 @@ ${PYSITELIB}/psutil/_psosx.py | |||
22 | ${PYSITELIB}/psutil/_psosx.pyc | 22 | ${PYSITELIB}/psutil/_psosx.pyc | |
23 | ${PYSITELIB}/psutil/_psosx.pyo | 23 | ${PYSITELIB}/psutil/_psosx.pyo | |
24 | ${PYSITELIB}/psutil/_psposix.py | 24 | ${PYSITELIB}/psutil/_psposix.py | |
25 | ${PYSITELIB}/psutil/_psposix.pyc | 25 | ${PYSITELIB}/psutil/_psposix.pyc | |
26 | ${PYSITELIB}/psutil/_psposix.pyo | 26 | ${PYSITELIB}/psutil/_psposix.pyo | |
27 | ${PYSITELIB}/psutil/_pssunos.py | 27 | ${PYSITELIB}/psutil/_pssunos.py | |
28 | ${PYSITELIB}/psutil/_pssunos.pyc | 28 | ${PYSITELIB}/psutil/_pssunos.pyc | |
29 | ${PYSITELIB}/psutil/_pssunos.pyo | 29 | ${PYSITELIB}/psutil/_pssunos.pyo | |
30 | ${PYSITELIB}/psutil/_psutil_${SYSTEM}.so | 30 | ${PYSITELIB}/psutil/_psutil_${SYSTEM}.so | |
31 | ${PYSITELIB}/psutil/_psutil_posix.so | 31 | ${PYSITELIB}/psutil/_psutil_posix.so | |
32 | ${PYSITELIB}/psutil/_pswindows.py | 32 | ${PYSITELIB}/psutil/_pswindows.py | |
33 | ${PYSITELIB}/psutil/_pswindows.pyc | 33 | ${PYSITELIB}/psutil/_pswindows.pyc | |
34 | ${PYSITELIB}/psutil/_pswindows.pyo | 34 | ${PYSITELIB}/psutil/_pswindows.pyo | |
35 | ${PYSITELIB}/psutil/tests/__init__.py | |||
36 | ${PYSITELIB}/psutil/tests/__init__.pyc | |||
37 | ${PYSITELIB}/psutil/tests/__init__.pyo | |||
38 | ${PYSITELIB}/psutil/tests/runner.py | |||
39 | ${PYSITELIB}/psutil/tests/runner.pyc | |||
40 | ${PYSITELIB}/psutil/tests/runner.pyo | |||
41 | ${PYSITELIB}/psutil/tests/test_bsd.py | |||
42 | ${PYSITELIB}/psutil/tests/test_bsd.pyc | |||
43 | ${PYSITELIB}/psutil/tests/test_bsd.pyo | |||
44 | ${PYSITELIB}/psutil/tests/test_linux.py | |||
45 | ${PYSITELIB}/psutil/tests/test_linux.pyc | |||
46 | ${PYSITELIB}/psutil/tests/test_linux.pyo | |||
47 | ${PYSITELIB}/psutil/tests/test_memory_leaks.py | |||
48 | ${PYSITELIB}/psutil/tests/test_memory_leaks.pyc | |||
49 | ${PYSITELIB}/psutil/tests/test_memory_leaks.pyo | |||
50 | ${PYSITELIB}/psutil/tests/test_misc.py | |||
51 | ${PYSITELIB}/psutil/tests/test_misc.pyc | |||
52 | ${PYSITELIB}/psutil/tests/test_misc.pyo | |||
53 | ${PYSITELIB}/psutil/tests/test_osx.py | |||
54 | ${PYSITELIB}/psutil/tests/test_osx.pyc | |||
55 | ${PYSITELIB}/psutil/tests/test_osx.pyo | |||
56 | ${PYSITELIB}/psutil/tests/test_posix.py | |||
57 | ${PYSITELIB}/psutil/tests/test_posix.pyc | |||
58 | ${PYSITELIB}/psutil/tests/test_posix.pyo | |||
59 | ${PYSITELIB}/psutil/tests/test_process.py | |||
60 | ${PYSITELIB}/psutil/tests/test_process.pyc | |||
61 | ${PYSITELIB}/psutil/tests/test_process.pyo | |||
62 | ${PYSITELIB}/psutil/tests/test_sunos.py | |||
63 | ${PYSITELIB}/psutil/tests/test_sunos.pyc | |||
64 | ${PYSITELIB}/psutil/tests/test_sunos.pyo | |||
65 | ${PYSITELIB}/psutil/tests/test_system.py | |||
66 | ${PYSITELIB}/psutil/tests/test_system.pyc | |||
67 | ${PYSITELIB}/psutil/tests/test_system.pyo | |||
68 | ${PYSITELIB}/psutil/tests/test_windows.py | |||
69 | ${PYSITELIB}/psutil/tests/test_windows.pyc | |||
70 | ${PYSITELIB}/psutil/tests/test_windows.pyo |
@@ -1,7 +1,8 @@ | @@ -1,7 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.15 2016/02/10 13:20:28 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.16 2016/04/29 15:33:57 prlw1 Exp $ | |
2 | 2 | |||
3 | SHA1 (psutil-release-3.4.2.tar.gz) = 14d6aa8925c782f0d27706901a0af47eb11f13fa | 3 | SHA1 (psutil-release-4.1.0.tar.gz) = 3f1c5f9c75fcaad72ce9f3465e77d7b9e191c732 | |
4 | RMD160 (psutil-release-3.4.2.tar.gz) = 98f12c89c2ab07cf44932563aa954fa2d9048200 | 4 | RMD160 (psutil-release-4.1.0.tar.gz) = c092eaff3d575c5e4f73206026d2f2087c2f025d | |
5 | SHA512 (psutil-release-3.4.2.tar.gz) = 84bf7e2ae2558223129917d31f91df6ffb90d38e742b8d09f115d25c0ab4b01b8b20dce96361aa74084850fa2881ea4cd2e9f1e910c32b3c3eb69d9d909a337c | 5 | SHA512 (psutil-release-4.1.0.tar.gz) = 98becc6d150de8580699ea348396f843f552f50a95acdebb42ff30c6a9d968a3b69b2e0162404fcb2e27a3573feaa1f03a12d1715899c0759c5aeb03f5635c43 | |
6 | Size (psutil-release-3.4.2.tar.gz) = 267700 bytes | 6 | Size (psutil-release-4.1.0.tar.gz) = 292325 bytes | |
7 | SHA1 (patch-psutil___psutil__bsd.c) = 089a38592fc22d81e9ede7b9d239cb6234c8844d | 7 | SHA1 (patch-psutil___psutil__bsd.c) = 20665e0e5cf13280a61064a29a8b77eeb38a3ad4 | |
8 | SHA1 (patch-psutil_arch_bsd_netbsd.c) = fbbabddd7a548e8ff1e8e958298f543c3fd1a4cd |
@@ -1,32 +1,29 @@ | @@ -1,32 +1,29 @@ | |||
1 | $NetBSD: patch-psutil___psutil__bsd.c,v 1.5 2016/02/10 13:20:28 wiz Exp $ | 1 | $NetBSD: patch-psutil___psutil__bsd.c,v 1.6 2016/04/29 15:33:57 prlw1 Exp $ | |
2 | 2 | |||
3 | 1. chunk: Workaround for DTYPE_VNODE not being available in public | 3 | MNT_RELATIME and MNT_EXTATTR are not available on NetBSD-5. | |
4 | headers, even with _KERNEL set, on NetBSD-6. | |||
5 | 4 | |||
6 | 2. chunk: MNT_DISCARD not available on NetBSD-6. | 5 | https://github.com/giampaolo/psutil/pull/812 | |
7 | 6 | |||
8 | https://github.com/giampaolo/psutil/pull/764 | 7 | --- psutil/_psutil_bsd.c.orig 2016-03-12 17:12:23.000000000 +0000 | |
9 | ||||
10 | --- psutil/_psutil_bsd.c.orig 2016-01-20 16:26:28.000000000 +0000 | |||
11 | +++ psutil/_psutil_bsd.c | 8 | +++ psutil/_psutil_bsd.c | |
12 | @@ -100,6 +100,9 @@ | 9 | @@ -712,16 +712,20 @@ psutil_disk_partitions(PyObject *self, P | |
13 | #define _KERNEL | 10 | strlcat(opts, ",union", sizeof(opts)); | |
14 | #include <uvm/uvm_extern.h> | 11 | if (flags & MNT_NOCOREDUMP) | |
15 | #undef _KERNEL | 12 | strlcat(opts, ",nocoredump", sizeof(opts)); | |
16 | + #ifndef DTYPE_VNODE | 13 | +#if defined(MNT_RELATIME) | |
17 | + #define DTYPE_VNODE 1 | 14 | if (flags & MNT_RELATIME) | |
18 | + #endif | |||
19 | #endif | |||
20 | ||||
21 | ||||
22 | @@ -703,8 +706,10 @@ psutil_disk_partitions(PyObject *self, P | |||
23 | strlcat(opts, ",relatime", sizeof(opts)); | 15 | strlcat(opts, ",relatime", sizeof(opts)); | |
16 | +#endif | |||
24 | if (flags & MNT_IGNORE) | 17 | if (flags & MNT_IGNORE) | |
25 | strlcat(opts, ",ignore", sizeof(opts)); | 18 | strlcat(opts, ",ignore", sizeof(opts)); | |
26 | +#if defined(MNT_DISCARD) | 19 | #if defined(MNT_DISCARD) | |
27 | if (flags & MNT_DISCARD) | 20 | if (flags & MNT_DISCARD) | |
28 | strlcat(opts, ",discard", sizeof(opts)); | 21 | strlcat(opts, ",discard", sizeof(opts)); | |
29 | +#endif | 22 | #endif | |
23 | +#if defined(MNT_EXTATTR) | |||
30 | if (flags & MNT_EXTATTR) | 24 | if (flags & MNT_EXTATTR) | |
31 | strlcat(opts, ",extattr", sizeof(opts)); | 25 | strlcat(opts, ",extattr", sizeof(opts)); | |
26 | +#endif | |||
32 | if (flags & MNT_LOG) | 27 | if (flags & MNT_LOG) | |
28 | strlcat(opts, ",log", sizeof(opts)); | |||
29 | if (flags & MNT_SYMPERM) |
$NetBSD: patch-psutil_arch_bsd_netbsd.c,v 1.4 2016/04/29 15:33:57 prlw1 Exp $
Declare warn().
https://github.com/giampaolo/psutil/pull/812
--- psutil/arch/bsd/netbsd.c.orig 2016-03-12 17:12:23.000000000 +0000
+++ psutil/arch/bsd/netbsd.c
@@ -13,6 +13,7 @@
#include <Python.h>
#include <assert.h>
+#include <err.h>
#include <errno.h>
#include <stdlib.h>
#include <stdio.h>