Attachment 75655 Details for Bug 109243 – symon-2.75.patch

[patch] symon-2.75.patch

symon-2.75.patch (text/plain), 5.78 KB, created by Ulrich Spoerlein on 2007-02-16 20:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ulrich Spoerlein

Created: 2007-02-16 20:20:02 UTC

Size: 5.78 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/sysutils/symon/Makefile,v
>retrieving revision 1.11
>diff -u -p -u -r1.11 Makefile
>--- Makefile	29 May 2006 20:46:13 -0000	1.11
>+++ Makefile	16 Feb 2007 19:34:08 -0000
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	symon
>-PORTVERSION=	2.72
>-PORTREVISION=	2
>+PORTVERSION=	2.75
> CATEGORIES=	sysutils
> MASTER_SITES=	http://www.xs4all.nl/~wpd/symon/philes/
> 
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/sysutils/symon/distinfo,v
>retrieving revision 1.3
>diff -u -p -u -r1.3 distinfo
>--- distinfo	2 Dec 2005 16:19:10 -0000	1.3
>+++ distinfo	16 Feb 2007 19:34:08 -0000
>@@ -1,3 +1,3 @@
>-MD5 (symon-2.72.tar.gz) = c88eeb4c7fb1c99e7d4448a8c3977bb2
>-SHA256 (symon-2.72.tar.gz) = b91a084ad6e8d91cd8c01a01a56a88e97e6a42f2036cdd844206ca5ff1f88bf1
>-SIZE (symon-2.72.tar.gz) = 82218
>+MD5 (symon-2.75.tar.gz) = 6b50d7ec1bf57ad1c184ac2300f5967d
>+SHA256 (symon-2.75.tar.gz) = ba0480020e4077895feb7426e869b426b3875a3f883b5b658e4583fcd09c79b1
>+SIZE (symon-2.75.tar.gz) = 92160
>Index: files/patch-platform__FreeBSD__platform.h
>===================================================================
>RCS file: files/patch-platform__FreeBSD__platform.h
>diff -N files/patch-platform__FreeBSD__platform.h
>--- files/patch-platform__FreeBSD__platform.h	2 Dec 2005 16:19:10 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,14 +0,0 @@
>---- platform/FreeBSD/platform.h.orig	Fri Oct 21 16:58:43 2005
>-+++ platform/FreeBSD/platform.h	Fri Dec  2 12:03:04 2005
>-@@ -4,8 +4,10 @@
>- #define _CONF_FREEBSD_H
>- 
>- #include <sys/queue.h>
>--#include <sys/socket.h>
>- #include <sys/types.h>
>-+#include <sys/socket.h>
>-+#include <sys/time.h>
>-+#include <sys/dkstat.h>
>- #include <sys/resource.h>
>- 
>- #include <net/if.h>
>Index: files/patch-platform__FreeBSD__sm_mem.c
>===================================================================
>RCS file: files/patch-platform__FreeBSD__sm_mem.c
>diff -N files/patch-platform__FreeBSD__sm_mem.c
>--- files/patch-platform__FreeBSD__sm_mem.c	28 Mar 2006 11:50:41 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,18 +0,0 @@
>---- platform/FreeBSD/sm_mem.c.orig	Mon Mar 27 06:06:18 2006
>-+++ platform/FreeBSD/sm_mem.c	Mon Mar 27 06:45:54 2006
>-@@ -131,12 +131,12 @@
>-     }
>-     for (i = 0; i < vmnswp_dat; i++) {
>- 	struct xswdev vmiswp_dat;
>--	int vmiswp_siz;
>-+	int vmiswp_siz = sizeof vmiswp_dat;
>- 	me_vmiswp_mib_nam[me_vmiswp_mib_len] = i;
>- 	if (sysctl(me_vmiswp_mib_nam, me_vmiswp_mib_len + 1, &vmiswp_dat, (void *)&vmiswp_siz, NULL, 0) < 0)
>- 		continue;
>--	me_stats[3] += (vmiswp_dat.xsw_used * DEV_BSIZE);
>--	me_stats[4] += (vmiswp_dat.xsw_nblks * DEV_BSIZE);
>-+	me_stats[3] += pagetob(vmiswp_dat.xsw_used);
>-+	me_stats[4] += pagetob(vmiswp_dat.xsw_nblks);
>-     }
>- #endif
>- 
>Index: files/patch-platform__FreeBSD__sm_pf.c
>===================================================================
>RCS file: files/patch-platform__FreeBSD__sm_pf.c
>diff -N files/patch-platform__FreeBSD__sm_pf.c
>--- files/patch-platform__FreeBSD__sm_pf.c	2 Dec 2005 16:19:10 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,15 +0,0 @@
>---- platform/FreeBSD/sm_pf.c.orig	Fri Dec  2 12:06:20 2005
>-+++ platform/FreeBSD/sm_pf.c	Fri Dec  2 12:06:38 2005
>-@@ -73,6 +73,12 @@
>-     fatal("pf support not available");
>- }
>- 
>-+void
>-+gets_pf()
>-+{
>-+    fatal("pf support not available");
>-+}
>-+
>- int
>- get_pf(char *symon_buf, int maxlen, struct stream *st)
>- {
>Index: files/patch-sm_io.c
>===================================================================
>RCS file: files/patch-sm_io.c
>diff -N files/patch-sm_io.c
>--- files/patch-sm_io.c	2 Dec 2005 16:19:10 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,29 +0,0 @@
>---- platform/FreeBSD/sm_io.c.orig	Sat Nov 12 20:16:41 2005
>-+++ platform/FreeBSD/sm_io.c	Sat Nov 12 20:17:10 2005
>-@@ -80,7 +80,7 @@
>- void
>- gets_io()
>- {
>--#if DEVSTAT_USER_API_VER == 5
>-+#if DEVSTAT_USER_API_VER == 5 || DEVSTAT_USER_API_VER == 6
>-     io_numdevs = devstat_getnumdevs(NULL);
>- #else
>-     io_numdevs = getnumdevs();
>-@@ -97,7 +97,7 @@
>-     /* clear the devinfo struct, as getdevs expects it to be all zeroes */
>-     bzero(io_stats.dinfo, sizeof(struct devinfo));
>- 
>--#if DEVSTAT_USER_API_VER == 5
>-+#if DEVSTAT_USER_API_VER == 5 || DEVSTAT_USER_API_VER == 6
>-     devstat_getdevs(NULL, &io_stats);
>- #else
>-     getdevs(&io_stats);
>-@@ -117,7 +117,7 @@
>- 	    strlen(ds->device_name) < strlen(st->arg) &&
>- 	    isdigit(st->arg[strlen(ds->device_name)]) &&
>- 	    atoi(&st->arg[strlen(ds->device_name)]) == ds->unit_number) {
>--#if DEVSTAT_USER_API_VER == 5
>-+#if DEVSTAT_USER_API_VER == 5 || DEVSTAT_USER_API_VER == 6
>- 	    return snpack(symon_buf, maxlen, st->arg, MT_IO2,
>- 			  ds->operations[DEVSTAT_READ],
>- 			  ds->operations[DEVSTAT_WRITE],
>Index: files/pkg-message.in
>===================================================================
>RCS file: /home/ncvs/ports/sysutils/symon/files/pkg-message.in,v
>retrieving revision 1.1
>diff -u -p -u -r1.1 pkg-message.in
>--- files/pkg-message.in	26 Apr 2005 14:32:53 -0000	1.1
>+++ files/pkg-message.in	16 Feb 2007 19:34:08 -0000
>@@ -1,15 +1,15 @@
> For the system monitor symon, use the following steps
> 
>-  1. Copy %%LOCALBASE%%/share/examples/symon/symon.conf
>-     to %%LOCALBASE%%/etc and edit.
>+  1. Copy %%PREFIX%%/share/examples/symon/symon.conf
>+     to %%PREFIX%%/etc and edit.
>   2. Run symon
> 
> For the data collector symux, use the following steps
> 
>-  1. Copy %%LOCALBASE%%/share/examples/symon/symux.conf
>-     to %%LOCALBASE%%/etc and edit.
>+  1. Copy %%PREFIX%%/share/examples/symon/symux.conf
>+     to %%PREFIX%%/etc and edit.
>   2. Enter the directory, where symux should store its data
>      (e.g. /var/db/symux) and run
>-	%%LOCALBASE%%/share/symon/c_smrrds.sh all
>+	%%PREFIX%%/share/symon/c_smrrds.sh all
>      to create the RR database.
>   3. Run symux

Actions: View | Diff

Attachments on bug 109243: 75655 | 75656