CVS commit: pkgsrc/sysutils/py-psutil

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Tue Jun 11 22:55:04 UTC 2019

Modified Files:
        pkgsrc/sysutils/py-psutil: Makefile distinfo
        pkgsrc/sysutils/py-psutil/patches: patch-psutil___psutil__bsd.c
            patch-psutil_arch_netbsd_specific.c

Log Message:
py-psutil: Update to 5.6.3

pkgsrc changes:
 - Remove no longer needed patch hunks (applied upstream)

Changes:
5.6.3
=====
2019-06-11
Enhancements
------------
 - 1494: [AIX] added support for Process.environ().  (patch by Arnon Yaari)

Bug fixes
---------
 - 1276: [AIX] can't get whole cmdline().  (patch by Arnon Yaari)
 - 1501: [Windows] Process cmdline() and exe() raise unhandled "WinError 1168
   element not found" exceptions for "Registry" and "Memory Compression" psuedo
   processes on Windows 10.
 - 1526: [NetBSD] process cmdline() could raise MemoryError.  (patch by
   Kamil Rytarowski)


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/sysutils/py-psutil/Makefile \
    pkgsrc/sysutils/py-psutil/distinfo
cvs rdiff -u -r1.9 -r1.10 \
    pkgsrc/sysutils/py-psutil/patches/patch-psutil___psutil__bsd.c
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/sysutils/py-psutil/patches/patch-psutil_arch_netbsd_specific.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/py-psutil/Makefile
diff -u pkgsrc/sysutils/py-psutil/Makefile:1.30 pkgsrc/sysutils/py-psutil/Makefile:1.31
--- pkgsrc/sysutils/py-psutil/Makefile:1.30     Fri Jun  7 19:09:06 2019
+++ pkgsrc/sysutils/py-psutil/Makefile  Tue Jun 11 22:55:04 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2019/06/07 19:09:06 leot Exp $
+# $NetBSD: Makefile,v 1.31 2019/06/11 22:55:04 leot Exp $
 
-DISTNAME=      psutil-5.6.2
-PKGREVISION=   2
+DISTNAME=      psutil-5.6.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/psutil/}
Index: pkgsrc/sysutils/py-psutil/distinfo
diff -u pkgsrc/sysutils/py-psutil/distinfo:1.30 pkgsrc/sysutils/py-psutil/distinfo:1.31
--- pkgsrc/sysutils/py-psutil/distinfo:1.30     Fri Jun  7 19:09:06 2019
+++ pkgsrc/sysutils/py-psutil/distinfo  Tue Jun 11 22:55:04 2019
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.30 2019/06/07 19:09:06 leot Exp $
+$NetBSD: distinfo,v 1.31 2019/06/11 22:55:04 leot Exp $
 
-SHA1 (psutil-5.6.2.tar.gz) = c01d48a103196eb513b72d32fbc7cee1ed64a38c
-RMD160 (psutil-5.6.2.tar.gz) = 5450a028ad787d3e274a2c0e11c127bf5cd7e9da
-SHA512 (psutil-5.6.2.tar.gz) = ff41428b43c59ad948b8b4e6824943258abb30dc76cd042bdf7fe72d5aceb9bcbd2a2038a6a43d2b4c36eccae9007ef78779fe0cb5ee3caa68da9b1ba687b66d
-Size (psutil-5.6.2.tar.gz) = 432907 bytes
+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___psutil__bsd.c) = 5516c6c257b389c7e977074d2a6eeb3c23f565d1
-SHA1 (patch-psutil_arch_netbsd_specific.c) = d43bc4d28212f75721df5a18287953d18a5673a4
+SHA1 (patch-psutil___psutil__bsd.c) = 6251074874ac1f5a763df0448d3d60b7f955056e
+SHA1 (patch-psutil_arch_netbsd_specific.c) = b44e3aca5a221cd38482a16b013edb170818905a
 SHA1 (patch-psutil_arch_netbsd_specific.h) = 4d6b3c96eefeec4908e1006b96ab175d64714dd2

