Date: Wed, 5 Nov 2008 16:07:10 +1030 (CST) From: Jarrod Sayers <jarrod@netleader.com.au> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/128596: [maintainer-update] net-mgmt/nagios: Update to 3.0.5 Message-ID: <200811050537.mA55bACs012257@manhattan.netleader.com.au> Resent-Message-ID: <200811050540.mA55e3gm069034@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 128596 >Category: ports >Synopsis: [maintainer-update] net-mgmt/nagios: Update to 3.0.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Nov 05 05:40:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Jarrod Sayers >Release: FreeBSD 7.0-RELEASE-p5 i386 >Organization: >Environment: System: FreeBSD manhattan.netleader.com.au 7.0-RELEASE-p5 FreeBSD 7.0-RELEASE-p5 #4: Fri Oct 24 14:12:01 CST 2008 root@manhattan.netleader.com.au:/usr/obj/usr/src/sys/MANHATTAN i386 >Description: Update to Nagios 3.0.5: - Security fix for Cross Site Request Forgery (CSRF) bug - Sample audio files for CGIs removed from distribution - Fix for mutliline config file continuation bug - Minor sample config file fix - Added documentation on CGI security issues Note that the change to patch-html-docs-configcgi.html may look unnecessary but while the files readable content remains unchanged, the file has had all of its line endings changed from \n to \r\n, see change log from URL below [1], 751 lines added, 751 lines removed. Boo... [1] http://nagios.cvs.sourceforge.net/viewvc/nagios/nagios/html/docs/configcgi.html?view=log >How-To-Repeat: >Fix: Downloadable diff from: http://www.netleader.com.au/~jarrod/FreeBSD/net-mgmt-nagios-3.0.5.diff --- net-mgmt-nagios-3.0.5.diff begins here --- diff -ruN ports/net-mgmt/nagios.orig/Makefile ports/net-mgmt/nagios/Makefile --- ports/net-mgmt/nagios.orig/Makefile 2008-10-30 06:11:12.000000000 +1030 +++ ports/net-mgmt/nagios/Makefile 2008-11-05 15:04:31.000000000 +1030 @@ -6,8 +6,7 @@ # PORTNAME= nagios -DISTVERSION= 3.0.4 -PORTREVISION= 1 +DISTVERSION= 3.0.5 CATEGORIES= net-mgmt MASTER_SITES= SF diff -ruN ports/net-mgmt/nagios.orig/distinfo ports/net-mgmt/nagios/distinfo --- ports/net-mgmt/nagios.orig/distinfo 2008-10-26 04:18:51.000000000 +1030 +++ ports/net-mgmt/nagios/distinfo 2008-11-05 15:06:45.000000000 +1030 @@ -1,3 +1,3 @@ -MD5 (nagios-3.0.4.tar.gz) = c14f8099488014b1f0e37699448d0a5c -SHA256 (nagios-3.0.4.tar.gz) = 5b4531322530c5866875da41944ee911869fe55c68b2020ecf6d9b89e9299298 -SIZE (nagios-3.0.4.tar.gz) = 2760530 +MD5 (nagios-3.0.5.tar.gz) = c607ffd5f4574cbea345bdf2e02dc480 +SHA256 (nagios-3.0.5.tar.gz) = 754edfdc08ca5e1f1d88d02a44eea53d5cf3e8acef6acf2cb698a0ff219d0cc9 +SIZE (nagios-3.0.5.tar.gz) = 2735018 diff -ruN ports/net-mgmt/nagios.orig/files/patch-html-Makefile.in ports/net-mgmt/nagios/files/patch-html-Makefile.in --- ports/net-mgmt/nagios.orig/files/patch-html-Makefile.in 2008-09-03 10:00:55.000000000 +0930 +++ ports/net-mgmt/nagios/files/patch-html-Makefile.in 2008-11-05 15:11:47.000000000 +1030 @@ -1,5 +1,5 @@ ---- html/Makefile.in.orig 2008-01-10 04:21:25.000000000 +1030 -+++ html/Makefile.in 2008-01-30 23:02:38.000000000 +1030 +--- html/Makefile.in.orig 2008-11-03 04:02:03.000000000 +1030 ++++ html/Makefile.in 2008-11-05 15:11:08.000000000 +1030 @@ -33,39 +33,39 @@ devclean: distclean @@ -29,9 +29,9 @@ for file in *.html; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done + do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done - for file in media/*.wav; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done + # for file in media/*.wav; \ +-# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done ++# do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done for file in stylesheets/*.css; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done + do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done diff -ruN ports/net-mgmt/nagios.orig/files/patch-html-docs-configcgi.html ports/net-mgmt/nagios/files/patch-html-docs-configcgi.html --- ports/net-mgmt/nagios.orig/files/patch-html-docs-configcgi.html 2008-10-23 10:33:15.000000000 +1030 +++ ports/net-mgmt/nagios/files/patch-html-docs-configcgi.html 2008-11-05 15:16:38.000000000 +1030 @@ -1,11 +1,11 @@ ---- html/docs/configcgi.html.orig 2007-08-31 08:05:04.000000000 +0930 -+++ html/docs/configcgi.html 2008-10-23 10:32:37.000000000 +1030 +--- html/docs/configcgi.html.orig 2008-11-05 08:58:39.000000000 +1030 ++++ html/docs/configcgi.html 2008-11-05 15:16:05.000000000 +1030 @@ -616,7 +616,7 @@ - </tr> - <tr> - <td valign=top>Example:</td> --<td><font color="red"><strong>ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$</strong></font></td> -+<td><font color="red"><strong>ping_syntax=/sbin/ping -n -c 5 $HOSTADDRESS$</strong></font></td> - </tr> - </table> - + </tr> + <tr> + <td valign=top>Example:</td> +-<td><font color="red"><strong>ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$</strong></font></td> ++<td><font color="red"><strong>ping_syntax=/sbin/ping -n -c 5 $HOSTADDRESS$</strong></font></td> + </tr> + </table> + diff -ruN ports/net-mgmt/nagios.orig/files/patch-sample-config-nagios.cfg.in ports/net-mgmt/nagios/files/patch-sample-config-nagios.cfg.in --- ports/net-mgmt/nagios.orig/files/patch-sample-config-nagios.cfg.in 2008-10-26 04:18:51.000000000 +1030 +++ ports/net-mgmt/nagios/files/patch-sample-config-nagios.cfg.in 2008-11-05 15:18:48.000000000 +1030 @@ -1,5 +1,5 @@ ---- sample-config/nagios.cfg.in.orig 2008-10-16 09:10:08.000000000 +1030 -+++ sample-config/nagios.cfg.in 2008-10-23 10:35:10.000000000 +1030 +--- sample-config/nagios.cfg.in.orig 2008-11-03 05:21:30.000000000 +1030 ++++ sample-config/nagios.cfg.in 2008-11-05 15:17:25.000000000 +1030 @@ -32,7 +32,7 @@ cfg_file=@sysconfdir@/objects/timeperiods.cfg cfg_file=@sysconfdir@/objects/templates.cfg @@ -9,12 +9,3 @@ cfg_file=@sysconfdir@/objects/localhost.cfg # Definitions for monitoring a Windows machine -@@ -548,7 +548,7 @@ - # These options determine when Nagios will react to detected changes - # in system time (either forward or backwards). - --time_change_threshold= -+time_change_threshold=900 - - - diff -ruN ports/net-mgmt/nagios.orig/pkg-plist ports/net-mgmt/nagios/pkg-plist --- ports/net-mgmt/nagios.orig/pkg-plist 2008-10-30 06:11:12.000000000 +1030 +++ ports/net-mgmt/nagios/pkg-plist 2008-11-05 15:33:44.000000000 +1030 @@ -106,6 +106,7 @@ %%NAGIOSWWWDIR%%/docs/cgiauth.html %%NAGIOSWWWDIR%%/docs/cgiincludes.html %%NAGIOSWWWDIR%%/docs/cgis.html +%%NAGIOSWWWDIR%%/docs/cgisecurity.html %%NAGIOSWWWDIR%%/docs/checkscheduling.html %%NAGIOSWWWDIR%%/docs/clusters.html %%NAGIOSWWWDIR%%/docs/config.html @@ -346,9 +347,6 @@ %%NAGIOSWWWDIR%%/images/zoom2.gif %%NAGIOSWWWDIR%%/index.html %%NAGIOSWWWDIR%%/main.html -%%NAGIOSWWWDIR%%/media/critical.wav -%%NAGIOSWWWDIR%%/media/hostdown.wav -%%NAGIOSWWWDIR%%/media/warning.wav %%NAGIOSWWWDIR%%/robots.txt %%NAGIOSWWWDIR%%/side.html %%NAGIOSWWWDIR%%/stylesheets/avail.css --- net-mgmt-nagios-3.0.5.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811050537.mA55bACs012257>