Install unit file (#475860).

Package-Manager: portage-2.1.12.11/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 181 insertions, 6 deletions

diff --git a/net-analyzer/smokeping/ChangeLog b/net-analyzer/smokeping/ChangeLog
index bedd12a6302c..546be3e9cc89 100644
--- a/net-analyzer/smokeping/ChangeLog
+++ b/net-analyzer/smokeping/ChangeLog
@@ -1,6 +1,12 @@
 # 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.44 2013/02/16 12:47:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.45 2013/07/06 06:44:55 pacho Exp $
+
+*smokeping-2.6.8-r1 (06 Jul 2013)
+
+  06 Jul 2013; Pacho Ramos <pacho@gentoo.org> +files/smokeping.conf,
+  +files/smokeping.service, +smokeping-2.6.8-r1.ebuild:
+  Install unit file (#475860).
 
   16 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due bug #96436
diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index 631380a1f991..638b83624669 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -3,20 +3,23 @@ Hash: SHA256
 
 AUX 79_smokeping.conf 351 SHA256 fa4c48387598f8c6e60b7642e4284bb64196dcd233cea9f18ff37009b212ff77 SHA512 d53abdf29e8f6bad67a654b17088c3f8dee7908ff82b0b911599e2ac6a11be84b8fa2c30b1f0b6142803ff9a5058f586946eafa112dfd26ca4f8f8664d19cfc6 WHIRLPOOL 907eff72a390aa36c7be80fb39f2204238ec8daa13f07d9b189401374cf4cc2cdf6df2842f8d0e9096bcd87670190b673d1bfa05adcca5ad0266b99d1bd79586
 AUX config.dist 2962 SHA256 031f0cb72de57812ed34f463d71e90d05fb7b0e2b8df79d5e6ec42e67dfeca7e SHA512 b9fbaf1f1d5fedf0c3ec2ced02a1cc457a24e28d1b405d61b8a97c97d9e8cee03da9fafb2526dac3c288451f6a20e4b568ed099351c88089081d8af0da47fd11 WHIRLPOOL ac4d45d87843cae5f6fbcae3b3c39b021dc35da00ad91ae69ccfec8a650baca0e6654a34e74cb6362e4e50d9fa9d482aed30ef7a6b82c3fbaf7e6889b26e4065
+AUX smokeping.conf 32 SHA256 aa672ff60f18cfa311ee3303fb824d390dc44ffd4b309e34235242b4c3de7ac7 SHA512 75863f16f8b57ca9ae7c7d65076acaf28aac66fa2d52ed78bce2bb3a4938dc75a1e8ed54236c52c3965b170a8348145780dd5c0f3d0fc8c95f4b88085252a4ef WHIRLPOOL 233839d651258edbd74377e39d87c238e4e6e8aabfe60b7edb4ad6bb746f57bec7f6fce1e1123119e0349a27d584e7991765fc4f5a9c5376ef54bbce41cac2e8
 AUX smokeping.init.2 1546 SHA256 f98a2e8747daa94678f5263aa3ad8e86636264acc7aa3ee558d1742ac8751747 SHA512 1aba6e08d531ca4de9df37af073b2d4f3ad01197ae02596108b9591e19ff474a1bdd6d1d980f760ffe3a924809d3188d0b2df01e776b3c9c43a8cd23d3a3a688 WHIRLPOOL 19fc271e949ab149937feb8a5d80ae264555896ae62145d35cecca48fc52596b711a4a7acc28535d400a7383d2d05d41221f8399fab6e9b86283fa5345beba52
 AUX smokeping.init.3 1756 SHA256 71ffdf90dd7c40129e407b5cf38035b8665511e0a7e52a1acfb5e7e6115391ad SHA512 f8a13a7c5af700fa6a9e89fba8f5e2c04b9330402763fde80e8a3dfc904dc1c20965db33e0d2ee3cfdb9b1333f4c5d743922f02e9f2ad11217b2b2ab897c62c0 WHIRLPOOL a83152ce18115c285c1847eaaeba000e95b5ed27e243df6922a224a323f72b28a18fdfd2bb5277c756ab6c8ba2755c37e94c14063eb4b93e09af54c23d27fc31
+AUX smokeping.service 200 SHA256 976a0bc33a30a3524cbf2b2de0641a28e53d0546695c41b5f323f8d96899dcaa SHA512 2f8824143b8283ad02274107c5ed0e84f0c1465fc089823e36ef44a42fec68564d8cc4ff5fb0ad6dc0443e21fac5a8cbcbb0a9bea151b57efaff2a082d15f344 WHIRLPOOL f3899165b71854dc96f5ea6b5f8c17c86ab9dd06faa8ed01abb052a6e647886855102f1d56d47698c7579f22b89fd8948a2684bb23ea4963e4ab99ca4735fee0
 AUX smokeping_fping-3.3.patch 1686 SHA256 f52307a64c2b0648543799406d1809e93cc38c8acfb61fd49e0352506adcce1f SHA512 eaea689b4e7f1e38e8d36950ffe9aa49bf8bb5f3a0f64dba72c18fdf2695fcc9d16d3bb3d629518f7fc418e7c1cd9402d200bdef71d6cea34a204f51515f1603 WHIRLPOOL d2604eff7db415ee91534e1ca629c690241ec214046156cdf59942636f23ab14a305ece07ed0bda7b78b2c7e255aa39e0d9bfd1c14da8ec277897e482326eadd
 DIST smokeping-2.4.2.tar.gz 909514 SHA256 ed8680d1b3fdb2b1efde3aa14b37bf7e9aee2c992c5814061dbd78e6eea00d49 SHA512 443a7c823801b64de930765011c762b4326f3b9a3f8140c4f782802a019dca0af6a2a248c613ea189592550446e89fdce6ec7236386123ced8c2bf1197b79403 WHIRLPOOL 28115d925d7329ba76f677dfceb89b954a53dee329f62cb4e2f9b6f96a91434a3e6595b89b4af1fca2cb5eb6fb095b69da9aed8fb616c0129513ea33a28bc107
 DIST smokeping-2.6.8.tar.gz 423516 SHA256 15fd99487d01649a552d2954bc1c6b0442967a72fca51c8ff197447389b1b16c SHA512 a8d4b201b63c42e4af7ad494023dc43db706788e52c160202888e5d8332da391ce4f0304a636070612137e9a49bd448778e3359e73f219e930d0ae391d1f6c27 WHIRLPOOL fe74474f637ef46cdff0077ea108c38b86853734ccec1e9b474d42e274095045c99dc9e8b570faadc280f13e1f6af8cbb1f396625ad2a4cd9325147604a5aee6
 EBUILD smokeping-2.4.2-r3.ebuild 5290 SHA256 9f369cd388add216d9ed48047124b32a1b89929e58ce38f69eb1edbb6a41f019 SHA512 532302caadea8b65964f721d6d7399c38575b2de0962f1e323ee172be2f04caa68fa824202eb5d9e3cf7a7d9d8a4c04f1858a5465a0c421fb1a237b051dab2e9 WHIRLPOOL 3084b04f82daa2350043abd9fb755ccac4953ff9c035c815fd6b3c70e6ab9a5150d1124653177b9145a41615367012c4ec754febed3558033b69cf61b0072939
 EBUILD smokeping-2.4.2-r4.ebuild 5624 SHA256 0e50d0cced542402fa1b27982c57d80be7265129db2738768be7a736c0e2a457 SHA512 3d7c282de8bb85d74d3226c4e36f283facf3f396783bedecb4d83692a621171077d5767748bea5c9b10e6fdbc2b146bf0f92091839100c84ab7e5672be82886c WHIRLPOOL 72c594b90cbf8803f8421f1bee15aa34075458342e28778806471b8d8922acd1d85afb8491cf9f1a8ff6166611bf45d591f48bfd8963eb35ca909d377daaf1a6
+EBUILD smokeping-2.6.8-r1.ebuild 5207 SHA256 8260f0313858832d3cb9a528c9b4c21c5e4b1d0ad2d3648776c20fc084336686 SHA512 46a9b47b050637b3582a162a5512e77464eaa4ebeef061eddffa357291ad8a38eaad3d4abba1369acd78918af54eaa3c2ed2827bb43a164e06f21ef2127930be WHIRLPOOL a0ee73f409694b0c5f614bed6f15bf7d8c187b484d848d7a2290018e7b72bdca7d4d0772d383bf2c05c3ed9b8dd9470954abed6875c4b978481d47cf6b496d2a
 EBUILD smokeping-2.6.8.ebuild 5090 SHA256 99b196404f77994fde42ec62725cb5ff4bfd489a66fe8e494843993c5d011708 SHA512 ccd2246bc30273f1a24b2288d3d31e519b7d445eb1f658fb9fdbbe3e4cdc75b0c08215fa80eac4746efa496f60ed26e5157f8481208a523058f3a0d5660a5896 WHIRLPOOL 2a93444ec826225f8c07acb253a24a69bb619004b7b94c4a8a677588ac8af36f5b46cde2ea4605b0c0b46912693cbe2f866c92bcae7f350a143f969c68b9f8b9
-MISC ChangeLog 6997 SHA256 02c2a821521faa0fc876de754915617b49f3d7f2edbdcf2e1049c84b9158778c SHA512 31302cd5d76109f26664298641ef4c1dd902cb040caa3b21908db4fa0f84db369b7a95fef0a6ecc9468fd477f9308a0d877566f623b2df7494a924513739ca3a WHIRLPOOL 209368f7a64746bc9a91ae9ec78fb21fad6fde9441ae9c76f82125aabe0abeac0e82c16e3c9eaa7956a3d60bfad150386463df7721a745aa8d01b1b78c67a9e9
+MISC ChangeLog 7189 SHA256 42d17dfa31c0a3d5b5fdd616fffea80188b984585bfc48c4096f9d86d06c8cc7 SHA512 48c8ad2f06d5bb4826a50c92887d075b2b15bb6d518d66efd90224e0faa23f0cbcb176271cf2bc38070e7679b63df43ed2afbcf54f75c4b36285d89064024f6f WHIRLPOOL 717ea1eda8abf3de9eb308bdaee9033085953128c6d8d1fcff113b0d4cdab684f6b68236c156b7c49ae3974bd3131068fd986f232584b135bf575fac3ad9cb00
 MISC metadata.xml 659 SHA256 b93062f989a674a87850ba57373942fc9dbe90708c2e496f549a7dbd144d24e7 SHA512 9d2567f77fdf5b36f94ada088b6187b347d9bbe587c3534eb5d5c51b4b3f6733b57e28b280be5a994992a11a039d286d915d0712823d23db73f011d8b79d78e1 WHIRLPOOL 96997d680b11408f26d96b68390be66bf27a965e9bc6120bdb00d37b08b8f39a5e4e8eb2bda9cf163f8c3bb7f3862f71eb26fdfc71b16cba92e10f0a982700b0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlEff+YACgkQCaWpQKGI+9TOXwCfVWsccsTxbeeQHvjqD/xAjPaW
-lxIAnjlHMzd2Ntw7BTlSRxt5L2Y6Edh0
-=qpEv
+iEYEAREIAAYFAlHXvOgACgkQCaWpQKGI+9R8HgCfbZI/ImCgO77nvP6N79/RxG1P
+71cAn1FHUzh/5fL6GgkypLY6COtRyr3D
+=D32/
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/smokeping/files/smokeping.conf b/net-analyzer/smokeping/files/smokeping.conf
new file mode 100644
index 000000000000..729726316fbd
--- /dev/null
+++ b/net-analyzer/smokeping/files/smokeping.conf
@@ -0,0 +1 @@
+d /run/smokeping	0755	root	root
diff --git a/net-analyzer/smokeping/files/smokeping.service b/net-analyzer/smokeping/files/smokeping.service
new file mode 100644
index 000000000000..2130aca23627
--- /dev/null
+++ b/net-analyzer/smokeping/files/smokeping.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Latency Logging and Graphing System
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/smokeping --nodaemon
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/smokeping/smokeping-2.6.8-r1.ebuild b/net-analyzer/smokeping/smokeping-2.6.8-r1.ebuild
new file mode 100644
index 000000000000..3f9ff3743440
--- /dev/null
+++ b/net-analyzer/smokeping/smokeping-2.6.8-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.6.8-r1.ebuild,v 1.1 2013/07/06 06:44:55 pacho Exp $
+
+EAPI="4"
+
+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 ~x86"
+
+# removing fcgi useflag as the configure script can't avoid it without patching
+IUSE="apache2 curl dig echoping ipv6 ldap radius ssh telnet"
+
+DEPEND="!apache2? ( virtual/httpd-cgi )
+		>=dev-lang/perl-5.8.8-r8
+		>=dev-perl/SNMP_Session-1.13
+		>=net-analyzer/fping-2.4_beta2-r2
+		>=net-analyzer/rrdtool-1.2[perl]
+		apache2? ( >=www-apache/mod_perl-2.0.1
+		www-apache/mod_fcgid )
+		curl? ( >=net-misc/curl-7.21.4 )
+		dev-perl/CGI-Session
+		dev-perl/Config-Grammar
+		dev-perl/Digest-HMAC
+		dev-perl/FCGI
+		dev-perl/IO-Socket-SSL
+		dev-perl/Net-DNS
+		dev-perl/libwww-perl
+		dig? ( net-dns/bind-tools )
+		echoping? ( >=net-analyzer/echoping-6.0.2 )
+		ipv6? ( >=dev-perl/Socket6-0.20 )
+		ldap? ( dev-perl/perl-ldap )
+		radius? ( dev-perl/RadiusPerl )
+		ssh? ( dev-perl/Net-OpenSSH )
+		telnet? ( dev-perl/Net-Telnet )
+		virtual/perl-libnet"
+
+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() {
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	newinitd "${FILESDIR}/${PN}.init.3" ${PN} || die
+	systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf || die
+	systemd_dounit "${FILESDIR}"/"${PN}".service || die
+
+	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 -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"
+
+	sed -e 's/$FindBin::Bin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
+		-i "${D}/usr/bin/smokeping" -i "${D}/usr/bin/smokeping_cgi"
+
+	sed -e 's:etc/config.dist:/etc/smokeping/config:' -i "${D}/usr/bin/tSmoke"
+
+	sed -e 's:/usr/etc/config:/etc/smokeping/config:' -i \
+		"${D}/var/www/localhost/smokeping/smokeping.fcgi.dist"
+
+	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" || die
+	fi
+
+	dodir /var/cache/smokeping
+	keepdir /var/cache/smokeping
+
+	# 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}"
+	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 your 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
+}