[pkgsrc/trunk]: pkgsrc/sysutils/htop htop: update to 3.2.1

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/18a03bc6090e
branches:  trunk
changeset: 380540:18a03bc6090e
user:      nia <nia%pkgsrc.org@localhost>
date:      Wed Jun 08 07:01:16 2022 +0000

description:
htop: update to 3.2.1

What's new in version 3.2.1

* Fix setting to show all branches collapsed by default
* Restore functionality of stripExeFromCmdline setting
* Fix some command line display settings not being honored without restart
* Display single digit precision for CPU% greater than 99.9%
* On Linux, FreeBSD and PCP consider only shrinkable ZFS ARC as cache
* On Linux, increase field width of CPUD% and SWAPD% columns
* Colorize process state characters in help screen
* Use mousemask(3X) to enable and disable mouse control
* Fix heap buffer overflow in Vector_compact
* On Solaris, fix a process time scaling error
* On Solaris, fix the build
* On NetBSD, OpenBSD and Solaris ensure env buffer size is sufficient
* On Linux, resolve processes exiting interfering with sampling
* Fix ProcessList quadratic removal when scanning processes
* Under LXC, limit CPU count to that given by /proc/cpuinfo
* Improve container detection for LXC
* Some minor documentation fixes

diffstat:

 sysutils/htop/Makefile                         |   4 +-
 sysutils/htop/distinfo                         |  11 ++---
 sysutils/htop/patches/patch-netbsd_Platform.c  |  31 -----------------
 sysutils/htop/patches/patch-openbsd_Platform.c |  31 -----------------
 sysutils/htop/patches/patch-solaris_Platform.c |  47 --------------------------
 5 files changed, 6 insertions(+), 118 deletions(-)

diffs (150 lines):

diff -r ca12fdef5044 -r 18a03bc6090e sysutils/htop/Makefile
--- a/sysutils/htop/Makefile    Wed Jun 08 06:54:53 2022 +0000
+++ b/sysutils/htop/Makefile    Wed Jun 08 07:01:16 2022 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2022/05/07 16:37:49 fox Exp $
+# $NetBSD: Makefile,v 1.28 2022/06/08 07:01:16 nia Exp $
 
-DISTNAME=      htop-3.2.0
+DISTNAME=      htop-3.2.1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=htop-dev/}
 
diff -r ca12fdef5044 -r 18a03bc6090e sysutils/htop/distinfo
--- a/sysutils/htop/distinfo    Wed Jun 08 06:54:53 2022 +0000
+++ b/sysutils/htop/distinfo    Wed Jun 08 07:01:16 2022 +0000
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.21 2022/05/16 12:14:22 jperkin Exp $
+$NetBSD: distinfo,v 1.22 2022/06/08 07:01:16 nia Exp $
 
-BLAKE2s (htop-3.2.0.tar.gz) = e165b7b4baf45df3e1b8c826a4b04262987b11abad79ff3992dd74e5e030a676
-SHA512 (htop-3.2.0.tar.gz) = 174eaa7333fa60e40f67148560c53125e7aaf46a48e7f3ecfa2daa68553c94b3d076d03320afd479dcee07e739c0ff286a81b67cbc994782c33e798d3ed4605c
-Size (htop-3.2.0.tar.gz) = 393712 bytes
-SHA1 (patch-netbsd_Platform.c) = a84e3a0c4c66e0da8df9825cdee3edb756dda2eb
-SHA1 (patch-openbsd_Platform.c) = 0b4a7022a2b5be4f9ec7b8e11bff86835e86a951
-SHA1 (patch-solaris_Platform.c) = b61123345578f36d0859db28ee9183cd23e889ce
+BLAKE2s (htop-3.2.1.tar.gz) = 39a22f2aace47c44cb8c2a8aba1d96656b9967bd5abd740cb0f62c6fdafb5117
+SHA512 (htop-3.2.1.tar.gz) = d7b76e28ee870ac572ba1d9606dec6f9475346a00e599ca15838017c97683f1fc1be40417b9c1e76128cacc8a60ff9ba88c6b237be1835d309f98329b25644fc
+Size (htop-3.2.1.tar.gz) = 397632 bytes
 SHA1 (patch-solaris_Platform.h) = c23c6cf20607dd69e626be716337471fffd70d86
diff -r ca12fdef5044 -r 18a03bc6090e sysutils/htop/patches/patch-netbsd_Platform.c
--- a/sysutils/htop/patches/patch-netbsd_Platform.c     Wed Jun 08 06:54:53 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-netbsd_Platform.c,v 1.1 2022/05/07 07:35:06 nia Exp $
-
-Ensure buffer for environment is large enough
-
-https://github.com/htop-dev/htop/pull/997
-
---- netbsd/Platform.c.orig     2021-11-30 01:03:21.000000000 +0000
-+++ netbsd/Platform.c
-@@ -303,7 +303,13 @@ char* Platform_getProcessEnv(pid_t pid) 
-    for (char** p = ptr; *p; p++) {
-       size_t len = strlen(*p) + 1;
- 
--      if (size + len > capacity) {
-+      while (size + len > capacity) {
-+         if (capacity > (SIZE_MAX / 2)) {
-+            free(env);
-+            env = NULL;
-+            goto end;
-+         }
-+
-          capacity *= 2;
-          env = xRealloc(env, capacity);
-       }
-@@ -319,6 +325,7 @@ char* Platform_getProcessEnv(pid_t pid) 
-       env[size + 1] = 0;
-    }
- 
-+end:
-    (void) kvm_close(kt);
-    return env;
- }
diff -r ca12fdef5044 -r 18a03bc6090e sysutils/htop/patches/patch-openbsd_Platform.c
--- a/sysutils/htop/patches/patch-openbsd_Platform.c    Wed Jun 08 06:54:53 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-openbsd_Platform.c,v 1.1 2022/05/07 07:35:06 nia Exp $
-
-Ensure buffer for environment is large enough
-
-https://github.com/htop-dev/htop/pull/997
-
---- openbsd/Platform.c.orig    2021-11-30 01:03:21.000000000 +0000
-+++ openbsd/Platform.c
-@@ -261,7 +261,13 @@ char* Platform_getProcessEnv(pid_t pid) 
-    for (char** p = ptr; *p; p++) {
-       size_t len = strlen(*p) + 1;
- 
--      if (size + len > capacity) {
-+      while (size + len > capacity) {
-+         if (capacity > (SIZE_MAX / 2)) {
-+            free(env);
-+            env = NULL;
-+            goto end;
-+         }
-+
-          capacity *= 2;
-          env = xRealloc(env, capacity);
-       }
-@@ -277,6 +283,7 @@ char* Platform_getProcessEnv(pid_t pid) 
-       env[size + 1] = 0;
-    }
- 
-+end:
-    (void) kvm_close(kt);
-    return env;
- }
diff -r ca12fdef5044 -r 18a03bc6090e sysutils/htop/patches/patch-solaris_Platform.c
--- a/sysutils/htop/patches/patch-solaris_Platform.c    Wed Jun 08 06:54:53 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-$NetBSD: patch-solaris_Platform.c,v 1.1 2022/05/07 07:35:06 nia Exp $
-
-Ensure buffer for environment is large enough
-
-https://github.com/htop-dev/htop/pull/997
-
---- solaris/Platform.c.orig    2021-11-30 01:03:21.000000000 +0000
-+++ solaris/Platform.c
-@@ -259,16 +259,21 @@ static int Platform_buildenv(void* accum
-    envAccum* accump = accum;
-    (void) Phandle;
-    (void) addr;
-+
-    size_t thissz = strlen(str);
--   if ((thissz + 2) > (accump->capacity - accump->size)) {
--      accump->env = xRealloc(accump->env, accump->capacity *= 2);
--   }
--   if ((thissz + 2) > (accump->capacity - accump->size)) {
--      return 1;
-+
-+   while ((thissz + 2) > (accump->capacity - accump->size)) {
-+      if (accump->capacity > (SIZE_MAX / 2))
-+         return 1;
-+
-+      accump->capacity *= 2;
-+      accump->env = xRealloc(accump->env, accump->capacity);
-    }
--   strlcpy( accump->env + accump->size, str, (accump->capacity - accump->size));
-+
-+   strlcpy( accump->env + accump->size, str, accump->capacity - accump->size);
-    strncpy( accump->env + accump->size + thissz + 1, "\n", 2);
--   accump->size = accump->size + thissz + 1;
-+
-+   accump->size += thissz + 1;
-    return 0;
- }
- 
-@@ -291,7 +296,8 @@ char* Platform_getProcessEnv(pid_t pid) 
-    Prelease(Phandle, 0);
- 
-    strncpy( envBuilder.env + envBuilder.size, "\0", 1);
--   return envBuilder.env;
-+
-+   return xRealloc(envBuilder.env, envBuilder.size + 1);
- }
- 
- char* Platform_getInodeFilename(pid_t pid, ino_t inode) {