Version bump.

Package-Manager: portage-2.1.2.12

4 files changed, 135 insertions, 6 deletions

diff --git a/net-analyzer/smokeping/ChangeLog b/net-analyzer/smokeping/ChangeLog
index 0bb8c0d10f6e..55f2a88edd38 100644
--- a/net-analyzer/smokeping/ChangeLog
+++ b/net-analyzer/smokeping/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for net-analyzer/smokeping
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.16 2007/09/16 22:24:28 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.17 2007/09/17 11:44:22 hansmi Exp $
 
-*smokeping-2.2.3-r1 (17 Sep 2007)
+*smokeping-2.2.4 (17 Sep 2007)
+
+  17 Sep 2007; Michael Hanselmann <hansmi@gentoo.org>
+  +smokeping-2.2.4.ebuild:
+  Version bump.
+
+*smokeping-2.2.3-r1 (16 Sep 2007)
 
   16 Sep 2007; Michael Hanselmann <hansmi@gentoo.org>
   -smokeping-2.2.3.ebuild, +smokeping-2.2.3-r1.ebuild:
diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index 053261c43c1e..639941d303b1 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -12,6 +12,7 @@ RMD160 c041fb04e1d63dfd077ecd7abd0248eb7dc63c1c files/smokeping.init 1632
 SHA256 625634db58c5eca142d6bf13741e5afbb18ecdbbd780cbfeafe13711a94dc929 files/smokeping.init 1632
 DIST smokeping-2.0.9.tar.gz 393777 RMD160 3ddbe35f6ec634773d6facc5d7e4c17c17753984 SHA1 89427122eada5fdf5f6145705f080583fb2d245a SHA256 c9fc10d04afae31ac5283101f0211e842faf98784301178833ada1e3e4a0dcf5
 DIST smokeping-2.2.3.tar.gz 697271 RMD160 e5ae9bf9bbad9002ce639906562bd0db338665d1 SHA1 18df7c831ea05a6bda48d0f65c4c6957b5e162b3 SHA256 4121655a2fcb5779b66f221c86cf898c6ea35ad557b67dc8e9ebc8e09a3ffb99
+DIST smokeping-2.2.4.tar.gz 588740 RMD160 74a784ac3b9a837ba29882c1bcc16f6bdb440b9a SHA1 45e210e79017853031dee379a05647db7697d076 SHA256 a1d684785294919b6b97924484579bc64c460a39482c4dd676514712b3699da9
 EBUILD smokeping-2.0.9.ebuild 3362 RMD160 61c81f7eafa15c2468b07e44fa3c3f5a410a9f8e SHA1 de051f3fef3791e29a9a72168f78644b3959e26b SHA256 68770bd5f4f3e78fd159b8b46ad772559fc388518504608ba1b9281f1d8eafee
 MD5 2c4944d422e4e9e29b3b671d6455dabd smokeping-2.0.9.ebuild 3362
 RMD160 61c81f7eafa15c2468b07e44fa3c3f5a410a9f8e smokeping-2.0.9.ebuild 3362
@@ -20,10 +21,14 @@ EBUILD smokeping-2.2.3-r1.ebuild 3563 RMD160 8c1aa16e88bbe05b3fba9bc5e3f9a37330c
 MD5 c56e379e900d26c09ba22687d815570e smokeping-2.2.3-r1.ebuild 3563
 RMD160 8c1aa16e88bbe05b3fba9bc5e3f9a37330cc4d75 smokeping-2.2.3-r1.ebuild 3563
 SHA256 5e779a97c1327065496fb92939c3cb94f79dc231375fe76f7c8089a440ea5e65 smokeping-2.2.3-r1.ebuild 3563
