pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net - fix FreeBSD/Dragonfly properly
details: https://anonhg.NetBSD.org/pkgsrc/rev/bad5aebc4ece
branches: trunk
changeset: 609867:bad5aebc4ece
user: spz <spz%pkgsrc.org@localhost>
date: Thu Oct 11 18:42:19 2012 +0000
description:
- 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.
diffstat:
net/xymon/Makefile | 7 ++--
net/xymon/distinfo | 20 ++++++------
net/xymon/patches/patch-ab | 30 ++++++++++----------
net/xymon/patches/patch-ad | 17 +++++++----
net/xymon/patches/patch-ae | 5 ++-
net/xymon/patches/patch-ah | 18 ++++-------
net/xymon/patches/patch-build_Makefile.FreeBSD | 14 +++++++++
net/xymon/patches/patch-build_rrd.sh | 8 ++--
net/xymon/patches/patch-lib_sha2.c | 13 --------
net/xymonclient/Makefile | 7 ++--
net/xymonclient/distinfo | 23 +++++++--------
net/xymonclient/patches/patch-aa | 4 ++-
net/xymonclient/patches/patch-ab | 24 ++++++++-------
net/xymonclient/patches/patch-ac | 4 ++-
net/xymonclient/patches/patch-ad | 5 ++-
net/xymonclient/patches/patch-ae | 17 +++++++----
net/xymonclient/patches/patch-af | 4 ++-
net/xymonclient/patches/patch-ag | 15 ----------
net/xymonclient/patches/patch-build_Makefile.FreeBSD | 14 +++++++++
net/xymonclient/patches/patch-lib_sha2.c | 13 --------
20 files changed, 133 insertions(+), 129 deletions(-)
diffs (truncated from 522 to 300 lines):
diff -r 60a7f8a9f4e0 -r bad5aebc4ece net/xymon/Makefile
--- a/net/xymon/Makefile Thu Oct 11 18:23:12 2012 +0000
+++ b/net/xymon/Makefile Thu Oct 11 18:42:19 2012 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2012/10/08 23:02:19 adam Exp $
+# $NetBSD: Makefile,v 1.26 2012/10/11 18:42:19 spz Exp $
#
-DISTNAME= xymon-4.3.7
-PKGREVISION= 5
+DISTNAME= xymon-4.3.10
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xymon/}
@@ -17,7 +16,7 @@
CONFLICTS+= hobbitmon-[0-9]*
CONFLICTS+= hobbitclient-[0-9]*
-DEPENDS+= fping>2:../../net/fping
+DEPENDS+= fping>=2:../../net/fping
# xymonclient ought to be the same version as the server, modulo nbN
DEPENDS+= xymonclient>=4.3.0b2:../../net/xymonclient
diff -r 60a7f8a9f4e0 -r bad5aebc4ece net/xymon/distinfo
--- a/net/xymon/distinfo Thu Oct 11 18:23:12 2012 +0000
+++ b/net/xymon/distinfo Thu Oct 11 18:42:19 2012 +0000
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.9 2012/08/13 18:47:40 marino Exp $
+$NetBSD: distinfo,v 1.10 2012/10/11 18:42:19 spz Exp $
-SHA1 (xymon-4.3.7.tar.gz) = 29339157a1a6155d134ed1ad9985391d43034ee8
-RMD160 (xymon-4.3.7.tar.gz) = 9547eac47a5893f978cace54b5761e9cabe75941
-Size (xymon-4.3.7.tar.gz) = 2740378 bytes
+SHA1 (xymon-4.3.10.tar.gz) = d37765da5741adc4282e081e3ad59862eb22353f
+RMD160 (xymon-4.3.10.tar.gz) = df5e01ab4528bc1146cdf784bbf69616f743bfa1
+Size (xymon-4.3.10.tar.gz) = 2754807 bytes
SHA1 (patch-aa) = c74991627bfc4286a67f66e45915c3af69b38c2f
-SHA1 (patch-ab) = d6079a2f09c38f701c553ab9744731050f66772c
+SHA1 (patch-ab) = 2914624fde86a888639be356c6f28eefd47b5eb6
SHA1 (patch-ac) = f65831af9899167e291aabd691945e9e4fc1d44b
-SHA1 (patch-ad) = dadd2d81ed55c70f03994b2d868cfe643969a8ba
-SHA1 (patch-ae) = aa29eefcf9f0fa87014166692dcf146cebd70ef5
+SHA1 (patch-ad) = 218ef05eb3d51d779230c357d731b2f904d4559f
+SHA1 (patch-ae) = 7519eaeecab9f5d4b6956e0fd426548ec7990a0b
SHA1 (patch-af) = e8c3fd4ed1de6f7a74db8fac152534a1fe9f29f5
-SHA1 (patch-ah) = 29942670246f55cf4e703b028cd9a0dcb0acb681
-SHA1 (patch-build_rrd.sh) = 6c9393b93265d3c6d5bda801a875ec66f3759b01
+SHA1 (patch-ah) = 03fee4b97cc3301339ace1ce459e7b679b83f96a
+SHA1 (patch-build_Makefile.FreeBSD) = e58b50f35068cba6fed89cc21bcc4eb7d30efd23
+SHA1 (patch-build_rrd.sh) = cfafece75defb13b413917bfddedb41cb9bb3c8b
SHA1 (patch-build_snmp.sh) = 4141c6e2bebea078ac662b7585e579f2af8ee64f
SHA1 (patch-configure) = 7b71ed7a567124a2aa36d9bf9188209649e88a4d
-SHA1 (patch-lib_sha2.c) = 363b1680bfb70acfd5a4f768fb9688f4511846be
SHA1 (patch-xymond_rrd_do__vmstat.c) = 8062acc24e9b0e767c5abd3373641aa7b9a5b2ae
diff -r 60a7f8a9f4e0 -r bad5aebc4ece net/xymon/patches/patch-ab
--- a/net/xymon/patches/patch-ab Thu Oct 11 18:23:12 2012 +0000
+++ b/net/xymon/patches/patch-ab Thu Oct 11 18:42:19 2012 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.3 2011/10/16 15:19:08 spz Exp $
+$NetBSD: patch-ab,v 1.4 2012/10/11 18:42:19 spz Exp $
add SNMPCONFIG var for non-standard PREFIX
add lots of pkgsrc magic
---- build/Makefile.rules.orig 2011-09-03 13:57:39.000000000 +0000
+--- build/Makefile.rules.orig 2012-08-02 11:20:21.000000000 +0000
+++ build/Makefile.rules
@@ -22,9 +22,9 @@ else
INSTALLTARGETS = install-client install-clientmsg
@@ -28,16 +28,16 @@
ifndef INSTALLEXTDIR
INSTALLEXTDIR = $(XYMONHOME)/ext
endif
-@@ -94,7 +97,7 @@ xymongen-build: lib-build common-build
+@@ -95,7 +98,7 @@ xymongen-build: lib-build common-build
xymonnet-build: lib-build common-build
-- CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" RPATHOPT="$(RPATHOPT)" SSLFLAGS="$(SSLFLAGS)" SSLINCDIR="$(SSLINCDIR)" SSLLIBS="$(SSLLIBS)" LDAPFLAGS="$(LDAPFLAGS)"
LDAPINCDIR="$(LDAPINCDIR)" LDAPLIBS="$(LDAPLIBS)" DOSNMP="$(DOSNMP)" NETLIBS="$(NETLIBS)" XYMONHOME="$(XYMONHOME)" ARESVER="$(ARESVER)" RUNTIMEDEFS="$(RUNTIMEDEFS)" PCREINCDIR="$(PCREINCDIR)"
PCRELIBS="$(PCRELIBS)" LIBRTDEF="$(LIBRTDEF)" $(MAKE) -C xymonnet all
-+ CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" RPATHOPT="$(RPATHOPT)" SSLFLAGS="$(SSLFLAGS)" SSLINCDIR="$(SSLINCDIR)" SSLLIBS="$(SSLLIBS)" LDAPFLAGS="$(LDAPFLAGS)"
LDAPINCDIR="$(LDAPINCDIR)" LDAPLIBS="$(LDAPLIBS)" DOSNMP="$(DOSNMP)" SNMPCONFIG="$(SNMPCONFIG)" NETLIBS="$(NETLIBS)" XYMONHOME="$(XYMONHOME)" ARESVER="$(ARESVER)" RUNTIMEDEFS="$(RUNTIMEDEFS)"
PCREINCDIR="$(PCREINCDIR)" PCRELIBS="$(PCRELIBS)" LIBRTDEF="$(LIBRTDEF)" $(MAKE) -C xymonnet all
+- CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" RPATHOPT="$(RPATHOPT)" SSLFLAGS="$(SSLFLAGS)" SSLINCDIR="$(SSLINCDIR)" SSLLIBS="$(SSLLIBS)" DOLDAP="$(DOLDAP)" LDAPFLAGS="$(LDAPFLAGS)"
LDAPINCDIR="$(LDAPINCDIR)" LDAPLIBS="$(LDAPLIBS)" DOSNMP="$(DOSNMP)" NETLIBS="$(NETLIBS)" XYMONHOME="$(XYMONHOME)" ARESVER="$(ARESVER)" FPINGVER="$(FPINGVER)" RUNTIMEDEFS="$(RUNTIMEDEFS)"
PCREINCDIR="$(PCREINCDIR)" PCRELIBS="$(PCRELIBS)" SQLITELIBS="$(SQLITELIBS)" ZLIBINCDIR="$(ZLIBINCDIR)" ZLIBLIBS="$(ZLIBLIBS)" LIBRTDEF="$(LIBRTDEF)" $(MAKE) -C xymonnet all
++ CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" RPATHOPT="$(RPATHOPT)" SSLFLAGS="$(SSLFLAGS)" SSLINCDIR="$(SSLINCDIR)" SSLLIBS="$(SSLLIBS)" DOLDAP="$(DOLDAP)" LDAPFLAGS="$(LDAPFLAGS)"
LDAPINCDIR="$(LDAPINCDIR)" LDAPLIBS="$(LDAPLIBS)" DOSNMP="$(DOSNMP)" SNMPCONFIG="$(SNMPCONFIG)" NETLIBS="$(NETLIBS)" XYMONHOME="$(XYMONHOME)" ARESVER="$(ARESVER)" FPINGVER="$(FPINGVER)"
RUNTIMEDEFS="$(RUNTIMEDEFS)" PCREINCDIR="$(PCREINCDIR)" PCRELIBS="$(PCRELIBS)" SQLITELIBS="$(SQLITELIBS)" ZLIBINCDIR="$(ZLIBINCDIR)" ZLIBLIBS="$(ZLIBLIBS)" LIBRTDEF="$(LIBRTDEF)" $(MAKE) -C xymonnet
all
xymonproxy-build: lib-build common-build
- CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" RPATHOPT="$(RPATHOPT)" NETLIBS="$(NETLIBS)" LIBRTDEF="$(LIBRTDEF)" XYMONHOME="$(XYMONHOME)" $(MAKE) -C xymonproxy all
-@@ -167,72 +170,77 @@ install-servermsg:
+ CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" RPATHOPT="$(RPATHOPT)" SSLLIBS="$(SSLLIBS)" NETLIBS="$(NETLIBS)" LIBRTDEF="$(LIBRTDEF)" XYMONHOME="$(XYMONHOME)" $(MAKE) -C xymonproxy all
+@@ -168,72 +171,77 @@ install-servermsg:
@echo "To view the Xymon webpages, go to http://${XYMONHOSTNAME}${XYMONHOSTURL}";
install-dirs:
@@ -123,7 +123,7 @@
mkdir -p $(INSTALLROOT)$(XYMONVAR)/acks
ifndef PKGBUILD
-@@ -283,25 +291,25 @@ ifndef PKGBUILD
+@@ -284,25 +292,25 @@ ifndef PKGBUILD
endif
install-common: install-dirs
@@ -139,24 +139,24 @@
+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)"
INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install-nocgi
install-xymonnet: install-common
-- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" DOSNMP="$(DOSNMP)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)"
INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C xymonnet install
-+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" DOSNMP="$(DOSNMP)" SNMPCONFIG="$(SNMPCONFIG)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)"
INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C
xymonnet install
+- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" FPINGVER="$(FPINGVER)" DOSNMP="$(DOSNMP)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)"
INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C
xymonnet install
++ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" FPINGVER="$(FPINGVER)" DOSNMP="$(DOSNMP)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)"
INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C
xymonnet install
install-xymonproxy: install-common
- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)"
INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymonproxy install
+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)"
INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymonproxy install
install-xymond: install-common
-- MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)"
XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)"
INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" HTTPDGID="$(HTTPDGID)" $(MAKE) -C xymond install
-+ MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)"
XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)"
INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLEXADIR)/www" HTTPDGID="$(HTTPDGID)" $(MAKE) -C xymond install
+- DORRD="$(DORRD)" MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)"
XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)"
INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" HTTPDGID="$(HTTPDGID)" $(MAKE) -C xymond install
++ DORRD="$(DORRD)" MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)"
XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)"
INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLEXADIR)/www" HTTPDGID="$(HTTPDGID)" $(MAKE) -C xymond install
install-web: install-common
-- MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)"
XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)"
INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install
-+ MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)"
XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)"
INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install
+- DORRD="$(DORRD)" MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)"
XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)"
INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install
++ DORRD="$(DORRD)" MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)"
XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)"
INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install
# NOTE: This one is normally not used - man-page install is done by the sub-Makefiles during "make install"
-@@ -314,10 +322,10 @@ install-man:
+@@ -315,10 +323,10 @@ install-man:
XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" $(MAKE) -C web install-man
install-docs:
diff -r 60a7f8a9f4e0 -r bad5aebc4ece net/xymon/patches/patch-ad
--- a/net/xymon/patches/patch-ad Thu Oct 11 18:23:12 2012 +0000
+++ b/net/xymon/patches/patch-ad Thu Oct 11 18:42:19 2012 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-ad,v 1.5 2011/10/15 23:04:51 spz Exp $
+$NetBSD: patch-ad,v 1.6 2012/10/11 18:42:19 spz Exp $
- netbsd has stdint.h
- remove stray commas
---- build/Makefile.NetBSD.orig 2011-03-08 17:20:28.000000000 +0000
+--- build/Makefile.NetBSD.orig 2012-08-01 08:48:15.000000000 +0000
+++ build/Makefile.NetBSD
@@ -1,7 +1,7 @@
# Xymon compile-time settings for NetBSD systems
@@ -14,12 +14,17 @@
# NETLIBS: None needed
NETLIBS =
-@@ -10,12 +10,12 @@ NETLIBS =
- CC= gcc
- PKGDIR?=/usr/pkg
- CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT $(LFSDEF) $(OSDEF) \
+@@ -12,16 +12,16 @@ CC= gcc
+ GCCVER := $(shell gcc -dumpversion|cut -d. -f1)
+ ifeq ($(GCCVER),4)
+ CFLAGS = -g -O2 -Wall -Wno-unused -Wno-pointer-sign -D_REENTRANT $(LFSDEF) $(OSDEF) \
- -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib
+ -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib
+ else
+ CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT $(LFSDEF) $(OSDEF) \
+- -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib
++ -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib
+ endif
RPATH = "-Wl,--rpath,"
# Compile flags for debugging
diff -r 60a7f8a9f4e0 -r bad5aebc4ece net/xymon/patches/patch-ae
--- a/net/xymon/patches/patch-ae Thu Oct 11 18:23:12 2012 +0000
+++ b/net/xymon/patches/patch-ae Thu Oct 11 18:42:19 2012 +0000
@@ -1,4 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2011/04/22 14:52:18 spz Exp $
+$NetBSD: patch-ae,v 1.3 2012/10/11 18:42:19 spz Exp $
+
+allow setting the path to wc and df via environment variable WC and DF,
+respectively
--- build/bb-commands.sh.orig 2011-03-08 17:20:28.000000000 +0000
+++ build/bb-commands.sh
diff -r 60a7f8a9f4e0 -r bad5aebc4ece net/xymon/patches/patch-ah
--- a/net/xymon/patches/patch-ah Thu Oct 11 18:23:12 2012 +0000
+++ b/net/xymon/patches/patch-ah Thu Oct 11 18:42:19 2012 +0000
@@ -1,27 +1,23 @@
-$NetBSD: patch-ah,v 1.2 2011/10/16 15:19:09 spz Exp $
+$NetBSD: patch-ah,v 1.3 2012/10/11 18:42:19 spz Exp $
the c-ares dependencies are being difficult, manipulate it into working
use a variable for the path to net-snmp-config, for cases with nonstandard
locations
---- xymonnet/Makefile.orig 2011-08-19 11:26:58.000000000 +0000
+--- xymonnet/Makefile.orig 2012-07-13 16:50:38.000000000 +0000
+++ xymonnet/Makefile
-@@ -59,6 +59,8 @@ c-ares/configure: c-ares-$(ARESVER).tar.
+@@ -66,6 +66,8 @@ c-ares/configure: c-ares-$(ARESVER).tar.
mv c-ares-$(ARESVER) c-ares
# Must touch "configure", or it will trigger a rebuild because it is older than the tar.gz file.
touch c-ares/configure
+ mkdir c-ares/.libs
+ touch c-ares/.libs/libcares.la
- beastat: $(BEASTATOBJS) ../lib/libxymon.a
- $(CC) $(CFLAGS) -o $@ $(RPATHOPT) $(BEASTATOBJS) ../lib/libxymon.a $(PCRELIBS) $(NETLIBS) $(LIBRTDEF)
-@@ -72,10 +74,10 @@ contest: contest.c httptest.o dns.o dns2
-
-
- xymon-snmpcollect: xymon-snmpcollect.o $(LIBOBJS)
-- $(CC) $(LDFLAGS) -o $@ xymon-snmpcollect.o `net-snmp-config --libs` ../lib/libxymon.a $(SSLLIBS) $(NETLIBS) $(LIBRTDEF)
-+ $(CC) $(LDFLAGS) -o $@ xymon-snmpcollect.o `${SNMPCONFIG} --libs` ../lib/libxymon.a $(SSLLIBS) $(NETLIBS) $(LIBRTDEF)
+ beastat: $(BEASTATOBJS) $(XYMONCOMMLIB) $(XYMONTIMELIB)
+ $(CC) $(CFLAGS) -o $@ $(RPATHOPT) $(BEASTATOBJS) $(XYMONCOMMLIBS) $(XYMONTIMELIBS) $(PCRELIBS)
+@@ -82,7 +84,7 @@ xymon-snmpcollect: xymon-snmpcollect.o $
+ $(CC) $(LDFLAGS) -o $@ xymon-snmpcollect.o `net-snmp-config --libs` ../lib/libxymon.a $(XYMONCOMMLIBS) $(XYMONTIMELIBS)
xymon-snmpcollect.o: xymon-snmpcollect.c
- $(CC) $(CFLAGS) -I. `net-snmp-config --cflags` -c -o $@ xymon-snmpcollect.c
diff -r 60a7f8a9f4e0 -r bad5aebc4ece net/xymon/patches/patch-build_Makefile.FreeBSD
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/xymon/patches/patch-build_Makefile.FreeBSD Thu Oct 11 18:42:19 2012 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-build_Makefile.FreeBSD,v 1.1 2012/10/11 18:42:19 spz Exp $
+
+FreeBSD has stdint.h
+
+--- build/Makefile.FreeBSD.orig 2011-03-08 17:20:28.000000000 +0000
++++ build/Makefile.FreeBSD
+@@ -1,6 +1,6 @@
+ # Xymon compile-time settings for FreeBSD systems
+
+-OSDEF = -DBSD
++OSDEF = -DBSD -DHAVE_STDINT_H
+
+ # NETLIBS: None needed
+ NETLIBS =
diff -r 60a7f8a9f4e0 -r bad5aebc4ece net/xymon/patches/patch-build_rrd.sh
--- a/net/xymon/patches/patch-build_rrd.sh Thu Oct 11 18:23:12 2012 +0000
+++ b/net/xymon/patches/patch-build_rrd.sh Thu Oct 11 18:42:19 2012 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-build_rrd.sh,v 1.2 2011/10/16 15:19:09 spz Exp $
+$NetBSD: patch-build_rrd.sh,v 1.3 2012/10/11 18:42:19 spz Exp $
make it possible to deal with nonstandard locations of libpng* and libz*
---- build/rrd.sh.orig 2011-03-08 17:20:28.000000000 +0000
+--- build/rrd.sh.orig 2012-07-31 13:51:12.000000000 +0000
+++ build/rrd.sh
@@ -70,6 +70,12 @@
if test "$USERRRDLIB" != ""; then
@@ -15,5 +15,5 @@
+ ZLIB="$USERZLIB"
+ fi
- if test -z "$RRDINC" -o -z "$RRDLIB"; then
- echo "RRDtool include- or library-files not found. These are REQUIRED for Xymon"
+ # See if it builds
+ RRDOK="YES"
diff -r 60a7f8a9f4e0 -r bad5aebc4ece net/xymon/patches/patch-lib_sha2.c
--- a/net/xymon/patches/patch-lib_sha2.c Thu Oct 11 18:23:12 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-lib_sha2.c,v 1.1 2012/08/13 18:47:40 marino Exp $
-
---- lib/sha2.c.orig 2011-03-08 17:20:28.000000000 +0000
-+++ lib/sha2.c
-@@ -51,7 +51,7 @@
- #define SHA384_BLOCK_SIZE SHA512_BLOCK_SIZE
- #define SHA224_BLOCK_SIZE SHA256_BLOCK_SIZE
-
--#ifdef HAVE_STDINT_H
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <stdint.h>
- #else
- typedef unsigned char uint8_t;
diff -r 60a7f8a9f4e0 -r bad5aebc4ece net/xymonclient/Makefile
--- a/net/xymonclient/Makefile Thu Oct 11 18:23:12 2012 +0000
+++ b/net/xymonclient/Makefile Thu Oct 11 18:42:19 2012 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2012/08/13 17:28:24 marino Exp $
+# $NetBSD: Makefile,v 1.15 2012/10/11 18:42:19 spz Exp $
#
-DISTNAME= xymon-4.3.7
-PKGNAME= xymonclient-4.3.7
-PKGREVISION= 1
+DISTNAME= xymon-4.3.10
+PKGNAME= xymonclient-4.3.10
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xymon/}
diff -r 60a7f8a9f4e0 -r bad5aebc4ece net/xymonclient/distinfo
--- a/net/xymonclient/distinfo Thu Oct 11 18:23:12 2012 +0000
+++ b/net/xymonclient/distinfo Thu Oct 11 18:42:19 2012 +0000
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.9 2012/08/13 17:28:24 marino Exp $
+$NetBSD: distinfo,v 1.10 2012/10/11 18:42:19 spz Exp $
-SHA1 (xymon-4.3.7.tar.gz) = 29339157a1a6155d134ed1ad9985391d43034ee8
Home |
Main Index |
Thread Index |
Old Index