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
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2019-12-12 13:48:33 +00:00
parent c022d4d239
commit 70a09510ea
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=519924
2 changed files with 24 additions and 0 deletions

View file

@ -3,6 +3,7 @@
PORTNAME= psutil
PORTVERSION= 5.6.7
PORTREVISION= 1
CATEGORIES= sysutils python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View file

@ -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)