procps-ng: new aport fork

Adds utmps dependency.

2 files changed, 120 insertions, 0 deletions

diff --git a/procps-ng/APKBUILD b/procps-ng/APKBUILD
new file mode 100644
index 0000000..595b586
--- /dev/null
+++ b/procps-ng/APKBUILD
@@ -0,0 +1,91 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=procps-ng
+pkgver=4.0.3
+pkgrel=3
+pkgdesc="Utilities for monitoring your system and processes on your system"
+url="https://gitlab.com/procps-ng/procps"
+arch="all"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
+makedepends="gettext-dev ncurses-dev utmps-dev"
+checkdepends="dejagnu"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang libproc2"
+source="$pkgname-$pkgver.tar.xz::https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-$pkgver.tar.xz/download
+	musl-fixes.patch
+	"
+
+# used to be named procps
+provides="procps=$pkgver-r$pkgrel"
+replaces="procps"
+
+case "$CARCH" in
+riscv64)
+	options="$options textrels"
+	;;
+esac
+
+case "$CARCH" in
+x86)
+	# TODO, FAIL: strtod_nol_or_err("123") != 123.000000
+	# https://gitlab.com/procps-ng/procps/-/issues/271
+	options="$options !check"
+	;;
+esac
+
+build() {
+	export LIBS="$LIBS -lintl -lutmps -lskarnet"
+	export CFLAGS="$CFLAGS -I/usr/include/utmps"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/ \
+		--bindir=/bin \
+		--sbindir=/sbin \
+		--libdir=/lib \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc \
+		--docdir=/usr/share/doc/procps \
+		--datarootdir=/usr/share \
+		--disable-static \
+		--disable-w-from \
+		--disable-kill \
+		--disable-rpath \
+		--with-ncurses \
+		--disable-modern-top
+	make
+}
+
+check() {
+	make check || {
+		cat test-suite.log
+		return 1
+	}
+}
+
+package() {
+	make DESTDIR="$pkgdir" ldconfig=true install="install -D" \
+		install
+
+	# These binaries are identical.
+	ln -sf pgrep "$pkgdir"/bin/pkill
+
+	# Override BusyBox symlinks
+	mkdir -p "$pkgdir"/usr/bin
+	for i in free pgrep pkill pmap pwdx top uptime; do
+		mv "$pkgdir"/bin/$i "$pkgdir"/usr/bin/$i
+	done
+
+	install -d "$pkgdir"/usr/lib
+	mv "$pkgdir"/include "$pkgdir"/usr/ \
+		&& mv "$pkgdir"/lib/pkgconfig "$pkgdir"/usr/lib/
+}
+
+libproc2() {
+	pkgdesc="Library for monitoring system and processes"
+
+	amove lib
+}
+
+sha512sums="
+be9dc5ac4a50fc1b8256af44ac2c5b50f74ef5e48c5c3dcac2779d508988daf3b60989d22db8fc8b699c2f2f338ad367e91b9c01ab46ac9fa0d5c5bbec6f16af  procps-ng-4.0.3.tar.xz
+c2422153df17b35a8e1d1bacb5d988100b24f6f480b817cb04d3264c7a102c361319fa666f8e677d73bcc79715ff64c500a82d9193005a1c135522b137dcc2d1  musl-fixes.patch
+"
diff --git a/procps-ng/musl-fixes.patch b/procps-ng/musl-fixes.patch
new file mode 100644
index 0000000..dd599cf
--- /dev/null
+++ b/procps-ng/musl-fixes.patch
@@ -0,0 +1,29 @@
+Pulling in utmpx.h which does not have UT_HOSTSIZE, UT_LINESIZE & UT_NAMESIZE defined.
+
+Causing:
+w.c: In function 'print_from':
+w.c:236:43: error: 'UT_HOSTSIZE' undeclared (first use in this function)
+  236 |    print_display_or_interface(u->ut_host, UT_HOSTSIZE, fromlen - len);
+      |                                           ^~~~~~~~~~~
+w.c:236:43: note: each undeclared identifier is reported only once for each function it appears in
+w.c: In function 'getproc':
+w.c:357:12: error: 'UT_NAMESIZE' undeclared (first use in this function)
+  357 |   char buf[UT_NAMESIZE + 1];
+....
+diff --git a/src/w.c b/src/w.c
+index 5e878f0..568db02 100644
+--- a/src/w.c
++++ b/src/w.c
+@@ -46,11 +46,7 @@
+ #include <termios.h>
+ #include <time.h>
+ #include <unistd.h>
+-#ifdef HAVE_UTMPX_H
+-#	include <utmpx.h>
+-#else
+-#	include <utmp.h>
+-#endif
++#include <utmp.h>
+ #include <arpa/inet.h>
+ 
+ #include "c.h"