Attachment #92297 for bug #129912

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




#

PORTNAME=	pnp
PORTVERSION=	0.4.12
PORTREVISION=	3
CATEGORIES=	net-mgmt
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	pnp4nagios


GNU_CONFIGURE=	yes
CONFIGURE_ARGS+=	\
	--prefix=${PREFIX} \
	--sysconfdir=${PREFIX}/etc/pnp \
	--datarootdir=${WWWDIR} \
	--datadir=${WWWDIR} \
	--localstatedir=/var/log \
	--with-rrdtool=${LOCALBASE}/bin/rrdtool \

Lines 1-3 Link Here

(-)b/net-mgmt/pnp/distinfo (-3 / +3 lines)
1	SIZE (pnp-0.4.10.tar.gz) = 301021	1	MD5 (pnp-0.4.12.tar.gz) = eb833a4769a5b58aad0ac53cae3e3e9f
2	MD5 (pnp-0.4.10.tar.gz) = 5e57d50e2d895878b626497fd7b217b7	2	SHA256 (pnp-0.4.12.tar.gz) = 8b74ff0fd32a08e416d0f760c36166aec67bfc1e839dd3c07c1dc08db69d96fb
3	SHA256 (pnp-0.4.10.tar.gz) = 35392c83fc9468eba38187e17b773090dff923f7b74c86c3c11e2574b99c214d	3	SIZE (pnp-0.4.12.tar.gz) = 311844

Lines 1-6 Link Here

(-)b/net-mgmt/pnp/files/extra-patch-share::pnp::include::function.inc.php (-27 / +27 lines)
1	--- share/pnp/include/function.inc.php.orig 2008-06-18 12:02:41.000000000 +0400	1	--- share/pnp/include/function.inc.php.orig 2008-10-11 18:13:34.000000000 +0400
2	+++ share/pnp/include/function.inc.php 2008-08-16 23:35:30.000000000 +0400	2	+++ share/pnp/include/function.inc.php 2008-12-24 01:03:58.000000000 +0300
3	@@ -819,114 +819,15 @@	3	@@ -982,123 +982,6 @@
4	}	4	}
5		5
6	function doPDF($display,$data) {	6	function doPDF($display,$data) {
Lines 54-65 Link Here
54	- $pdf->AddPage();	54	- $pdf->AddPage();
55	- if($use_bg){$pdf->useTemplate($tplIdx);}	55	- if($use_bg){$pdf->useTemplate($tplIdx);}
56	- }	56	- }
57	-	57	- if($d['source'] == 1){
58	- $pdf->SetFont('Arial', '', 10);	58	- $pdf->SetFont('Arial', '', 10);
59	- $pdf->CELL(120, 5, $d["n_hostname"]." / ".$d["n_servicedesc"] , 0, 1);	59	- $pdf->CELL(120, 5, $d["n_hostname"]." / ".$d["n_servicedesc"] , 0, 1);
60	- $pdf->SetFont('Arial', '', 8);	60	- $pdf->SetFont('Arial', '', 8);
61	- $pdf->CELL(120, 5, $d["view_title"]. " (" . $d["f_start"]." - ".$d["f_end"].")", 0, 1);	61	- $pdf->CELL(120, 5, $d["view_title"]. " (" . $d["f_start"]." - ".$d["f_end"].")", 0, 1);
62	-	62	- $pdf->CELL(120, 5, _DATASOURCE ." ".$d["ds_name"], 0, 1);
		63	- }else{
		64	- $pdf->SetFont('Arial', '', 8);
		65	- $pdf->CELL(120, 5, _DATASOURCE ." ".$d["ds_name"], 0, 1);
		66	- }
