Attachment #82309 for bug #117742

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




#

PORTNAME=	nagios
PORTVERSION=	2.10
PORTREVISION=	2
CATEGORIES=	net-mgmt
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	nagios

USE_PERL5_BUILD=	yes
USE_AUTOTOOLS=	autoconf:261
USE_RC_SUBR=	nagios.sh

CONFLICTS=	nagios-[13].*

OPTIONS=	EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8+]" OFF \
		NANOSLEEP "Use nanosleep in event timing" OFF

Lines 1-3 Link Here

(-)ports/net-mgmt/nagios/distinfo (-3 / +3 lines)
1	MD5 (nagios-2.9.tar.gz) = b6e3a21c91edb063c00712c6001e15ec	1	MD5 (nagios-2.10.tar.gz) = 8c3a29e138f2ff8c8abbd3dd8a40c4b6
2	SHA256 (nagios-2.9.tar.gz) = f60a72dec1edef308a899734eff4f7e5167522f1afeb5c24fd1852e2749c5d9d	2	SHA256 (nagios-2.10.tar.gz) = d3e916bd11619259246e12a45aac8761e7318b54ed701472e8e49a03d939e5c8
3	SIZE (nagios-2.9.tar.gz) = 1738698	3	SIZE (nagios-2.10.tar.gz) = 1740558




--- Makefile.in.orig	Tue Apr 24 01:14:25 2007
+++ Makefile.in	Thu Nov  1 20:08:40 2007
@@ -186,7 +186,7 @@
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives

 
 install-config:
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg
-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg
-	$(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg
-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg
-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample




**********************************************************************

 Enable Nagios in /etc/rc.conf with the following line:

   nagios_enable="YES"

 Configuration templates are available in %%PREFIX%%/etc/nagios as
 *.cfg-sample files.  Copy them to *.cfg files where required and
 edit to suit your needs.  Documentation is available in HTML form
 in %%PREFIX%%/%%NAGIOSWWWDIR%%/docs.

 If you don't already have a web server running, you will need to
 install and configure one to finish off your Nagios installation.
 When used with Apache, the following should be sufficient to publish
 the web component of Nagios (modify the allow list to suit):

   <Directory %%PREFIX%%/%%NAGIOSWWWDIR%%>
     Order deny,allow
     Deny from all
     Allow from 127.0.0.1
   </Directory>

   <Directory %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin>
     Options ExecCGI
   </Directory>

   ScriptAlias %%NAGIOSCGIURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin/
   Alias %%NAGIOSHTMURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/

**********************************************************************

 Users experiencing troubles with logos used in the Status Map CGI
 should first check the value of the physical_html_path variable
 defined in %%PREFIX%%/etc/nagios/cgi.cfg.  Refer to the example in
 %%PREFIX%%/etc/nagios/cgi.cfg-sample for the correct value.

**********************************************************************

Return to bug 117742

Lines 6-13 Link Here

(-)ports/net-mgmt/nagios/Makefile (-2 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= nagios	8	PORTNAME= nagios
9	PORTVERSION= 2.9	9	PORTVERSION= 2.10
10	PORTREVISION= 2
11	CATEGORIES= net-mgmt	10	CATEGORIES= net-mgmt
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= nagios	12	MASTER_SITE_SUBDIR= nagios
Lines 23-28 Link Here
23	USE_PERL5_BUILD= yes	22	USE_PERL5_BUILD= yes
24	USE_AUTOTOOLS= autoconf:261	23	USE_AUTOTOOLS= autoconf:261
25	USE_RC_SUBR= nagios.sh	24	USE_RC_SUBR= nagios.sh
		25
		26	CONFLICTS= nagios-[13].*
26		27
27	OPTIONS= EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8+]" OFF \	28	OPTIONS= EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8+]" OFF \
28	NANOSLEEP "Use nanosleep in event timing" OFF	29	NANOSLEEP "Use nanosleep in event timing" OFF

Lines 1-5 Link Here

(-)ports/net-mgmt/nagios/files/patch-Makefile.in (-7 / +7 lines)
1	--- Makefile.in.orig Tue Nov 28 12:59:04 2006	1	--- Makefile.in.orig Tue Apr 24 01:14:25 2007
2	+++ Makefile.in Sat Dec 9 08:04:47 2006	2	+++ Makefile.in Thu Nov 1 20:08:40 2007
3	@@ -186,7 +186,7 @@	3	@@ -186,7 +186,7 @@
4	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)	4	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
5	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives	5	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
Lines 14-24 Link Here
14		14
15	install-config:	15	install-config:
16	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)	16	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
17	- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample	17	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg
18	- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample	18	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg
19	- $(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample	19	- $(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg
20	- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg-sample	20	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg
21	- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg-sample	21	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg
22	+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)	22	+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
23	+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample	23	+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
24	+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample	24	+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample

Lines 1-36 Link Here

(-)ports/net-mgmt/nagios/files/pkg-message.in (-15 / +9 lines)
1	**********************************************************************	1	**********************************************************************
2		2
3	Enable nagios in /etc/rc.conf with the following line:	3	Enable Nagios in /etc/rc.conf with the following line:
4		4
5	nagios_enable="YES"	5	nagios_enable="YES"
6		6
7	Configuration templates are available in %%PREFIX%%/etc/nagios as	7	Configuration templates are available in %%PREFIX%%/etc/nagios as
8	.cfg-sample files. Copy then to .cfg files where required and	8	.cfg-sample files. Copy them to .cfg files where required and
9	edit to suit your needs. Documentation is available in HTML form	9	edit to suit your needs. Documentation is available in HTML form
10	in %%PREFIX%%/%%NAGIOSWWWDIR%%/docs.	10	in %%PREFIX%%/%%NAGIOSWWWDIR%%/docs.
11		11
12	If you don't already have a web server running, you will need to	12	If you don't already have a web server running, you will need to
13	install and configure one to finish off your nagios installation.	13	install and configure one to finish off your Nagios installation.
14	When used with Apache, the following should be sufficient to publish	14	When used with Apache, the following should be sufficient to publish
15	the web component of nagios (modification of allow list encouraged):	15	the web component of Nagios (modify the allow list to suit):
16		16
17	<Directory %%PREFIX%%/%%NAGIOSWWWDIR%%>	17	<Directory %%PREFIX%%/%%NAGIOSWWWDIR%%>
18	Order allow,deny	18	Order deny,allow
19	Allow from all	19	Deny from all
		20	Allow from 127.0.0.1
20	</Directory>	21	</Directory>
21		22
22	<Directory %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin>	23	<Directory %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin>
23	Options ExecCGI	24	Options ExecCGI
24	</Directory>	25	</Directory>
25		26
26	ScriptAlias %%NAGIOSCGIURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin/	27	ScriptAlias %%NAGIOSCGIURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin/
27	Alias %%NAGIOSHTMURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/	28	Alias %%NAGIOSHTMURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/
28
29	**********************************************************************
30
31	Users experiencing troubles with logos used in the Status Map CGI
32	should first check the value of the physical_html_path variable
33	defined in %%PREFIX%%/etc/nagios/cgi.cfg. Refer to the example in
34	%%PREFIX%%/etc/nagios/cgi.cfg-sample for the correct value.
35		29
36	**********************************************************************	30	**********************************************************************