Version bump.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 153 insertions, 5 deletions

diff --git a/net-analyzer/smokeping/ChangeLog b/net-analyzer/smokeping/ChangeLog
index 77c013a79b7a..858b9fab0285 100644
--- a/net-analyzer/smokeping/ChangeLog
+++ b/net-analyzer/smokeping/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/smokeping
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.59 2014/11/05 15:54:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.60 2014/11/08 20:07:40 jer Exp $
+
+*smokeping-2.6.11 (08 Nov 2014)
+
+  08 Nov 2014; Jeroen Roovers <jer@gentoo.org> +smokeping-2.6.11.ebuild:
+  Version bump.
 
 *smokeping-2.6.10 (05 Nov 2014)
 
diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index 301ff082073d..65a167baf076 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -8,15 +8,17 @@ AUX smokeping.init.3 1736 SHA256 ce54a0e8c62345e9621f7dd65f224d67be3e90b0adf68eb
 AUX smokeping.init.4 1756 SHA256 c9d058490ba0ac86a4ff0a9356ff430e6331761fc06703236522e661ebc3ef6c SHA512 b3438f3926b9c0368b8fe262ec08ea9957690fb98a49a7eb30841fab23054f8582bc0690242fd178157bc814f23f8648b87df5b341d8fca1be1a82877c3887b5 WHIRLPOOL dd378704b8b48f53995c873d1fdb2fc793332050cdcb0912808b427b5afd4dff59af0f4f415e1718904b397add9f1d7fbfb66cf3975f4415b327714f9ad6c0fc
 AUX smokeping.service 200 SHA256 976a0bc33a30a3524cbf2b2de0641a28e53d0546695c41b5f323f8d96899dcaa SHA512 2f8824143b8283ad02274107c5ed0e84f0c1465fc089823e36ef44a42fec68564d8cc4ff5fb0ad6dc0443e21fac5a8cbcbb0a9bea151b57efaff2a082d15f344 WHIRLPOOL f3899165b71854dc96f5ea6b5f8c17c86ab9dd06faa8ed01abb052a6e647886855102f1d56d47698c7579f22b89fd8948a2684bb23ea4963e4ab99ca4735fee0
 DIST smokeping-2.6.10.tar.gz 415383 SHA256 0121672951f47bd45575898c3e4d767e22cc692dd272d723b422515fd3cc641c SHA512 e91ac80ceafccb945ec48cc80020b8cbf2afe29b5f422dc5aaf7c52387eafc498180c293cf82dccc4fdec88ec56f80fb1bd08ebcb2ae9aea563475a069b91f13 WHIRLPOOL dc2b75b694ffb93d777f4a97e6f3f26c898741eb67f19d9b6ebb3dcb1d3688422cb4756c2f969e858ad89e98d4278c2995abc39927b2615a249efd1f02b733aa
+DIST smokeping-2.6.11.tar.gz 417338 SHA256 f2b3c386e95a74af2b1e7aec6410d0a58852339f00e9963f3c770cfd85ba30dd SHA512 928722832d6e01ffbb7b74542678f7b9d5fc22819c0feae164ce58b8d8a5595800f617c8a672e07cae4b2c4ccbfa4883a11438ba2a172fc2887abc2933388422 WHIRLPOOL e7c0dc3fd5fe1e66b9a8f70584bb2973a807990ad2e7cec50951294e794f67e60e88b39ec52adfe0e92e80e9d11e899fcb5b0bef7fc67d5e271f10c5ba44dc56
 DIST smokeping-2.6.9.tar.gz 427185 SHA256 cd551d4384d8b19879d128ea0566bd680c19bb4ad8664a3c5a304604746f8863 SHA512 ab3cec15fd9f90510f902da7ce5bac5915558cac198cc88f0ce193a53a0158c9055e28c8c6671cc6653ac42ab51346e1eb19e537f1ab5c234fd498c6b777499d WHIRLPOOL e3a47ed5222798f69f5b957cea5a0404fc1f58675678bd82f93d39085f5a029de2b71974ad245e4de0454d7f689a199f2a2134abbc1ac6ed8e042835c14d3f57
 EBUILD smokeping-2.6.10.ebuild 4179 SHA256 20da53c2679ff5dd74b4fb3360f614e6c16f11d2e11f161cd9af6047c6cfb275 SHA512 92d05ecd9504c3270d7a272963a5f46198e152ce64c62a2344dd92902d2fe913b888bc88c226f73bf35a4cbd2f041238ab2c059665a2474e72674488aaf4ece4 WHIRLPOOL 1a09a7e845b035991455c2b811ada0111a9b5dca1da64b33a38e793cb8f7b3c150b55b49d02189041a028433eb0667f2f0c3bc439ea2d61098577af70f21e7c3