Index: pkgsrc/sysutils/py-psutil/patches/patch-psutil___psutil__bsd.c
diff -u pkgsrc/sysutils/py-psutil/patches/patch-psutil___psutil__bsd.c:1.9 pkgsrc/sysutils/py-psutil/patches/patch-psutil___psutil__bsd.c:1.10
--- pkgsrc/sysutils/py-psutil/patches/patch-psutil___psutil__bsd.c:1.9  Sat Jun  1 01:11:57 2019
+++ pkgsrc/sysutils/py-psutil/patches/patch-psutil___psutil__bsd.c      Tue Jun 11 22:55:04 2019
@@ -1,22 +1,9 @@
-$NetBSD: patch-psutil___psutil__bsd.c,v 1.9 2019/06/01 01:11:57 kamil Exp $
-
-Don't include <sys/user.h> on every BSD.
-It's absent on NetBSD and unused on OpenBSD.
+$NetBSD: patch-psutil___psutil__bsd.c,v 1.10 2019/06/11 22:55:04 leot Exp $
 
 Define proc_cwd on NetBSD >= 8.99.42.
 
 --- psutil/_psutil_bsd.c.orig  2019-04-11 21:10:12.000000000 +0000
 +++ psutil/_psutil_bsd.c
-@@ -30,7 +30,9 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/sysctl.h>
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <sys/user.h>
-+#endif
- #include <sys/proc.h>
- #include <sys/file.h>
- #include <sys/socket.h>
 @@ -919,6 +921,8 @@ PsutilMethods[] = {
  #if defined(PSUTIL_FREEBSD) || defined(PSUTIL_OPENBSD)
      {"proc_connections", psutil_proc_connections, METH_VARARGS,

Index: pkgsrc/sysutils/py-psutil/patches/patch-psutil_arch_netbsd_specific.c
diff -u pkgsrc/sysutils/py-psutil/patches/patch-psutil_arch_netbsd_specific.c:1.3 pkgsrc/sysutils/py-psutil/patches/patch-psutil_arch_netbsd_specific.c:1.4
--- pkgsrc/sysutils/py-psutil/patches/patch-psutil_arch_netbsd_specific.c:1.3   Fri Jun  7 19:09:06 2019
+++ pkgsrc/sysutils/py-psutil/patches/patch-psutil_arch_netbsd_specific.c       Tue Jun 11 22:55:04 2019
@@ -1,23 +1,9 @@
-$NetBSD: patch-psutil_arch_netbsd_specific.c,v 1.3 2019/06/07 19:09:06 leot Exp $
-
-Don't include <sys/user.h> on NetBSD. Include <sys/iostat.h> instead.
+$NetBSD: patch-psutil_arch_netbsd_specific.c,v 1.4 2019/06/11 22:55:04 leot Exp $
 
 Use proc_cwd on NetBSD >= 8.99.42.
 
-Use an `int' to store `kern.argmax' to avoid possible read of
-uninitialized memory.
-
 --- psutil/arch/netbsd/specific.c.orig 2019-03-02 20:46:28.000000000 +0000
 +++ psutil/arch/netbsd/specific.c
-@@ -22,7 +22,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/sysctl.h>
--#include <sys/user.h>
-+#include <sys/iostat.h>
- #include <sys/proc.h>
- #include <sys/swap.h>  // for swap_mem
- #include <signal.h>
 @@ -112,6 +112,24 @@ kinfo_getfile(pid_t pid, int* cnt) {
      return kf;
  }
@@ -43,31 +29,3 @@ uninitialized memory.
  
  // XXX: This is no longer used as per
  // https://github.com/giampaolo/psutil/pull/557#issuecomment-171912820
-@@ -313,8 +331,8 @@ psutil_get_proc_list(kinfo_proc **procLi
- char *
- psutil_get_cmd_args(pid_t pid, size_t *argsize) {
-     int mib[4];
-+    int argmax;
-     ssize_t st;
--    size_t argmax;
-     size_t size;
-     char *procargs = NULL;
- 
-@@ -339,14 +357,15 @@ psutil_get_cmd_args(pid_t pid, size_t *a
-     mib[2] = pid;
-     mib[3] = KERN_PROC_ARGV;
- 
--    st = sysctl(mib, 4, procargs, &argmax, NULL, 0);
-+    size = argmax;
-+    st = sysctl(mib, 4, procargs, &size, NULL, 0);
-     if (st == -1) {
-         free(procargs);
-         PyErr_SetFromErrno(PyExc_OSError);
-         return NULL;
-     }
- 
--    *argsize = argmax;
-+    *argsize = size;
-     return procargs;
- }
-