View | Details | Raw Unified | Return to bug 168197
Collapse All | Expand All

(-)ports/net-mgmt/nagios/Makefile (-1 / +1 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	nagios
8
PORTNAME=	nagios
9
PORTVERSION=	3.3.1
9
PORTVERSION=	3.4.1
10
CATEGORIES=	net-mgmt
10
CATEGORIES=	net-mgmt
11
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
11
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
12
12
(-)ports/net-mgmt/nagios/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (nagios-3.3.1.tar.gz) = c4e39cd31a8a9ee814df848fd933b8611465f749b48432672aef4ae5849d9652
1
SHA256 (nagios-3.4.1.tar.gz) = a5c693f9af22410cc17d6da9c0df9bd65c47d787de3f937b5ccbda934131f8c8
2
SIZE (nagios-3.3.1.tar.gz) = 1714630
2
SIZE (nagios-3.4.1.tar.gz) = 1782817
(-)ports/net-mgmt/nagios/files/patch-html-Makefile.in (-7 / +11 lines)
Lines 1-6 Link Here
1
--- html/Makefile.in.orig	2011-07-25 03:23:52.000000000 +0930
1
--- html/Makefile.in.orig	2012-02-14 07:10:42.000000000 +1030
2
+++ html/Makefile.in	2011-08-20 19:32:21.000000000 +0930
2
+++ html/Makefile.in	2012-05-21 21:34:09.000000000 +0930
3
@@ -33,52 +33,52 @@
3
@@ -34,55 +34,55 @@
4
 devclean: distclean
4
 devclean: distclean
5
 
5
 
6
 install:
6
 install:
Lines 10-15 Link Here
10
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
10
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
11
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
11
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
12
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
12
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
13
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js
13
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
14
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
14
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
15
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
15
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
16
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
Lines 24-29 Link Here
24
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
25
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
25
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
26
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
26
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
27
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
28
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js
27
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
29
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
28
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
30
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
29
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
31
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
Lines 48-53 Link Here
48
 	for file in contexthelp/*.html; \
50
 	for file in contexthelp/*.html; \
49
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
51
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
50
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
52
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
53
 	for file in js/*.js; \
54
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done
55
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done
51
 #	for file in docs/*.html; \
56
 #	for file in docs/*.html; \
52
-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
57
-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
53
+#	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
58
+#	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
Lines 71-82 Link Here
71
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
76
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
72
 	for file in includes/*.*; \
77
 	for file in includes/*.*; \
73
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
78
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
74
-	for file in includes/rss/*; \
75
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
76
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
79
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
77
+	for file in includes/rss/*.*; \
80
 	for file in includes/rss/*.*; \
81
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
78
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
82
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
79
 	for file in includes/rss/extlib/*; \
83
 	for file in includes/rss/extlib/*.*; \
80
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
84
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
81
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
85
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
82
 
86
 
(-)ports/net-mgmt/nagios/files/patch-html-main.php (-39 / +38 lines)
Lines 1-39 Link Here
1
--- html/main.php.orig	2011-07-26 12:46:26.000000000 +0930
1
--- html/main.php.orig	2012-05-12 09:30:53.000000000 +0930
2
+++ html/main.php	2011-08-20 19:57:13.000000000 +0930
2
+++ html/main.php	2012-05-21 21:37:23.000000000 +0930
3
@@ -36,36 +36,10 @@
3
@@ -40,35 +40,10 @@
4
 <div class="product">Nagios<sup><span style="font-size: small;">&reg;</span></sup> Core<sup><span style="font-size: small;">&trade;</span></sup></div>
4
 <div class="product">Nagios<sup><span style="font-size: small;">&reg;</span></sup> Core<sup><span style="font-size: small;">&trade;</span></sup></div>
5
 <div class="version">Version 3.3.1</div>
5
 <div class="version">Version 3.4.1</div>
6
 <div class="releasedate">July 25, 2011</div>
6
 <div class="releasedate">May 11, 2012</div>
7
-<div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=3.3.1&product=nagioscore" target="_blank">Check for updates</a></div>
7
-<div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=3.4.1&product=nagioscore" target="_blank">Check for updates</a></div>
8
 <!--<div class="whatsnew"><a href="http://go.nagios.com/nagioscore/whatsnew">Read what's new in Nagios Core 3</a></div>-->
8
 <!--<div class="whatsnew"><a href="http://go.nagios.com/nagioscore/whatsnew">Read what's new in Nagios Core 3</a></div>-->
9
 </div>
9
 </div>
10
 
10
 
11
 
11
 
12
-<div id="updateversioninfo">
12
-<div id="updateversioninfo">
13
-<?php
13
-<?php
14
-	$updateinfo=get_update_information();
14
-	$updateinfo=get_update_information();
15
-	//print_r($updateinfo);
15
-	//print_r($updateinfo);
16
-	//$updateinfo['update_checks_enabled']=false;
16
-	//$updateinfo['update_checks_enabled']=false;
17
-	//$updateinfo['update_available']=true;
17
-	//$updateinfo['update_available']=true;
18
-	if($updateinfo['update_checks_enabled']==false && $this_version!=$updateinfo['update_version']){
18
-	if($updateinfo['update_checks_enabled']==false){
19
-?>
19
-?>
20
-		<div class="updatechecksdisabled">
20
-		<div class="updatechecksdisabled">
21
-		<div class="warningmessage">Warning: Automatic Update Checks are Disabled!</div>
21
-		<div class="warningmessage">Warning: Automatic Update Checks are Disabled!</div>
22
-		<div class="submessage">Disabling update checks presents a possible security risk.  Visit <a href="http://www.nagios.org/" target="_blank">nagios.org</a> to check for updates manually or enable update checks in your Nagios config file.</a></div>
22
-		<div class="submessage">Disabling update checks presents a possible security risk.  Visit <a href="http://www.nagios.org/" target="_blank">nagios.org</a> to check for updates manually or enable update checks in your Nagios config file.</a></div>
23
-		</div>
23
-		</div>
24
-<?php
24
-<?php
25
-		}
25
-		}
26
-	else if($updateinfo['update_available']==true){
26
-	else if($updateinfo['update_available']==true && $this_version!=$updateinfo['update_version']){
27
-?>
27
-?>
28
-		<div class="updateavailable">
28
-		<div class="updateavailable">
29
-		<div class="updatemessage">A new version of Nagios Core is available!</div>
29
-		<div class="updatemessage">A new version of Nagios Core is available!</div>
30
-		<div class="submessage">Visit <a href="http://www.nagios.org/download/" target="_blank">nagios.org</a> to download Nagios <?php echo $updateinfo['update_version'];?>.</div>
30
-		<div class="submessage">Visit <a href="http://www.nagios.org/download/" target="_blank">nagios.org</a> to download Nagios <?php echo $updateinfo['update_version'];?>.</div>
31
-		</div>
31
-		</div>
32
-<?php
32
-<?php
33
-		}
33
-		}
34
-?>
34
-?>
35
-</div>
35
-</div>
36
-
36
 
37
 <div id="splashboxes">
37
 
38
 <div id="splashbox1" class="splashbox">
38
 
39
 <h2>Get Started</h2>
(-)ports/net-mgmt/nagios/pkg-plist (+10 lines)
Lines 97-108 Link Here
97
%%NAGIOSWWWDIR%%/contexthelp/N5.html
97
%%NAGIOSWWWDIR%%/contexthelp/N5.html
98
%%NAGIOSWWWDIR%%/contexthelp/N6.html
98
%%NAGIOSWWWDIR%%/contexthelp/N6.html
99
%%NAGIOSWWWDIR%%/contexthelp/N7.html
99
%%NAGIOSWWWDIR%%/contexthelp/N7.html
100
%%NAGIOSWWWDIR%%/images/Nagios-clearbg.png
100
%%NAGIOSWWWDIR%%/images/NagiosEnterprises-whitebg-112x46.png
101
%%NAGIOSWWWDIR%%/images/NagiosEnterprises-whitebg-112x46.png
101
%%NAGIOSWWWDIR%%/images/ack.gif
102
%%NAGIOSWWWDIR%%/images/ack.gif
102
%%NAGIOSWWWDIR%%/images/action-graph.gif
103
%%NAGIOSWWWDIR%%/images/action-graph.gif
103
%%NAGIOSWWWDIR%%/images/action-nagios.gif
104
%%NAGIOSWWWDIR%%/images/action-nagios.gif
104
%%NAGIOSWWWDIR%%/images/action-orig.gif
105
%%NAGIOSWWWDIR%%/images/action-orig.gif
105
%%NAGIOSWWWDIR%%/images/action.gif
106
%%NAGIOSWWWDIR%%/images/action.gif
107
%%NAGIOSWWWDIR%%/images/b_first2.png
108
%%NAGIOSWWWDIR%%/images/b_last2.png
109
%%NAGIOSWWWDIR%%/images/b_next2.png
110
%%NAGIOSWWWDIR%%/images/b_prev2.png
106
%%NAGIOSWWWDIR%%/images/command.png
111
%%NAGIOSWWWDIR%%/images/command.png
107
%%NAGIOSWWWDIR%%/images/comment.gif
112
%%NAGIOSWWWDIR%%/images/comment.gif
108
%%NAGIOSWWWDIR%%/images/contexthelp1.gif
113
%%NAGIOSWWWDIR%%/images/contexthelp1.gif
Lines 349-358 Link Here
349
%%NAGIOSWWWDIR%%/includes/rss/rss_fetch.inc
354
%%NAGIOSWWWDIR%%/includes/rss/rss_fetch.inc
350
%%NAGIOSWWWDIR%%/includes/rss/rss_parse.inc
355
%%NAGIOSWWWDIR%%/includes/rss/rss_parse.inc
351
%%NAGIOSWWWDIR%%/includes/rss/rss_utils.inc
356
%%NAGIOSWWWDIR%%/includes/rss/rss_utils.inc
357
%%NAGIOSWWWDIR%%/includes/jquery-1.7.1.min.js
352
%%NAGIOSWWWDIR%%/includes/utils.inc.php
358
%%NAGIOSWWWDIR%%/includes/utils.inc.php
353
%%NAGIOSWWWDIR%%/index.php
359
%%NAGIOSWWWDIR%%/index.php
360
%%NAGIOSWWWDIR%%/js/jquery-1.7.1.min.js
354
%%NAGIOSWWWDIR%%/main.php
361
%%NAGIOSWWWDIR%%/main.php
355
%%NAGIOSWWWDIR%%/robots.txt
362
%%NAGIOSWWWDIR%%/robots.txt
363
%%NAGIOSWWWDIR%%/rss-corefeed.php
364
%%NAGIOSWWWDIR%%/rss-newsfeed.php
356
%%NAGIOSWWWDIR%%/side.php
365
%%NAGIOSWWWDIR%%/side.php
357
%%NAGIOSWWWDIR%%/stylesheets/avail.css
366
%%NAGIOSWWWDIR%%/stylesheets/avail.css
358
%%NAGIOSWWWDIR%%/stylesheets/checksanity.css
367
%%NAGIOSWWWDIR%%/stylesheets/checksanity.css
Lines 382-387 Link Here
382
@dirrm %%NAGIOSWWWDIR%%/includes/rss/extlib
391
@dirrm %%NAGIOSWWWDIR%%/includes/rss/extlib
383
@dirrm %%NAGIOSWWWDIR%%/includes/rss
392
@dirrm %%NAGIOSWWWDIR%%/includes/rss
384
@dirrm %%NAGIOSWWWDIR%%/includes
393
@dirrm %%NAGIOSWWWDIR%%/includes
394
@dirrm %%NAGIOSWWWDIR%%/js
385
@dirrm %%NAGIOSWWWDIR%%/media
395
@dirrm %%NAGIOSWWWDIR%%/media
386
@dirrm %%NAGIOSWWWDIR%%/ssi
396
@dirrm %%NAGIOSWWWDIR%%/ssi
387
@dirrm %%NAGIOSWWWDIR%%/stylesheets
397
@dirrm %%NAGIOSWWWDIR%%/stylesheets

Return to bug 168197