[patch] promised patch

atop-1.21-cron.patch (text/plain), 3.94 KB, created by Dmitriy Bogun on 2009-09-09 13:25:23 UTC

diff -Naur a/sys-processes/atop/atop-1.21.ebuild b/sys-processes/atop/atop-1.21.ebuild
--- a/sys-processes/atop/atop-1.21.ebuild	2007-11-28 20:36:37.000000000 +0200
+++ b/sys-processes/atop/atop-1.21.ebuild	2009-09-09 16:04:26.000000000 +0300
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-process/atop/atop-1.21.ebuild,v 1.5 2007/11/28 18:33:25 opfer Exp $
 
+inherit eutils
+
 DESCRIPTION="Resource-specific view of processes"
 HOMEPAGE="http://www.atcomputing.nl/Tools/atop"
 SRC_URI="http://www.atconsultancy.nl/atop/packages/${P}.tar.gz"
@@ -22,7 +24,12 @@
 		Makefile
 	cp "${FILESDIR}"/atop.rc atop.init
 	chmod a+rx atop.init
-	sed -i 's: root : :' atop.cron #191926
+
+	if ! has_version sys-process/vixie-cron ; then
+		sed -i 's: root : :' atop.cron #191926
+	fi
+
+	epatch ${FILESDIR}/atop.daily.patch || die 'Patching failed!'
 }
 
 src_install() {
diff -Naur a/sys-processes/atop/files/atop.daily.patch b/sys-processes/atop/files/atop.daily.patch
--- a/sys-processes/atop/files/atop.daily.patch	1970-01-01 03:00:00.000000000 +0300
+++ b/sys-processes/atop/files/atop.daily.patch	2009-09-09 15:57:25.000000000 +0300
@@ -0,0 +1,13 @@
+diff -Naur a/atop.daily b/atop.daily
+--- a/atop.daily	2007-08-17 12:50:59.000000000 +0300
++++ b/atop.daily	2009-09-09 15:57:01.000000000 +0300
+@@ -5,6 +5,9 @@
+ PIDFILE=/var/run/atop.pid
+ INTERVAL=600		# interval 10 minutes
+ 
++# If atop service was not started we should not touch anything
++/etc/init.d/atop --quiet status || exit
++
+ # verify if atop still runs for daily logging
+ #
+ if [ -e $PIDFILE ] && ps -p `cat $PIDFILE` | grep 'atop$' > /dev/null
diff -Naur a/sys-processes/atop/Manifest b/sys-processes/atop/Manifest
--- a/sys-processes/atop/Manifest	2009-03-19 15:36:56.000000000 +0200
+++ b/sys-processes/atop/Manifest	2009-09-09 16:04:31.000000000 +0300
@@ -1,9 +1,4 @@
+AUX atop.daily.patch 453 RMD160 56cc4431772b923cd0bbeb7137de39098736de12 SHA1 bf2c04484623078c4c52d860192f473113672226 SHA256 b910b30f4d3c26163351a02b83b9389dee029246f73ff9ebef06e6ce5b0dd921
 AUX atop.rc 611 RMD160 52aae70d59d625ef4f4a673659c3d66c9a3e90a3 SHA1 77f09d17d76e226bb205eaa90c5c9b894c154dae SHA256 44c32f5dbffee01bb243c2e0a7775b6bf562d87c93fe2e1f008a2440e1a5b6fb
 DIST atop-1.21.tar.gz 157637 RMD160 b788857c3af48b15b850e05e78c240acef0d3d10 SHA1 357821f841cb65811cd09263a00cf536db869766 SHA256 2ae0108907f7ff8238ec0d9c1cc2712b4581be65da7eb1f7a625afa3df067b57
-DIST atop-1.22.tar.gz 162211 RMD160 78b0e8f048e987881ebeca83c969721d115b4374 SHA1 8a120508a21b70881a0d6b46e5fd2d2452e40e7b SHA256 535c503dff98329d9a99150950862f0c9bec48500d5c492e626dc638dc9eb89f
-DIST atop-1.23.tar.gz 174352 RMD160 56165f13a24771a042ba0608bd6839a314446665 SHA1 9a1eb0e8d60e94e147a926ad684f5a35f9fe4463 SHA256 20fa6dc87d9c032dc550ed65314e20a0f12963ec89e8678a620d93a3f348cbc6
-EBUILD atop-1.21.ebuild 779 RMD160 aa4c32de69cce6f4b9b9b3019c277563fda67c8a SHA1 609fce2b6a0af88d82dcbab568da3488bc8e7050 SHA256 313e9f419757e6b7416b5bdeafbae4b76e2e4cae02f260c4f41170e23d3daea6
-EBUILD atop-1.22.ebuild 783 RMD160 34c73473d5af0500b35dea96249a3a1f803571bf SHA1 0a08916e6a88fe542b8586e339a6e40211b446ac SHA256 3d9e30e429cdae7b9caac09bdf4d44e89e8562cf016a4b9354508693a796d54f
-EBUILD atop-1.23.ebuild 788 RMD160 284513788817ff2d03f03ff4f0b57860e841d1da SHA1 340e8d735148bc688588001804ab8c65b7dd1cd0 SHA256 95ad352b50639cf224109004435241dfa1f1300f180f8551bc36e4919ece16bb
-MISC ChangeLog 3727 RMD160 befcbb700505f6cb7475710ee654a4ec3d08b15c SHA1 e1ae026bcac8af092dff9e7b056021328f369d5d SHA256 73dd1079437d4e39aa60c170e61498f561337fb6be953f97a7322e38401ef78d
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+EBUILD atop-1.21.ebuild 913 RMD160 99844a595e7be7f972aaa91ed89a0ead29f3d5c4 SHA1 cbf61b4ea39b494d935d303582c35738c74cf644 SHA256 b680a9d3ede5d4bd8579ba0c90e3ff211f759e44998796147657b1b71b4c4604