Attachment #166363 for bug #206405

Lines 2-8 Link Here

(-)net-mgmt/guifi-snpservices/Makefile (-1 / +4 lines)
2	# $FreeBSD: head/net-mgmt/guifi-snpservices/Makefile 363983 2014-08-04 09:32:35Z bapt $	2	# $FreeBSD: head/net-mgmt/guifi-snpservices/Makefile 363983 2014-08-04 09:32:35Z bapt $
3		3
4	PORTNAME= snpservices	4	PORTNAME= snpservices
5	DISTVERSION= 0.2.2-5	5	DISTVERSION= 0.2.2-8
6	CATEGORIES= net-mgmt www	6	CATEGORIES= net-mgmt www
7	MASTER_SITES= http://serveis.guifi.net/debian/guifi/ \	7	MASTER_SITES= http://serveis.guifi.net/debian/guifi/ \
8	http://www.potion-studios.com/	8	http://www.potion-studios.com/
Lines 24-29 Link Here
24	WRKSRC= ${WRKDIR}/${PORTNAME}-0.2.2	24	WRKSRC= ${WRKDIR}/${PORTNAME}-0.2.2
25	NO_BUILD= yes	25	NO_BUILD= yes
26		26
		27	post-patch:
		28	@${FIND} ${WRKSRC} -name \*.orig -delete;
		29
27	do-install:	30	do-install:
28	${MKDIR} ${STAGEDIR}${WWWDIR}	31	${MKDIR} ${STAGEDIR}${WWWDIR}
29	(cd ${WRKSRC} \	32	(cd ${WRKSRC} \

Lines 1-2 Link Here

(-)net-mgmt/guifi-snpservices/distinfo (-2 / +2 lines)
1	SHA256 (snpservices_0.2.2-5.tar.gz) = b08d003221d9d5ad688602a973838a0f83b1c99022a11c1ed08a520de8debb51	1	SHA256 (snpservices_0.2.2-8.tar.gz) = a3d574d8bf080e03e201ecc23cb00dc79dafd57011f5f81a5ffa821ac3c8e5b5
2	SIZE (snpservices_0.2.2-5.tar.gz) = 185825	2	SIZE (snpservices_0.2.2-8.tar.gz) = 243830

Lines 1-5 Link Here

(-)net-mgmt/guifi-snpservices/files/patch-common-ping.sh (-4 / +4 lines)
1	--- ./common/ping.sh.orig 2014-02-21 15:53:13.000000000 +0000	1	--- ./common/ping.sh.orig 2015-05-22 23:50:50.000000000 +0100
2	+++ ./common/ping.sh 2014-04-10 14:19:56.000000000 +0000	2	+++ ./common/ping.sh 2016-01-31 18:07:24.559136016 +0000
3	@@ -1,15 +1,15 @@	3	@@ -1,15 +1,15 @@
4	#!/bin/sh	4	#!/bin/sh
5	- PING="/bin/ping"	5	- PING="/bin/ping"
Lines 18-22 Link Here
18	- if [ $LOSS = 100 ];	18	- if [ $LOSS = 100 ];
19	+ if [ "$LOSS" = 100 ];	19	+ if [ "$LOSS" = 100 ];
20	then	20	then
21	echo 0	21	echo 0
22	else	22	echo ",$ADDR," >> /tmp/blacklist.snmp

Lines 1-11 Link Here

(-)net-mgmt/guifi-snpservices/files/patch-common-refresh_mrtg.php (-11 lines)
1	--- common/refresh_mrtg.php.orig 2014-04-10 12:44:08.000000000 +0000
2	+++ common/refresh_mrtg.php 2014-04-10 12:44:27.000000000 +0000
3	@@ -29,7 +29,7 @@
4
5	echo "Getting MRTG CSV file\n";
6	$hcnml = @fopen($MRTGConfigSource, "r");
7	- $wcnml = @fopen("../data/guifi_mrtg.csv", "w");
8	+ $wcnml = @fopen("/var/tmp/snpservices/data/guifi_mrtg.csv", "w");
9	while (!feof($hcnml)) {
10	$buffer = fgets($hcnml, 4096);
11	fwrite($wcnml,$buffer);




--- ./graphs/mrtgcsv2mrtgcfg.php.orig	2015-06-16 21:14:01.000000000 +0100
+++ ./graphs/mrtgcsv2mrtgcfg.php	2016-01-31 18:18:04.779135280 +0000
@@ -1,20 +1,20 @@
 <?php
 
-if (file_exists("../common/config.php")) {

+  include_once(dirname(__FILE__)."/../common/config.php.template");
 }
 
 function mrtgcfg_from_mrtgcsv($rrdtool_header,$rrdimg_path,$rrddb_path,$mrtg_traffic_template,$mrtg_ping_template) {
@@ -57,7 +57,7 @@
 print date('Y/m/d H:i:s')."\n";
 
   if (!file_exists('/tmp/blacklist.ips'))
-    system('/bin/touch /tmp/blacklist.ips');
+    system('/usr/bin/touch /tmp/blacklist.ips');
 
-    system('/bin/grep -vf /tmp/blacklist.ips /tmp/mrtg.csv > /tmp/mrtg.blacklisted.csv');
+    system('/usr/bin/grep -vf /tmp/blacklist.ips /tmp/mrtg.csv > /tmp/mrtg.blacklisted.csv');
 
 $hf = @fopen('/tmp/mrtg.blacklisted.csv','r');
-$cf = @fopen('../data/mrtg.cfg','w+');
+$cf = @fopen('/var/tmp/snpservices/data/mrtg.cfg','w+');
 
 fputs($cf,sprintf($rrdtool_header,$rrdimg_path,$rrdimg_path,$rrddb_path,$rrddb_path));
 
@@ -96,8 +96,8 @@
 if ($argv[1]=="CACHE") {
   if (file_exists('/tmp/blacklist.ips')) { 
     $blacklist_time = filemtime('/tmp/blacklist.ips');
-    if (file_exists('../data/mrtg.cfg')) {
-       $mrtg_time = filemtime('../data/mrtg.cfg');
+    if (file_exists('/var/tmp/snpservices/data/mrtg.cfg')) {
+       $mrtg_time = filemtime('/var/tmp/snpservices/data/mrtg.cfg');
     } else {
        $mrtg_time = 0;
        echo "No mrtg.cfg file present, refreshing...\n";

Lines 20-25 Link Here

(-)net-mgmt/guifi-snpservices/files/pkg-message.in (+1 lines)
20		20
21	For more information, see various guifi.net doc pages, and related:	21	For more information, see various guifi.net doc pages, and related:
22		22
		23	https://guifi.net/en/node/72593
23	http://es.wiki.guifi.net/wiki/Servidor_de_gr%C3%A1ficas	24	http://es.wiki.guifi.net/wiki/Servidor_de_gr%C3%A1ficas
24	http://es.wiki.guifi.net/wiki/Servidor_de_gr%C3%A1ficas_1	25	http://es.wiki.guifi.net/wiki/Servidor_de_gr%C3%A1ficas_1
25	http://es.wiki.guifi.net/wiki/Servidor_de_gr%C3%A1ficas_2	26	http://es.wiki.guifi.net/wiki/Servidor_de_gr%C3%A1ficas_2




%%WWWDIR%%/README
%%WWWDIR%%/common/check_blacklist.php
%%WWWDIR%%/common/check_blacklist.sh
%%WWWDIR%%/common/config.php.template
%%WWWDIR%%/common/get_snmpifaces.php
%%WWWDIR%%/common/misc.php
%%WWWDIR%%/common/misc.php.orig
%%WWWDIR%%/common/mrtg.sh
%%WWWDIR%%/common/ping.sh
%%WWWDIR%%/common/pping.sh
%%WWWDIR%%/common/qnodes.php
%%WWWDIR%%/common/qnodes.php.orig
%%WWWDIR%%/common/refresh.sh
%%WWWDIR%%/common/refresh_cnml.php
%%WWWDIR%%/common/refresh_cnml.php.orig
%%WWWDIR%%/common/refresh_mrtg.php
%%WWWDIR%%/common/refresh_mrtg.php.orig
%%WWWDIR%%/common/rrdtool.php
%%WWWDIR%%/common/snpservices.conf
%%WWWDIR%%/debian/README.Debian
%%WWWDIR%%/debian/changelog
%%WWWDIR%%/debian/compat

%%WWWDIR%%/debian/watch.ex
%%WWWDIR%%/graphs/LICENSE.txt
%%WWWDIR%%/graphs/cnml2mrtgcsv.php
%%WWWDIR%%/graphs/cnml2mrtgcsv_v2.php
%%WWWDIR%%/graphs/config.php
%%WWWDIR%%/graphs/graphs.php
%%WWWDIR%%/graphs/mrtgcsv2mrtgcfg.php
%%WWWDIR%%/graphs/mrtgcsv2mrtgcfg.php.orig
%%WWWDIR%%/graphs/refresh.php
%%WWWDIR%%/index.php
%%WWWDIR%%/index.php.orig
%%WWWDIR%%/misc/xml2ov2.php
%%WWWDIR%%/services/availability.php
%%WWWDIR%%/services/example.php
%%WWWDIR%%/services/graph.php
%%WWWDIR%%/services/liveping.php
%%WWWDIR%%/services/livetraceroute.php
%%WWWDIR%%/services/stats.php
%%WWWDIR%%/tools/guinux/config.php.guinux
%%WWWDIR%%/tools/guinux/snpconfig.pl
%%WWWDIR%%/tools/guinux/snpservices.conf

Return to bug 206405

Lines 1-6 Link Here

(-)net-mgmt/guifi-snpservices/files/patch-graphs-mrtgcsv2mrtgcfg.php (-7 / +23 lines)
1	--- graphs/mrtgcsv2mrtgcfg.php.orig 2014-02-21 15:53:13.000000000 +0000	1	--- ./graphs/mrtgcsv2mrtgcfg.php.orig 2015-06-16 21:14:01.000000000 +0100
2	+++ graphs/mrtgcsv2mrtgcfg.php 2014-04-10 12:35:33.000000000 +0000	2	+++ ./graphs/mrtgcsv2mrtgcfg.php 2016-01-31 18:18:04.779135280 +0000
3	@@ -1,9 +1,9 @@	3	@@ -1,20 +1,20 @@
4	<?php	4	<?php
5		5
6	-if (file_exists("../common/config.php")) {	6	-if (file_exists("../common/config.php")) {
Lines 12-24 Link Here
12	+ include_once(dirname(__FILE__)."/../common/config.php.template");	12	+ include_once(dirname(__FILE__)."/../common/config.php.template");
13	}	13	}
14		14
15	$now = time();	15	function mrtgcfg_from_mrtgcsv($rrdtool_header,$rrdimg_path,$rrddb_path,$mrtg_traffic_template,$mrtg_ping_template) {
16	@@ -57,7 +57,7 @@
17	print date('Y/m/d H:i:s')."\n";
18		16
19	$hf = @fopen($MRTGConfigSource,"r") or die('Error reading MRTG csv input\n"');	17	if (!file_exists('/tmp/blacklist.ips'))
		18	- system('/bin/touch /tmp/blacklist.ips');
		19	+ system('/usr/bin/touch /tmp/blacklist.ips');
		20
		21	- system('/bin/grep -vf /tmp/blacklist.ips /tmp/mrtg.csv > /tmp/mrtg.blacklisted.csv');
		22	+ system('/usr/bin/grep -vf /tmp/blacklist.ips /tmp/mrtg.csv > /tmp/mrtg.blacklisted.csv');
		23
		24	$hf = @fopen('/tmp/mrtg.blacklisted.csv','r');
20	-$cf = @fopen('../data/mrtg.cfg','w+');	25	-$cf = @fopen('../data/mrtg.cfg','w+');
21	+$cf = @fopen('/var/tmp/snpservices/data/mrtg.cfg','w+');	26	+$cf = @fopen('/var/tmp/snpservices/data/mrtg.cfg','w+');
22		27
23	fputs($cf,sprintf($rrdtool_header,$rrdimg_path,$rrdimg_path,$rrddb_path,$rrddb_path));	28	fputs($cf,sprintf($rrdtool_header,$rrdimg_path,$rrdimg_path,$rrddb_path,$rrddb_path));
24		29
		30	@@ -96,8 +96,8 @@
		31	if ($argv[1]=="CACHE") {
		32	if (file_exists('/tmp/blacklist.ips')) {
		33	$blacklist_time = filemtime('/tmp/blacklist.ips');
		34	- if (file_exists('../data/mrtg.cfg')) {
		35	- $mrtg_time = filemtime('../data/mrtg.cfg');
		36	+ if (file_exists('/var/tmp/snpservices/data/mrtg.cfg')) {
		37	+ $mrtg_time = filemtime('/var/tmp/snpservices/data/mrtg.cfg');
		38	} else {
		39	$mrtg_time = 0;
		40	echo "No mrtg.cfg file present, refreshing...\n";

Lines 1-20 Link Here

(-)net-mgmt/guifi-snpservices/pkg-plist (-16 / +6 lines)
1	%%WWWDIR%%/README	1	%%WWWDIR%%/README
2	%%WWWDIR%%/common/cnml2ov2.php	2	%%WWWDIR%%/common/check_blacklist.php
		3	%%WWWDIR%%/common/check_blacklist.sh
3	%%WWWDIR%%/common/config.php.template	4	%%WWWDIR%%/common/config.php.template
4	%%WWWDIR%%/common/config.php.template.orig	5	%%WWWDIR%%/common/get_snmpifaces.php
5	%%WWWDIR%%/common/misc.php	6	%%WWWDIR%%/common/misc.php
6	%%WWWDIR%%/common/misc.php.orig
7	%%WWWDIR%%/common/mrtg.sh
8	%%WWWDIR%%/common/ping.sh	7	%%WWWDIR%%/common/ping.sh
9	%%WWWDIR%%/common/ping.sh.orig	8	%%WWWDIR%%/common/pping.sh
10	%%WWWDIR%%/common/qnodes.php	9	%%WWWDIR%%/common/qnodes.php
11	%%WWWDIR%%/common/qnodes.php.orig
12	%%WWWDIR%%/common/refresh.sh	10	%%WWWDIR%%/common/refresh.sh
13	%%WWWDIR%%/common/refresh_cnml.php	11	%%WWWDIR%%/common/refresh_cnml.php
14	%%WWWDIR%%/common/refresh_cnml.php.orig
15	%%WWWDIR%%/common/refresh_mrtg.php
16	%%WWWDIR%%/common/refresh_mrtg.php.orig
17	%%WWWDIR%%/common/rrdtool.php	12	%%WWWDIR%%/common/rrdtool.php
		13	%%WWWDIR%%/common/snpservices.conf
18	%%WWWDIR%%/debian/README.Debian	14	%%WWWDIR%%/debian/README.Debian
19	%%WWWDIR%%/debian/changelog	15	%%WWWDIR%%/debian/changelog
20	%%WWWDIR%%/debian/compat	16	%%WWWDIR%%/debian/compat
Lines 35-55 Link Here
35	%%WWWDIR%%/debian/watch.ex	31	%%WWWDIR%%/debian/watch.ex
36	%%WWWDIR%%/graphs/LICENSE.txt	32	%%WWWDIR%%/graphs/LICENSE.txt
37	%%WWWDIR%%/graphs/cnml2mrtgcsv.php	33	%%WWWDIR%%/graphs/cnml2mrtgcsv.php
38	%%WWWDIR%%/graphs/cnml2mrtgcsv.php.orig	34	%%WWWDIR%%/graphs/cnml2mrtgcsv_v2.php
39	%%WWWDIR%%/graphs/config.php	35	%%WWWDIR%%/graphs/config.php
40	%%WWWDIR%%/graphs/graphs.php	36	%%WWWDIR%%/graphs/graphs.php
41	%%WWWDIR%%/graphs/mrtgcsv2mrtgcfg.php	37	%%WWWDIR%%/graphs/mrtgcsv2mrtgcfg.php
42	%%WWWDIR%%/graphs/mrtgcsv2mrtgcfg.php.orig
43	%%WWWDIR%%/graphs/refresh.php	38	%%WWWDIR%%/graphs/refresh.php
44	%%WWWDIR%%/index.php	39	%%WWWDIR%%/index.php
45	%%WWWDIR%%/index.php.orig
46	%%WWWDIR%%/misc/xml2ov2.php
47	%%WWWDIR%%/services/availability.php	40	%%WWWDIR%%/services/availability.php
48	%%WWWDIR%%/services/example.php	41	%%WWWDIR%%/services/example.php
49	%%WWWDIR%%/services/graph.php	42	%%WWWDIR%%/services/graph.php
50	%%WWWDIR%%/services/liveping.php	43	%%WWWDIR%%/services/liveping.php
51	%%WWWDIR%%/services/livetraceroute.php	44	%%WWWDIR%%/services/livetraceroute.php
52	%%WWWDIR%%/services/stats.php	45	%%WWWDIR%%/services/stats.php
53	%%WWWDIR%%/tools/guinux/config.php.guinux
54	%%WWWDIR%%/tools/guinux/snpconfig.pl
55	%%WWWDIR%%/tools/guinux/snpservices.conf