Create /var/run/smokeping directory at init.d script start as FSH suggests. Fix permissions of that directory, bug #324177, thank Weeve for report.

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

4 files changed, 101 insertions, 26 deletions

diff --git a/net-analyzer/smokeping/ChangeLog b/net-analyzer/smokeping/ChangeLog
index d1d8700c4f9e..b146e0c2f0af 100644
--- a/net-analyzer/smokeping/ChangeLog
+++ b/net-analyzer/smokeping/ChangeLog
@@ -1,6 +1,14 @@
 # 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.29 2010/06/02 06:29:54 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.30 2010/06/16 18:24:17 pva Exp $
+
+*smokeping-2.4.2-r2 (16 Jun 2010)
+
+  16 Jun 2010; Peter Volkov <pva@gentoo.org> -smokeping-2.4.2.ebuild,
+  +smokeping-2.4.2-r2.ebuild, +files/smokeping.init.2:
+  Create /var/run/smokeping directory at init.d script start as FSH
+  suggests. Fix permissions of that directory, bug #324177, thank Weeve for
+  report.
 
   02 Jun 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove chtekk from metadata.xml (#103720)
diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index 678a819a0178..fdc3208a1cc4 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -1,24 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 78_smokeping.conf 376 RMD160 6a5ab3e4d5d94e6b410f52dfdbf99fe3e8ef32ab SHA1 1ef976cddf5bd1cfc5f68dacc2172d075be4677c SHA256 c29e0c2e83b28f1aac3cda5d4990f0eee5fdc9e2abd084b07a538aec29860b0e
 AUX 79_smokeping.conf 351 RMD160 96e13a810420790cdf7b5ea8969048be603e6c7e SHA1 69942bd8d0559c25a538edde540233c9ef7ff1e3 SHA256 fa4c48387598f8c6e60b7642e4284bb64196dcd233cea9f18ff37009b212ff77
 AUX config.dist 2962 RMD160 e19833de607c6b8a6c88b26b4c903736e9b5ca86 SHA1 7dd78fdf8f0129c3e2b47015b67381e7b127332d SHA256 031f0cb72de57812ed34f463d71e90d05fb7b0e2b8df79d5e6ec42e67dfeca7e
 AUX smokeping.init 1641 RMD160 0f2656c931fc1dac12e6ef794f55d9e0e6fe28c8 SHA1 992f118547cc153993b0427920e0cc5eb1c0d54e SHA256 d47d12cc2c48203cfaad4ab91456e22487f3b1247ab98601680b6738edd236c7
 AUX smokeping.init.1 1700 RMD160 f15885579b4068b11bd591514ebfdf38df66cfce SHA1 b658a72fd6169b148746478adaa38dc2b2b5d270 SHA256 680b472a245a0cd20ac6066d03669f8bccdb42dfa8cab02ea881aae2e35eadba
+AUX smokeping.init.2 1747 RMD160 4f1d2029d4ad7b862726458e0892f77a335c0a78 SHA1 f87591f156e58abf5ed8b8723729de6ee28d7930 SHA256 331cddc6cce8d7aba23e93211568e3ce99c25e113633c4013e55bb5d98a161e4
 DIST smokeping-2.2.4.tar.gz 588740 RMD160 74a784ac3b9a837ba29882c1bcc16f6bdb440b9a SHA1 45e210e79017853031dee379a05647db7697d076 SHA256 a1d684785294919b6b97924484579bc64c460a39482c4dd676514712b3699da9
 DIST smokeping-2.3.5.tar.gz 580458 RMD160 484efd851453024e83cb84ecad753d2051df0081 SHA1 d7ed6d1cf7fde5c8c9e1cb69c1e543cdf3f3edfa SHA256 e50eb7944ffd27897cb2af7d551592a142d33479284bb35c36bf68481ca64556
 DIST smokeping-2.4.2.tar.gz 909514 RMD160 4c91f1c6be77ef4d851821f5c0a8a60be0770527 SHA1 055d65c7e3c49cd0d6e8f96242131fe69dc3110e SHA256 ed8680d1b3fdb2b1efde3aa14b37bf7e9aee2c992c5814061dbd78e6eea00d49
 EBUILD smokeping-2.2.4.ebuild 3434 RMD160 508163eccfa73e35126c8584f4ff18773773276e SHA1 65e67e495c353a96075a868edfdf59682887226a SHA256 479946714cc7ca03e36ff813c23f06d5bd4a6325414636904019388694549ea4
 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.ebuild 5097 RMD160 e6b74e1db20e2e117622f5afc2a2305ca151b585 SHA1 07aec92f40a5eb9ef8d31738ae4a48ea4b3506e6 SHA256 e84805ba267d4386bcb77db060678900a8387142e1f1f4c9c3fdc53129e076fa
-MISC ChangeLog 4317 RMD160 1cb6e1f525aa69a62f58f68c0a63f09168d0c330 SHA1 f4c94db5c1adabaeb366cefbb2fbb4a26f36531f SHA256 2591dc9a67780dcd33a905c863d894ac148b0a5684ed2c969c35a7a26f31cbd9
+EBUILD smokeping-2.4.2-r2.ebuild 5244 RMD160 7116ade07953c70b2a93e33e92e4c27f6c347da9 SHA1 744b187242ce0d66079132009bb8d425e699cb6f SHA256 f65f55074fe50b7422d1866ed299676641dd2c782d794d9699acd7dc3817c24b
+MISC ChangeLog 4631 RMD160 d00d9a79502e8b5914d6f936d1b8fb8a0cbec7d9 SHA1 e8428a017717b3e90a732dcbeb166d342b3de0c9 SHA256 0c9845e300bc1800007ed100092bfdec35ede4ea23735f57872f8789df3a6724
 MISC metadata.xml 361 RMD160 7de7c7bb433ae943618d7ea8c434da347d1a7f8e SHA1 ebad6ec275bddd0fc705ee7aabe7607070593071 SHA256 c91655cb47d86f209ce10de9c4e62bac01c76127b9bad94e2be166bbde2691e2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwF+mcACgkQV3J2n04EauxDlgCdG7O9d9+AEgmgu4mUT++SBTTn
-+tIAnR4J/j6vgHjVPiV7aSmyIMuddDVu
-=DR/4
------END PGP SIGNATURE-----
diff --git a/net-analyzer/smokeping/files/smokeping.init.2 b/net-analyzer/smokeping/files/smokeping.init.2
new file mode 100644
index 000000000000..068f33ff25ce
--- /dev/null
+++ b/net-analyzer/smokeping/files/smokeping.init.2
@@ -0,0 +1,77 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+opts="${opts} dump reload 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 /var/run/smokeping/ ]; then
+		mkdir /var/run/smokeping/
+	fi
+	chown smokeping:smokeping /var/run/smokeping/
+
+	ebegin "Starting smokeping"
+	LC_ALL=C \
+	start-stop-daemon --start --name smokeping \
+		--pidfile /var/run/smokeping/smokeping.pid \
+		--exec /usr/bin/smokeping \
+		--chuid smokeping:smokeping
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping smokeping"
+	start-stop-daemon --stop \
+		--pidfile /var/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"
+	if service_started "${myservice}" ; then
+		eerror "You need to stop smokeping before dumping files!"
+		return 1
+	fi
+	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"
+	if service_started "${myservice}" ; then
+		eerror "You need to stop smokeping before restoring files!"
+		return 1
+	fi
+	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/smokeping-2.4.2.ebuild b/net-analyzer/smokeping/smokeping-2.4.2-r2.ebuild
index 155acbf350ca..7d92b6c9035c 100644
--- a/net-analyzer/smokeping/smokeping-2.4.2.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.4.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.ebuild,v 1.3 2009/03/07 12:57:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.4.2-r2.ebuild,v 1.1 2010/06/16 18:24:17 pva Exp $
 
 EAPI="2"
 
@@ -15,17 +15,22 @@ 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
 		dev-perl/Net-DNS
 		speedy? ( dev-perl/SpeedyCGI )
 		!apache2? ( virtual/httpd-cgi )
-		apache2? ( >=www-apache/mod_perl-2.0.1 )"
+		apache2? ( >=www-apache/mod_perl-2.0.1 )
+		!dev-perl/JSON"
 
 RDEPEND="${DEPEND}"
 
@@ -34,14 +39,10 @@ pkg_preinst() {
 	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
 }
 
-src_unpack() {
-	# perl-mod.eclass does not support EAPI=2.
-	unpack ${A}
-}
-
 src_prepare() {
-	# we depend on dev-perl/Digest-HMAC. No need for bundled version.
-	rm -rf lib/Digest
+	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
 }
 
@@ -101,7 +102,7 @@ src_install() {
 	sed -e '/^<script/{s:cropper/:/cropper/:}' -i "${D}/etc/${PN}/basepage.html"
 	fperms 700 /etc/${PN}/smokeping_secrets
 
-	newinitd "${FILESDIR}/${PN}.init.1" ${PN} || die
+	newinitd "${FILESDIR}/${PN}.init.2" ${PN} || die
 
 	if use apache2 ; then
 		insinto /etc/apache2/modules.d
@@ -117,8 +118,6 @@ src_install() {
 		fowners smokeping:smokeping /var/lib/${PN}/.simg
 	fi
 	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
-	keepdir /var/run/${PN} # for pid files
-	fowners smokeping:smokeping /var/run/${PN}
 
 	# Install documentation.
 	insinto "/usr/share/doc/${PF}"