CVS commit: pkgsrc/sysutils/htop

["Santhosh Raju" <fox%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fox
Date:           Tue Mar 11 20:09:54 UTC 2025

Modified Files:
        pkgsrc/sysutils/htop: Makefile distinfo
Added Files:
        pkgsrc/sysutils/htop/patches: patch-Settings.c
Removed Files:
        pkgsrc/sysutils/htop/patches: patch-solaris_Platform.c
            patch-solaris_SolarisMachine.c patch-solaris_SolarisMachine.h
            patch-solaris_SolarisProcess.c patch-solaris_SolarisProcess.h
            patch-solaris_SolarisProcessTable.c

Log Message:
sysutils/htop: Update to 3.4.0

- Removed Solaris patch since it is contained in upstream
- Added a patch to fix build using native curses in NetBSD

Changes since 3.3.0:

What's new in version 3.4.0

* More expressive version tag generated for development versions (htop --version, help screen)
* Improve Darwin support for ARM-based systems
* Fix static linking with libsystemd
* Various build fixes for DragonFlyBSD, Darwin, NetBSD, OpenBSD & Solaris
* Fix running task display (count)
* Fix sort order handling in tree mode
* Add warning when exiting with a signal (not saving .htoprc)
* Add Disk I/O and Network I/O meter for DragonFlyBSD
* Improve handling of invalid Unicode strings
* Disable basename checking for kernel tasks
* Updated documentation for pcp-htop
* Disable FOCUS_IN/FOCUS_OUT event handling
* Add GPU meter for Linux and PCP
* Add colum for GPU time per process on Linux and PCP
* Avoid glibc FILE API voodoo
* Ignore previously unhandled signals USR1 and USR2
* Force locating the config file to only use absolute paths
* Prefer reading htoprc from ~/.config/htop/htoprc over legacy ~/.htoprc
* Force writing the configuration to a regular file
* Use distinct config files for htop and pcp-htop
* Link libnl3 at runtime
* Gather permitted capabilities via capget(2)
* Avoid fetching certain process information for each thread on Linux (speed up)
* Improved handling for invalid data in /proc/tty/drivers on Linux
* Various changes to avoid memory allocations inside signal handlers
* Add single column header layout
* Fix DivByZero bug on startup on Darwin
* Include thread information on Darwin
* Show process state on Darwin
* Update compat check for C23 compilers
* Improved detail in help screen
* Unicode support for CGROUP, CCGROUP, CONTAINER and SECATTR columns
* Mark newline characters in the process command line display
* Resolve nested derived metrics for PCP
* Make supported modes/styles specific to each meter
* Refined checks for terminals supporting to redefine keys
* Fix handling of the NICE value on FreeBSD
* Fix display of CPU utilization on FreeBSD
* Honour update interval adjustments properly without restart
* Force rebuild of display table after item removals
* Reworked handling for various temperature sensors
* Fix high CPU load when the strace'd process exits prematurely
* Document --drop-capabilities to require a compile time support
* Always call PKG_PROG_PKG_CONFIG in configure
* Make configure warn when pkg.m4 is absent
* Rewrite curses/terminfo detection code in configure
* Keep following a process when resuming process updates (Z key)
* Normalize Disk I/O usage and allow utilization above 100%
* Plug several memory leaks and improve performance for information parsing
* Allow to show or hide cache and buffers in memory usage meter
* Visibility hint and UX improvements in status bar of display options panel
* Remove IOKit / IOMainPort / IOMMasterPort logic for Darwin builds
* Replace BCC with metrics from BPF for pcp-htop


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/sysutils/htop/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/sysutils/htop/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/htop/patches/patch-Settings.c
cvs rdiff -u -r1.3 -r0 pkgsrc/sysutils/htop/patches/patch-solaris_Platform.c
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/sysutils/htop/patches/patch-solaris_SolarisMachine.c \
    pkgsrc/sysutils/htop/patches/patch-solaris_SolarisMachine.h \
    pkgsrc/sysutils/htop/patches/patch-solaris_SolarisProcess.c \
    pkgsrc/sysutils/htop/patches/patch-solaris_SolarisProcess.h \
    pkgsrc/sysutils/htop/patches/patch-solaris_SolarisProcessTable.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/htop/Makefile
diff -u pkgsrc/sysutils/htop/Makefile:1.34 pkgsrc/sysutils/htop/Makefile:1.35
--- pkgsrc/sysutils/htop/Makefile:1.34  Mon May  6 08:40:32 2024
+++ pkgsrc/sysutils/htop/Makefile       Tue Mar 11 20:09:53 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2024/05/06 08:40:32 jperkin Exp $
+# $NetBSD: Makefile,v 1.35 2025/03/11 20:09:53 fox Exp $
 
-DISTNAME=      htop-3.3.0
-PKGREVISION=   1
+DISTNAME=      htop-3.4.0
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=htop-dev/}
 
