sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 01:09:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net-mgmt/guifi-snpservices: Update to 0.2.2.8

Browse source 
PR:		206405
This commit is contained in:
Mark Felder 2016-03-20 18:39:54 +00:00
parent 930811e71f
commit 639496935f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=411512
7 changed files with 40 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
net-mgmt/guifi-snpservices/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= snpservices
DISTVERSION= 0.2.2-5
DISTVERSION= 0.2.2-8
CATEGORIES= net-mgmt www
MASTER_SITES= http://serveis.guifi.net/debian/guifi/ \
http://www.potion-studios.com/
@ -24,6 +24,9 @@ SUB_LIST= SNPSERVICES_TMPDIR=${SNPSERVICES_TMPDIR}
WRKSRC= ${WRKDIR}/${PORTNAME}-0.2.2
NO_BUILD= yes
post-patch:
@${FIND} ${WRKSRC} -name \*.orig -delete;
do-install:
${MKDIR} ${STAGEDIR}${WWWDIR}
(cd ${WRKSRC} \

4
net-mgmt/guifi-snpservices/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (snpservices_0.2.2-5.tar.gz) = b08d003221d9d5ad688602a973838a0f83b1c99022a11c1ed08a520de8debb51
SIZE (snpservices_0.2.2-5.tar.gz) = 185825
SHA256 (snpservices_0.2.2-8.tar.gz) = a3d574d8bf080e03e201ecc23cb00dc79dafd57011f5f81a5ffa821ac3c8e5b5
SIZE (snpservices_0.2.2-8.tar.gz) = 243830

6
net-mgmt/guifi-snpservices/files/patch-common-ping.sh
View file

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

11
net-mgmt/guifi-snpservices/files/patch-common-refresh_mrtg.php
View file

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

30
net-mgmt/guifi-snpservices/files/patch-graphs-mrtgcsv2mrtgcfg.php
View file

@ -1,6 +1,6 @@
--- graphs/mrtgcsv2mrtgcfg.php.orig 2014-02-21 15:53:13.000000000 +0000
+++ graphs/mrtgcsv2mrtgcfg.php 2014-04-10 12:35:33.000000000 +0000
@@ -1,9 +1,9 @@
--- ./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")) {
@ -12,13 +12,29 @@
+ include_once(dirname(__FILE__)."/../common/config.php.template");
}
$now = time();
@@ -57,7 +57,7 @@
print date('Y/m/d H:i:s')."\n";
function mrtgcfg_from_mrtgcsv($rrdtool_header,$rrdimg_path,$rrddb_path,$mrtg_traffic_template,$mrtg_ping_template) {
$hf = @fopen($MRTGConfigSource,"r") or die('Error reading MRTG csv input\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";

1
net-mgmt/guifi-snpservices/files/pkg-message.in
View file

@ -20,6 +20,7 @@ POST-INSTALL CONFIGURATION FOR GUIFI SNPSERVICES
For more information, see various guifi.net doc pages, and related:
https://guifi.net/en/node/72593
http://es.wiki.guifi.net/wiki/Servidor_de_gr%C3%A1ficas
http://es.wiki.guifi.net/wiki/Servidor_de_gr%C3%A1ficas_1
http://es.wiki.guifi.net/wiki/Servidor_de_gr%C3%A1ficas_2

22
net-mgmt/guifi-snpservices/pkg-plist
View file

@ -1,20 +1,16 @@
%%WWWDIR%%/README
%%WWWDIR%%/common/cnml2ov2.php
%%WWWDIR%%/common/check_blacklist.php
%%WWWDIR%%/common/check_blacklist.sh
%%WWWDIR%%/common/config.php.template
%%WWWDIR%%/common/config.php.template.orig
%%WWWDIR%%/common/get_snmpifaces.php
%%WWWDIR%%/common/misc.php
%%WWWDIR%%/common/misc.php.orig
%%WWWDIR%%/common/mrtg.sh
%%WWWDIR%%/common/ping.sh
%%WWWDIR%%/common/ping.sh.orig
%%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
@ -35,21 +31,15 @@
%%WWWDIR%%/debian/watch.ex
%%WWWDIR%%/graphs/LICENSE.txt
%%WWWDIR%%/graphs/cnml2mrtgcsv.php
%%WWWDIR%%/graphs/cnml2mrtgcsv.php.orig
%%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