Update to 5.3.0

Changes:	https://github.com/giampaolo/psutil/blob/master/HISTORY.rst

3 files changed, 4 insertions, 175 deletions

diff --git a/sysutils/py-psutil/Makefile b/sysutils/py-psutil/Makefile
index 503f1c2fcf7b..0d417e6a5f42 100644
--- a/sysutils/py-psutil/Makefile
+++ b/sysutils/py-psutil/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	psutil
-PORTVERSION=	5.2.2
+PORTVERSION=	5.3.0
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/sysutils/py-psutil/distinfo b/sysutils/py-psutil/distinfo
index bc0018e901cd..da6a82a4f43b 100644
--- a/sysutils/py-psutil/distinfo
+++ b/sysutils/py-psutil/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491897974
-SHA256 (psutil-5.2.2.tar.gz) = 44746540c0fab5b95401520d29eb9ffe84b3b4a235bd1d1971cbe36e1f38dd13
-SIZE (psutil-5.2.2.tar.gz) = 348413
+TIMESTAMP = 1504355550
+SHA256 (psutil-5.3.0.tar.gz) = a3940e06e92c84ab6e82b95dad056241beea93c3c9b1d07ddf96485079855185
+SIZE (psutil-5.3.0.tar.gz) = 397265
diff --git a/sysutils/py-psutil/files/patch-psutil-arch-bsd-freebsd_socks.c b/sysutils/py-psutil/files/patch-psutil-arch-bsd-freebsd_socks.c
deleted file mode 100644
index 36cda53e3b93..000000000000
--- a/sysutils/py-psutil/files/patch-psutil-arch-bsd-freebsd_socks.c
+++ /dev/null
@@ -1,171 +0,0 @@
---- 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 @@ 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 ||
-@@ -135,20 +148,36 @@ psutil_search_tcplist(char *buf, struct 
-         if (kif->kf_sock_domain == AF_INET) {
-             if (!psutil_sockaddr_matches(
-                     AF_INET, inp->inp_lport, &inp->inp_laddr,
-+#if __FreeBSD_version < 1200031
-                     &kif->kf_sa_local))
-+#else
-+                    &kif->kf_un.kf_sock.kf_sa_local))
-+#endif
-                 continue;
-             if (!psutil_sockaddr_matches(
-                     AF_INET, inp->inp_fport, &inp->inp_faddr,
-+#if __FreeBSD_version < 1200031
-                     &kif->kf_sa_peer))
-+#else
-+                    &kif->kf_un.kf_sock.kf_sa_peer))
-+#endif
-                 continue;
-         } else {
-             if (!psutil_sockaddr_matches(
-                     AF_INET6, inp->inp_lport, &inp->in6p_laddr,
-+#if __FreeBSD_version < 1200031
-                     &kif->kf_sa_local))
-+#else
-+                    &kif->kf_un.kf_sock.kf_sa_local))
-+#endif
-                 continue;
-             if (!psutil_sockaddr_matches(
-                     AF_INET6, inp->inp_fport, &inp->in6p_faddr,
-+#if __FreeBSD_version < 1200031
-                     &kif->kf_sa_peer))
-+#else
-+                    &kif->kf_un.kf_sock.kf_sa_peer))
-+#endif
-                 continue;
-         }
- 
-@@ -208,7 +237,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 +306,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 +321,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 +519,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;
-@@ -547,19 +593,35 @@ psutil_proc_connections(PyObject *self, 
-                 inet_ntop(
-                     kif->kf_sock_domain,
-                     psutil_sockaddr_addr(kif->kf_sock_domain,
-+#if __FreeBSD_version < 1200031
-                                          &kif->kf_sa_local),
-+#else
-+                                         &kif->kf_un.kf_sock.kf_sa_local),
-+#endif
-                     lip,
-                     sizeof(lip));
-                 inet_ntop(
-                     kif->kf_sock_domain,
-                     psutil_sockaddr_addr(kif->kf_sock_domain,
-+#if __FreeBSD_version < 1200031
-                                          &kif->kf_sa_peer),
-+#else
-+                                         &kif->kf_un.kf_sock.kf_sa_peer),
-+#endif
-                     rip,
-                     sizeof(rip));
-                 lport = htons(psutil_sockaddr_port(kif->kf_sock_domain,
-+#if __FreeBSD_version < 1200031
-                                                    &kif->kf_sa_local));
-+#else
-+                                                   &kif->kf_un.kf_sock.kf_sa_local));
-+#endif
-                 rport = htons(psutil_sockaddr_port(kif->kf_sock_domain,
-+#if __FreeBSD_version < 1200031
-                                                    &kif->kf_sa_peer));
-+#else
-+                                                   &kif->kf_un.kf_sock.kf_sa_peer));
-+#endif
- 
-                 // construct python tuple/list
-                 py_laddr = Py_BuildValue("(si)", lip, lport);
-@@ -590,7 +652,11 @@ psutil_proc_connections(PyObject *self, 
-             else if (kif->kf_sock_domain == AF_UNIX) {
-                 struct sockaddr_un *sun;
- 
-+#if __FreeBSD_version < 1200031
-                 sun = (struct sockaddr_un *)&kif->kf_sa_local;
-+#else
-+                sun = (struct sockaddr_un *)&kif->kf_un.kf_sock.kf_sa_local;
-+#endif
-                 snprintf(
-                     path, sizeof(path), "%.*s",
-                     (int)(sun->sun_len - (sizeof(*sun) - sizeof(sun->sun_path))),