@@ -12,7 +11,7 @@ LICENSE=      gnu-gpl-v2
 
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
-USE_TOOLS+=    autoreconf automake
+USE_TOOLS+=    autoreconf automake pkg-config
 USE_CURSES=    getmouse
 
 .include "options.mk"

Index: pkgsrc/sysutils/htop/distinfo
diff -u pkgsrc/sysutils/htop/distinfo:1.25 pkgsrc/sysutils/htop/distinfo:1.26
--- pkgsrc/sysutils/htop/distinfo:1.25  Mon Feb 26 09:31:51 2024
+++ pkgsrc/sysutils/htop/distinfo       Tue Mar 11 20:09:53 2025
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.25 2024/02/26 09:31:51 nia Exp $
+$NetBSD: distinfo,v 1.26 2025/03/11 20:09:53 fox Exp $
 
-BLAKE2s (htop-3.3.0.tar.gz) = 49b573cab35804cb6e0c437af78e9311e00d719e66724222252980cf4b869f99
-SHA512 (htop-3.3.0.tar.gz) = 4c03bd183d97ec84010472ea52ff6e210e6d211c813d0ab52bacef16d7e4eef9483e65279fb0a846dcdb532ad19eb1c1c39bad9dd8b103d36aeb51cb5d28e23a
-Size (htop-3.3.0.tar.gz) = 406012 bytes
-SHA1 (patch-solaris_Platform.c) = 0388d962692ce071e587a9a6a9f809051e817ef8
-SHA1 (patch-solaris_SolarisMachine.c) = 8a25f831b674a2bb2342d70052c78edf3602c81f
-SHA1 (patch-solaris_SolarisMachine.h) = 76d744d0189a7849b2d655e2343569e33609f367
-SHA1 (patch-solaris_SolarisProcess.c) = 5d9725eccbd3a5cf857575f309ec86519adb433e
-SHA1 (patch-solaris_SolarisProcess.h) = a1cc8f29f008e9a21cc79a524f78d9cd91bcd36c
-SHA1 (patch-solaris_SolarisProcessTable.c) = 951b595cce2e6c460a16e46e8a26a6c2329607e0
+BLAKE2s (htop-3.4.0.tar.gz) = 18f6219aeae1e06a3381cca36629aed4ddee13d3e9bf6983737f11d3abc29896
+SHA512 (htop-3.4.0.tar.gz) = aff7fc1961687b885fe680ec27cd08fdfdcc8b5411156fa7195e7acce10b7cf3c11eca7d6f55741da2d286ade77a0238f609cfeb862151cdaf6815087c73c340
+Size (htop-3.4.0.tar.gz) = 427077 bytes
+SHA1 (patch-Settings.c) = af04b2ff4e9aee95e6903e6417e01f474816c833

Added files:

Index: pkgsrc/sysutils/htop/patches/patch-Settings.c
diff -u /dev/null pkgsrc/sysutils/htop/patches/patch-Settings.c:1.1
--- /dev/null   Tue Mar 11 20:09:54 2025
+++ pkgsrc/sysutils/htop/patches/patch-Settings.c       Tue Mar 11 20:09:53 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-Settings.c,v 1.1 2025/03/11 20:09:53 fox Exp $
+
+https://github.com/htop-dev/htop/pull/1634
+
+Fix build when using native curses.
+
+--- Settings.c.orig    2025-03-10 20:22:40.410153171 +0000
++++ Settings.c
+@@ -14,6 +14,7 @@ in the source distribution for its full 
+ #include <fcntl.h>
+ #include <limits.h>
+ #include <pwd.h>
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>