63	- $img = saveImage($d['rrd_opts']);	67	- $img = saveImage($d['rrd_opts']);
64	- $Y = $pdf->GetY();	68	- $Y = $pdf->GetY();
65	- $cell_height = ($img['height'] * 0.23);	69	- $cell_height = ($img['height'] * 0.23);
Lines 96-105 Link Here
96	- $pdf->AddPage();	100	- $pdf->AddPage();
97	- if($use_bg){$pdf->useTemplate($tplIdx);}	101	- if($use_bg){$pdf->useTemplate($tplIdx);}
98	- }	102	- }
99	- $pdf->SetFont('Arial', '', 10);	103	- if($d['source'] == 1){
100	- $pdf->CELL(120, 7, $d["hostname"]." / ".$d["servicedesc"] , 0, 1);	104	- $pdf->SetFont('Arial', '', 10);
101	- $pdf->SetFont('Arial', '', 8);	105	- $pdf->CELL(120, 5, $d["n_hostname"]." / ".$d["n_servicedesc"] , 0, 1);
102	- $pdf->CELL(120, 5, $d["f_start"]." - ".$d["f_end"], 0, 1);	106	- $pdf->SetFont('Arial', '', 8);
		107	- $pdf->CELL(120, 5, $d["view_title"]. " (" . $d["f_start"]." - ".$d["f_end"].")", 0, 1);
		108	- $pdf->CELL(120, 5, _DATASOURCE ." ".$d["ds_name"], 0, 1);
		109	- }else{
		110	- $pdf->SetFont('Arial', '', 8);
		111	- $pdf->CELL(120, 5, _DATASOURCE ." ".$d["ds_name"], 0, 1);
		112	- }
103	-	113	-
104	- $img = saveImage($d['rrd_opts']);	114	- $img = saveImage($d['rrd_opts']);
105	- $Y = $pdf->GetY();	115	- $Y = $pdf->GetY();
Lines 110-130 Link Here
110	- unlink($img['name']);	120	- unlink($img['name']);
111	- }	121	- }
112	- }	122	- }
113	-	123	- $pdf->Output("pnp4nagios.pdf","I");
114	- $pdf->Output();	124	exit;
115	+ print "<html>\n";
116	+ print "<head>\n";
117	+ print "<title>Failed</title>\n";
118	+ print "</head>\n";
119	+ print "<body>\n";
120	+ print "<h1>Failed</h1>\n";
121	+ print "</body>\n";
122	+ print "<html>\n";
123	+ exit(0);
124	}	125	}
125		126
126	function doStrip($string) {	127	@@ -1350,23 +1233,6 @@
127	@@ -1173,23 +1074,6 @@
128	}	128	}
129		129
130	function doPDFIcon($type){	130	function doPDFIcon($type){
Lines 139-145 Link Here
139	-	139	-
140	- switch($type){	140	- switch($type){
141	- case "PAGE":	141	- case "PAGE":
142	- print "<a href=\"index.php?page=$page&display=$display&view=$view&do=pdf\"><img src=\"images/pdf.png\" HEIGHT=\"32px\" WIDTH=\"32px\" title=\"Display PDF\" ></a>\n";	142	- print "<a href=\"index.php?page=$page&display=$display&view=$view&end=$end&start=$start&do=pdf\"><img src=\"images/pdf.png\" HEIGHT=\"32px\" WIDTH=\"32px\" title=\"Display PDF\" ></a>\n";
143	- break;	143	- break;
144	- default:	144	- default:
145	- print "<a href=\"index.php?host=$hostname&srv=$servicedesc&display=$display&view=$view&source=$source&end=$end&start=$start&do=pdf\"><img src=\"images/pdf.png\" HEIGHT=\"32px\" WIDTH=\"32px\" title=\"Display PDF\" ></a>\n";	145	- print "<a href=\"index.php?host=$hostname&srv=$servicedesc&display=$display&view=$view&source=$source&end=$end&start=$start&do=pdf\"><img src=\"images/pdf.png\" HEIGHT=\"32px\" WIDTH=\"32px\" title=\"Display PDF\" ></a>\n";




--- sample-config/Makefile.in.orig	2008-10-11 18:13:17.000000000 +0400
+++ sample-config/Makefile.in	2008-12-24 17:33:32.000000000 +0300
@@ -27,23 +27,19 @@
 
 CP=@CP@
 
+DIRMODE=755
+FILEMODE=644
+
 all html:
 
 clean:
@@ -28,26 +31,22 @@
 devclean: distclean
 
 install:
-	-rm -f $(DESTDIR)$(HTMLDIR)/conf/config.php
-
 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)
 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands
 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages
 	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/pnp4nagios_release $(DESTDIR)$(SYSCONFDIR)
-	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)
-	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/background.pdf $(DESTDIR)$(SYSCONFDIR)
+	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php-sample
+	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/background.pdf $(DESTDIR)$(SYSCONFDIR)/background.pdf-sample
+	$(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(CFGDIR)/config.php-sample
+	$(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS)  pnp/background.pdf $(DESTDIR)$(CFGDIR)/background.pdf-sample
 
 install-config: 
-	-rm -f $(DESTDIR)$(HTMLDIR)/conf/config.php
-
 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)
 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands
 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages
+	$(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
+	$(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/check_commands
+	$(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/pages
 	
-	$(INSTALL) -m 664 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(CFGDIR)
-	$(INSTALL) -m 664 $(INSTALL_OPTS)  pnp/process_perfdata.cfg-sample $(DESTDIR)$(CFGDIR)
-	$(INSTALL) -m 664 $(INSTALL_OPTS)  pnp/rra.cfg-sample $(DESTDIR)$(CFGDIR)
-	$(INSTALL) -m 664 $(INSTALL_OPTS)  pnp/check_commands/check_nwstat.cfg-sample $(DESTDIR)$(CFGDIR)/check_commands
-	$(INSTALL) -m 664 $(INSTALL_OPTS)  pnp/pages/web_traffic.cfg-sample $(DESTDIR)$(CFGDIR)/pages
+	$(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(CFGDIR)/config.php-sample
+	$(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS)  pnp/process_perfdata.cfg-sample $(DESTDIR)$(CFGDIR)
+	$(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS)  pnp/rra.cfg-sample $(DESTDIR)$(CFGDIR)
+	$(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS)  pnp/check_commands/check_nwstat.cfg-sample $(DESTDIR)$(CFGDIR)/check_commands
+	$(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS)  pnp/pages/web_traffic.cfg-sample $(DESTDIR)$(CFGDIR)/pages
 
-	$(INSTALL) -m 664 $(INSTALL_OPTS)  pnp/npcd.cfg-sample $(DESTDIR)$(CFGDIR)
+	$(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS)  pnp/npcd.cfg-sample $(DESTDIR)$(CFGDIR)
 	
-	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)
+	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php-sample
 	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/process_perfdata.cfg-sample $(DESTDIR)$(SYSCONFDIR)
 	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/rra.cfg-sample $(DESTDIR)$(SYSCONFDIR)
 	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/check_commands/check_nwstat.cfg-sample $(DESTDIR)$(SYSCONFDIR)/check_commands




--- scripts/Makefile.in.orig	2008-12-24 01:11:40.000000000 +0300
+++ scripts/Makefile.in	2008-12-24 01:12:25.000000000 +0300
@@ -25,7 +25,6 @@
 PERFDATADIR=@PERFDATA_DIR@
 DATAROOTDIR=@datarootdir@
 
+BINMODE=755
+
 CP=@CP@
 
 all html:
@@ -26,19 +28,15 @@
 devclean: distclean
 
 install-init: 
-	$(INSTALL) -m 755 $(INIT_OPTS) -d $(DESTDIR)$(INIT_DIR)
 	$(INSTALL) -m 755 $(INIT_OPTS) rc.npcd $(DESTDIR)$(INIT_DIR)/npcd
+	$(INSTALL) -m $(BINMODE) $(INIT_OPTS) rc.npcd $(DESTDIR)$(INIT_DIR)/npcd
 
 install-processperfdata: 
@@ -35,12 +34,9 @@
 	$(INSTALL) -m 755 $(INSTALL_OPTS) check_pnp_rrds.pl $(DESTDIR)$(LIBEXECDIR)
 
 install-net2pnp:
-	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
 	$(INSTALL) -m 755 $(INSTALL_OPTS) net2pnp.pl $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m $(BINMODE) $(INSTALL_OPTS) net2pnp.pl $(DESTDIR)$(BINDIR)
 
 install: 
-	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATADIR)
-	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
 	$(MAKE) install-processperfdata
 	$(MAKE) install-plugins
 	




--- share/Makefile.in.orig	2008-06-18 12:02:41.000000000 +0400
+++ share/Makefile.in	2008-08-18 18:55:45.000000000 +0400
@@ -11,6 +11,9 @@
 
 CP=@CP@
 
+DIRMODE=755
+FILEMODE=644
+
 all html:
 
 clean:
@@ -24,38 +27,38 @@
 devclean: distclean
 
 install:
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/include
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/include/font
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/include/font/makefont
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/include/js
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/lang/
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/templates/
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/templates.dist/
+	$(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
+	$(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
+	$(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/include
+	$(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/include/font
+	$(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/include/font/makefont
+	$(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/include/js
+	$(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/lang/
+	$(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/templates/
+	$(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/templates.dist/
 
 	for file in pnp/*.php; \
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
+	do $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
 
 	for file in pnp/templates.dist/*.php; \
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/templates.dist; done
+	do $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/templates.dist; done
 
 	for file in pnp/lang/*.php; \
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/lang; done
+	do $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/lang; done
 	
 	for file in pnp/images/*; \
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+	do $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
 
 	for file in pnp/include/*.*; \
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/include; done
+	do $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/include; done
 
 	for file in pnp/include/js/*; \
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/include/js; done
+	do $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/include/js; done
 
 	for file in pnp/include/font/*.php; \
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/include/font; done
+	do $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/include/font; done
 
 	for file in pnp/include/font/makefont/*; \
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/include/font/makefont; done
+	do $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/include/font/makefont; done
 
 	




--- src/Makefile.in.orig	2008-12-24 01:12:54.000000000 +0300
+++ src/Makefile.in	2008-12-24 01:13:31.000000000 +0300
@@ -88,8 +88,6 @@
 	$(MAKE) install-basic
 
 install-basic:
-	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATA_SPOOL_DIR)
 	$(INSTALL) -m 754 $(INSTALL_OPTS) @npcd_name@ $(DESTDIR)$(BINDIR)
 
 strip-post-install:
 	$(STRIP) $(DESTDIR)$(BINDIR)/@npcd_name@

Lines 48-53 configuration for the PNP area: Link Here

(-)b/net-mgmt/pnp/files/pkg-message.in (+5 lines)
48	Deny from all	48	Deny from all
49	</Directory>	49	</Directory>
50		50
		51	Please, note that user who runs Apache processes should be able to
		52	read PNP RRD spool files from
		53	%%PNP_RRDS%%
		54	so you should tune path permissions accordingly. Probably one could
		55	start from adding Apache user to the group '%%NAGIOSGROUP%%'.
51		56
52	Remember to restart NPCD service after upgrade if you're using	57	Remember to restart NPCD service after upgrade if you're using
53	'bulk' mode with NPCD.	58	'bulk' mode with NPCD.

Lines 1-4 Link Here

(-)b/net-mgmt/pnp/pkg-plist (-1 / +10 lines)
1	bin/npcd	1	bin/npcd
		2	etc/pnp/pnp4nagios_release
2	etc/pnp/config.php-sample	3	etc/pnp/config.php-sample
3	etc/pnp/background.pdf-sample	4	etc/pnp/background.pdf-sample
4	etc/pnp/check_commands/check_nwstat.cfg-sample	5	etc/pnp/check_commands/check_nwstat.cfg-sample
Lines 7-12 etc/pnp/process_perfdata.cfg-sample Link Here
7	etc/pnp/rra.cfg-sample	8	etc/pnp/rra.cfg-sample
8	etc/pnp/npcd.cfg-sample	9	etc/pnp/npcd.cfg-sample
9	libexec/process_perfdata.pl	10	libexec/process_perfdata.pl
		11	libexec/check_pnp_rrds.pl
10	%%WWWDIR%%/images/ack.png	12	%%WWWDIR%%/images/ack.png
11	%%WWWDIR%%/images/calendar.png	13	%%WWWDIR%%/images/calendar.png
12	%%WWWDIR%%/images/critical.png	14	%%WWWDIR%%/images/critical.png
Lines 27-32 libexec/process_perfdata.pl Link Here
27	%%WWWDIR%%/images/warning.png	29	%%WWWDIR%%/images/warning.png
28	%%WWWDIR%%/images/xml.png	30	%%WWWDIR%%/images/xml.png
29	%%WWWDIR%%/images/zoom.png	31	%%WWWDIR%%/images/zoom.png
		32	%%WWWDIR%%/include/tpl_function.inc.php
30	%%WWWDIR%%/include/font/makefont/cp1250.map	33	%%WWWDIR%%/include/font/makefont/cp1250.map
31	%%WWWDIR%%/include/font/makefont/cp1251.map	34	%%WWWDIR%%/include/font/makefont/cp1251.map
32	%%WWWDIR%%/include/font/makefont/cp1252.map	35	%%WWWDIR%%/include/font/makefont/cp1252.map
Lines 112-117 libexec/process_perfdata.pl Link Here
112	%%WWWDIR%%/templates.dist/check_nwstat_LOAD15.php	115	%%WWWDIR%%/templates.dist/check_nwstat_LOAD15.php
113	%%WWWDIR%%/templates.dist/check_nwstat_LOAD5.php	116	%%WWWDIR%%/templates.dist/check_nwstat_LOAD5.php
114	%%WWWDIR%%/templates.dist/check_nwstat_ofiles.php	117	%%WWWDIR%%/templates.dist/check_nwstat_ofiles.php
		118	%%WWWDIR%%/templates.dist/check_oracle_connection-time.php
		119	%%WWWDIR%%/templates.dist/check_oracle_health_connection-time.php
		120	%%WWWDIR%%/templates.dist/check_oracle_health_pga-in-memory-sort-ratio.php
		121	%%WWWDIR%%/templates.dist/check_oracle_health_redo-io-traffic.php
		122	%%WWWDIR%%/templates.dist/check_oracle_health_switch-interval.php
		123	%%WWWDIR%%/templates.dist/check_oracle_health_tablespace-usage.php
		124	%%WWWDIR%%/templates.dist/check_pnp_rrds.php
115	%%WWWDIR%%/templates.dist/check_smtp.php	125	%%WWWDIR%%/templates.dist/check_smtp.php
116	%%WWWDIR%%/templates.dist/check_snmp_int-bits.php	126	%%WWWDIR%%/templates.dist/check_snmp_int-bits.php
117	%%WWWDIR%%/templates.dist/check_snmp_int.php	127	%%WWWDIR%%/templates.dist/check_snmp_int.php
118	-

Return to bug 129912

Lines 6-13 Link Here

(-)b/net-mgmt/pnp/Makefile (-3 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= pnp	8	PORTNAME= pnp
9	PORTVERSION= 0.4.10	9	PORTVERSION= 0.4.12
10	PORTREVISION= 3
11	CATEGORIES= net-mgmt	10	CATEGORIES= net-mgmt
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= pnp4nagios	12	MASTER_SITE_SUBDIR= pnp4nagios
Lines 42-48 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-share::pnp::include::function.inc.php Link Here
42		41
43	GNU_CONFIGURE= yes	42	GNU_CONFIGURE= yes
44	CONFIGURE_ARGS+= \	43	CONFIGURE_ARGS+= \
45	--prefix=${LOCALBASE} \	44	--prefix=${PREFIX} \
		45	--sysconfdir=${PREFIX}/etc/pnp \
		46	--datarootdir=${WWWDIR} \
46	--datadir=${WWWDIR} \	47	--datadir=${WWWDIR} \
47	--localstatedir=/var/log \	48	--localstatedir=/var/log \
48	--with-rrdtool=${LOCALBASE}/bin/rrdtool \	49	--with-rrdtool=${LOCALBASE}/bin/rrdtool \

Lines 1-53 Link Here

(-)b/net-mgmt/pnp/files/patch-sample-config::Makefile.in (-44 / +20 lines)
1	--- sample-config/Makefile.in.orig 2008-06-18 12:02:38.000000000 +0400	1	--- sample-config/Makefile.in.orig 2008-10-11 18:13:17.000000000 +0400
2	+++ sample-config/Makefile.in 2008-08-18 18:50:24.000000000 +0400	2	+++ sample-config/Makefile.in 2008-12-24 17:33:32.000000000 +0300
3	@@ -13,6 +13,9 @@	3	@@ -27,23 +27,19 @@
4
5	CP=@CP@
6
7	+DIRMODE=755
8	+FILEMODE=644
9	+
10	all html:
11
12	clean:
13	@@ -28,26 +31,22 @@
14	devclean: distclean	4	devclean: distclean
15		5
16	install:	6	install:
17	- -rm -f $(HTMLDIR)/conf/config.php	7	- -rm -f $(DESTDIR)$(HTMLDIR)/conf/config.php
18	-	8	-
19	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)	9	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)
20	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/check_commands	10	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands
21	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/pages	11	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages
22	- $(INSTALL) -m 664 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(CFGDIR)	12	$(INSTALL) -m 644 $(INSTALL_OPTS) pnp/pnp4nagios_release $(DESTDIR)$(SYSCONFDIR)
23	- $(INSTALL) -m 664 $(INSTALL_OPTS) pnp/background.pdf $(DESTDIR)$(CFGDIR)	13	- $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR)
24	+ $(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)	14	- $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/background.pdf $(DESTDIR)$(SYSCONFDIR)
25	+ $(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/check_commands	15	+ $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php-sample
26	+ $(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/pages	16	+ $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/background.pdf $(DESTDIR)$(SYSCONFDIR)/background.pdf-sample
27	+ $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(CFGDIR)/config.php-sample
28	+ $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) pnp/background.pdf $(DESTDIR)$(CFGDIR)/background.pdf-sample
29		17
30	install-config:	18	install-config:
31	- -rm -f $(DESTDIR)$(HTMLDIR)/conf/config.php	19	- -rm -f $(DESTDIR)$(HTMLDIR)/conf/config.php
32	-	20	-
33	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)	21	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)
34	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/check_commands	22	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands
35	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/pages	23	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages
36	+ $(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
37	+ $(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/check_commands
38	+ $(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/pages
39
40	- $(INSTALL) -m 664 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(CFGDIR)
41	- $(INSTALL) -m 664 $(INSTALL_OPTS) pnp/process_perfdata.cfg-sample $(DESTDIR)$(CFGDIR)
42	- $(INSTALL) -m 664 $(INSTALL_OPTS) pnp/rra.cfg-sample $(DESTDIR)$(CFGDIR)
43	- $(INSTALL) -m 664 $(INSTALL_OPTS) pnp/check_commands/check_nwstat.cfg-sample $(DESTDIR)$(CFGDIR)/check_commands
44	- $(INSTALL) -m 664 $(INSTALL_OPTS) pnp/pages/web_traffic.cfg-sample $(DESTDIR)$(CFGDIR)/pages
45	+ $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(CFGDIR)/config.php-sample
46	+ $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) pnp/process_perfdata.cfg-sample $(DESTDIR)$(CFGDIR)
47	+ $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) pnp/rra.cfg-sample $(DESTDIR)$(CFGDIR)
48	+ $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) pnp/check_commands/check_nwstat.cfg-sample $(DESTDIR)$(CFGDIR)/check_commands
49	+ $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) pnp/pages/web_traffic.cfg-sample $(DESTDIR)$(CFGDIR)/pages
50
51	- $(INSTALL) -m 664 $(INSTALL_OPTS) pnp/npcd.cfg-sample $(DESTDIR)$(CFGDIR)
52	+ $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) pnp/npcd.cfg-sample $(DESTDIR)$(CFGDIR)
53		24
		25	- $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR)
		26	+ $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php-sample
		27	$(INSTALL) -m 644 $(INSTALL_OPTS) pnp/process_perfdata.cfg-sample $(DESTDIR)$(SYSCONFDIR)
		28	$(INSTALL) -m 644 $(INSTALL_OPTS) pnp/rra.cfg-sample $(DESTDIR)$(SYSCONFDIR)
		29	$(INSTALL) -m 644 $(INSTALL_OPTS) pnp/check_commands/check_nwstat.cfg-sample $(DESTDIR)$(SYSCONFDIR)/check_commands

Lines 1-34 Link Here

(-)b/net-mgmt/pnp/files/patch-scripts::Makefile.in (-24 / +13 lines)
1	--- scripts/Makefile.in.orig 2008-06-18 12:02:39.000000000 +0400	1	--- scripts/Makefile.in.orig 2008-12-24 01:11:40.000000000 +0300
2	+++ scripts/Makefile.in 2008-08-18 18:53:43.000000000 +0400	2	+++ scripts/Makefile.in 2008-12-24 01:12:25.000000000 +0300
3	@@ -13,6 +13,8 @@	3	@@ -25,7 +25,6 @@
4	PERFDATADIR=@PERFDATA_DIR@
5	DATAROOTDIR=@datarootdir@
6
7	+BINMODE=755
8	+
9	CP=@CP@
10
11	all html:
12	@@ -26,19 +28,15 @@
13	devclean: distclean	4	devclean: distclean
14		5
15	install-init:	6	install-init:
16	- $(INSTALL) -m 755 -d $(INIT_OPTS) $(DESTDIR)$(INIT_DIR)	7	- $(INSTALL) -m 755 $(INIT_OPTS) -d $(DESTDIR)$(INIT_DIR)
17	- $(INSTALL) -m 755 $(INIT_OPTS) rc.npcd $(DESTDIR)$(INIT_DIR)/npcd	8	$(INSTALL) -m 755 $(INIT_OPTS) rc.npcd $(DESTDIR)$(INIT_DIR)/npcd
18	+ $(INSTALL) -m $(BINMODE) $(INIT_OPTS) rc.npcd $(DESTDIR)$(INIT_DIR)/npcd
19		9
20	install-processperfdata:	10	install-processperfdata:
21	- $(INSTALL) -m 774 $(INSTALL_OPTS) process_perfdata.pl $(DESTDIR)$(LIBEXECDIR)	11	@@ -35,12 +34,9 @@
22	+ $(INSTALL) -m $(BINMODE) $(INSTALL_OPTS) process_perfdata.pl $(DESTDIR)$(LIBEXECDIR)	12	$(INSTALL) -m 755 $(INSTALL_OPTS) check_pnp_rrds.pl $(DESTDIR)$(LIBEXECDIR)
23		13
24	install-net2pnp:	14	install-net2pnp:
25	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)	15	- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
26	- $(INSTALL) -m 774 $(INSTALL_OPTS) net2pnp.pl $(DESTDIR)$(BINDIR)	16	$(INSTALL) -m 755 $(INSTALL_OPTS) net2pnp.pl $(DESTDIR)$(BINDIR)
27	+ $(INSTALL) -m $(BINMODE) $(INSTALL_OPTS) net2pnp.pl $(DESTDIR)$(BINDIR)
28		17
29	install:	18	install:
30	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATADIR)	19	- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATADIR)
31	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)	20	- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
32	$(MAKE) install-processperfdata	21	$(MAKE) install-processperfdata
33		22	$(MAKE) install-plugins
34		23

Removed Link Here

(-)a/net-mgmt/pnp/files/patch-share::Makefile.in (-68 lines)
1	--- share/Makefile.in.orig 2008-06-18 12:02:41.000000000 +0400
2	+++ share/Makefile.in 2008-08-18 18:55:45.000000000 +0400
3	@@ -11,6 +11,9 @@
4
5	CP=@CP@
6
7	+DIRMODE=755
8	+FILEMODE=644
9	+
10	all html:
11
12	clean:
13	@@ -24,38 +27,38 @@
14	devclean: distclean
15
16	install:
17	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
18	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
19	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/include
20	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/include/font
21	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/include/font/makefont
22	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/include/js
23	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/lang/
24	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/templates/
25	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/templates.dist/
26	+ $(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
27	+ $(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
28	+ $(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/include
29	+ $(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/include/font
30	+ $(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/include/font/makefont
31	+ $(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/include/js
32	+ $(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/lang/
33	+ $(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/templates/
34	+ $(INSTALL) -m $(DIRMODE) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/templates.dist/
35
36	for file in pnp/*.php; \
37	- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
38	+ do $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
39
40	for file in pnp/templates.dist/*.php; \
41	- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/templates.dist; done
42	+ do $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/templates.dist; done
43
44	for file in pnp/lang/*.php; \
45	- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/lang; done
46	+ do $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/lang; done
47
48	for file in pnp/images/*; \
49	- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
50	+ do $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
51
52	for file in pnp/include/.; \
53	- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/include; done
54	+ do $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/include; done
55
56	for file in pnp/include/js/*; \
57	- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/include/js; done
58	+ do $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/include/js; done
59
60	for file in pnp/include/font/*.php; \
61	- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/include/font; done
62	+ do $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/include/font; done
63
64	for file in pnp/include/font/makefont/*; \
65	- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/include/font/makefont; done
66	+ do $(INSTALL) -m $(FILEMODE) $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/include/font/makefont; done
67
68

Lines 1-12 Link Here

(-)b/net-mgmt/pnp/files/patch-src::Makefile.in (-7 / +6 lines)
1	--- src/Makefile.in.orig 2008-06-18 12:02:39.000000000 +0400	1	--- src/Makefile.in.orig 2008-12-24 01:12:54.000000000 +0300
2	+++ src/Makefile.in 2008-08-18 18:56:20.000000000 +0400	2	+++ src/Makefile.in 2008-12-24 01:13:31.000000000 +0300
3	@@ -93,8 +93,7 @@	3	@@ -88,8 +88,6 @@
4	$(MAKE) install-basic	4	$(MAKE) install-basic
5		5
6	install-basic:	6	install-basic:
7	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)	7	- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
8	- $(INSTALL) -m 774 $(INSTALL_OPTS) @npcd_name@ $(DESTDIR)$(BINDIR)	8	- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATA_SPOOL_DIR)
9	+ $(INSTALL) -m 755 $(INSTALL_OPTS) @npcd_name@ $(DESTDIR)$(BINDIR)	9	$(INSTALL) -m 754 $(INSTALL_OPTS) @npcd_name@ $(DESTDIR)$(BINDIR)
10		10
11	strip-post-install:	11	strip-post-install:
12	$(STRIP) $(DESTDIR)$(BINDIR)/@npcd_name@