Does anyone running nagios on -current want to try this?
----- Forwarded message from Stuart Henderson <st...@openbsd.org> ----- From: Stuart Henderson <st...@openbsd.org> Date: Mon, 11 Aug 2014 13:04:20 +0100 To: Pete Vickers <peter.vick...@gmail.com> Cc: ports@openbsd.org User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: Nagios port, update to address bug ? On 2014/08/11 11:02, Pete Vickers wrote: > Hi, > > I use the Nagios port (net/nagios) but I keep hitting this bug in it: > > http://sourceforge.net/p/nagios/nagioscore/ci/a604d5e0b352789dbb151a8748d6bc975f8b7512/ > > is it possible incorporate that patch into the ports version ? ( or bump up > the the next Nagios minor version ?) > > I'm happy to send beer/pizza etc to motivate/compensate if necessary. > > thanks > > /Pete > Please try this update diff and report back, I replaced my Nagios instances with Icinga so I can't test it myself. Index: Makefile =================================================================== RCS file: /cvs/ports/net/nagios/nagios/Makefile,v retrieving revision 1.70 diff -u -p -r1.70 Makefile --- Makefile 19 Jul 2014 22:36:13 -0000 1.70 +++ Makefile 11 Aug 2014 12:04:03 -0000 @@ -3,9 +3,7 @@ COMMENT-main= host and service monitor COMMENT-web= cgis and webpages for nagios -V= 4.0.1 -REVISION-main= 4 -REVISION-web= 1 +V= 4.0.7 DISTNAME= nagios-$V PKGNAME-main= nagios-$V PKGNAME-web= nagios-web-$V Index: distinfo =================================================================== RCS file: /cvs/ports/net/nagios/nagios/distinfo,v retrieving revision 1.29 diff -u -p -r1.29 distinfo --- distinfo 7 Nov 2013 10:31:38 -0000 1.29 +++ distinfo 11 Aug 2014 12:04:03 -0000 @@ -1,2 +1,2 @@ -SHA256 (nagios-4.0.1.tar.gz) = brZxh+8/96adzQKnFydBuM0TOUOYgatRfehrcjfW9zU= -SIZE (nagios-4.0.1.tar.gz) = 1695367 +SHA256 (nagios-4.0.7.tar.gz) = 7x3h0Qb2VyqIVH8+03p0TF1Pp3iFnORPyQQ9pZfFB5k= +SIZE (nagios-4.0.7.tar.gz) = 1798034 Index: patches/patch-cgi_Makefile_in =================================================================== RCS file: /cvs/ports/net/nagios/nagios/patches/patch-cgi_Makefile_in,v retrieving revision 1.6 diff -u -p -r1.6 patch-cgi_Makefile_in --- patches/patch-cgi_Makefile_in 7 Nov 2013 10:31:38 -0000 1.6 +++ patches/patch-cgi_Makefile_in 11 Aug 2014 12:04:03 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-cgi_Makefile_in,v 1.6 2013/11/07 10:31:38 rpe Exp $ ---- cgi/Makefile.in.orig Wed Oct 16 01:36:42 2013 -+++ cgi/Makefile.in Fri Nov 1 17:45:15 2013 -@@ -182,9 +182,9 @@ install-unstripped: +--- cgi/Makefile.in.orig Tue Jun 3 15:41:42 2014 ++++ cgi/Makefile.in Mon Aug 11 12:58:33 2014 +@@ -201,9 +201,9 @@ install-unstripped: $(MAKE) install-basic install-basic: Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/net/nagios/nagios/patches/patch-configure,v retrieving revision 1.15 diff -u -p -r1.15 patch-configure --- patches/patch-configure 7 Nov 2013 10:31:38 -0000 1.15 +++ patches/patch-configure 11 Aug 2014 12:04:03 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure,v 1.15 2013/11/07 10:31:38 rpe Exp $ ---- configure.orig Wed Oct 16 01:36:42 2013 -+++ configure Fri Nov 1 17:47:13 2013 -@@ -1077,7 +1077,7 @@ do +--- configure.orig Tue Jun 3 15:41:42 2014 ++++ configure Mon Aug 11 12:59:30 2014 +@@ -1094,7 +1094,7 @@ do ac_prev=sysconfdir ;; -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) @@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.15 2013/11 -target | --target | --targe | --targ | --tar | --ta | --t) ac_prev=target_alias ;; -@@ -4633,7 +4633,7 @@ cat >>confdefs.h <<_ACEOF +@@ -6014,7 +6014,7 @@ cat >>confdefs.h <<_ACEOF #define DEFAULT_NAGIOS_GROUP "$nagios_grp" _ACEOF @@ -19,16 +19,16 @@ $OpenBSD: patch-configure,v 1.15 2013/11 -@@ -4890,7 +4890,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1). +@@ -6701,7 +6701,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1). $as_echo_n "(cached) " >&6 else ac_save_LIBS="$LIBS" - LIBS="-lgd -lttf -lpng -ljpeg -lz -lm $LIBS" + LIBS="-lgd -lfontconfig -lfreetype -lpng -ljpeg -lz -lm $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -4921,7 +4921,7 @@ fi + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -6761,7 +6761,7 @@ fi $as_echo "yes" >&6; } GDLIBFOUND=yep @@ -36,8 +36,8 @@ $OpenBSD: patch-configure,v 1.15 2013/11 + GDLIBS="-lgd -lfontconfig -lfreetype -lpng -ljpeg -lz -lm" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -@@ -5432,9 +5432,9 @@ $as_echo_n "checking for linker flags for loadable mod + { $as_echo "$as_me:$LINENO: result: no" >&5 +@@ -7766,9 +7766,9 @@ $as_echo_n "checking for linker flags for loadable mod MOD_LDFLAGS="-shared" MOD_CFLAGS="-fPIC" ;; Index: pkg/PLIST-web =================================================================== RCS file: /cvs/ports/net/nagios/nagios/pkg/PLIST-web,v retrieving revision 1.8 diff -u -p -r1.8 PLIST-web --- pkg/PLIST-web 5 May 2013 22:13:48 -0000 1.8 +++ pkg/PLIST-web 11 Aug 2014 12:04:03 -0000 @@ -1,5 +1,6 @@ @comment $OpenBSD: PLIST-web,v 1.8 2013/05/05 22:13:48 rpe Exp $ cgi-bin/nagios/ +@bin cgi-bin/nagios/archivejson.cgi @bin cgi-bin/nagios/avail.cgi @bin cgi-bin/nagios/cmd.cgi @bin cgi-bin/nagios/config.cgi @@ -7,9 +8,11 @@ cgi-bin/nagios/ @bin cgi-bin/nagios/histogram.cgi @bin cgi-bin/nagios/history.cgi @bin cgi-bin/nagios/notifications.cgi +@bin cgi-bin/nagios/objectjson.cgi @bin cgi-bin/nagios/outages.cgi @bin cgi-bin/nagios/showlog.cgi @bin cgi-bin/nagios/status.cgi +@bin cgi-bin/nagios/statusjson.cgi @bin cgi-bin/nagios/statusmap.cgi @bin cgi-bin/nagios/statuswml.cgi @bin cgi-bin/nagios/statuswrl.cgi @@ -352,10 +355,15 @@ nagios/includes/utils.inc.php nagios/index.php nagios/js/ nagios/js/jquery-1.7.1.min.js +nagios/js/jsonquery.js +nagios/jsonquery.html nagios/main.php nagios/media/ nagios/robots.txt +nagios/rss-corebanner.php +nagios/rss-corefeed.html nagios/rss-corefeed.php +nagios/rss-newsfeed.html nagios/rss-newsfeed.php nagios/side.php nagios/ssi/ @@ -368,6 +376,7 @@ nagios/stylesheets/config.css nagios/stylesheets/extinfo.css nagios/stylesheets/histogram.css nagios/stylesheets/history.css +nagios/stylesheets/jsonquery.css nagios/stylesheets/ministatus.css nagios/stylesheets/notifications.css nagios/stylesheets/outages.css ----- End forwarded message -----
