Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
aports
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Rasmus Thomsen
aports
Commits
efde3da2
Commit
efde3da2
authored
Jun 12, 2017
by
A. Klitzing
Committed by
Natanael Copa
Jun 12, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
main/atop: upgrade to 2.3.0
Modernize abuild
parent
bd136200
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
91 deletions
+10
-91
main/atop/APKBUILD
main/atop/APKBUILD
+10
-26
main/atop/musl-fix-includes.patch
main/atop/musl-fix-includes.patch
+0
-65
No files found.
main/atop/APKBUILD
View file @
efde3da2
# 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"
main/atop/musl-fix-includes.patch
deleted
100644 → 0
View file @
bd136200
--- 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>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment