aboutsummaryrefslogtreecommitdiff
path: root/devel/libgtop2/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/libgtop2/files')
-rw-r--r--devel/libgtop2/files/patch-ah63
-rw-r--r--devel/libgtop2/files/patch-lib::lib.pl62
-rw-r--r--devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c30
-rw-r--r--devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c48
-rw-r--r--devel/libgtop2/files/patch-sysdeps_common_fsusage.c14
-rw-r--r--devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in20
6 files changed, 0 insertions, 237 deletions
diff --git a/devel/libgtop2/files/patch-ah b/devel/libgtop2/files/patch-ah
deleted file mode 100644
index e0d7484420ec..000000000000
--- a/devel/libgtop2/files/patch-ah
+++ /dev/null
@@ -1,63 +0,0 @@
---- sysdeps/freebsd/procmap.c.orig Sat Sep 25 07:49:06 2004
-+++ sysdeps/freebsd/procmap.c Fri Nov 19 11:26:15 2004
-@@ -47,7 +47,13 @@
- #endif
- #endif
-
-+#ifdef __FreeBSD__
-+#define _KVM_VNODE
-+#endif
- #include <sys/vnode.h>
-+#ifdef __FreeBSD__
-+#undef _KVM_VNODE
-+#endif
- #include <sys/mount.h>
- #include <ufs/ufs/quota.h>
- #include <ufs/ufs/inode.h>
-@@ -104,7 +110,7 @@
- glibtop_map_entry *maps;
- #if defined __FreeBSD__
- struct vnode vnode;
--#if __FreeBSD_version >= 500039
-+#if __FreeBSD_version < 500039
- struct inode inode;
- #endif
- #endif
-@@ -122,8 +128,10 @@
-
- /* Get the process data */
- pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
-- if ((pinfo == NULL) || (count < 1))
-+ if ((pinfo == NULL) || (count < 1)) {
- glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
-+ return NULL;
-+ }
-
- /* Now we get the memory maps. */
-
-@@ -264,8 +272,10 @@
- #if defined(__FreeBSD__) && (__FreeBSD_version >= 500039)
- switch (vnode.v_type) {
- case VREG:
-+#if __FreeBSD_version < 600006
- maps [i-1].inode = vnode.v_cachedid;
- maps [i-1].device = vnode.v_cachedfs;
-+#endif
- default:
- continue;
- }
-@@ -278,13 +288,9 @@
- &inode, sizeof (inode)) != sizeof (inode))
- glibtop_error_io_r (server, "kvm_read (inode)");
-
-- if (kvm_read (server->machine.kd,
-- (unsigned long) vnode.v_mount,
-- &mount, sizeof (mount)) != sizeof (mount))
-- glibtop_error_io_r (server, "kvm_read (mount)");
--#endif
- maps [i-1].inode = inode.i_number;
- maps [i-1].device = inode.i_dev;
-+#endif
- #endif
- } while (entry.next != first);
-
diff --git a/devel/libgtop2/files/patch-lib::lib.pl b/devel/libgtop2/files/patch-lib::lib.pl
deleted file mode 100644
index 6e08ba030855..000000000000
--- a/devel/libgtop2/files/patch-lib::lib.pl
+++ /dev/null
@@ -1,62 +0,0 @@
---- lib/lib.pl.orig Mon Sep 1 20:17:45 2003
-+++ lib/lib.pl Wed Sep 3 11:53:12 2003
-@@ -116,6 +116,8 @@
- $param_decl = '';
- $send_size = '';
- $send_ptr = '';
-+ $send_buf_decl = '';
-+ $send_buf = '';
- $nr_params = (@params = split(/:/, $param_def, 9999));
- for ($param = 1; $param <= $nr_params; $param++) {
- $list = $params[$param];
-@@ -135,28 +137,37 @@
-
- $fields[$field];
- $call_param = $call_param . ', ' . $fields[$field];
-- if ($send_ptr eq '') {
-- $send_ptr = "\n\tconst void *send_ptr = &" .
--
-- $fields[$field] . ';';
-- }
-- if ($send_size eq '') {
-- $send_size = "\n\tconst size_t send_size =\n\t\t";
-+ if ($send_buf eq '') {
-+ $send_size = "\n\tconst size_t send_size = ";
-+ $send_ptr = "\n\tconst void *send_ptr = &";
-+ if ($nr_params == 1 && $count == 1) {
-+ $send_size = $send_size . 'sizeof (' . $fields[$field] . ');';
-+ $send_ptr = $send_ptr . $fields[$field] . ';';
-+ last;
-+ }
-+ $send_size = $send_size . 'sizeof (send_buf);';
-+ $send_ptr = $send_ptr . 'send_buf;';
- }
- else {
-- $send_size = $send_size . ' + ';
-+ $send_buf_decl = $send_buf_decl . ' ';
-+ $send_buf = $send_buf . ', ';
- }
-- $send_size = $send_size . 'sizeof (' . $fields[$field] . ')';
-+ $send_buf_decl = $send_buf_decl . '' . $convert{$type} . ' ' .
-+
-+ $fields[$field] . ';';
-+ $send_buf = $send_buf . '' . $fields[$field];
- }
- }
-- if ($send_size ne '') {
-- $send_size = $send_size . ';';
-- }
-- else {
-+ if ($send_size eq '') {
- $send_size = "\n\tconst size_t send_size = 0;";
- }
- if ($send_ptr eq '') {
- $send_ptr = "\n\tconst void *send_ptr = NULL;";
-+ }
-+ if ($send_buf ne '') {
-+ $send_ptr = "\n\tconst struct { " . $send_buf_decl . " } send_buf =\n" .
-+ "\t\t{ " . $send_buf . ' };' .
-+ $send_ptr;
- }
- }
-
diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
deleted file mode 100644
index 0713da61925e..000000000000
--- a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- sysdeps/freebsd/procmem.c.orig Mon Jul 19 02:07:03 2004
-+++ sysdeps/freebsd/procmem.c Tue Jul 20 22:03:29 2004
-@@ -125,7 +125,7 @@
- #else
- struct vm_object object;
- #endif
-- struct plimit plimit;
-+ struct rlimit rlimit;
- int count;
-
- glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MEM), 0);
-@@ -160,15 +160,12 @@
-
- #define PROC_VMSPACE kp_proc.p_vmspace
-
-- if (kvm_read (server->machine.kd,
-- (unsigned long) pinfo [0].PROC_VMSPACE,
-- (char *) &plimit, sizeof (plimit)) != sizeof (plimit)) {
-- glibtop_warn_io_r (server, "kvm_read (plimit)");
-+ if (getrlimit (RLIMIT_RSS, &rlimit) < 0) {
-+ glibtop_warn_io_r (server, "getrlimit");
- return;
- }
-
-- buf->rss_rlim = (guint64)
-- (plimit.pl_rlimit [RLIMIT_RSS].rlim_cur);
-+ buf->rss_rlim = (u_int64_t) (rlimit.rlim_cur);
-
- vms = &pinfo [0].kp_eproc.e_vm;
-
diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c b/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c
deleted file mode 100644
index 37b5b56df49a..000000000000
--- a/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- sysdeps/freebsd/proctime.c.orig Wed Mar 10 21:23:52 2004
-+++ sysdeps/freebsd/proctime.c Thu Mar 11 15:47:35 2004
-@@ -59,6 +59,7 @@
-
- #ifndef __FreeBSD__
-
-+#ifndef __FreeBSD__
- static void
- calcru(p, up, sp, ip)
- struct proc *p;
-@@ -81,19 +82,10 @@
- tot = 1;
- }
-
--#if (defined __FreeBSD__) && (__FreeBSD_version >= 300003)
--
-- /* This was changed from a `struct timeval' into a `guint64'
-- * on FreeBSD 3.0 and renamed p_rtime -> p_runtime.
-- */
--
-- totusec = (u_quad_t) p->p_runtime;
--#else
- sec = p->p_rtime.tv_sec;
- usec = p->p_rtime.tv_usec;
-
- totusec = (quad_t)sec * 1000000 + usec;
--#endif
-
- if (totusec < 0) {
- /* XXX no %qd in kernel. Truncate. */
-@@ -116,6 +108,7 @@
- ip->tv_usec = it % 1000000;
- }
- }
-+#endif
-
- #endif /* !__FreeBSD__ */
-
-@@ -133,9 +126,6 @@
- #endif
- struct pstats pstats;
- int count;
--
-- char filename [BUFSIZ];
-- struct stat statb;
-
- glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_TIME), 0);
-
diff --git a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c b/devel/libgtop2/files/patch-sysdeps_common_fsusage.c
deleted file mode 100644
index de564dcfd5f6..000000000000
--- a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- sysdeps/common/fsusage.c.orig Sun Oct 17 00:51:26 2004
-+++ sysdeps/common/fsusage.c Sun Oct 17 00:52:07 2004
-@@ -253,8 +253,9 @@
- if (statvfs (path, &fsd) < 0)
- return;
-
--#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))
-- /* Solaris but not SunOS */
-+#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)) \
-+ || defined(__FreeBSD__)
-+ /* Solaris but not SunOS and FreeBSD */
- buf->block_size = fsd.f_frsize;
- #else
- /* else, including Linux */
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in
deleted file mode 100644
index 16bcbb055472..000000000000
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- sysdeps/freebsd/Makefile.in.orig Sun Feb 15 16:13:22 2004
-+++ sysdeps/freebsd/Makefile.in Sun Feb 15 16:16:05 2004
-@@ -138,7 +138,7 @@
-
- noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
-
--libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c
-+libgtop_sysdeps_2_0_la_SOURCES = nosuid.c
-
- libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
-
-@@ -172,7 +172,7 @@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- libgtop_sysdeps_2_0_la_LIBADD =
--libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo
-+libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo
- libgtop_sysdeps_suid_2_0_la_LIBADD =
- libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo siglist.lo \
- cpu.lo mem.lo swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo \
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-23 10:52:41 +0000