Update to 5.3.1
Changes: https://github.com/giampaolo/psutil/blob/master/HISTORY.rst
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= psutil
|
||||
PORTVERSION= 5.3.0
|
||||
PORTVERSION= 5.3.1
|
||||
CATEGORIES= sysutils python
|
||||
MASTER_SITES= CHEESESHOP
|
||||
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1504355550
|
||||
SHA256 (psutil-5.3.0.tar.gz) = a3940e06e92c84ab6e82b95dad056241beea93c3c9b1d07ddf96485079855185
|
||||
SIZE (psutil-5.3.0.tar.gz) = 397265
|
||||
TIMESTAMP = 1505043420
|
||||
SHA256 (psutil-5.3.1.tar.gz) = 12dd9c8abbad15f055e9579130035b38617020ce176f4a498b7870e6321ffa67
|
||||
SIZE (psutil-5.3.1.tar.gz) = 397075
|
||||
|
||||
@@ -1,87 +0,0 @@
|
||||
--- psutil/arch/freebsd/proc_socks.c.orig 2017-08-03 16:14:27 UTC
|
||||
+++ psutil/arch/freebsd/proc_socks.c
|
||||
@@ -136,20 +136,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_un.kf_sock.kf_sa_local))
|
||||
+#else
|
||||
&kif->kf_sa_local))
|
||||
+#endif
|
||||
continue;
|
||||
if (!psutil_sockaddr_matches(
|
||||
AF_INET, inp->inp_fport, &inp->inp_faddr,
|
||||
+#if __FreeBSD_version >= 1200031
|
||||
+ &kif->kf_un.kf_sock.kf_sa_peer))
|
||||
+#else
|
||||
&kif->kf_sa_peer))
|
||||
+#endif
|
||||
continue;
|
||||
} else {
|
||||
if (!psutil_sockaddr_matches(
|
||||
AF_INET6, inp->inp_lport, &inp->in6p_laddr,
|
||||
+#if __FreeBSD_version >= 1200031
|
||||
+ &kif->kf_un.kf_sock.kf_sa_local))
|
||||
+#else
|
||||
&kif->kf_sa_local))
|
||||
+#endif
|
||||
continue;
|
||||
if (!psutil_sockaddr_matches(
|
||||
AF_INET6, inp->inp_fport, &inp->in6p_faddr,
|
||||
+#if __FreeBSD_version >= 1200031
|
||||
+ &kif->kf_un.kf_sock.kf_sa_peer))
|
||||
+#else
|
||||
&kif->kf_sa_peer))
|
||||
+#endif
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -243,19 +259,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_un.kf_sock.kf_sa_local),
|
||||
+#else
|
||||
&kif->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_un.kf_sock.kf_sa_peer),
|
||||
+#else
|
||||
&kif->kf_sa_peer),
|
||||
+#endif
|
||||
rip,
|
||||
sizeof(rip));
|
||||
lport = htons(psutil_sockaddr_port(kif->kf_sock_domain,
|
||||
+#if __FreeBSD_version >= 1200031
|
||||
+ &kif->kf_un.kf_sock.kf_sa_local));
|
||||
+#else
|
||||
&kif->kf_sa_local));
|
||||
+#endif
|
||||
rport = htons(psutil_sockaddr_port(kif->kf_sock_domain,
|
||||
+#if __FreeBSD_version >= 1200031
|
||||
+ &kif->kf_un.kf_sock.kf_sa_peer));
|
||||
+#else
|
||||
&kif->kf_sa_peer));
|
||||
+#endif
|
||||
|
||||
// construct python tuple/list
|
||||
py_laddr = Py_BuildValue("(si)", lip, lport);
|
||||
@@ -287,7 +319,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_un.kf_sock.kf_sa_local;
|
||||
+#else
|
||||
sun = (struct sockaddr_un *)&kif->kf_sa_local;
|
||||
+#endif
|
||||
snprintf(
|
||||
path, sizeof(path), "%.*s",
|
||||
(int)(sun->sun_len - (sizeof(*sun) - sizeof(sun->sun_path))),
|
||||
Reference in New Issue
Block a user