Add ./tarball_archive/symon-2.62.tar.gz

symon/CHANGELOG

@@ -1,3 +1,9 @@
+12/10/2003 - 2.62
+
+   - removed errors in c_smrrds.sh (Henning Brauer)
+   
+   - detecting sensor support was broken (Nick Forbes)
+
 03/10/2003 - 2.61
 
    - added sensor probe
@@ -290,4 +296,4 @@
 29/09/2001 - Lexer had trouble dealing with ip-addresses. Cleaned up the number	
              parsing code and removed a second comment reader.
 
-$Id: CHANGELOG,v 1.19 2003/09/22 10:58:59 dijkstra Exp $
+$Id: CHANGELOG,v 1.21 2003/10/12 17:26:04 dijkstra Exp $

symon/INSTALL

@@ -90,5 +90,5 @@ symon2web run on POSIX compliant unixes, but the monitoring application itself
 
 Willem Dijkstra - wpd@xs4all.nl
 
-$Id: INSTALL,v 1.10 2003/01/08 16:04:40 dijkstra Exp $
+$Id: INSTALL,v 1.11 2003/10/10 15:19:45 dijkstra Exp $
 

symon/Makefile

@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.11 2003/01/18 09:55:31 dijkstra Exp $
+# $Id: Makefile,v 1.12 2003/10/10 15:19:45 dijkstra Exp $
 
 SUBDIR=	lib symon symux client
 

symon/Makefile.inc

@@ -1,6 +1,6 @@
-# $Id: Makefile.inc,v 1.16 2003/06/20 08:41:00 dijkstra Exp $
+# $Id: Makefile.inc,v 1.18 2003/10/12 17:26:04 dijkstra Exp $
 
-V=2.61
+V=2.62
 
 AR=	ar
 CC=	cc

symon/TODO

@@ -10,4 +10,4 @@ TODO:
 - change rrd to accommodate batch updates
 - write a muxer that supports unix pipes
 
-$Id: TODO,v 1.24 2003/06/20 08:41:00 dijkstra Exp $
+$Id: TODO,v 1.25 2003/10/10 15:19:45 dijkstra Exp $

symon/client/SymuxClient.pm

@@ -1,4 +1,4 @@
-# $Id: SymuxClient.pm,v 1.5 2003/06/20 08:41:03 dijkstra Exp $
+# $Id: SymuxClient.pm,v 1.6 2003/10/10 15:19:47 dijkstra Exp $
 #
 # Copyright (c) 2001-2002 Willem Dijkstra
 # All rights reserved.

symon/lib/data.c

