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

symon/CHANGELOG

@@ -1,7 +1,14 @@
+10/01/2002 - 2.57
+
+   Christian Weisgerber reported that netinet/ip_ipsp.h already defines htonq - fixed.
+   Will Wainwright reported 1) a small bug in test_config.php - fixed, 2) that
+   I left out some files (class_proc.inc and class_debug.inc) from the PLIST
+   files.
+
 29/12/2002 - 2.56
 
    Added proc and debug symon2web frontends. Debug has limited useability, you
-   are better of defining one for yourself.
+   are better off defining one for yourself.
 
 14/12/2002 - 
 
@@ -234,4 +241,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.13 2002/12/29 16:23:40 dijkstra Exp $
+$Id: CHANGELOG,v 1.14 2003/01/08 16:04:40 dijkstra Exp $

symon/INSTALL

@@ -6,8 +6,8 @@ Priviledges
 symux needs read and write access to it's rrdfiles.
 
 monitoring needs:
-cpu, if, mem, io - symon can run as nobody
-pf               - symon needs r/w on /dev/pf
+cpu, if, mem, io, debug, proc  - symon can run as nobody
+pf                             - symon needs r/w on /dev/pf
 
 symon2web is a php4 application and needs access to the rrdfiles. Note that
 symon2web interprets the url for graphing parameters. It should never be exposed
@@ -78,9 +78,9 @@ Less quick, but more verbose
   also contains some settings on how the data is displayed.
 
   symon2web runs 'rrdtool' to generate graphs as requests for pictures come
-  in. As of OpenBSD 3.2 apache is chrooted at /var/www. Make sure a statically
-  linked rrdtool is available, or break the chroot. You were not planning of
-  running this software on a machine tied to the internet anyway.
+  in. As of OpenBSD 3.2 apache is chrooted at /var/www. The easiest way around
+  this is to break the chroot. You were not planning of running this software
+  on a machine tied to the internet anyway.
 
      + $symon2web["view"] = show all graphs for all machines ('all') or show
        only graphs for a single selected machine ('one').
@@ -120,5 +120,5 @@ symon2web run on POSIX compliant unixes, but the monitoring application itself
 
 Willem Dijkstra <wpd@xs4all.nl>
 
-$Id: INSTALL,v 1.9 2002/11/29 10:50:28 dijkstra Exp $
+$Id: INSTALL,v 1.10 2003/01/08 16:04:40 dijkstra Exp $
 

symon/Makefile

@@ -25,6 +25,7 @@ dist: clean
 	cp /tmp/symon-${V}.tar.gz /usr/ports/distfiles/; \
 	cd $${workdir}/ports/symon; \
 	${MAKE} makesum; \
+	chown dijkstra.dijkstra distinfo; \
 	cd ..; \
 	find symon -type f -print | egrep -v 'CVS' | \
 		tar -czvf /tmp/ports-symon-${V}.tar.gz -I -; \

symon/Makefile.inc

@@ -1,6 +1,6 @@
-# $Id: Makefile.inc,v 1.13 2002/12/15 14:28:35 dijkstra Exp $
+# $Id: Makefile.inc,v 1.14 2003/01/08 16:04:40 dijkstra Exp $
 
-V=2.56
+V=2.57
 
 AR=	ar
 CC=	cc

symon/lib/data.h

