From owner-svn-ports-head@freebsd.org Thu Dec 12 13:48:34 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3223D1D2955; Thu, 12 Dec 2019 13:48:34 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47YZrd6n1nz4fb0; Thu, 12 Dec 2019 13:48:33 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A987C24A11; Thu, 12 Dec 2019 13:48:33 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBCDmXXt097421; Thu, 12 Dec 2019 13:48:33 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBCDmXNr097419; Thu, 12 Dec 2019 13:48:33 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201912121348.xBCDmXNr097419@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Thu, 12 Dec 2019 13:48:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519924 - in head/sysutils/py-psutil: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/sysutils/py-psutil: . files X-SVN-Commit-Revision: 519924 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Dec 2019 13:48:34 -0000 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)