-MISC ChangeLog 2135 RMD160 cff179e223873cd2a802d4405250e53f060e8775 SHA1 be99d9bc8c9281cfd7036f0de135d6ccfc7192f4 SHA256 81a372c2a5234ece75937342ebf8ac9574ea3512ad0f010336fd3e6d4ed6e1c5
-MD5 3ec1525c8e34e0be2add7d62a68a5410 ChangeLog 2135
-RMD160 cff179e223873cd2a802d4405250e53f060e8775 ChangeLog 2135
-SHA256 81a372c2a5234ece75937342ebf8ac9574ea3512ad0f010336fd3e6d4ed6e1c5 ChangeLog 2135
+EBUILD smokeping-2.2.4.ebuild 3560 RMD160 8da84cae66985fd4b36ee40b0cceb061d9d58afd SHA1 cb2c842d56d299bdb7fa312d240fa8c794760368 SHA256 b4ce45c9e13881458f31c5726001f42934f9cfae15c303b2add15b456bb8254f
+MD5 964826b9b7e9311ead71d66062f74ef4 smokeping-2.2.4.ebuild 3560
+RMD160 8da84cae66985fd4b36ee40b0cceb061d9d58afd smokeping-2.2.4.ebuild 3560
+SHA256 b4ce45c9e13881458f31c5726001f42934f9cfae15c303b2add15b456bb8254f smokeping-2.2.4.ebuild 3560
+MISC ChangeLog 2265 RMD160 e52d0e3c4cb2d45eb91dc2a5c87917a881c93ca8 SHA1 796cc92827fdd1fbfed5bfa8b30f3f4cf12a0a91 SHA256 5e5f2d6721d61792a199a1969dbb428fb7041c2792a918fdcc41576a60741ff5
+MD5 0da80e8413e08e34e2f25a6cc2fdbc8a ChangeLog 2265
+RMD160 e52d0e3c4cb2d45eb91dc2a5c87917a881c93ca8 ChangeLog 2265
+SHA256 5e5f2d6721d61792a199a1969dbb428fb7041c2792a918fdcc41576a60741ff5 ChangeLog 2265
 MISC metadata.xml 251 RMD160 b51dbdd722927410f6ddea140ac6eebb8980b94e SHA1 2294d43232148e83653e27ee326c4c84389e4123 SHA256 4ba83a5bcb7a3c1cb108e970efc076f21e52493f59d52d271867588fe330d16b
 MD5 34a8120f0854b70fb459e6d2c486370f metadata.xml 251
 RMD160 b51dbdd722927410f6ddea140ac6eebb8980b94e metadata.xml 251
@@ -34,3 +39,6 @@ SHA256 1cf4755243694a82121a0a5b8f46731cabfd1bfc61b951aa3e5dd3ef44fa51ae files/di
 MD5 943f2541123a339aa07f3a096d638c9c files/digest-smokeping-2.2.3-r1 247
 RMD160 ba2bf849402aad233bf5289a8a491dd9982253dc files/digest-smokeping-2.2.3-r1 247
 SHA256 2bedf394ac67ddd9ee3e997b160b6723e62efd723544b12d2237c38d78c9f8c5 files/digest-smokeping-2.2.3-r1 247
+MD5 e72d9a4e05c4bf8167472d6b18d5d3cf files/digest-smokeping-2.2.4 247
+RMD160 005aba6400e63900b369eaa4fdf2be6f6c9872c6 files/digest-smokeping-2.2.4 247
+SHA256 b751798db3cb302501a8645015c152cc7a34b7ba73137d5c17d71b319b29825f files/digest-smokeping-2.2.4 247
diff --git a/net-analyzer/smokeping/files/digest-smokeping-2.2.4 b/net-analyzer/smokeping/files/digest-smokeping-2.2.4
new file mode 100644
index 000000000000..fa508f94991f
--- /dev/null
+++ b/net-analyzer/smokeping/files/digest-smokeping-2.2.4
@@ -0,0 +1,3 @@
+MD5 85dd954cce33092a9e36b2e3999cb056 smokeping-2.2.4.tar.gz 588740
+RMD160 74a784ac3b9a837ba29882c1bcc16f6bdb440b9a smokeping-2.2.4.tar.gz 588740
+SHA256 a1d684785294919b6b97924484579bc64c460a39482c4dd676514712b3699da9 smokeping-2.2.4.tar.gz 588740
diff --git a/net-analyzer/smokeping/smokeping-2.2.4.ebuild b/net-analyzer/smokeping/smokeping-2.2.4.ebuild
new file mode 100644
index 000000000000..05df09e81402
--- /dev/null
+++ b/net-analyzer/smokeping/smokeping-2.2.4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.2.4.ebuild,v 1.1 2007/09/17 11:44:22 hansmi Exp $
+
+inherit perl-module eutils
+
+KEYWORDS="~amd64 ~sparc ~x86"
+
+DESCRIPTION="A powerful latency measurement tool."
+SRC_URI="http://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
+HOMEPAGE="http://oss.oetiker.ch/smokeping/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2"
+
+DEPEND="dev-lang/perl
+		virtual/perl-libnet
+		>=net-analyzer/rrdtool-1.2
+		net-analyzer/fping
+		dev-perl/libwww-perl
+		dev-perl/Net-DNS
+		apache2? ( >=www-servers/apache-2.0.54-r30 >=www-apache/mod_perl-2.0.1 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! built_with_use '>=net-analyzer/rrdtool-1.2' perl ; then
+		eerror "You must build net-analyzer/rrdtool with the"
+		eerror "'perl' USE flag turned on!"
+		die "net-analyzer/rrdtool installed with 'perl' USE flag disabled"
+	fi
+
+	enewgroup smokeping
+	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
+}
+
+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 lib/*.pm
+	### This one kind of concerns me, possible conflict with other software
+	insinto ${VENDOR_LIB}/Config
+	doins lib/Config/*.pm
+	insinto ${VENDOR_LIB}/Smokeping
+	doins lib/Smokeping/*.pm
+	insinto ${VENDOR_LIB}/Smokeping/matchers
+	doins lib/Smokeping/matchers/*.pm
+	insinto ${VENDOR_LIB}/Smokeping/probes
+	doins lib/Smokeping/probes/*.pm
+	insinto ${VENDOR_LIB}/Smokeping/sorters
+	doins lib/Smokeping/sorters/*.pm
+
+	# Create the files in var for rrd file storage and the cgi webserver script
+	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
+	exeinto /var/www/localhost/perl
+	newexe htdocs/${PN}.cgi.dist ${PN}.pl
+	dosed 's:^use lib:#use lib:g' /var/www/localhost/perl/${PN}.pl
+	dosed 's:sepp/bin/speedy:bin/perl:' /var/www/localhost/perl/${PN}.pl
+	dosed 's:/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config:/etc/smokeping:' \
+		/var/www/localhost/perl/${PN}.pl
+
+	# Install AJAX scripts
+	insinto /var/www/localhost/perl
+	doins -r htdocs/cropper
+
+	# Create the binary
+	newbin bin/${PN}.dist ${PN}
+	dosed 's:/usr/sepp/bin/perl-5.8.4:/usr/bin/perl:g' /usr/bin/${PN}
+	dosed 's:^use lib:#use lib:g' /usr/bin/${PN}
+	# dosed 's:/sepp::' /usr/bin/${PN}
+	dosed 's:etc/config.dist:/etc/smokeping:' /usr/bin/${PN}
+
+	# Create the config files
+	insinto /etc
+	newins "${FILESDIR}/config.dist" ${PN}
+	newins etc/basepage.html.dist ${PN}.template
+	doins etc/smokemail.dist
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+	if use apache2 ; then
+		insinto /etc/apache2/modules.d
+		doins "${FILESDIR}/78_${PN}.conf"
+	fi
+}
+
+pkg_postinst() {
+	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
+	chmod 755 "${ROOT}/var/lib/${PN}"
+	elog
+	elog "Four more steps are needed to get ${PN} un&running:"
+	elog "1) You need to edit /etc/${PN}"
+	elog "2) You need to edit the template at /etc/${PN}.template"
+	elog "3) You need to make the fping binary setuid root:"
+	elog "    # chmod 4755 /usr/sbin/fping"
+	if use apache2 ; then
+		elog "4) Make sure to add -D PERL to APACHE2_OPTS in /etc/conf.d/apache2"
+		elog "   and to restart apache2."
+	fi
+	elog "You can now start ${PN} with '/etc/init.d/${PN} start'."
+	elog
+}