+EBUILD smokeping-2.6.11.ebuild 4165 SHA256 cd34fbcb8e868a61f08608ca38869cc8dcaae992b7eca484b804240aad48ef83 SHA512 c1fa97762c6738a66d4b126e15eabeeb82b09e30c2c2446eddb765290ff2862ef6734d5971633f1ffa35f6009b859c41e6f012b45b37446efcd22a41be58e18d WHIRLPOOL 13fe4d5733b35d51d5f0795e55126dd1a260edd3aea0b1fcab15aff0fd4ee0a25eb0d9dd470ddfe531fb247a48e9b9d272a8a3df5a0d026052e57c51763ec92b
 EBUILD smokeping-2.6.9.ebuild 4277 SHA256 4059fc49144ab7f50c7d175cb806818d28235cc4a9a7d6f642bfe8a1a51fc966 SHA512 67f7f72052900733fa99754bc460d20ffeda1a421a3e9ffd13b59161baffd47064d12174b4c66eac56df26e72e8164c6d747712298e06cd9bb8fdd3195d6648f WHIRLPOOL bb6befb4b54b5af9cac4933b65a29903c48b593ba5200203cb538c3785256763b4442f4728c5d63d22a6c4d38a40da04a2ba5cc0400b2affe8276c2a16eb2cc9
-MISC ChangeLog 9075 SHA256 c76ccae325716632f3eff0f73d1f6ad2b4a2e6539884c703db9e0d54b29d4e71 SHA512 acacdc81aa4ec529b0d9a99110233d7bc3d3eb6c1a2fbb6755d2d1f8f924e3e33246bca2088b238c6417c2e7da1ccf2e4034bcde4b05c937d235eed598909093 WHIRLPOOL 5e8937c750f83994ca687a54cfea8c5553e5064e7ee28e6e154f154a24e94e328471a8c4fef5af7c5f66c2d398816251ea492035c1afd3ce5c8d2d55c6ff2d8c
+MISC ChangeLog 9198 SHA256 86cf8371dd7f425f5828305093600c09f356e7d0977947c1d49cc0c0ce50f34e SHA512 b09b7a19d0db3abcdc395f520bfe842105bccb3f5889503daead5489433bc1012652e26166c255c1fcfa7234781fd5d140b41d70a1d20b1b7bdfa58f3bd14b6c WHIRLPOOL ff5b40bff9ddc43c2b6ff335dac5636edf790f5c947382fde336dcc9271c29848de6873757d6ba5674f0d75ada190a1cf3c8e39eafbc38813c18c3cb51eed896
 MISC metadata.xml 494 SHA256 e8b6774a1005b8153ac5a090e865a2456626ea74dd2d57efbd131146df30a817 SHA512 8981b4f6532a90ef699fa8639145648e999e94dd3afd93ba67d069a5d7aa98a7c6739b272e0f0e96a9d0471b0a1bb4d0e3968373eee6923380fe271ea939eb12 WHIRLPOOL 4399dd13c9945dbccd1a1fff51c61dca52475aaba648ed4d48df682108bb9469ec46a49d635970f5f3d2bc6e52db5e5fe91d0acad4a1f982abe4a66c342bfb3f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRaSEEACgkQVWmRsqeSphOHvgCfUCvItiOK/rhJlwtn7RiNgxU1
