diff options
| author | André Klitzing <aklitzing@gmail.com> | 2017-06-12 19:47:59 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-06-12 19:50:08 +0000 |
| commit | efde3da28d96dd9fd825018f41ff0ebf658ae672 (patch) | |
| tree | b2fd3c48c170dea181fce178f87e257392caa77c | |
| parent | bd1362002c14df91a42b8b80aaf2dbd86a980fd5 (diff) | |
| download | aports-efde3da28d96dd9fd825018f41ff0ebf658ae672.tar.bz2 aports-efde3da28d96dd9fd825018f41ff0ebf658ae672.tar.xz | |
main/atop: upgrade to 2.3.0
Modernize abuild
| -rw-r--r-- | main/atop/APKBUILD | 36 | ||||
| -rw-r--r-- | main/atop/musl-fix-includes.patch | 65 |
2 files changed, 10 insertions, 91 deletions
diff --git a/main/atop/APKBUILD b/main/atop/APKBUILD index 58a7383eca..895ffdf5a9 100644 --- a/main/atop/APKBUILD +++ b/main/atop/APKBUILD @@ -1,7 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=atop -pkgver=2.2_p3 -_ver=${pkgver/_p/-} +pkgver=2.3.0 pkgrel=0 pkgdesc="Resource-specific view of processes" url="http://www.atoptool.nl/" @@ -10,21 +9,16 @@ license="GPL2+" depends="" makedepends="zlib-dev ncurses-dev linux-headers" subpackages="$pkgname-doc" -source="http://www.atoptool.nl/download/atop-$_ver.tar.gz - musl-fix-includes.patch +source="http://www.atoptool.nl/download/atop-$pkgver.tar.gz atop-bb-compat.patch atop.initd" - -_builddir="$srcdir"/$pkgname-$_ver +builddir="$srcdir"/$pkgname-$pkgver options="suid" prepare() { - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done + cd "$builddir" + default_prepare + sed -i -e '/^CFLAGS/s: = -O : += :' \ -e '/^LDFLAGS/s: = : += :' Makefile cp "$srcdir"/atop.initd atop.init @@ -32,32 +26,22 @@ prepare() { } build() { - cd "$_builddir" - return 0 + cd "$builddir" } package() { - cd "$_builddir" + cd "$builddir" mkdir -p "$pkgdir"/var/log/atop "$pkgdir"/var/run "$pkgdir"/usr/sbin make -j1 DESTDIR="$pkgdir" \ INIPATH=/etc/init.d \ SCRPATH=/etc/periodic/daily \ - sysvinstall || return 1 + sysvinstall rm -fr "$pkgdir"/etc/cron.d mv "$pkgdir"/etc/periodic/daily/atop.daily \ "$pkgdir"/etc/periodic/daily/atop } -md5sums="034dc1544f2ec4e4d2c739d320dc326d atop-2.2-3.tar.gz -01f5be19880c3ac217f805b3af74de78 musl-fix-includes.patch -aad073074cddafec32f731568110cd90 atop-bb-compat.patch -aeb838c2a666bd5bac5c78aedba59670 atop.initd" -sha256sums="c785b8a2355be28b3de6b58a8ea4c4fcab8fadeaa57a99afeb03c66fac8e055d atop-2.2-3.tar.gz -73927ed070edb59fd18739816c14446d64c7f80b29f3333bdfa5f99c27c10970 musl-fix-includes.patch -e05b747449b2057002a602e89e45391cf8f0427d3c8b6a091fdcf5e897509ef3 atop-bb-compat.patch -ca017cd909cb7de87b8cdb396b7121f0eaa1a8f7599146a72452846990b1dc39 atop.initd" -sha512sums="34076e35004367bbfd63f3aac1e786dab566633799b5d4f2c4d45f343642d145027f6298aa40d5e83c1356f502e3c51faa58da07cea58f2960bfacd78cf77915 atop-2.2-3.tar.gz -0c0398221f6ab3625676d49f9e961b183baa62f84eb0165e1d3f34a93c56be6c4865735be87093a22ce59b159b632321824cb1b0ea046af4b26a94ee0f7d4907 musl-fix-includes.patch +sha512sums="51cc868545403cab439a66cc38fe9324c6ff7537e6dad5271fa3f0a22cbad471b0e15186d4f78f0080129301ba0a59e0c1cd1cc694bc3a4f982118a8d0cae429 atop-2.3.0.tar.gz 165e5f17f1a752f8663a774d72476eac5693f93922b32fa198f09233ca6dfde2d6c63b10c31d0388ac9f10d210e7067787f30ef25e0ef9419a1520486f290b15 atop-bb-compat.patch 172c9d367b936427ccbbbd1140c7808ec8ffe3194b3557ba024820dac8fa68c9919f7dc34d332e91283fde64d731db7bdbfee3c2d6caad3cd291e0f1c227cb03 atop.initd" diff --git a/main/atop/musl-fix-includes.patch b/main/atop/musl-fix-includes.patch deleted file mode 100644 index 44f42015ae..0000000000 --- a/main/atop/musl-fix-includes.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- atop-2.0.2.orig/deviate.c -+++ atop-2.0.2/deviate.c -@@ -178,6 +178,7 @@ - #include <stdio.h> - #include <errno.h> - #include <fcntl.h> -+#include <stdlib.h> - #include <unistd.h> - #include <limits.h> - #include <memory.h> ---- atop-2.0.2.orig/procdbase.c -+++ atop-2.0.2/procdbase.c -@@ -67,7 +67,7 @@ - #include <fcntl.h> - #include <unistd.h> - #include <string.h> --#include <malloc.h> -+#include <stdlib.h> - - #include "atop.h" - #include "photoproc.h" ---- atop-2.0.2.orig/showgeneric.c -+++ atop-2.0.2/showgeneric.c -@@ -268,7 +268,7 @@ - #include <errno.h> - #include <fcntl.h> - #include <string.h> --#include <termio.h> -+#include <termios.h> - #include <unistd.h> - #include <stdarg.h> - #include <curses.h> ---- atop-2.0.2.orig/showlinux.c -+++ atop-2.0.2/showlinux.c -@@ -274,7 +274,7 @@ - #include <string.h> - #include <errno.h> - #include <fcntl.h> --#include <termio.h> -+#include <termios.h> - #include <unistd.h> - #include <stdarg.h> - #include <curses.h> ---- atop-2.0.2.orig/showprocs.c -+++ atop-2.0.2/showprocs.c -@@ -94,7 +94,7 @@ - #include <string.h> - #include <errno.h> - #include <fcntl.h> --#include <termio.h> -+#include <termios.h> - #include <unistd.h> - #include <stdarg.h> - #include <curses.h> ---- atop-2.0.2.orig/showsys.c -+++ atop-2.0.2/showsys.c -@@ -80,7 +80,7 @@ - #include <string.h> - #include <errno.h> - #include <fcntl.h> --#include <termio.h> -+#include <termios.h> - #include <unistd.h> - #include <stdarg.h> - #include <curses.h> |