svn commit: r519924 - in head/sysutils/py-psutil: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Thu Dec 12 13:48:33 2019
New Revision: 519924
URL: https://svnweb.freebsd.org/changeset/ports/519924

Log:
  Fix Process on 12.0+ i386
  
  - Bump PORTREVISION for package change
  
  FreeBSD 12.0+ change ki_tdev from 32 bits to 64 bits.
  
  PR:		242543
  Submitted by:	antoine

Added:
  head/sysutils/py-psutil/files/
  head/sysutils/py-psutil/files/patch-psutil-_psutil_bsd.c   (contents, props changed)
Modified:
  head/sysutils/py-psutil/Makefile

Modified: head/sysutils/py-psutil/Makefile
==============================================================================
--- head/sysutils/py-psutil/Makefile	Thu Dec 12 13:48:27 2019	(r519923)
+++ head/sysutils/py-psutil/Makefile	Thu Dec 12 13:48:33 2019	(r519924)
@@ -3,6 +3,7 @@
 
 PORTNAME=	psutil
 PORTVERSION=	5.6.7
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

Added: head/sysutils/py-psutil/files/patch-psutil-_psutil_bsd.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/py-psutil/files/patch-psutil-_psutil_bsd.c	Thu Dec 12 13:48:33 2019	(r519924)
@@ -0,0 +1,23 @@
+--- psutil/_psutil_bsd.c.orig	2019-11-20 08:39:49 UTC
++++ psutil/_psutil_bsd.c
+@@ -271,7 +271,11 @@ psutil_proc_oneshot_info(PyObject *self, PyObject *arg
+ 
+     // Return a single big tuple with all process info.
+     py_retlist = Py_BuildValue(
++#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031
++        "(lillllllLdllllddddlllllbO)",
++#else
+         "(lillllllidllllddddlllllbO)",
++#endif
+ #ifdef PSUTIL_FREEBSD
+         //
+         (long)kp.ki_ppid,                // (long) ppid
+@@ -285,7 +289,7 @@ psutil_proc_oneshot_info(PyObject *self, PyObject *arg
+         (long)kp.ki_groups[0],           // (long) effective gid
+         (long)kp.ki_svuid,               // (long) saved gid
+         //
+-        kp.ki_tdev,                      // (int) tty nr
++        kp.ki_tdev,                      // (int or long long) tty nr
+         PSUTIL_TV2DOUBLE(kp.ki_start),   // (double) create time
+         // ctx switches
+         kp.ki_rusage.ru_nvcsw,           // (long) ctx switches (voluntary)