-Y34An20S6xG7ScwWazroYB+IqcWN5jXa
-=bleS
+iEYEAREIAAYFAlReeA0ACgkQVWmRsqeSphMCxACfdjhTL/aCbeonOAkby3HxDvbv
+wCYAn2G5+lQIMrUHJiB9xFs57HfUNguq
+=gmsA
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/smokeping/smokeping-2.6.11.ebuild b/net-analyzer/smokeping/smokeping-2.6.11.ebuild
new file mode 100644
index 000000000000..ed66e5dc3f0b
--- /dev/null
+++ b/net-analyzer/smokeping/smokeping-2.6.11.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.6.11.ebuild,v 1.1 2014/11/08 20:07:40 jer Exp $
+
+EAPI=5
+inherit eutils user systemd
+
+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"
+# dropping hppa and sparc because of way too may dependencies not having
+# keywords in those architectures.
+KEYWORDS="~amd64 ~hppa ~x86"
+
+# removing fcgi useflag as the configure script can't avoid it without patching
+IUSE="apache2 curl dig echoping ipv6 radius"
+
+DEPEND="
+	>=dev-lang/perl-5.8.8-r8
+	>=dev-perl/SNMP_Session-1.13
+	>=net-analyzer/fping-2.4_beta2-r2[suid]
+	>=net-analyzer/rrdtool-1.2[graph,perl]
+	dev-perl/CGI-Session
+	dev-perl/Config-Grammar
+	dev-perl/Digest-HMAC
+	dev-perl/FCGI
+	dev-perl/IO-Socket-SSL
+	dev-perl/IO-Tty
+	dev-perl/Net-DNS
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SNMP
+	dev-perl/Net-Telnet
+	dev-perl/libwww-perl
+	dev-perl/perl-ldap
+	virtual/perl-libnet
+	!apache2? ( virtual/httpd-cgi )
+	apache2? (
+		>=www-apache/mod_perl-2.0.1
+		www-apache/mod_fcgid
+	)
+	curl? ( >=net-misc/curl-7.21.4 )
+	dig? ( net-dns/bind-tools )
+	echoping? ( >=net-analyzer/echoping-6.0.2 )
+	ipv6? ( >=dev-perl/Socket6-0.20 )
+	radius? ( dev-perl/RadiusPerl )
+"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup smokeping
+	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
+}
+
+src_prepare() {
+	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} # dev-perl/SNMP_Session
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/smokeping \
+		--with-htdocs-dir=/var/www/localhost/smokeping
+}
+
+src_compile() {
+	LC_ALL=C emake
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.init.4 ${PN}
+	systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf
+	systemd_dounit "${FILESDIR}"/"${PN}".service
+
+	mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html"
+	mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config"
+	mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail"
+	mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets"
+	mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail"
+
+	sed -i \
+		-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 /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:}' \
+		"${D}/etc/${PN}/config" || die
+
+	sed -i \
+		-e '/^<script/{s:cropper/:/cropper/:}' \
+		"${D}/etc/${PN}/basepage.html" || die
+
+	sed -i \
+		-e 's/$FindBin::Bin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
+		"${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die
+
+	sed -i \
+		-e 's:etc/config.dist:/etc/smokeping/config:' \
+		"${D}/usr/bin/tSmoke" || die
+
+	sed -i \
+		-e 's:/usr/etc/config:/etc/smokeping/config:' \
+		"${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
+
+	dodir /var/www/localhost/cgi-bin
+		mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
+		"${D}/var/www/localhost/cgi-bin/smokeping.fcgi"
+
+	fperms 700 /etc/${PN}/smokeping_secrets
+
+	if use apache2 ; then
+		insinto /etc/apache2/modules.d
+		doins "${FILESDIR}/79_${PN}.conf"
+	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
+		fowners -R apache:apache /var/www
+	else
+		fowners smokeping:smokeping /var/lib/${PN}/.simg
+	fi
+
+	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
+}
+
+pkg_postinst() {
+	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
+	chmod 755 "${ROOT}/var/lib/${PN}"
+}