- procps-ng: bump version to 4.0.0

package/procps-ng/patches/0001-fix-watch-build.patch

@@ -0,0 +1,13 @@
+diff --git a/watch.c b/watch.c
+index 0ba6b3f..96f525b 100644
+--- a/watch.c
++++ b/watch.c
+@@ -52,7 +52,7 @@
+ # define _XOPEN_SOURCE_EXTENDED 1
+ # include <wchar.h>
+ # include <wctype.h>
+-# include <ncursesw/ncurses.h>
++# include <ncurses.h>
+ #else
+ # include <ncurses.h>
+ #endif	/* WITH_WATCH8BIT */

package/procps-ng/patches/0001-no-tests-docs.patch

@@ -1,26 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -15,10 +15,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
- 
- ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = \
--	include \
--	man-po \
--	po \
--	testsuite
-+	include
- 
- AM_CFLAGS = -Iproc
- LDADD = ./proc/libprocps.la $(CYGWINFLAGS)
---- a/configure.ac
-+++ b/configure.ac
-@@ -323,8 +323,5 @@ AC_CHECK_FUNCS([__fpending alarm atexit dup2 gethostname getpagesize gettimeofda
- 
- AC_CONFIG_FILES([Makefile
-                  include/Makefile
--                 man-po/Makefile
--                 po/Makefile.in
--                 proc/libprocps.pc
--                 testsuite/Makefile])
-+                 proc/libprocps.pc])
- AC_OUTPUT

package/procps-ng/patches/0001-w.c-correct-musl-builds.patch

@@ -1,44 +0,0 @@
-From 22f8d25567b8d64bdbab0fb0b4915b4362561d9b Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Wed, 24 Feb 2021 21:14:31 +0000
-Subject: [PATCH] w.c: correct musl builds
-
-No need to redefine UT_ stuff to something that does not exist.
-
-UT_ is already provided in musl but via utmp.h header, so include
-it always.
-
-Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/126]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- w.c | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/w.c b/w.c
-index 9d07ac9..d10639b 100644
---- a/w.c
-+++ b/w.c
-@@ -57,9 +57,8 @@
- #include <unistd.h>
- #ifdef HAVE_UTMPX_H
- #	include <utmpx.h>
--#else
--#	include <utmp.h>
- #endif
-+#include <utmp.h>
- #include <arpa/inet.h>
- 
- static int ignoreuser = 0;	/* for '-u' */
-@@ -72,12 +71,6 @@ typedef struct utmpx utmp_t;
- typedef struct utmp utmp_t;
- #endif
- 
--#if !defined(UT_HOSTSIZE) || defined(__UT_HOSTSIZE)
--#	define UT_HOSTSIZE __UT_HOSTSIZE
--#	define UT_LINESIZE __UT_LINESIZE
--#	define UT_NAMESIZE __UT_NAMESIZE
--#endif
--
- #ifdef W_SHOWFROM
- # define FROM_STRING "on"
- #else

package/procps-ng/patches/0002-proc-escape.c-add-missing-include.patch

@@ -1,23 +0,0 @@
-From 4f964821398dff7ab21fec63da15e1e00b2e9277 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Wed, 24 Feb 2021 21:16:14 +0000
-Subject: [PATCH] proc/escape.c: add missing include
-
-Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/126]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- proc/escape.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/proc/escape.c b/proc/escape.c
-index 2e8fb7d..e1f4612 100644
---- a/proc/escape.c
-+++ b/proc/escape.c
-@@ -21,6 +21,7 @@
- #include <sys/types.h>
- #include <string.h>
- #include <limits.h>
-+#include <langinfo.h>
- #include "procps.h"
- #include "escape.h"
- #include "readproc.h"

package/procps-ng/procps-ng.mk

@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-PROCPS_NG_VERSION = 3.3.17
-PROCPS_NG_DIR = procps-$(PROCPS_NG_VERSION)
+PROCPS_NG_VERSION = 4.0.0
+PROCPS_NG_DIR = procps-ng-$(PROCPS_NG_VERSION)
 PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz
 PROCPS_NG_SITE = http://sourceforge.net/projects/procps-ng/files/Production
 
@@ -28,18 +28,22 @@ PROCPS_NG_CONF_OPTS = \
 
 # Allows unicode characters to show in 'watch'
 ifeq ($(BS_PACKAGE_NCURSES_WCHAR),y)
-  PROCPS_NG_CONF_OPTS += \
+PROCPS_NG_CONF_OPTS += \
 	--enable-watch8bit
+
+PROCPS_NG_CONF_OPTS += \
+	CPPFLAGS=-DOFF_XTRAWIDE
 endif
 
 PROCPS_NG_BINARIES = ps top
 
 define PROCPS_NG_INSTALL_BINARIES
-	for bin in $(PROCPS_NG_BINARIES); do \
-		rm -f $(TARGET_base_bindir)/$$bin; \
-		$(INSTALL_EXEC) -D $(TARGET_base_bindir).$(@F)/$$bin $(TARGET_base_bindir)/$$bin; \
-	done
-	rm -r $(TARGET_base_bindir).$(@F)
+	$(foreach binary,$($(PKG)_BINARIES),\
+		rm -f $(TARGET_base_bindir)/$(binary); \
+		$(INSTALL_EXEC) -D $(TARGET_base_bindir).$(@F)/$(binary) $(TARGET_base_bindir)/$(binary); \
+		rm -f $(TARGET_base_bindir).$(@F)/$(binary)$(sep) \
+	)
+	$(TARGET_RM) $(TARGET_base_bindir).$(@F)
 endef
 PROCPS_NG_TARGET_FINALIZE_HOOKS += PROCPS_NG_INSTALL_BINARIES