aboutsummaryrefslogtreecommitdiffstats
path: root/main/atop
diff options
context:
space:
mode:
authorMilan P. Stanić <mps@arvanta.net>2019-09-21 14:40:19 +0200
committerKevin Daudt <kdaudt@alpinelinux.org>2019-09-27 19:10:09 +0000
commit2e6378d6f425a4334b66aa832082a2ad81daf3be (patch)
tree640117eba1dfa714f4341002bc4410e13d6d7693 /main/atop
parentd0670e9afcca654e89ae5bb83f099d04a96fa4d8 (diff)
downloadaports-2e6378d6f425a4334b66aa832082a2ad81daf3be.tar.bz2
aports-2e6378d6f425a4334b66aa832082a2ad81daf3be.tar.xz
main/atop: upgrade to 2.4.0
update atop-daily-bb.patch to fix changes in atop.daily file Closes !72
Diffstat (limited to 'main/atop')
-rw-r--r--main/atop/APKBUILD8
-rw-r--r--main/atop/atop-daily-bb.patch14
2 files changed, 10 insertions, 12 deletions
diff --git a/main/atop/APKBUILD b/main/atop/APKBUILD
index 499200f615..28b5ca2d62 100644
--- a/main/atop/APKBUILD
+++ b/main/atop/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=atop
-pkgver=2.3.0
-pkgrel=2
+pkgver=2.4.0
+pkgrel=0
pkgdesc="Resource-specific view of processes"
url="https://www.atoptool.nl/"
arch="all"
@@ -42,8 +42,8 @@ package() {
}
-sha512sums="51cc868545403cab439a66cc38fe9324c6ff7537e6dad5271fa3f0a22cbad471b0e15186d4f78f0080129301ba0a59e0c1cd1cc694bc3a4f982118a8d0cae429 atop-2.3.0.tar.gz
+sha512sums="2d0bbecc13bd64427263372b50f50d3278d1e0401e7f2eefe6ff20a874da6315271c885cef3492cde60a2955d1c8db4d8522c3374edcedf1a6992b8fa97c8f18 atop-2.4.0.tar.gz
165e5f17f1a752f8663a774d72476eac5693f93922b32fa198f09233ca6dfde2d6c63b10c31d0388ac9f10d210e7067787f30ef25e0ef9419a1520486f290b15 atop-bb-compat.patch
-078e76315a6336a63e03873ec4c76e2c0d2698879840bfad5c57db266a15abd521dde9f720f0ddf482b4e2a18cac9d869e0c08994cfe5ef9a3343603e3858a11 atop-daily-bb.patch
+664225450074962aac0e13484c9b2feaf08620bbe1e0f9c5dc1b02f1ecd315224cd04df53134f2d107210fc9223a64d8885ae70d33d0663c2335fa6d46f6ddfd atop-daily-bb.patch
f30c9e6051332af8c8cafcd881f89a0e2d2a8e1d84eee8ac0c8c6b58f3ae3431fcf9c40dea6d03e271f8969802de449d33b4323c13045bdb38a539732c81a8b6 atop-include-macros.patch
172c9d367b936427ccbbbd1140c7808ec8ffe3194b3557ba024820dac8fa68c9919f7dc34d332e91283fde64d731db7bdbfee3c2d6caad3cd291e0f1c227cb03 atop.initd"
diff --git a/main/atop/atop-daily-bb.patch b/main/atop/atop-daily-bb.patch
index 80f9a8ccec..d6a90ae9cb 100644
--- a/main/atop/atop-daily-bb.patch
+++ b/main/atop/atop-daily-bb.patch
@@ -1,19 +1,17 @@
-diff --git a/atop.daily b/atop.daily
-index 8943014..edf67a0 100755
---- a/atop.daily
-+++ b/atop.daily
-@@ -8,13 +8,13 @@ INTERVAL=600 # interval 10 minutes
+--- a/atop.daily 2019-01-12 23:37:19.000000000 +0100
++++ b/atop.daily 2019-09-21 14:30:57.905978235 +0200
+@@ -30,13 +30,13 @@
# verify if atop still runs for daily logging
#
--if [ -e $PIDFILE ] && ps -p `cat $PIDFILE` | grep 'atop$' > /dev/null
+-if [ -e "$PIDFILE" ] && ps -p `cat "$PIDFILE"` | grep 'atop$' > /dev/null
+if [ -e $PIDFILE ] && ps | grep `cat $PIDFILE` > /dev/null
then
- kill -USR2 `cat $PIDFILE` # final sample and terminate
+ kill -USR2 `cat "$PIDFILE"` # final sample and terminate
CNT=0
-- while ps -p `cat $PIDFILE` > /dev/null
+- while ps -p `cat "$PIDFILE"` > /dev/null
+ while ps | grep `cat $PIDFILE` > /dev/null
do
let CNT+=1