37238211b9
Also contains the inode check expansion for NetBSD from PR 48575 Upstream changelog: Changes for 4.3.15 - 4.3.17 =========================== No significant changes. Changes for 4.3.14 ================== In previous Xymon versions, a client-only configuration (i.e. one configured with "./configure --client") would place the client files in a "client" subdirectory below the directory specified during configuration. This is the same directory layout as a server installation, where the server and client parts of Xymon are in separate subdirectories. In 4.3.14, the default has changed so a client-only installation now installs in the directory given during the configure-step. The "/client" has been eliminated, so if you are upgrading an existing client you must either move the old client installation one level up from the "client/" directory, or change the Makefile generated by "configure --client" and add "/client" to the XYMONTOPDIR setting. The SNI support added in 4.3.13 causes problems with some older webservers, whose SSL implementation cannot handshake correctly when SNI is used. The failed handshake causes Xymon to report the site as down. In 4.3.14, the default is changed so SNI is disabled. A new "--sni" option was added to xymonnet to control the default setting, and two new tags "sni" and "nosni" can be used in hosts.cfg to control SNI for each host that is tested. Changes for 4.3.13 ================== This is mostly a bugfix release. Apart from simple bugs (see the Changes file), there are some enhancements: Alerts sent via e-mail have <CR><NL> line-endings converted to plain <NL>, since the carriage-return characters would cause some mailers to send alerts as a (binary) attachment to an empty mail message. https-URL's can be forced to use TLS only, by using "httpst://..." similar to how SSLv2 and SSLv3 can be chosen. SSL connections (e.g. for https URL's) now use the TLS "Server Name Indication" (SNI) if your OpenSSL library supports it. This allows testing of systems that have multiple SSL websites located on the same physical IP+port (i.e. virtual name-based hosts). Changes for 4.3.12 ================== NOTE: This release includes a bugfix for a security issue in the xymond_history and xymond_rrd modules. A "drophost" command sent to the xymond port (default: 1984) from an IP listed in the --admin-senders access control list can be used to delete files owned by the user running the xymond daemon. This is allowed by default, so it is highly recommended to install this update. Changes for 4.3.2 - 4.3.11 ========================== See the Changes file for a list of significant changes. These releases are mostly to fix bugs. NOTE: Some configuration parameters have changed, so you must regenerate the top-level Makefile by running the "configure" script before compiling the new version. The inode-check introduced in 4.3.8 and 4.3.10 requires that you update both the Xymon server installation and the Xymon client on the systems where you want to monitor how many inodes are being used.
87 lines
3.2 KiB
Text
87 lines
3.2 KiB
Text
$NetBSD: patch-aa,v 1.5 2014/02/27 20:22:41 spz Exp $
|
|
|
|
add extra options for cases where PREFIX is not in a standard location
|
|
|
|
add INSTALLEXADIR for some pkgsrc magic
|
|
|
|
$NetBSD: patch-aa,v 1.5 2014/02/27 20:22:41 spz Exp $
|
|
|
|
--- configure.server.orig 2014-01-26 12:39:20.000000000 +0000
|
|
+++ configure.server
|
|
@@ -17,6 +17,8 @@ do
|
|
To configure Xymon, the following options are available:
|
|
--rrdinclude DIRECTORY : Specify location of RRDtool include files
|
|
--rrdlib DIRECTORY : Specify location of RRDtool libraries
|
|
+ --pngconfig PROGRAM : Specify location of libpng-config program
|
|
+ --zlib DIRECTORY : Specify location of Z library
|
|
--pcreinclude DIRECTORY : Specify location of PCRE include files
|
|
--pcrelib DIRECTORY : Specify location of PCRE libraries
|
|
--sslinclude DIRECTORY : Specify location of OpenSSL include files
|
|
@@ -25,6 +27,7 @@ do
|
|
--ldaplib DIRECTORY : Specify location of OpenLDAP libraries
|
|
--caresinclude DIRECTORY : Specify location of C-ARES include files
|
|
--careslib DIRECTORY : Specify location of C-ARES libraries
|
|
+ --snmpconfig PROGRAM : Specify location of net-snmp-config program
|
|
--fping FILENAME : Specify location of the Fping program
|
|
|
|
The script will search a number of standard directories for
|
|
@@ -38,6 +41,12 @@ EOF
|
|
"--rrdlib")
|
|
USERRRDLIB="$1"; shift
|
|
;;
|
|
+ "--pngconfig")
|
|
+ USERPNGCONFIG="$1"; shift
|
|
+ ;;
|
|
+ "--zlib")
|
|
+ USERZLIB="$1"; shift
|
|
+ ;;
|
|
"--pcreinclude")
|
|
USERPCREINC="$1"; shift
|
|
;;
|
|
@@ -62,6 +71,9 @@ EOF
|
|
"--careslib")
|
|
USERCARESLIB="$1"; shift
|
|
;;
|
|
+ "--snmpconfig")
|
|
+ USERSNMPCONFIG="$1"; shift
|
|
+ ;;
|
|
"--fping")
|
|
USERFPING="$1"; shift
|
|
;;
|
|
@@ -400,14 +412,16 @@ then
|
|
fi
|
|
echo ""; echo ""
|
|
|
|
-echo "# Toplevel Makefile for Xymon" > Makefile
|
|
+echo "# Toplevel Makefile for Xymon" > Makefile
|
|
|
|
echo "BUILDTOPDIR=\`pwd\`" >>Makefile
|
|
echo "" >>Makefile
|
|
-echo "# configure settings for Xymon" >>Makefile
|
|
+echo "# configure settings for Xymon" >>Makefile
|
|
echo "#" >>Makefile
|
|
echo "# Toplevel dir" >>Makefile
|
|
echo "XYMONTOPDIR = $XYMONTOPDIR" >>Makefile
|
|
+echo "# Linkfarm" >>Makefile
|
|
+echo "XYMONHOME = $XYMONHOME" >>Makefile
|
|
echo "# Server data dir for hist/ etc." >>Makefile
|
|
echo "XYMONVAR = $XYMONVAR" >>Makefile
|
|
echo "# CGI scripts go in CGIDIR" >>Makefile
|
|
@@ -527,6 +541,7 @@ echo "LIBRTDEF = $LIBRTDEF"
|
|
echo "" >>Makefile
|
|
echo "# Net-SNMP settings" >>Makefile
|
|
echo "DOSNMP = $DOSNMP" >>Makefile
|
|
+echo "SNMPCONFIG = $SNMPCONFIG" >>Makefile
|
|
echo "" >>Makefile
|
|
|
|
echo "# Large File Support settings" >>Makefile
|
|
@@ -557,6 +572,9 @@ fi
|
|
if test "$INSTALLETCDIR" != ""; then
|
|
echo "INSTALLETCDIR = $INSTALLETCDIR" >>Makefile
|
|
fi
|
|
+if test "$INSTALLEXADIR" != ""; then
|
|
+ echo "INSTALLEXADIR = $INSTALLEXADIR" >>Makefile
|
|
+fi
|
|
if test "$INSTALLEXTDIR" != ""; then
|
|
echo "INSTALLEXTDIR = $INSTALLEXTDIR" >>Makefile
|
|
fi
|