kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make it compilable on FreeBSD 12 after struct inpcb and struct tcpcb were

Browse source 
stopped being exported.
This commit is contained in:
Gleb Smirnoff 2017-03-21 08:42:58 +00:00
parent 7919ba38d7
commit ff7ba6577e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=436575
2 changed files with 51 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysutils/py-psutil121/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= psutil
PORTVERSION= 1.2.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= sysutils python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

50
sysutils/py-psutil121/files/patch-_psutil_bsd.c Normal file
View file

@ -0,0 +1,50 @@
--- psutil/_psutil_bsd.c.orig 2017-03-21 00:39:17.505652000 -0700
+++ psutil/_psutil_bsd.c 2017-03-21 00:41:20.821739000 -0700
@@ -917,11 +917,19 @@
psutil_sockaddr_addrlen(family)) == 0);
}
+#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;
@@ -929,9 +937,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 ||
@@ -976,7 +990,11 @@
struct kinfo_file *kif;
struct kinfo_proc kipp;
char *tcplist = NULL;
+#if __FreeBSD_version >= 1200026
+ struct xtcpcb *tcp;
+#else
struct tcpcb *tcp;
+#endif
PyObject *retList = PyList_New(0);
PyObject *tuple = NULL;