Update dev-perl/Socket6 version and mv enew{user,group} into pkg_setup as user/group are use in src_install, thank blain 'Doc' Anderson and Torsten Veller for report, bug #341175.

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

3 files changed, 166 insertions, 2 deletions

diff --git a/net-analyzer/smokeping/ChangeLog b/net-analyzer/smokeping/ChangeLog
index b146e0c2f0af..8c2c5bc6e724 100644
--- a/net-analyzer/smokeping/ChangeLog
+++ b/net-analyzer/smokeping/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/smokeping
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.30 2010/06/16 18:24:17 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.31 2010/11/03 19:00:25 pva Exp $
+
+*smokeping-2.4.2-r3 (03 Nov 2010)
+
+  03 Nov 2010; Peter Volkov <pva@gentoo.org> +smokeping-2.4.2-r3.ebuild:
+  Update dev-perl/Socket6 version and mv enew{user,group} into pkg_setup as
+  user/group are use in src_install, thank blain 'Doc' Anderson and Torsten
+  Veller for report, bug #341175.
 
 *smokeping-2.4.2-r2 (16 Jun 2010)
 
diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index fdc3208a1cc4..48fb313654ba 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -11,5 +11,6 @@ EBUILD smokeping-2.2.4.ebuild 3434 RMD160 508163eccfa73e35126c8584f4ff1877377327
 EBUILD smokeping-2.3.5.ebuild 3530 RMD160 a02f1ddf97dec18e665ae0f672a506d641d0598e SHA1 6e7dace2850d575762bc83cdb7dce2f39677808e SHA256 3fa31b1e1ecf02eda5b093c250b62d2d3a06fefb1ae1ff8d3e20d6068392e5e0
 EBUILD smokeping-2.4.2-r1.ebuild 5328 RMD160 eec0f75cd9f063828b6f125924447ab46d0acb20 SHA1 54dc3111a924305b69039cfb8f99b69267d6df3f SHA256 bc0d0bba6e4f8e1a3a745542749a036c888a5d87b65bca3baec28684b80f4a49
 EBUILD smokeping-2.4.2-r2.ebuild 5244 RMD160 7116ade07953c70b2a93e33e92e4c27f6c347da9 SHA1 744b187242ce0d66079132009bb8d425e699cb6f SHA256 f65f55074fe50b7422d1866ed299676641dd2c782d794d9699acd7dc3817c24b
-MISC ChangeLog 4631 RMD160 d00d9a79502e8b5914d6f936d1b8fb8a0cbec7d9 SHA1 e8428a017717b3e90a732dcbeb166d342b3de0c9 SHA256 0c9845e300bc1800007ed100092bfdec35ede4ea23735f57872f8789df3a6724
+EBUILD smokeping-2.4.2-r3.ebuild 5249 RMD160 589bf1aac1784d313eea335543c6c679affa1b11 SHA1 53686a1840dea92e2dfb252f2e2a924d3bbb6f68 SHA256 86f08bc5b1b1e96d3e6de1d7e6536355227ac28d6064110edfbc0a527adef79b
+MISC ChangeLog 4926 RMD160 811669164cfbc8cc90e4e7fdf3d952a6f52ca5c7 SHA1 22aa55186a89a7e5376f93ad47576a4271d723c3 SHA256 ba16f483f194e2edf3dd0be901a864f6e22e08ea65a6d2766a469a21626773f4
 MISC metadata.xml 361 RMD160 7de7c7bb433ae943618d7ea8c434da347d1a7f8e SHA1 ebad6ec275bddd0fc705ee7aabe7607070593071 SHA256 c91655cb47d86f209ce10de9c4e62bac01c76127b9bad94e2be166bbde2691e2
diff --git a/net-analyzer/smokeping/smokeping-2.4.2-r3.ebuild b/net-analyzer/smokeping/smokeping-2.4.2-r3.ebuild
new file mode 100644
index 000000000000..58ef5fa2161a
--- /dev/null
+++ b/net-analyzer/smokeping/smokeping-2.4.2-r3.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2010 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.1 2010/11/03 19:00:25 pva Exp $
+
+EAPI="2"
+
+inherit perl-module eutils
+
+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 ~sparc ~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/JSON"
+
+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
+}