Index: head/sysutils/py-psutil/Makefile =================================================================== --- head/sysutils/py-psutil/Makefile (revision 436994) +++ head/sysutils/py-psutil/Makefile (revision 436995) @@ -1,26 +1,25 @@ # Created by: Ju Pengfei # $FreeBSD$ PORTNAME= psutil -PORTVERSION= 5.2.0 -PORTREVISION= 1 +PORTVERSION= 5.2.1 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 436994) +++ head/sysutils/py-psutil/distinfo (revision 436995) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488809771 -SHA256 (psutil-5.2.0.tar.gz) = 2fc91d068faa5613c093335f0e758673ef8c722ad4bfa4aded64c13ae69089eb -SIZE (psutil-5.2.0.tar.gz) = 345519 +TIMESTAMP = 1490461220 +SHA256 (psutil-5.2.1.tar.gz) = fe0ea53b302f68fca1c2a3bac289e11344456786141b73391ed4022b412d5455 +SIZE (psutil-5.2.1.tar.gz) = 347241 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 436994) +++ head/sysutils/py-psutil/files/patch-psutil__arch__bsd__freebsd_socks.c (nonexistent) @@ -1,86 +0,0 @@ ---- 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 @@ - } - - -+#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 @@ - 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 @@ - 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 @@ - 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 @@ - "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 @@ - 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; Property changes on: head/sysutils/py-psutil/files/patch-psutil__arch__bsd__freebsd_socks.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property 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 (nonexistent) +++ head/sysutils/py-psutil/files/patch-psutil-arch-bsd-freebsd_socks.c (revision 436995) @@ -0,0 +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 @@ + } + + ++#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 @@ + 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 @@ + 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 @@ + 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 @@ + "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 @@ + 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; Property changes on: head/sysutils/py-psutil/files/patch-psutil-arch-bsd-freebsd_socks.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property