svn commit: r441759 - head/devel/libgtop/files
Koop Mast
kwm at FreeBSD.org
Fri May 26 08:01:17 UTC 2017
Author: kwm
Date: Fri May 26 08:01:16 2017
New Revision: 441759
URL: https://svnweb.freebsd.org/changeset/ports/441759
Log:
Add a patch to allow libgtop to compile HEAD after the 64-bit inode
support was added.
I only added the extra __FreeBSD_version gaurds
Submitted by: kib@
Differential Revision: https://reviews.freebsd.org/D10795
Added:
head/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c (contents, props changed)
Added: head/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c Fri May 26 08:01:16 2017 (r441759)
@@ -0,0 +1,57 @@
+--- sysdeps/freebsd/procopenfiles.c.orig 2014-10-12 07:17:26 UTC
++++ sysdeps/freebsd/procopenfiles.c
+@@ -322,12 +322,21 @@ glibtop_get_proc_open_files_s (glibtop *server, glibto
+ struct sockaddr_un *sun;
+
+ entry.type = GLIBTOP_FILE_TYPE_LOCALSOCKET;
++/* 64bit inodes */
++#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
+
+ if (sun->sun_path[0]) {
+ char *addrstr;
+
++#if __FreeBSD_version > 1200031
++ addrstr = addr_to_string(&kif->kf_un.kf_sock.kf_sa_local);
++#else
+ addrstr = addr_to_string(&kif->kf_sa_local);
++#endif
+ g_strlcpy(entry.info.localsock.name,
+ addrstr,
+ sizeof(entry.info.localsock.name));
+@@ -335,7 +344,11 @@ glibtop_get_proc_open_files_s (glibtop *server, glibto
+ } else {
+ char *addrstr;
+
++#if __FreeBSD_version > 1200031
++ addrstr = addr_to_string(&kif->kf_un.kf_sock.kf_sa_peer);
++#else
+ addrstr = addr_to_string(&kif->kf_sa_peer);
++#endif
+ g_strlcpy(entry.info.localsock.name,
+ addrstr,
+ sizeof(entry.info.localsock.name));
+@@ -349,12 +362,20 @@ glibtop_get_proc_open_files_s (glibtop *server, glibto
+ entry.type = GLIBTOP_FILE_TYPE_INETSOCKET;
+ else
+ entry.type = GLIBTOP_FILE_TYPE_INET6SOCKET;
++#if __FreeBSD_version > 1200031
++ addrstr = addr_to_string(&kif->kf_un.kf_sock.kf_sa_peer);
++#else
+ addrstr = addr_to_string(&kif->kf_sa_peer);
++#endif
+ g_strlcpy(entry.info.sock.dest_host,
+ addrstr,
+ sizeof(entry.info.sock.dest_host));
+ g_free(addrstr);
++#if __FreeBSD_version > 1200031
++ entry.info.sock.dest_port = addr_to_port(&kif->kf_un.kf_sock.kf_sa_peer);
++#else
+ entry.info.sock.dest_port = addr_to_port(&kif->kf_sa_peer);
++#endif
+ }
+ } else if (kif->kf_type == KF_TYPE_PIPE) {
+ entry.type = GLIBTOP_FILE_TYPE_PIPE;
More information about the svn-ports-all
mailing list