diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2015-12-18 07:33:35 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2015-12-18 07:33:39 +0000 |
| commit | a37b6262c4a6e5ce15425c03f0e3e3827e0c1d74 (patch) | |
| tree | bd59036f7ff9583f5bf6eb9ca5162948145fb6e7 /main | |
| parent | 27a6cf85deff80b573dd89b349633e464152f604 (diff) | |
| download | aports-a37b6262c4a6e5ce15425c03f0e3e3827e0c1d74.tar.bz2 aports-a37b6262c4a6e5ce15425c03f0e3e3827e0c1d74.tar.xz | |
main/atop: upgrade to 2.2-3
Diffstat (limited to 'main')
| -rw-r--r-- | main/atop/APKBUILD | 24 | ||||
| -rw-r--r-- | main/atop/atop-bb-compat.patch | 28 |
2 files changed, 12 insertions, 40 deletions
diff --git a/main/atop/APKBUILD b/main/atop/APKBUILD index 6e85adfab7..a3a2a928b7 100644 --- a/main/atop/APKBUILD +++ b/main/atop/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=atop -pkgver=2.1_p1 +pkgver=2.2_p3 _ver=${pkgver/_p/-} -pkgrel=4 +pkgrel=0 pkgdesc="Resource-specific view of processes" url="http://www.atoptool.nl/" arch="all" @@ -11,11 +11,11 @@ depends="" makedepends="zlib-dev ncurses-dev linux-headers" subpackages="$pkgname-doc" source="http://www.atoptool.nl/download/atop-$_ver.tar.gz - atop-bb-compat.patch musl-fix-includes.patch + atop-bb-compat.patch atop.initd" -_builddir="$srcdir"/$pkgname-${_ver%-*} +_builddir="$srcdir"/$pkgname-$_ver options="suid" prepare() { @@ -33,7 +33,7 @@ prepare() { build() { cd "$_builddir" - make || return 1 + return 0 } package() { @@ -42,22 +42,22 @@ package() { make -j1 DESTDIR="$pkgdir" \ INIPATH=/etc/init.d \ SCRPATH=/etc/periodic/daily \ - install || return 1 + sysvinstall || return 1 rm -f "$pkgdir"/etc/cron.d mv "$pkgdir"/etc/periodic/daily/atop.daily \ "$pkgdir"/etc/periodic/daily/atop } -md5sums="d956f5b0c7e0705cff6cf44898d664d7 atop-2.1-1.tar.gz -3b4c7d162eafcd3db6e2647269065823 atop-bb-compat.patch +md5sums="034dc1544f2ec4e4d2c739d320dc326d atop-2.2-3.tar.gz 01f5be19880c3ac217f805b3af74de78 musl-fix-includes.patch +aad073074cddafec32f731568110cd90 atop-bb-compat.patch aeb838c2a666bd5bac5c78aedba59670 atop.initd" -sha256sums="39a2d4febc338dd4147904b1496d1aa9513da0d22ad0602b66023452bdc7989f atop-2.1-1.tar.gz -cc5ceb0b01024cacc923c5c224a6241644900d240bd214ba9c3c3e52ec5758e0 atop-bb-compat.patch +sha256sums="c785b8a2355be28b3de6b58a8ea4c4fcab8fadeaa57a99afeb03c66fac8e055d atop-2.2-3.tar.gz 73927ed070edb59fd18739816c14446d64c7f80b29f3333bdfa5f99c27c10970 musl-fix-includes.patch +e05b747449b2057002a602e89e45391cf8f0427d3c8b6a091fdcf5e897509ef3 atop-bb-compat.patch ca017cd909cb7de87b8cdb396b7121f0eaa1a8f7599146a72452846990b1dc39 atop.initd" -sha512sums="89b33c9a299213faa42c8ee4393c9588c0dbe7940f8709a617d51d6202525a7e7385299242c8c032d573dea9fa631e705d8edfb4685414d35169b773e1290613 atop-2.1-1.tar.gz -918fda65f27c9b58b6f58a4ff0a169ef8218e9819e85c111d00cfcee6f37825c15c20d13599b1f6a796d3546aaa5f3466d6b90c6d951709d0216364dc43f4256 atop-bb-compat.patch +sha512sums="34076e35004367bbfd63f3aac1e786dab566633799b5d4f2c4d45f343642d145027f6298aa40d5e83c1356f502e3c51faa58da07cea58f2960bfacd78cf77915 atop-2.2-3.tar.gz 0c0398221f6ab3625676d49f9e961b183baa62f84eb0165e1d3f34a93c56be6c4865735be87093a22ce59b159b632321824cb1b0ea046af4b26a94ee0f7d4907 musl-fix-includes.patch +165e5f17f1a752f8663a774d72476eac5693f93922b32fa198f09233ca6dfde2d6c63b10c31d0388ac9f10d210e7067787f30ef25e0ef9419a1520486f290b15 atop-bb-compat.patch 172c9d367b936427ccbbbd1140c7808ec8ffe3194b3557ba024820dac8fa68c9919f7dc34d332e91283fde64d731db7bdbfee3c2d6caad3cd291e0f1c227cb03 atop.initd" diff --git a/main/atop/atop-bb-compat.patch b/main/atop/atop-bb-compat.patch index 66e45234ae..015f06be6e 100644 --- a/main/atop/atop-bb-compat.patch +++ b/main/atop/atop-bb-compat.patch @@ -5,31 +5,3 @@ index c72214c..ac4b3b7 100755 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh - CURDAY=`date +%Y%m%d` - LOGPATH=/var/log/atop - BINPATH=/usr/bin -@@ -7,15 +7,20 @@ INTERVAL=600 # interval 10 minutes - - # verify if atop still runs for daily logging - # --if [ -e $PIDFILE ] && ps -p `cat $PIDFILE` | grep 'atop$' > /dev/null -+pid= -+if [ -e $PIDFILE ]; then -+ pid=$(cat $PIDFILE) -+fi -+ -+if [ -n "$pid" ] && [ -d /proc/$pid ] - then -- kill -USR2 `cat $PIDFILE` # final sample and terminate -+ kill -USR2 $pid # final sample and terminate - - CNT=0 - -- while ps -p `cat $PIDFILE` > /dev/null -+ while [ -d /proc/$pid ] - do -- let CNT+=1 -+ CNT=$(($CNT + 1)) - - if [ $CNT -gt 5 ] - then |