2013-01-11 01:05:05 +01:00
|
|
|
$NetBSD: patch-af,v 1.3 2013/01/11 00:05:05 joerg Exp $
|
- fix FreeBSD/Dragonfly properly
- update to newest version
Upstream changelog:
Xymon release 4.3.10 - released on Aug 6 2012
=============================================
Main features in this release is the addition of inode-checks
on all major platforms, and a series of enhancements to the
build procedure.
Also, building Xymon on most common platforms is now explicitly
described in the "install" document.
* Fix build problems with "errno"
* Fix build problems with OpenSSL in non-default locations
* Fix build problems with certain LDAP configurations
* Fix build problems with RRDtool on FreeBSD / OpenBSD
* Fix problem with ifstat data from Fedora in graphs
* "inode" check on FreeBSD, OpenBSD, OSX, Solaris, HP/UX, AIX
in addition to existing support for Linux
* Document building and installing Xymon on common platforms
(Linux, FreeBSD, OpenBSD, Solaris)
* Enhance xymoncfg so it can be used to import Xymon configuration
settings into shell-scripts.
Xymon release 4.3.9 - released on Jul 24 2012
=============================================
This release is mainly a bug-fix release.
* Fix crash when XYMSRV is undefined but XYMSERVERS is
* Fix error in calculating combo-status messages with
forward references
* Fix error in disable-until-TIME or disable-until-OK code
* Fix documentation of DURATION in alerts.cfg / xymond_alert so
it is consistenly listed as being in "minutes".
* Permit explicit use of ">" and ">=" in alerts.cfg
* Permit building without the RRDtool libraries, e.g. for
a network-tester build, but with trend-graphing disabled.
* Full compiler-warning cleanup
* Various configuration/build-script issues fixed.
Xymon release 4.3.8 - released on Jul 15 2012
=============================================
This release is mainly a bug-fix release.
Bugfixes
* Workaround for DNS timeout handling, now fixed at approximately 25
seconds.
* "hostinfo" command for xymond documented
* confreport only shows processes that are monitored
* analysis.cfg parsing of COLOR for UP rules was broken
* RRD handlers no longer crash after receiving 1 billion updates
* Using .netrc for authentication could crash xymonnet
* "directory" includes would report the wrong filename for missing
directories.
* useradm CGI would invoke htpassword twice
* "include" and "directory" now ignores trailing whitespace
* SSLv2 support disabled if SSL-library does not support it
* Minor bugfixes and cleanups of compiler warnings.
Enhancements
* Service status on info page now links to the detailed status page.
* Add RRDGRAPHOPTS setting to permit global user-specified RRD options,
e.g. for font to showgraph CGI
* Add check for the size of public keys used in SSL certificates
(enabled via --sslkeysize=N option for xymonnet)
* Optionally disable the display of SSL ciphers in the sslcert status
(the --no-cipherlist option for xymonnet)
* Improved build-scripts works on newer systems with libraries in
new and surprising places
* Reduce xymonnet memory usage and runtime for ping tests when there
are multiple hosts.cfg entries with the same IP-address.
* Add code for inode-monitoring on Linux. Does not currently work on
any other client platform.
* Added the ability to disable tests until a specific time, instead of
for some interval. Disabling a test also now computes the expire time
for the disable to happen at the next closest minute.
2012-10-11 20:42:19 +02:00
|
|
|
|
|
|
|
|
use the correct type for physmem
|
2010-02-14 17:11:11 +01:00
|
|
|
|
2013-01-11 01:05:05 +01:00
|
|
|
--- client/netbsd-meminfo.c.orig 2011-07-31 21:01:52.000000000 +0000
|
2010-02-14 17:11:11 +01:00
|
|
|
+++ client/netbsd-meminfo.c
|
2013-01-11 01:05:05 +01:00
|
|
|
@@ -15,14 +15,16 @@ static char rcsid[] = "$Id: netbsd-memin
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
#include <sys/sysctl.h>
|
|
|
|
|
#include <sys/swap.h>
|
|
|
|
|
+#include <sys/vmmeter.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
+#include <stdint.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
2010-02-14 17:11:11 +01:00
|
|
|
int main(int argc, char *argv[])
|
|
|
|
|
{
|
|
|
|
|
int hw_physmem[] = { CTL_HW, HW_PHYSMEM64 };
|
|
|
|
|
- int64 physmem;
|
|
|
|
|
+ int64_t physmem;
|
|
|
|
|
|
|
|
|
|
int hw_pagesize[] = { CTL_HW, HW_PAGESIZE };
|
|
|
|
|
int pagesize;
|
2013-01-11 01:05:05 +01:00
|
|
|
@@ -64,7 +66,7 @@ int main(int argc, char *argv[])
|
|
|
|
|
swapused /= (2*1024);
|
|
|
|
|
|
|
|
|
|
// printf("Pagesize:%d\n", pagesize);
|
|
|
|
|
- printf("Total:%d\n", (physmem / (1024 * 1024)));
|
|
|
|
|
+ printf("Total:%" PRId64"\n", (physmem / (1024 * 1024)));
|
|
|
|
|
printf("Free:%d\n", (pagesize / 1024)*(vmdata.t_free / 1024));
|
|
|
|
|
printf("Swaptotal:%lu\n", swaptotal);
|
|
|
|
|
printf("Swapused:%lu\n", swapused);
|
