From owner-svn-ports-all@freebsd.org Sun Mar 20 18:39:56 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84012AD724E; Sun, 20 Mar 2016 18:39:56 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 44E0013BA; Sun, 20 Mar 2016 18:39:56 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2KIdtDo027562; Sun, 20 Mar 2016 18:39:55 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2KIdsps027556; Sun, 20 Mar 2016 18:39:54 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201603201839.u2KIdsps027556@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sun, 20 Mar 2016 18:39:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411512 - in head/net-mgmt/guifi-snpservices: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Mar 2016 18:39:56 -0000 Author: feld Date: Sun Mar 20 18:39:54 2016 New Revision: 411512 URL: https://svnweb.freebsd.org/changeset/ports/411512 Log: net-mgmt/guifi-snpservices: Update to 0.2.2.8 PR: 206405 Deleted: head/net-mgmt/guifi-snpservices/files/patch-common-refresh_mrtg.php Modified: head/net-mgmt/guifi-snpservices/Makefile head/net-mgmt/guifi-snpservices/distinfo head/net-mgmt/guifi-snpservices/files/patch-common-ping.sh head/net-mgmt/guifi-snpservices/files/patch-graphs-mrtgcsv2mrtgcfg.php head/net-mgmt/guifi-snpservices/files/pkg-message.in head/net-mgmt/guifi-snpservices/pkg-plist Modified: head/net-mgmt/guifi-snpservices/Makefile ============================================================================== --- head/net-mgmt/guifi-snpservices/Makefile Sun Mar 20 18:38:46 2016 (r411511) +++ head/net-mgmt/guifi-snpservices/Makefile Sun Mar 20 18:39:54 2016 (r411512) @@ -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=${SNPSERVI WRKSRC= ${WRKDIR}/${PORTNAME}-0.2.2 NO_BUILD= yes +post-patch: + @${FIND} ${WRKSRC} -name \*.orig -delete; + do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} (cd ${WRKSRC} \ Modified: head/net-mgmt/guifi-snpservices/distinfo ============================================================================== --- head/net-mgmt/guifi-snpservices/distinfo Sun Mar 20 18:38:46 2016 (r411511) +++ head/net-mgmt/guifi-snpservices/distinfo Sun Mar 20 18:39:54 2016 (r411512) @@ -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 Modified: head/net-mgmt/guifi-snpservices/files/patch-common-ping.sh ============================================================================== --- head/net-mgmt/guifi-snpservices/files/patch-common-ping.sh Sun Mar 20 18:38:46 2016 (r411511) +++ head/net-mgmt/guifi-snpservices/files/patch-common-ping.sh Sun Mar 20 18:39:54 2016 (r411512) @@ -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" @@ -18,5 +18,5 @@ - if [ $LOSS = 100 ]; + if [ "$LOSS" = 100 ]; then - echo 0 - else + echo 0 + echo ",$ADDR," >> /tmp/blacklist.snmp Modified: head/net-mgmt/guifi-snpservices/files/patch-graphs-mrtgcsv2mrtgcfg.php ============================================================================== --- head/net-mgmt/guifi-snpservices/files/patch-graphs-mrtgcsv2mrtgcfg.php Sun Mar 20 18:38:46 2016 (r411511) +++ head/net-mgmt/guifi-snpservices/files/patch-graphs-mrtgcsv2mrtgcfg.php Sun Mar 20 18:39:54 2016 (r411512) @@ -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 @@ /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"; Modified: head/net-mgmt/guifi-snpservices/files/pkg-message.in ============================================================================== --- head/net-mgmt/guifi-snpservices/files/pkg-message.in Sun Mar 20 18:38:46 2016 (r411511) +++ head/net-mgmt/guifi-snpservices/files/pkg-message.in Sun Mar 20 18:39:54 2016 (r411512) @@ -20,6 +20,7 @@ POST-INSTALL CONFIGURATION FOR GUIFI SNP 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 Modified: head/net-mgmt/guifi-snpservices/pkg-plist ============================================================================== --- head/net-mgmt/guifi-snpservices/pkg-plist Sun Mar 20 18:38:46 2016 (r411511) +++ head/net-mgmt/guifi-snpservices/pkg-plist Sun Mar 20 18:39:54 2016 (r411512) @@ -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