Index: head/sysutils/py-psutil/Makefile =================================================================== --- head/sysutils/py-psutil/Makefile (revision 438277) +++ head/sysutils/py-psutil/Makefile (revision 438278) @@ -1,25 +1,25 @@ # Created by: Ju Pengfei # $FreeBSD$ PORTNAME= psutil -PORTVERSION= 5.2.1 +PORTVERSION= 5.2.2 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Process utilities module for Python LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \ ${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2 USE_PYTHON= autoplist concurrent distutils USES= python post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/psutil/_psutil_bsd.so ${STAGEDIR}${PYTHON_SITELIBDIR}/psutil/_psutil_posix.so .include Index: head/sysutils/py-psutil/distinfo =================================================================== --- head/sysutils/py-psutil/distinfo (revision 438277) +++ head/sysutils/py-psutil/distinfo (revision 438278) @@ -1,3 +1,3 @@ -TIMESTAMP = 1490461220 -SHA256 (psutil-5.2.1.tar.gz) = fe0ea53b302f68fca1c2a3bac289e11344456786141b73391ed4022b412d5455 -SIZE (psutil-5.2.1.tar.gz) = 347241 +TIMESTAMP = 1491897974 +SHA256 (psutil-5.2.2.tar.gz) = 44746540c0fab5b95401520d29eb9ffe84b3b4a235bd1d1971cbe36e1f38dd13 +SIZE (psutil-5.2.2.tar.gz) = 348413 Index: head/sysutils/py-psutil/files/patch-psutil-arch-bsd-freebsd_socks.c =================================================================== --- head/sysutils/py-psutil/files/patch-psutil-arch-bsd-freebsd_socks.c (revision 438277) +++ head/sysutils/py-psutil/files/patch-psutil-arch-bsd-freebsd_socks.c (revision 438278) @@ -1,86 +1,86 @@ ---- psutil/arch/bsd/freebsd_socks.c.orig 2017-03-21 00:28:50.234080000 -0700 -+++ psutil/arch/bsd/freebsd_socks.c 2017-03-21 00:35:53.545508000 -0700 -@@ -112,10 +112,17 @@ +--- psutil/arch/bsd/freebsd_socks.c.orig 2017-03-26 08:09:27 UTC ++++ psutil/arch/bsd/freebsd_socks.c +@@ -112,10 +112,17 @@ psutil_sockaddr_matches(int family, int } +#if __FreeBSD_version >= 1200026 +static struct xtcpcb * +psutil_search_tcplist(char *buf, struct kinfo_file *kif) { + struct xtcpcb *tp; + struct xinpcb *inp; +#else static struct tcpcb * psutil_search_tcplist(char *buf, struct kinfo_file *kif) { struct tcpcb *tp; struct inpcb *inp; +#endif struct xinpgen *xig, *oxig; struct xsocket *so; -@@ -123,9 +130,15 @@ +@@ -123,9 +130,15 @@ psutil_search_tcplist(char *buf, struct for (xig = (struct xinpgen *)((char *)xig + xig->xig_len); xig->xig_len > sizeof(struct xinpgen); xig = (struct xinpgen *)((char *)xig + xig->xig_len)) { +#if __FreeBSD_version >= 1200026 + tp = (struct xtcpcb *)xig; + inp = &tp->xt_inp; + so = &inp->xi_socket; +#else tp = &((struct xtcpcb *)xig)->xt_tp; inp = &((struct xtcpcb *)xig)->xt_inp; so = &((struct xtcpcb *)xig)->xt_socket; +#endif if (so->so_type != kif->kf_sock_type || so->xso_family != kif->kf_sock_domain || -@@ -208,7 +221,11 @@ +@@ -208,7 +221,11 @@ int psutil_gather_inet(int proto, PyObje struct xinpgen *xig, *exig; struct xinpcb *xip; struct xtcpcb *xtp; +#if __FreeBSD_version >= 1200026 + struct xinpcb *inp; +#else struct inpcb *inp; +#endif struct xsocket *so; const char *varname = NULL; size_t len, bufsize; -@@ -273,8 +290,13 @@ +@@ -273,8 +290,13 @@ int psutil_gather_inet(int proto, PyObje goto error; } inp = &xtp->xt_inp; +#if __FreeBSD_version >= 1200026 + so = &inp->xi_socket; + status = xtp->t_state; +#else so = &xtp->xt_socket; status = xtp->xt_tp.t_state; +#endif break; case IPPROTO_UDP: xip = (struct xinpcb *)xig; -@@ -283,7 +305,11 @@ +@@ -283,7 +305,11 @@ int psutil_gather_inet(int proto, PyObje "struct xinpcb size mismatch"); goto error; } +#if __FreeBSD_version >= 1200026 + inp = xip; +#else inp = &xip->xi_inp; +#endif so = &xip->xi_socket; status = PSUTIL_CONN_NONE; break; -@@ -477,7 +503,11 @@ +@@ -477,7 +503,11 @@ psutil_proc_connections(PyObject *self, struct kinfo_file *freep = NULL; struct kinfo_file *kif; char *tcplist = NULL; +#if __FreeBSD_version >= 1200026 + struct xtcpcb *tcp; +#else struct tcpcb *tcp; +#endif PyObject *py_retlist = PyList_New(0); PyObject *py_tuple = NULL;