Date: Sun, 23 Feb 2014 22:20:05 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345774 - in head: . net-mgmt/mk-livestatus net-mgmt/mk-livestatus/files Message-ID: <201402232220.s1NMK5bK060932@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sun Feb 23 22:20:05 2014 New Revision: 345774 URL: http://svnweb.freebsd.org/changeset/ports/345774 QAT: https://qat.redports.org/buildarchive/r345774/ Log: - update to 1.2.4 - add option to build for Nagios3 (default) and Nagios4 - add stage support - remove livecheck patches (broker was removed) Changes: ======== 1.2.4 o nagios4 livestatus support 1.2.4b1 o New header for limiting the execution time of a query o FIX: Parse state of downtime notification log entries correctly o FIX: Limit the number of lines read from a single logfile o FIX: Fix semantics of columns num_services_hard_* 1.2.3.i7 o livedump: new option to mark the mode at the beginning of the dump and documentation fixes o FIX: Fixed incorrect starttime of table statehist entries o FIX: Availability no longer showes incorrect entries when only one logfile exists o FIX: Fixed missing entries in log file and availability view 1.2.3.i5 o Removed "livecheck". It never was really stable. Nagios4 has something similar built in. o table statehist: no longer computes an unmonitored state for hosts and services on certain instances. (showed up as no hosts/services in the multisite gui) o table statehist: fixed SIGSEGV chance on larger queries 1.2.3.i3 o FIX: check_mk snmp checks with a custom check interval no longer have an incorrect staleness value 1.2.3.i2 o new service column staleness: indicator for outdated service checks o new host column staleness: indicator for outdated host checks 1.2.3i1 o Table statehist: Improved detection of vanished hosts and services. Now able to detect and remove nonsense check plugin output o FIX: able to handle equal comment_id between host and service o livestatus.log: show utf-8 decoding problems only with debug logging >=2 o livestatus: fixed incorrect output formatting of comments_with_info column 1.2.2p3 o livestatus: fixed incorrect output formatting of comments_with_info column o table statehist: fixed memory leak Deleted: head/net-mgmt/mk-livestatus/files/patch-src__check_icmp.c head/net-mgmt/mk-livestatus/files/patch-src__livecheck.c Modified: head/UPDATING head/net-mgmt/mk-livestatus/Makefile head/net-mgmt/mk-livestatus/distinfo head/net-mgmt/mk-livestatus/files/patch-src__Makefile.in head/net-mgmt/mk-livestatus/files/pkg-message.in Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun Feb 23 22:13:34 2014 (r345773) +++ head/UPDATING Sun Feb 23 22:20:05 2014 (r345774) @@ -5,11 +5,19 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20140223: + AFFECTS: users of net-mgmt/mk-livestatus + AUTHOR: ohauer@FreeBSD.org + + livecheck was removed in 1.2.3.i5. It never was really stable, Nagios4 + has something similar built in. + Please remove the "livecheck=..." directive from etc/nagios/nagios.cfg. + 20140222: AFFECTS: users of mail/courier-imap AUTHOR: oliver@FreeBSD.org - When using SSL and updating from an older version, run mkdhparams(8) to + When using SSL and updating from an older version, run mkdhparams(8) to create the new TLS_DHPARAMS file which is needed for Courier IMAP 4.15 and up. @@ -148,8 +156,8 @@ you update your ports collection, before To update the existing user on your system, run: - # pw usermod zabbix -s /bin/sh - + # pw usermod zabbix -s /bin/sh + 20140114: AFFECTS: users of www/mod_authnz_external AUTHOR: ohauer@FreeBSD.org Modified: head/net-mgmt/mk-livestatus/Makefile ============================================================================== --- head/net-mgmt/mk-livestatus/Makefile Sun Feb 23 22:13:34 2014 (r345773) +++ head/net-mgmt/mk-livestatus/Makefile Sun Feb 23 22:20:05 2014 (r345774) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mk-livestatus -PORTVERSION= 1.2.2p2 +PORTVERSION= 1.2.4 CATEGORIES= net-mgmt MASTER_SITES= http://mathias-kettner.de/download/ \ LOCAL/ohauer @@ -13,11 +13,21 @@ COMMENT= Nagios event broker module LICENSE= GPLv2 -USE_GMAKE= yes +USES= gmake GNU_CONFIGURE= yes +OPTIONS_SINGLE= NAGIOS +OPTIONS_SINGLE_NAGIOS= NAGIOS3 NAGIOS4 +OPTIONS_DEFAULT= NAGIOS3 + +NAGIOS3_DESC= build for nagios-3.x +NAGIOS4_DESC= build for nagios-4.x + +NAGIOS4_CONFIGURE_ON= --with-nagios4 + +.include <bsd.port.options.mk> + PLIST_FILES= lib/mk-livestatus/unixcat \ - lib/mk-livestatus/livecheck \ lib/mk-livestatus/livestatus.o PLIST_DIRS= lib/${PORTNAME} SUB_FILES= pkg-message @@ -36,24 +46,19 @@ COMMAND_FILE?= /var/spool/nagios/rw/live # perl api is really outdated, do not install! # Actual version can be found on CPAN # http://search.cpan.org/~nierlein/Monitoring-Livestatus/ -NO_STAGE= yes post-extract: @${RM} -rf ${WRKSRC}/api/perl post-patch: -.for i in ${EXAMPLE_FILES} - @${SED} -i '' -e 's|/usr/bin/python|${LOCALBASE}/bin/python|g' \ + @${SED} -i '' -e 's|/usr/bin/python|${LOCALBASE}/bin/python2.7|g' \ -e 's|/var/lib/nagios/rw/live|${COMMAND_FILE}|g' \ - -e 's|/var/run/nagios/rw/live|${COMMAND_FILE}|g' ${WRKSRC}/$i -.endfor + -e 's|/var/run/nagios/rw/live|${COMMAND_FILE}|g' \ + ${EXAMPLE_FILES:S|^|${WRKSRC}/|} @${SED} -i '' -e 's|/usr/local/nagios/var/rw/live|${COMMAND_FILE}|' \ ${WRKSRC}/src/livestatus.h post-install: -.if !defined(NOPORTEXAMPLES) - @${MKDIR} ${EXAMPLESDIR} - ( cd ${WRKSRC} && ${COPYTREE_SHARE} api\* ${EXAMPLESDIR}/ ) -.endif - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ( cd ${WRKSRC} && ${COPYTREE_SHARE} api\* ${STAGEDIR}${EXAMPLESDIR}/ ) .include <bsd.port.mk> Modified: head/net-mgmt/mk-livestatus/distinfo ============================================================================== --- head/net-mgmt/mk-livestatus/distinfo Sun Feb 23 22:13:34 2014 (r345773) +++ head/net-mgmt/mk-livestatus/distinfo Sun Feb 23 22:20:05 2014 (r345774) @@ -1,2 +1,2 @@ -SHA256 (check_mk/mk-livestatus-1.2.2p2.tar.gz) = 77213f22898cd6280196293743e9ef9486ffccca878350ed277d358146a6d0b5 -SIZE (check_mk/mk-livestatus-1.2.2p2.tar.gz) = 382165 +SHA256 (check_mk/mk-livestatus-1.2.4.tar.gz) = 1ae6c30ac2f7f182b2a4d5ca01d09cd84afb300ad75fea3bb5db8f5ae95d4eff +SIZE (check_mk/mk-livestatus-1.2.4.tar.gz) = 434179 Modified: head/net-mgmt/mk-livestatus/files/patch-src__Makefile.in ============================================================================== --- head/net-mgmt/mk-livestatus/files/patch-src__Makefile.in Sun Feb 23 22:13:34 2014 (r345773) +++ head/net-mgmt/mk-livestatus/files/patch-src__Makefile.in Sun Feb 23 22:20:05 2014 (r345774) @@ -1,6 +1,6 @@ ---- ./src/Makefile.in.orig 2013-06-10 14:49:28.000000000 +0200 -+++ ./src/Makefile.in 2013-06-16 22:13:23.000000000 +0200 -@@ -264,7 +264,7 @@ +--- ./src/Makefile.in.orig 2014-02-10 10:54:03.000000000 +0100 ++++ ./src/Makefile.in 2014-02-20 22:47:49.000000000 +0100 +@@ -260,7 +260,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ @@ -9,11 +9,19 @@ build_alias = @build_alias@ builddir = @builddir@ datadir = @datadir@ -@@ -1966,7 +1966,6 @@ - $(INSTALL_PROGRAM) livestatus.o $(DESTDIR)$(pkglibdir) - rm -f $(DESTDIR)$(pkglibdir)/livestatus.so - $(INSTALL_PROGRAM) livecheck $(DESTDIR)$(pkglibdir) -- rm -f $(DESTDIR)$(bindir)/livecheck +@@ -366,15 +366,6 @@ + test -z "$$list2" || { \ + echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(INSTALL_DATA) $$list2 "$(DESTDIR)$(pkglibdir)" || exit $$?; } +- @$(POST_INSTALL) +- @list='$(pkglib_LIBRARIES)'; test -n "$(pkglibdir)" || list=; \ +- for p in $$list; do \ +- if test -f $$p; then \ +- $(am__strip_dir) \ +- echo " ( cd '$(DESTDIR)$(pkglibdir)' && $(RANLIB) $$f )"; \ +- ( cd "$(DESTDIR)$(pkglibdir)" && $(RANLIB) $$f ) || exit $$?; \ +- else :; fi; \ +- done - clean-local: - rm -f *~ + uninstall-pkglibLIBRARIES: + @$(NORMAL_UNINSTALL) Modified: head/net-mgmt/mk-livestatus/files/pkg-message.in ============================================================================== --- head/net-mgmt/mk-livestatus/files/pkg-message.in Sun Feb 23 22:13:34 2014 (r345773) +++ head/net-mgmt/mk-livestatus/files/pkg-message.in Sun Feb 23 22:20:05 2014 (r345774) @@ -12,4 +12,7 @@ Notes: to %%PREFIX%%/lib/mk-livestatus in order to avoid a conflict with sysutils/ucspi-unix + * livecheck was removed in 1.2.3.i5, + Please adjust your "broker_module=..." directive in etc/nagios/nagios.cfg! + =============================================================================
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402232220.s1NMK5bK060932>