procps: fix & enable utility 'uptime'

Replace 'uptime' from busybox.

packages/procps/build.sh

@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://gitlab.com/procps-ng/procps
 TERMUX_PKG_DESCRIPTION="Utilities that give information about processes using the /proc filesystem"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=3.3.16
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/procps-ng-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_SHA256=925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af
 TERMUX_PKG_DEPENDS="ncurses"
@@ -24,12 +24,10 @@ ac_cv_header_stdio_ext_h=no
 
 # About kill: https://bugs.launchpad.net/ubuntu/+source/coreutils/+bug/141168:
 # "For compatibility between distributions, can we have /bin/kill made available from coreutils?"
-# About uptime: Does not work on later android versions as /proc/uptime cannot be read.
 # About top: The system top works better.
 TERMUX_PKG_RM_AFTER_INSTALL="
 bin/top share/man/man1/top.1
 bin/kill share/man/man1/kill.1
 bin/slabtop share/man/man1/slabtop.1
-bin/uptime share/man/man1/uptime.1
 bin/w share/man/man1/w.1
 "

packages/procps/proc-sysinfo.c.patch

@@ -1,6 +1,6 @@
-diff -u -r ../procps-ng-3.3.15/proc/sysinfo.c ./proc/sysinfo.c
+diff -uNr procps-ng-3.3.16/proc/sysinfo.c procps-ng-3.3.16.mod/proc/sysinfo.c
---- ../procps-ng-3.3.15/proc/sysinfo.c	2018-05-18 21:32:22.010979780 +0000
+--- procps-ng-3.3.16/proc/sysinfo.c	2019-10-27 13:32:58.347231010 +0200
-+++ ./proc/sysinfo.c	2019-08-07 19:53:05.528343190 +0000
++++ procps-ng-3.3.16.mod/proc/sysinfo.c	2020-06-07 02:13:55.803923760 +0300
 @@ -33,6 +33,9 @@
  #ifdef __CYGWIN__
  #include <sys/param.h>
@@ -78,31 +78,26 @@ diff -u -r ../procps-ng-3.3.15/proc/sysinfo.c ./proc/sysinfo.c
    jiffies = user_j + nice_j + sys_j + other_j + wait_j + hirq_j + sirq_j + stol_j ;
    seconds = (up_1 + up_2) / 2;
    h = (unsigned)( (double)jiffies/seconds/smp_num_cpus );
-@@ -445,18 +468,30 @@
+@@ -445,6 +468,17 @@
  /***********************************************************************/
  void loadavg(double *restrict av1, double *restrict av5, double *restrict av15) {
      double avg_1=0, avg_5=0, avg_15=0;
-+#ifndef __ANDROID__
++#ifdef __ANDROID__
-     char *savelocale;
++#define LOAD_INT(x)  (unsigned)((x) >> 16)
-+#endif
++#define LOAD_FRAC(x) (LOAD_INT(((x) & 65535) * 100) / 100.0f)
 +
-+    if (loadavg_fd == -1 && (loadavg_fd = open(LOADAVG_FILE, O_RDONLY)) == -1) {
++    struct sysinfo system_information;
-+	return;
++    if (sysinfo(&system_information) == 0) {
++        avg_1 = LOAD_INT(system_information.loads[0]) + LOAD_FRAC(system_information.loads[0]);
++        avg_5 = LOAD_INT(system_information.loads[1]) + LOAD_FRAC(system_information.loads[1]);
++        avg_15 = LOAD_INT(system_information.loads[2]) + LOAD_FRAC(system_information.loads[2]);
 +    }
++#else
+     char *savelocale;
  
      FILE_TO_BUF(LOADAVG_FILE,loadavg_fd);
-+#ifndef __ANDROID__
+@@ -457,6 +491,7 @@
-     savelocale = strdup(setlocale(LC_NUMERIC, NULL));
-     setlocale(LC_NUMERIC, "C");
-+#endif
-     if (sscanf(buf, "%lf %lf %lf", &avg_1, &avg_5, &avg_15) < 3) {
- 	fputs("bad data in " LOADAVG_FILE "\n", stderr);
-+#ifndef __ANDROID__
- 	free(savelocale);
-+#endif
- 	exit(1);
      }
-+#ifndef __ANDROID__
      setlocale(LC_NUMERIC, savelocale);
      free(savelocale);
 +#endif

packages/procps/proc-whattime.c.patch

@@ -0,0 +1,20 @@
+diff -uNr procps-ng-3.3.16/proc/whattime.c procps-ng-3.3.16.mod/proc/whattime.c
+--- procps-ng-3.3.16/proc/whattime.c	2019-10-27 13:32:58.347231010 +0200
++++ procps-ng-3.3.16.mod/proc/whattime.c	2020-06-07 02:18:11.078243361 +0300
+@@ -95,6 +95,7 @@
+     else
+       pos += sprintf(buf + pos, "%d min, ", upminutes);
+ 
++#ifndef __ANDROID__
+ /* count the number of users */
+ 
+     numuser = 0;
+@@ -107,7 +108,7 @@
+     endutent();
+ 
+     pos += sprintf(buf + pos, "%2d user%s, ", numuser, numuser == 1 ? "" : "s");
+-
++#endif
+     loadavg(&av[0], &av[1], &av[2]);
+ 
+     pos += sprintf(buf + pos, " load average: %.2f, %.2f, %.2f",