@@ -1,4 +1,4 @@
-/* $Id: data.c,v 1.20 2003/06/20 08:41:07 dijkstra Exp $ */
+/* $Id: data.c,v 1.21 2003/10/10 15:19:49 dijkstra Exp $ */
 
 /*
  * Copyright (c) 2001-2002 Willem Dijkstra

symon/lib/data.h

@@ -1,4 +1,4 @@
-/* $Id: data.h,v 1.20 2003/06/20 08:41:07 dijkstra Exp $ */
+/* $Id: data.h,v 1.21 2003/10/10 15:19:49 dijkstra Exp $ */
 
 /*
  * Copyright (c) 2001-2002 Willem Dijkstra

symon/lib/lex.c

@@ -1,4 +1,4 @@
-/* $Id: lex.c,v 1.16 2003/06/20 08:41:07 dijkstra Exp $ */
+/* $Id: lex.c,v 1.17 2003/10/10 15:19:49 dijkstra Exp $ */
 
 /*
  * Copyright (c) 2001-2003 Willem Dijkstra

symon/lib/lex.h

@@ -1,4 +1,4 @@
-/* $Id: lex.h,v 1.16 2003/06/20 08:41:07 dijkstra Exp $ */
+/* $Id: lex.h,v 1.17 2003/10/10 15:19:49 dijkstra Exp $ */
 
 /*
  * Copyright (c) 2001-2003 Willem Dijkstra

symon/ports/symon/Makefile

@@ -1,11 +1,11 @@
 # $OpenBSD: Makefile,v 1.7 2003/03/31 22:13:51 dhartmei Exp $
 
 COMMENT=		"active monitoring tool"
-V=			2.61
+V=			2.62
 DISTNAME=		symon-${V}
 CATEGORIES=		sysutils net
 
-HOMEPAGE=		http://www.xs4all.nl/~wpd/symon/
+HOMEPAGE=		http://www.xs4all.nl/~wpd/symon.new/philes
 MAINTAINER=		Willem Dijkstra <wpd@xs4all.nl>
 
 # BSD

symon/ports/symon/distinfo

@@ -1,3 +0,0 @@
-MD5 (symon-2.61.tar.gz) = bd1fd1f30aa9b6801206cc2bc89f2f4c
-RMD160 (symon-2.61.tar.gz) = 57ea98c81961340f7eecd8b64c0b7f9b2b2d4b00
-SHA1 (symon-2.61.tar.gz) = 716d72510f58f3b06426beedcb26a4ca9d332473

symon/symon/Makefile

@@ -1,10 +1,10 @@
-# $Id: Makefile,v 1.30 2003/06/20 08:41:19 dijkstra Exp $
+# $Id: Makefile,v 1.32 2003/10/12 17:26:09 dijkstra Exp $
 .include "../Makefile.inc"
 
 LIBS=	-L../lib -lsymon
 SRCS=	symon.c sm_cpu.c sm_debug.c sm_mem.c sm_if.c sm_io.c sm_pf.c sm_mbuf.c sm_proc.c sm_sensor.c readconf.c symonnet.c 
 OBJS+=	${SRCS:R:S/$/.o/g}
-CFLAGS+=-I../lib
+CFLAGS+=-I../lib -I.
 
 all: symon symon.cat8
 
@@ -35,8 +35,8 @@ conf.h:  Makefile
 	*)	echo "#undef HAS_KERN_MBSTAT" >> $@;;			\
 	esac;
 	@case `grep -csq "struct sensor" /usr/include/sys/sensors.h` in \
-	1)	echo "#define HAS_SENSOR_H	1" >> $@;;		\
-	*)	echo "#undef HAS_SENSOR_H" >> $@;;			\
+	1)	echo "#define HAS_SENSORS_H	1" >> $@;;		\
+	*)	echo "#undef HAS_SENSORS_H" >> $@;;			\
 	esac
 
 symon.h: conf.h

symon/symon/readconf.c

@@ -1,4 +1,4 @@
-/* $Id: readconf.c,v 1.14 2003/06/20 08:41:19 dijkstra Exp $ */
+/* $Id: readconf.c,v 1.15 2003/10/10 15:20:01 dijkstra Exp $ */
 
 /*
  * Copyright (c) 2001-2002 Willem Dijkstra

symon/symon/sm_cpu.c

@@ -1,4 +1,4 @@
-/* $Id: sm_cpu.c,v 1.14 2002/11/29 10:48:53 dijkstra Exp $ */
+/* $Id: sm_cpu.c,v 1.15 2003/10/10 15:20:01 dijkstra Exp $ */
 
 /* The author of this code is Willem Dijkstra (wpd@xs4all.nl).
  *

symon/symon/sm_mbuf.c

@@ -1,4 +1,4 @@
-/* $Id: sm_mbuf.c,v 1.1 2003/06/20 08:42:03 dijkstra Exp $ */
+/* $Id: sm_mbuf.c,v 1.2 2003/10/12 17:26:09 dijkstra Exp $ */
 
 /*
  * Copyright (c) 2003 Daniel Hartmeier
@@ -30,6 +30,8 @@
  *
  */
 
+#include <conf.h>
+
 #include <sys/param.h>
 #include <sys/mbuf.h>
 #include <sys/sysctl.h>
@@ -40,7 +42,6 @@
 
 #include "error.h"
 #include "symon.h"
-#include "conf.h"
 
 #ifndef HAS_KERN_MBSTAT
 void 

symon/symon/sm_sensor.c

@@ -1,4 +1,4 @@
-/* $Id: $ */
+/* $Id: sm_sensor.c,v 1.1 2003/10/12 17:32:22 dijkstra Exp $ */
 
 /*
  * Copyright (c) 2001-2003 Willem Dijkstra
@@ -37,6 +37,7 @@
  *
  * This code is not re-entrant. It uses sysctl and can be run as any user.
  */
+#include <conf.h>
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
@@ -52,7 +53,6 @@
 
 #include "error.h"
 #include "symon.h"
-#include "conf.h"
 
 #ifndef HAS_SENSORS_H
 void

symon/symon/symon.c

@@ -1,4 +1,4 @@
-/* $Id: symon.c,v 1.29 2003/06/20 08:41:19 dijkstra Exp $ */
+/* $Id: symon.c,v 1.30 2003/10/10 15:20:01 dijkstra Exp $ */
 
 /*
  * Copyright (c) 2001-2002 Willem Dijkstra

symon/symon/symon.h

@@ -1,4 +1,4 @@
-/* $Id: symon.h,v 1.24 2003/06/20 08:41:19 dijkstra Exp $ */
+/* $Id: symon.h,v 1.26 2003/10/12 17:26:09 dijkstra Exp $ */
 
 /*
  * Copyright (c) 2001-2002 Willem Dijkstra
@@ -33,11 +33,12 @@
 #ifndef _SYMON_SYMON_H
 #define _SYMON_SYMON_H
 
+#include <conf.h>
+
 #include <sys/queue.h>
 
 #include "lex.h"
 #include "data.h"
-#include "conf.h"
 
 #define SYMON_PID_FILE    "/var/run/symon.pid"
 #define SYMON_INTERVAL 5	        /* measurement interval */

symon/symux/Makefile

@@ -1,10 +1,10 @@
-# $Id: Makefile,v 1.16 2003/06/20 08:41:23 dijkstra Exp $
+# $Id: Makefile,v 1.17 2003/10/12 17:26:10 dijkstra Exp $
 .include "../Makefile.inc"
 
 SRCS=	symux.c readconf.c symuxnet.c share.c
 OBJS+=	${SRCS:R:S/$/.o/g}
 LIBS=  -L../lib -L/usr/local/lib -lsymon -lrrd
-CFLAGS+=-I../lib -I/usr/local/include
+CFLAGS+=-I../lib -I/usr/local/include -I.
 
 all: symux symux.cat8
 

symon/symux/c_smrrds.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
-# $Id: c_smrrds.sh,v 1.19 2003/06/20 08:41:23 dijkstra Exp $
+# $Id: c_smrrds.sh,v 1.21 2003/10/12 17:26:10 dijkstra Exp $
 
 #
-# Copyright (c) 2001-2002 Willem Dijkstra
+# Copyright (c) 2001-2003 Willem Dijkstra
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
@@ -87,7 +87,7 @@ RRA_SETUP=" RRA:AVERAGE:0.5:1:34560
 fi
 
 # All interfaces and disks
-INTERFACES="an|awi|be|bge|bm|cnw|dc|de|ec|ef|eg|el|em|ep|ex|fea|fpa|fxp|gem|gm|gre|hme|ie|kue|lc|le|lge|lmc|lo|ne|ne|nge|ray|rl|qe|qec|sf|sis|sk|skc|sl|sm|siop|ste|stge|ti|tl|tr|tx|txp|vme|vr|wb|we|wi|wx|xe|xl"
+INTERFACES="an|awi|be|bge|bm|cnw|dc|de|ec|ef|eg|el|em|ep|ex|fea|fpa|fxp|gem|gm|gre|hme|ie|kue|lc|le|lge|lmc|lo|ne|nge|ray|rl|qe|sf|sis|sk|sl|sm|ste|stge|ti|tl|tr|tx|txp|vme|vr|wb|we|wi|wx|xe|xl"
 VIRTUALINTERFACES="bridge|enc|faith|gif|ppp|sppp|strip|tun|vlan";
 DISKS="sd|cd|ch|rd|raid|ss|uk|vnc|wd"
 

symon/symux/readconf.c

@@ -1,4 +1,4 @@
-/* $Id: readconf.c,v 1.19 2003/06/20 08:41:23 dijkstra Exp $ */
+/* $Id: readconf.c,v 1.20 2003/10/10 15:20:03 dijkstra Exp $ */
 
 /*
  * Copyright (c) 2001-2002 Willem Dijkstra

symon/symux/share.c

@@ -1,4 +1,4 @@
-/* $Id: share.c,v 1.11 2002/11/29 10:49:41 dijkstra Exp $ */
+/* $Id: share.c,v 1.12 2003/10/10 15:20:03 dijkstra Exp $ */
 
 /*
  * Copyright (c) 2001-2002 Willem Dijkstra

symon/symux/symux.h

@@ -1,4 +1,4 @@
-/* $Id: symux.h,v 1.16 2002/11/29 10:45:22 dijkstra Exp $ */
+/* $Id: symux.h,v 1.17 2003/10/12 17:26:10 dijkstra Exp $ */
 
 /*
  * Copyright (c) 2001-2002 Willem Dijkstra
@@ -33,7 +33,7 @@
 #ifndef _SYMUX_SYMUX_H
 #define _SYMUX_SYMUX_H
 
-#include "conf.h"
+#include <conf.h>
 
 #define SYMUX_PID_FILE "/var/run/symux.pid"