diff options
| -rw-r--r-- | net-mgmt/nagios/Makefile | 3 | ||||
| -rw-r--r-- | net-mgmt/nagios/distinfo | 6 | ||||
| -rw-r--r-- | net-mgmt/nagios/files/patch-html-Makefile.in | 10 | ||||
| -rw-r--r-- | net-mgmt/nagios/files/patch-html-docs-configcgi.html | 20 | ||||
| -rw-r--r-- | net-mgmt/nagios/files/patch-sample-config-nagios.cfg.in | 13 | ||||
| -rw-r--r-- | net-mgmt/nagios/pkg-plist | 4 |
6 files changed, 22 insertions, 34 deletions
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile index 1cd3ddbcc8fd..1f6aa1a951c9 100644 --- a/net-mgmt/nagios/Makefile +++ b/net-mgmt/nagios/Makefile @@ -6,8 +6,7 @@ # PORTNAME= nagios -DISTVERSION= 3.0.4 -PORTREVISION= 1 +DISTVERSION= 3.0.5 CATEGORIES= net-mgmt MASTER_SITES= SF diff --git a/net-mgmt/nagios/distinfo b/net-mgmt/nagios/distinfo index 315e31d577f6..c5d21041c42d 100644 --- a/net-mgmt/nagios/distinfo +++ b/net-mgmt/nagios/distinfo @@ -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 --git a/net-mgmt/nagios/files/patch-html-Makefile.in b/net-mgmt/nagios/files/patch-html-Makefile.in index 0a5dc643d707..fe3fcd26878a 100644 --- a/net-mgmt/nagios/files/patch-html-Makefile.in +++ b/net-mgmt/nagios/files/patch-html-Makefile.in @@ -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 --git a/net-mgmt/nagios/files/patch-html-docs-configcgi.html b/net-mgmt/nagios/files/patch-html-docs-configcgi.html index 5fe328f2b85e..f87ab0b99b6a 100644 --- a/net-mgmt/nagios/files/patch-html-docs-configcgi.html +++ b/net-mgmt/nagios/files/patch-html-docs-configcgi.html @@ -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-08 17:49:55.000000000 +0100 ++++ html/docs/configcgi.html 2008-11-08 17:50:33.000000000 +0100 @@ -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 --git a/net-mgmt/nagios/files/patch-sample-config-nagios.cfg.in b/net-mgmt/nagios/files/patch-sample-config-nagios.cfg.in index eaefab39bc54..e2d462451438 100644 --- a/net-mgmt/nagios/files/patch-sample-config-nagios.cfg.in +++ b/net-mgmt/nagios/files/patch-sample-config-nagios.cfg.in @@ -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 --git a/net-mgmt/nagios/pkg-plist b/net-mgmt/nagios/pkg-plist index 22affb3077d9..bbfce3fd374c 100644 --- a/net-mgmt/nagios/pkg-plist +++ b/net-mgmt/nagios/pkg-plist @@ -106,6 +106,7 @@ etc/nagios/resource.cfg-sample %%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 @@ etc/nagios/resource.cfg-sample %%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 |