@@ -1,4 +1,4 @@
-/* $Id: data.h,v 1.18 2002/12/15 14:27:43 dijkstra Exp $ */
+/* $Id: data.h,v 1.19 2003/01/08 16:04:12 dijkstra Exp $ */
 
 /*
  * Copyright (c) 2001-2002 Willem Dijkstra
@@ -55,6 +55,7 @@
 #define htonq(n) (n)
 #define ntohq(n) (n)
 #else
+#ifndef ntohq
 static inline u_int64_t
        htonq(u_int64_t v)
 {
@@ -65,7 +66,8 @@ static inline u_int64_t
 {
     return (u_int64_t) ntohl(v) << 32 | ntohl(v >> 32);
 }
-#endif
+#endif /* ntohq */
+#endif /* BYTE_ORDER */
 
 /* Symon packet version
  * version 1:

symon/ports/symon/Makefile

@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.1 2002/10/08 07:56:42 dhartmei Exp $
 
 COMMENT=		"active monitoring tool"
-V=			2.56
+V=			2.57
 DISTNAME=		symon-${V}
 CATEGORIES=		net sysutils
 

symon/ports/symon/pkg/PLIST

@@ -13,6 +13,8 @@ share/symon/web/class_if.inc
 share/symon/web/class_io.inc         
 share/symon/web/class_mem.inc        
 share/symon/web/class_pf.inc         
+share/symon/web/class_debug.inc
+share/symon/web/class_proc.inc
 share/symon/web/datasources.inc      
 share/symon/web/graph_cpu.php        
 share/symon/web/graph_if.php         

symon/ports/symon/pkg/PLIST-web

@@ -6,6 +6,8 @@ share/symon/web/class_if.inc
 share/symon/web/class_io.inc         
 share/symon/web/class_mem.inc        
 share/symon/web/class_pf.inc         
+share/symon/web/class_debug.inc
+share/symon/web/class_proc.inc
 share/symon/web/datasources.inc      
 share/symon/web/graph_cpu.php        
 share/symon/web/graph_if.php         

symon/symon2web/Makefile

@@ -8,11 +8,13 @@ clean:
 install: 
 	${INSTALL} -d -m 555 -g www -o www ${PREFIX}/${WEBDIR}
 	${INSTALL} -c -m 444 -g www -o www class_cpu.inc	${PREFIX}/${WEBDIR}
+	${INSTALL} -c -m 444 -g www -o www class_debug.inc	${PREFIX}/${WEBDIR}
 	${INSTALL} -c -m 444 -g www -o www class_graph.inc	${PREFIX}/${WEBDIR}
 	${INSTALL} -c -m 444 -g www -o www class_if.inc		${PREFIX}/${WEBDIR}
 	${INSTALL} -c -m 444 -g www -o www class_io.inc		${PREFIX}/${WEBDIR}
 	${INSTALL} -c -m 444 -g www -o www class_mem.inc	${PREFIX}/${WEBDIR}
 	${INSTALL} -c -m 444 -g www -o www class_pf.inc		${PREFIX}/${WEBDIR}
+	${INSTALL} -c -m 444 -g www -o www class_proc.inc	${PREFIX}/${WEBDIR}
 	${INSTALL} -c -m 444 -g www -o www datasources.inc	${PREFIX}/${WEBDIR}
 	${INSTALL} -c -m 444 -g www -o www graph_cpu.php	${PREFIX}/${WEBDIR}
 	${INSTALL} -c -m 444 -g www -o www graph_if.php		${PREFIX}/${WEBDIR}
@@ -20,8 +22,8 @@ install:
 	${INSTALL} -c -m 444 -g www -o www graph_mem.php	${PREFIX}/${WEBDIR}
 	${INSTALL} -c -m 444 -g www -o www graph_pf.php		${PREFIX}/${WEBDIR}
 	${INSTALL} -c -m 444 -g www -o www index.php		${PREFIX}/${WEBDIR}
+	${INSTALL} -c -m 444 -g www -o www spacer.png		${PREFIX}/${WEBDIR}
 	${INSTALL} -c -m 444 -g www -o www symon.css		${PREFIX}/${WEBDIR}
 	${INSTALL} -c -m 444 -g www -o www symon.png		${PREFIX}/${WEBDIR}
-	${INSTALL} -c -m 444 -g www -o www spacer.png		${PREFIX}/${WEBDIR}
 	${INSTALL} -c -m 444 -g www -o www test_config.php	${PREFIX}/${WEBDIR
 

symon/symon2web/test_config.php

@@ -4,7 +4,7 @@
  </head>
  <body>
 <?php
-// $Id: test_config.php,v 1.1 2002/11/29 10:45:46 dijkstra Exp $
+// $Id: test_config.php,v 1.2 2003/01/08 16:02:34 dijkstra Exp $
 //
 // Test configuration variables
 require_once('datasources.inc');
@@ -18,9 +18,9 @@ require_once('class_pf.inc');
 // Test to see if we can run rrdtool
 print "Trying to find rrdtool:<b>";
 $g = new CPU_Graph();
-$g->init(); $g->parseoptions();
+$g->init(); $g->parseoptions("");
 $rrdtool = substr($g->get("rrdtool"), 0, strpos($g->get("rrdtool"), " "));
-print $rrdtool;
+print $rrdtool . "<br>\n";
 if (!is_string($rrdtool)) {
     exit("Internal error, class_graph does not set a default rrdtool location!");
 } else {

symon/symux/readconf.c

@@ -372,7 +372,7 @@ read_source(struct sourcelist * sol, struct lex * l)
 		}
 		break;		/* LXT_CPU/IF/IO/MEM/PF/DEBUG/PROC */
 	    default:
-		parse_error(l, "{cpu|mem|if|io|debug}");
+		parse_error(l, "{cpu|mem|if|io|debug|proc}");
 		return 0;
 		break;
 	    }