ports/124807: [patch] devel/libgtop unbreak after change in cdev structure

[Pietro Cerutti]

>Number:         124807
>Category:       ports
>Synopsis:       [patch] devel/libgtop unbreak after change in cdev structure
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 21 00:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Pietro Cerutti
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
The FreeBSD Project 
>Environment:


System: FreeBSD 8.0-CURRENT #0: Wed Jun 18 01:38:09 CEST 2008
    root at gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034



>Description:


This has broken libgtop:

http://www.freebsd.org/cgi/cvsweb.cgi/src%2Fsys%2Fsys/conf.h.diff?r1=1.241;r2=1.242




>How-To-Repeat:





>Fix:


--- libgtop.diff begins here ---
Index: files/patch-sysdeps_freebsd_procmap.c
===================================================================
RCS file: files/patch-sysdeps_freebsd_procmap.c
diff -N files/patch-sysdeps_freebsd_procmap.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-sysdeps_freebsd_procmap.c	20 Jun 2008 23:58:54 -0000
@@ -0,0 +1,18 @@
+--- sysdeps/freebsd/procmap.c.orig	2008-06-21 01:58:25.000000000 +0200
++++ sysdeps/freebsd/procmap.c	2008-06-21 01:58:30.000000000 +0200
+@@ -103,8 +103,14 @@
+ 
+         if (kvm_read (server->machine.kd, (gulong) inode.i_dev, (char *) &si,
+ 	              sizeof (si)) != sizeof (si) ||
++#if __FreeBSD_version >= 800039
++            kvm_read (server->machine.kd, (gulong)  cdev2priv(&si), (char *) &priv,
++		      sizeof (priv))
++#else
+             kvm_read (server->machine.kd, (gulong) si.si_priv, (char *) &priv,
+-		      sizeof (priv)) != sizeof (priv))
++		      sizeof (priv))
++#endif
++	    != sizeof (priv))
+         {
+                 glibtop_warn_io_r (server, "kvm_read (si)");
+                 return;
--- libgtop.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: