Old.

(Portage version: 2.2.0_alpha187/cvs/Linux x86_64, signed Manifest commit with key A792A613)

6 files changed, 6 insertions, 447 deletions

diff --git a/net-analyzer/smokeping/ChangeLog b/net-analyzer/smokeping/ChangeLog
index 893966b7947d..7586cd00e595 100644
--- a/net-analyzer/smokeping/ChangeLog
+++ b/net-analyzer/smokeping/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/smokeping
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.52 2013/07/10 05:18:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.53 2013/07/10 11:14:37 jer Exp $
+
+  10 Jul 2013; Jeroen Roovers <jer@gentoo.org> -files/config.dist,
+  -files/smokeping.init.2, -files/smokeping_fping-3.3.patch,
+  -smokeping-2.4.2-r3.ebuild, metadata.xml:
+  Old.
 
   10 Jul 2013; Agostino Sarubbo <ago@gentoo.org> smokeping-2.6.9.ebuild:
   Stable for x86, wrt bug #399553
diff --git a/net-analyzer/smokeping/files/config.dist b/net-analyzer/smokeping/files/config.dist
deleted file mode 100644
index 3c6796c4b841..000000000000
--- a/net-analyzer/smokeping/files/config.dist
+++ /dev/null
@@ -1,174 +0,0 @@
-# Note that all IP addresses in this file are false, to prevent some
-# machine falling uder a deadly DOS storm because all users keep
-# the same addresses in their config.
-
-*** General ***
-
-owner     = Joe Random
-contact   = joe@some.place.xyz
-mailhost  = smtp.mailhost.abc
-sendmail  = /usr/lib/sendmail
-imgcache  = /var/lib/smokeping/.simg
-imgurl    = ../.simg
-datadir   = /var/lib/smokeping
-piddir    = /var/lib/smokeping
-cgiurl    = http://some.place.xyz/cgi-perl/smokeping.pl
-smokemail = /etc/smokemail.dist
-# specify this to get syslog logging
-syslogfacility = local0
-# each probe is now run in its own process
-# disable this to revert to the old behaviour
-# concurrentprobes = no
-
-*** Alerts ***
-to = admin@some.place.xyz
-from = smokealert@some.place.xyz
-
-+bigloss
-type = loss
-# in percent
-pattern = ==0%,==0%,==0%,==0%,>0%,>0%,>0%
-comment = suddenly there is packet loss
-
-+someloss
-type = loss
-# in percent
-pattern = >0%,*12*,>0%,*12*,>0%
-comment = loss 3 times  in a row
-
-+startloss
-type = loss
-# in percent
-pattern = ==S,>0%,>0%,>0%
-comment = loss at startup
-
-+rttdetect
-type = rtt
-# in milli seconds
-pattern = <10,<10,<10,<10,<10,<100,>100,>100,>100
-comment = routing mesed up again ?
-
-*** Database ***
-
-step     = 300
-pings    = 20
-
-# consfn mrhb steps total
-
-AVERAGE  0.5   1  1008
-AVERAGE  0.5  12  4320
-    MIN  0.5  12  4320
-    MAX  0.5  12  4320
-AVERAGE  0.5 144   720
-    MAX  0.5 144   720
-    MIN  0.5 144   720
-
-*** Presentation ***
-
-template = /etc/smokeping.template
-
-+ overview 
-
-width = 600
-height = 50
-range = 10h
-
-+ detail
-
-width = 600
-height = 200
-unison_tolerance = 2
-
-"Last 3 Hours"    3h
-"Last 30 Hours"   30h
-"Last 10 Days"    10d
-"Last 400 Days"   400d
-
-*** Probes ***
-
-+ FPing
-
-binary = /usr/sbin/fping
-
-*** Targets ***
-
-probe = FPing
-
-menu = Top
-title = Network Latency Grapher
-remark = Welcome to the SmokePing website of YYZ. \
-         Here you will learn all about the latency of our network.
-
-+ World
-
-menu = World
-title = Worldwide Connectivity
-
-++ Europe
-
-menu = Europe
-title = European Connectivity
-
-+++ Switzerland
-
-menu = Switzerland
-title = Swiss Connectivity
-alerts = bigloss,someloss,startloss
-
-++++ SBB
-
-menu = SBB/CFF/FFS
-title = Swiss Federal Railways Webserver
-host = www.railway-server.abc
-
-++++ Tiscali
-
-menu = Tiscali Web
-title = Tiscali Webserver www.tiscali.abc
-host = www.tiscali-web.abc
-
-+++ UK
-
-menu = United Kingdom
-title = United Kingdom
-
-++++ UCL
-
-menu = UCL
-title = UCL
-host = www.ucl-abc.acc.uki
-
-++ USA
-
-menu = North America
-title =North American Connectivity
-
-+++ MIT
-
-menu = MIT
-title = Massachusetts Institute of Technology Webserver
-host = www.gurkoman.ybc
-
-+++ IU
-
-menu = IU
-title = Indiana University
-host = www.iu.ali
-
-+++ UCB
-
-menu = U. C. Berkeley
-title = U. C. Berkeley Webserver
-host = www.berkly.udi
-
-+++ UCSD
-
-menu = U. C. San Diego
-title = U. C. San Diego Webserver
-host = www.ucsdddar.art
-
-+++ Sun
-
-menu = Sun Microsystems
-title = Sun Microsystems Webserver
-host = www.sun-web.com
diff --git a/net-analyzer/smokeping/files/smokeping.init.2 b/net-analyzer/smokeping/files/smokeping.init.2
deleted file mode 100644
index 9eac6a361938..000000000000
--- a/net-analyzer/smokeping/files/smokeping.init.2
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-extra_stopped_commands="dump restore"
-
-depend() {
-	need net
-	use dns
-}
-
-checkconfig() {
-	if [ ! -f "/etc/smokeping/config" ] ; then
-		eerror "You need /etc/smokeping/config to run smokeping!"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	if [ ! -d /run/smokeping/ ]; then
-		mkdir /run/smokeping/
-	fi
-	chown smokeping:smokeping /run/smokeping/
-
-	ebegin "Starting smokeping"
-	LC_ALL=C \
-	start-stop-daemon --start --name smokeping \
-		--pidfile /run/smokeping/smokeping.pid \
-		--exec /usr/bin/smokeping \
-		--chuid smokeping:smokeping
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping smokeping"
-	start-stop-daemon --stop \
-		--pidfile /run/smokeping/smokeping.pid
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading smokeping"
-	/usr/bin/smokeping --reload 1>/dev/null 2>&1
-	eend $?
-}
-
-dump() {
-	ebegin "Dumping smokeping rrd files to XML for backup or upgrade use"
-	for f in `find /var/lib/smokeping -name '*.rrd' -print` ; do
-		f_xml=`dirname $f`/`basename $f .rrd`.xml
-		rrdtool dump "$f" > "${f_xml}"
-		chown root:0 "${f_xml}"
-	done
-	eend $?
-}
-
-restore() {
-	ebegin "Restoring smokeping rrd files from XML dump files"
-	for f in `find /var/lib/smokeping -name '*.xml' -print` ; do
-		f_rrd=`dirname $f`/`basename $f .xml`.rrd
-		mv -f "${f_rrd}" "${f_rrd}.bak"
-		chown root:0 "${f_rrd}.bak"
-		rrdtool restore "$f" "${f_rrd}"
-		chown smokeping:smokeping "${f_rrd}"
-	done
-	eend $?
-}
diff --git a/net-analyzer/smokeping/files/smokeping_fping-3.3.patch b/net-analyzer/smokeping/files/smokeping_fping-3.3.patch
deleted file mode 100644
index 56b8b2d0088f..000000000000
--- a/net-analyzer/smokeping/files/smokeping_fping-3.3.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 491498b57a427230069604d10b68073c0f6f5e33
-Author: Tobias Oetiker <tobi@oetiker.ch>
-Date:   Wed Aug 29 09:49:57 2012 +0200
-
-    allow to configure FPing probe to read fping output form stdout instead of stderr
-
-diff --git a/lib/Smokeping/probes/FPing.pm b/lib/Smokeping/probes/FPing.pm
-index 2b932bf..0901201 100644
---- a/lib/Smokeping/probes/FPing.pm
-+++ b/lib/Smokeping/probes/FPing.pm
-@@ -32,6 +32,9 @@ your system yet, you can get a slightly enhanced version from L<www.smokeping.or
-   
- The (optional) B<packetsize> option lets you configure the packetsize for the pings sent.
- 
-+Since version 3.3 fping sends its statistics to stdout. Set B<usestdout> to 'true'
-+so make smokeping read stdout instead of stderr.
-+
- In B<blazemode>, FPing sends one more ping than requested, and discards
- the first RTT value returned as it's likely to be an outlier.
- 
-@@ -142,7 +145,8 @@ sub ping ($){
-     $self->do_debug("Executing @cmd");
-     my $pid = open3($inh,$outh,$errh, @cmd);
-     $self->{rtts}={};
--    while (<$errh>){
-+    my $fh = ($self->{properties}{usestdout} || '') eq 'true' ? $outh : $errh;
-+    while (<$fh>){
-         chomp;
- 	$self->do_debug("Got fping output: '$_'");
-         next unless /^\S+\s+:\s+[-\d\.]/; #filter out error messages from fping
-@@ -194,6 +198,12 @@ sub probevars {
- 			_doc => "Send an extra ping and then discarge the first answer since the first is bound to be an outliner.",
- 
- 		},
-+		usestdout => {
-+			_re => '(true|false)',
-+			_example => 'true',
-+			_doc => "Listen for FPing output on stdout instead of stderr ... (version 3.3+ sends its statistics on stdout).",
-+
-+		},
- 		timeout => {
- 			_re => '(\d*\.)?\d+',
- 			_example => 1.5,
diff --git a/net-analyzer/smokeping/metadata.xml b/net-analyzer/smokeping/metadata.xml
index bdaa143b7d47..71b3ad2d71e7 100644
--- a/net-analyzer/smokeping/metadata.xml
+++ b/net-analyzer/smokeping/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <use>
-<flag name='speedy'>Use <pkg>dev-perl/SpeedyCGI</pkg> instead of perl to speed up cgi scripts</flag>
 <flag name='dig'>Install <pkg>net-dns/bind-tools</pkg> for dig functionality</flag>
 <flag name='echoping'>Install <pkg>net-analyzer/echoping</pkg> for echoping functionality</flag>
 <flag name='telnet'>Install <pkg>dev-perl/Net-Telnet</pkg> for telnet functionality</flag>
diff --git a/net-analyzer/smokeping/smokeping-2.4.2-r3.ebuild b/net-analyzer/smokeping/smokeping-2.4.2-r3.ebuild
deleted file mode 100644
index 3523042a1558..000000000000
--- a/net-analyzer/smokeping/smokeping-2.4.2-r3.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.4.2-r3.ebuild,v 1.8 2012/06/12 03:14:47 zmedico Exp $
-
-EAPI="2"
-
-inherit perl-module user
-
-DESCRIPTION="A powerful latency measurement tool."
-HOMEPAGE="http://oss.oetiker.ch/smokeping/"
-SRC_URI="http://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="apache2 speedy"
-
-# dev-perl/JSON-1.x is bundled and is incompatible with version 2.x wich is in
-# the tree. See http://bugs.gentoo.org/show_bug.cgi?id=260170#c2
-DEPEND="dev-lang/perl
-		virtual/perl-libnet
-		>=net-analyzer/rrdtool-1.2[perl]
-		>=net-analyzer/fping-2.4_beta2-r2
-		dev-perl/Digest-HMAC
-		dev-perl/libwww-perl
-		dev-perl/CGI-Session
-		>=dev-perl/SNMP_Session-1.13
-		>=dev-perl/Socket6-0.20
-		dev-perl/Net-DNS
-		speedy? ( dev-perl/SpeedyCGI )
-		!apache2? ( virtual/httpd-cgi )
-		apache2? ( >=www-apache/mod_perl-2.0.1 )
-		!dev-perl/Config-Grammar
-		!dev-perl/JSON
-		!perl-core/JSON-PP"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup smokeping
-	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
-}
-
-src_prepare() {
-	rm -rf lib/Digest # provided by dev-perl/Digest-HMAC
-	rm -rf lib/CGI # provided by dev-perl/CGI-Session
-	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} # dev-perl/SNMP_Session
-	rm qooxdoo/qooxdoolink
-}
-
-src_compile() {
-	# There is a makefile we don't want to run so leave this here
-	einfo "Skip compile."
-}
-
-src_install() {
-	# First move all the perl modules into the vendor lib area of Perl
-	perlinfo
-	insinto ${VENDOR_LIB}/
-	doins -r lib/*
-
-	# Install the CGI webserver scripts
-	sed 's:^use lib:#use lib:g' -i htdocs/*.cgi.dist
-	if use speedy; then
-		sed '1{s:/usr/[^ ]*:/usr/bin/speedy:}' -i htdocs/*.cgi.dist
-	else
-		sed '1{s:/usr/[^ ]*:/usr/bin/perl:}' -i htdocs/*.cgi.dist
-	fi
-	sed 's:/home/oetiker.*/config.dist:/etc/smokeping/config:' \
-			-i htdocs/*.cgi.dist
-	exeinto /var/www/localhost/perl/
-	newexe htdocs/smokeping.cgi.dist smokeping.pl || die
-	exeinto /var/www/localhost/smokeping
-	newexe htdocs/tr.cgi.dist tr.cgi || die
-	rm htdocs/{tr,smokeping}.cgi.dist
-
-	# Install AJAX scripts
-	insinto /var/www/localhost/smokeping
-	doins -r htdocs/* || die
-
-	# Create the smokeping binaries
-	for bin in ${PN} tSmoke; do
-		newbin bin/${bin}.dist ${bin}
-		dosed 's:^use lib:#use lib:g' /usr/bin/${bin}
-		dosed 's:etc/config.dist:/etc/smokeping/config:' /usr/bin/${bin}
-	done
-
-	# Create the config files
-	insinto /etc/${PN}
-	for file in etc/*; do
-		config=${file/.dist}
-		newins ${file} ${config#*/}
-	done
-	sed -e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
-		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
-		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
-		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /var/run/smokeping:}' \
-		-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
-		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
-		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
-		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
-		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
-			-i "${D}/etc/${PN}/config" || die
-	sed -e '/^<script/{s:cropper/:/cropper/:}' -i "${D}/etc/${PN}/basepage.html"
-	fperms 700 /etc/${PN}/smokeping_secrets
-
-	newinitd "${FILESDIR}/${PN}.init.2" ${PN} || die
-
-	if use apache2 ; then
-		insinto /etc/apache2/modules.d
-		doins "${FILESDIR}/79_${PN}.conf" || die
-	fi
-
-	# Create the files in /var for rrd file storage
-	keepdir /var/lib/${PN}/.simg
-	fowners smokeping:smokeping /var/lib/${PN}
-	if use apache2 ; then
-		fowners apache:apache /var/lib/${PN}/.simg
-	else
-		fowners smokeping:smokeping /var/lib/${PN}/.simg
-	fi
-	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
-
-	# Install documentation.
-	insinto "/usr/share/doc/${PF}"
-	doins -r doc/examples
-	dodoc CHANGES CONTRIBUTORS README TODO || die
-	doman doc/{smokeping{.1,.cgi.1,_config.5},Smokeping.3,smokeping_examples.7} \
-		doc/{smokeping_{extend,install,master_slave,upgrade}.7,smoketrace.7} \
-			doc/{tSmoke.1,Smokeping/Smokeping::{Examples,RRDtools}.3} || die
-}
-
-pkg_postinst() {
-	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
-	chmod 755 "${ROOT}/var/lib/${PN}"
-	elog
-	elog "Additional steps are needed to get ${PN} up & running:"
-	elog
-	elog "First you need to edit /etc/${PN}/config. After that"
-	elog "you can start ${PN} with '/etc/init.d/${PN} start'."
-	elog
-	if use apache2 ; then
-		elog "For web interface make sure to add -D PERL to APACHE2_OPTS in"
-		elog "/etc/conf.d/apache2 and to restart apache2. To access site from"
-		elog "other places check permissions at /etc/apache2/modules.d/79_${PN}.conf"
-		elog
-	else
-		elog "For web interface configure your web server to serve perl cgi"
-		elog "script at /var/www/localhost/perl/"
-	fi
-	elog "To make cropper working you just need to copy /var/www/localhost/smokeping/cropper"
-	elog "into you htdocs (or create symlink and allow webserver to follow symlinks)."
-	elog
-	elog "We install all files required for smoketrace, but you have to"
-	elog "configure it manually. Just read 'man smoketrace'. Also you need to"
-	elog "'emerge traceroute'."
-	elog
-}