Accepting request 1198682 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1198682
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/procps?expand=0&rev=138

CVE-2023-4016.patch

@@ -1,102 +0,0 @@
-From 2c933ecba3bb1d3041a5a7a53a7b4078a6003413 Mon Sep 17 00:00:00 2001
-From: Craig Small <csmall@dropbear.xyz>
-Date: Thu, 10 Aug 2023 21:18:38 +1000
-Subject: [PATCH] ps: Fix possible buffer overflow in -C option
-
-ps allocates memory using malloc(length of arg * len of struct).
-In certain strange circumstances, the arg length could be very large
-and the multiplecation will overflow, allocating a small amount of
-memory.
-
-Subsequent strncpy() will then write into unallocated memory.
-The fix is to use calloc. It's slower but this is a one-time
-allocation. Other malloc(x * y) calls have also been replaced
-by calloc(x, y)
-
-References:
- https://www.freelists.org/post/procps/ps-buffer-overflow-CVE-20234016
- https://nvd.nist.gov/vuln/detail/CVE-2023-4016
- https://gitlab.com/procps-ng/procps/-/issues/297
- https://bugs.debian.org/1042887
-
-Signed-off-by: Craig Small <csmall@dropbear.xyz>
----
- ps/parser.c |   24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
---- ps/parser.c
-+++ ps/parser.c	2023-08-15 12:19:13.375422122 +0000
-@@ -183,8 +183,7 @@ static const char *parse_list(const char
-   int need_item;
-   const char *err;       /* error code that could or did happen */
-   /*** prepare to operate ***/
--  node = malloc(sizeof(selection_node));
--  node->u = malloc(strlen(arg)*sizeof(sel_union)); /* waste is insignificant */
-+  node = xmalloc(sizeof(selection_node));
-   node->n = 0;
-   buf = strdup(arg);
-   /*** sanity check and count items ***/
-@@ -205,6 +204,7 @@ static const char *parse_list(const char
-   } while (*++walk);
-   if(need_item) goto parse_error;
-   node->n = items;
-+  node->u = xcalloc(items*sizeof(sel_union));
-   /*** actually parse the list ***/
-   walk = buf;
-   while(items--){
-@@ -569,8 +569,8 @@ static const char *parse_bsd_option(void
-       /* put our tty on a tiny list */
-       {
-         selection_node *node;
--        node = malloc(sizeof(selection_node));
--        node->u = malloc(sizeof(sel_union));
-+        node = xmalloc(sizeof(selection_node));
-+        node->u = xmalloc(sizeof(sel_union));
-         node->u[0].tty = cached_tty;
-         node->typecode = SEL_TTY;
-         node->n = 1;
-@@ -706,8 +706,8 @@ static const char *parse_bsd_option(void
-       if(!arg){
-         /* Wow, obsolete BSD syntax. Put our tty on a tiny list. */
-         selection_node *node;
--        node = malloc(sizeof(selection_node));
--        node->u = malloc(sizeof(sel_union));
-+        node = xmalloc(sizeof(selection_node));
-+        node->u = xmalloc(sizeof(sel_union));
-         node->u[0].tty = cached_tty;
-         node->typecode = SEL_TTY;
-         node->n = 1;
-@@ -1030,16 +1030,16 @@ static const char *parse_trailing_pids(v
-   argp = ps_argv + thisarg;
-   thisarg = ps_argc - 1;   /* we must be at the end now */
- 
--  pidnode = malloc(sizeof(selection_node));
--  pidnode->u = malloc(i*sizeof(sel_union)); /* waste is insignificant */
-+  pidnode = xmalloc(sizeof(selection_node));
-+  pidnode->u = xcalloc(i*sizeof(sel_union)); /* waste is insignificant */
-   pidnode->n = 0;
- 
--  grpnode = malloc(sizeof(selection_node));
--  grpnode->u = malloc(i*sizeof(sel_union)); /* waste is insignificant */
-+  grpnode = xmalloc(sizeof(selection_node));
-+  grpnode->u = xcalloc(i*sizeof(sel_union)); /* waste is insignificant */
-   grpnode->n = 0;
- 
--  sidnode = malloc(sizeof(selection_node));
--  sidnode->u = malloc(i*sizeof(sel_union)); /* waste is insignificant */
-+  sidnode = xmalloc(sizeof(selection_node));
-+  sidnode->u = xcalloc(i*sizeof(sel_union)); /* waste is insignificant */
-   sidnode->n = 0;
- 
-   while(i--){
---- proc/libprocps.sym
-+++ proc/libprocps.sym	2023-08-15 12:43:18.905661726 +0000
-@@ -67,6 +67,8 @@ global:
- 	unix_print_signals;
- 	uptime;
- 	xalloc_err_handler;
-+	xcalloc;
-+	xmalloc;
- local:
- 	*;
- };

bsc1195468-23da4f40.patch

@@ -1,33 +0,0 @@
-From 23da4f40ea27afe998e92ca317f2dcb48a6ffc1f Mon Sep 17 00:00:00 2001
-From: Tommi Rantala <tommi.t.rantala@nokia.com>
-Date: Mon, 11 Oct 2021 13:33:18 +0300
-Subject: [PATCH] ps: ignore SIGURG
-
-Stop registering signal handler for SIGURG, to avoid ps failure if
-someone sends such signal. Without the signal handler, SIGURG will
-just be ignored.
-
-  Signal 23 (URG) caught by ps (3.3.16).
-  ps:ps/display.c:66: please report this bug
-
-https://man7.org/linux/man-pages/man7/signal.7.html
-https://www.freebsd.org/cgi/man.cgi?sektion=3&query=signal
----
- ps/display.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ps/display.c b/ps/display.c
-index 04803c3b..346e21a7 100644
---- a/ps/display.c
-+++ b/ps/display.c
-@@ -673,6 +673,7 @@ int main(int argc, char *argv[]){
-     case SIGKILL:  /* can not catch */
-     case SIGSTOP:  /* can not catch */
-     case SIGWINCH: /* don't care if window size changes */
-+    case SIGURG:   /* Urgent condition on socket (4.2BSD) */
-       ;
-     }
-   } while (0);
--- 
-GitLab
-

procps-3.3.17-bsc1181976.patch

@@ -1,45 +0,0 @@
-From 3dd1661a3d91671ca6c977c2e514f47d807be79d Mon Sep 17 00:00:00 2001
-From: Craig Small <csmall@dropbear.xyz>
-Date: Mon, 29 Mar 2021 22:11:27 +1100
-Subject: [PATCH] docs: psr ps field is last run processor
-
-The ps.1 manpage incorrectly stated that psr field showed the
-processor the process was assigned to. However if the assignment
-has changed but the process has not run, then the field doesn't
-change.
-
-Some digging by @srikard showed it wasn't the processor assigned
-but the last one it was run on. The man page now correctly
-describes psr in that way.
-
-References:
- procps-ng/procps#187
----
- ps/ps.1 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git ps/ps.1 ps/ps.1
-index 8678123..b433655 100644
---- ps/ps.1
-+++ ps/ps.1
-|@@ -4,7 +4,7 @@
-| .\" Quick hack conversion by Albert Cahalan, 1998.
-| .\" Licensed under version 2 of the Gnu General Public License.
-| .\"
-|-.TH PS "1" "2021-03-05" "procps-ng" "User Commands"
-|+.TH PS "1" "2021-03-29" "procps-ng" "User Commands"
-| .\"
-| .\" To render this page:
-| .\"    groff -t -b -man -X -P-resolution -P100 -Tps ps.1 &
-@@ -1518,7 +1518,7 @@ priority of the process.  Higher number means lower priority.
- T}
- 
- psr	PSR	T{
--processor that process is currently assigned to.
-+processor that process last executed on.
- T}
- 
- rgid	RGID	T{
--- 
-2.26.2
-

procps-3.3.17-ignore-sysctl_conf.patch

@@ -1,11 +0,0 @@
---- procps-3.3.17/sysctl.c.old	2021-02-09 11:11:25.000000000 +0100
-+++ procps-3.3.17/sysctl.c	2023-12-14 13:56:36.785976315 +0100
-@@ -546,6 +546,8 @@
- 		fp = (globbuf.gl_pathv[j][0] == '-' && !globbuf.gl_pathv[j][1])
- 		    ? stdin : fopen(globbuf.gl_pathv[j], "r");
- 		if (!fp) {
-+		        if (strcmp ("/usr/lib/sysctl.d/99-sysctl.conf", globbuf.gl_pathv[j]) == 0)
-+			        continue;
- 			xwarn(_("cannot open \"%s\""), globbuf.gl_pathv[j]);
- 			rc = -1;
- 			goto out;

procps-3.3.17-library-bsc1181475.patch

@@ -1,41 +0,0 @@
----
- free.1         |    2 +-
- proc/sysinfo.c |    9 +++++----
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
---- free.1
-+++ free.1	2022-12-15 09:40:32.807087343 +0000
-@@ -19,7 +19,7 @@ columns are:
- Total installed memory (MemTotal and SwapTotal in /proc/meminfo)
- .TP
- \fBused\fR
--Used memory (calculated as \fBtotal\fR - \fBfree\fR - \fBbuffers\fR - \fBcache\fR)
-+Used memory (calculated as \fBtotal\fR - \fBavailable\fR)
- .TP
- \fBfree\fR
- Unused memory (MemFree and SwapFree in /proc/meminfo)
---- proc/sysinfo.c
-+++ proc/sysinfo.c	2022-06-22 11:29:39.240066488 +0000
-@@ -794,10 +794,6 @@ nextline:
-      where such values will be dramatically distorted over those of the host. */
-   if (kb_main_available > kb_main_total)
-     kb_main_available = kb_main_free;
--  mem_used = kb_main_total - kb_main_free - kb_main_cached - kb_main_buffers;
--  if (mem_used < 0)
--    mem_used = kb_main_total - kb_main_free;
--  kb_main_used = (unsigned long)mem_used;
- 
-   /* zero? might need fallback for 2.6.27 <= kernel <? 3.14 */
-   if (!kb_main_available) {
-@@ -821,6 +817,11 @@ nextline:
-       kb_main_available = kb_main_free;
- #endif /* linux */
-   }
-+
-+  mem_used = kb_main_total - kb_main_available;
-+  if (mem_used < 0)
-+    mem_used = kb_main_total - kb_main_free;
-+  kb_main_used = (unsigned long)mem_used;
- }
- 
- /*****************************************************************/

procps-3.3.17-top-bsc1181475.patch

@@ -1,37 +0,0 @@
----
- top/top.1 |    4 ++--
- top/top.c |    6 ++++--
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
---- top/top.1
-+++ top/top.1	2022-06-22 12:05:55.572154830 +0000
-@@ -565,8 +565,8 @@ visual graphs of those representations.
- 
- In the case of \*(MP, the percentage represents the \fBtotal\fR minus the estimated
- \fBavail\fR noted above.
--The `Mem' graph itself is divided between \fBused\fR and any remaining memory not
--otherwise accounted for by \fBavail\fR.
-+The `Mem' graph itself is divided between the non-cached portion of \fBused\fR and
-+any remaining memory not otherwise accounted for by \fBavail\fR.
- \*(XT 4b. SUMMARY AREA Commands and the `m' command for additional information
- on that special 4-way toggle.
- 
---- top/top.c
-+++ top/top.c	2022-06-22 12:03:17.911044097 +0000
-@@ -6086,12 +6086,14 @@ numa_nope:
-          char used[SMLBUFSIZ], util[SMLBUFSIZ], dual[MEDBUFSIZ];
-          float pct_used, pct_misc, pct_swap;
-          int ix, num_used, num_misc;
-+         unsigned long my_ulong;
- 
--         pct_used = (float)kb_main_used * (100.0 / (float)kb_main_total);
-+         my_ulong = kb_main_total - kb_main_buffers - kb_main_cached - kb_main_free;
-+         pct_used = (float)my_ulong * (100.0 / (float)kb_main_total);
- #ifdef MEMGRAPH_OLD
-          pct_misc = (float)(kb_main_buffers + kb_main_cached) * (100.0 / (float)kb_main_total);
- #else
--         pct_misc = (float)(kb_main_total - kb_main_available - kb_main_used) * (100.0 / (float)kb_main_total);
-+         pct_misc = (float)(kb_main_total - kb_main_available - my_ulong) * (100.0 / (float)kb_main_total);
- #endif
-          if (pct_used + pct_misc > 100.0 || pct_misc < 0) pct_misc = 0;
-          pct_swap = kb_swap_total ? (float)kb_swap_used * (100.0 / (float)kb_swap_total) : 0;

procps-ng-3.3.10-bnc634071_procstat2.diff

@@ -1,61 +0,0 @@
----
- proc/libprocps.sym |    1 +
- proc/sysinfo.c     |   13 +++++++++++--
- proc/sysinfo.h     |    2 ++
- 3 files changed, 14 insertions(+), 2 deletions(-)
-
---- proc/libprocps.sym
-+++ proc/libprocps.sym	2018-04-04 11:30:51.841725161 +0000
-@@ -60,6 +60,7 @@ global:
- 	signal_name_to_number;
- 	signal_number_to_name;
- 	smp_num_cpus;
-+	__smp_num_cpus;
- 	sprint_uptime;
- 	strtosig;
- 	tty_to_dev;
---- proc/sysinfo.c
-+++ proc/sysinfo.c	2018-04-04 11:33:26.306886237 +0000
-@@ -47,7 +47,8 @@
- #endif
- #include <elf.h>
- 
--long smp_num_cpus;     /* number of CPUs */
-+#undef smp_num_cpus
-+long smp_num_cpus=-1;  /* number of CPUs */
- long page_bytes;       /* this architecture's page size */
- 
- #define BAD_OPEN_MESSAGE					\
-@@ -1166,7 +1167,11 @@ out:
- 
- ///////////////////////////////////////////////////////////////////////////
- 
--void cpuinfo (void) {
-+long __smp_num_cpus (void) {
-+
-+  if (smp_num_cpus != -1)
-+    return(smp_num_cpus);
-+
-   // ought to count CPUs in /proc/stat instead of relying
-   // on glibc, which foolishly tries to parse /proc/cpuinfo
-   // note: that may have been the case but now /proc/stat
-@@ -1181,4 +1186,8 @@ void cpuinfo (void) {
-   smp_num_cpus = sysconf(_SC_NPROCESSORS_ONLN);
-   if (smp_num_cpus<1)        /* SPARC glibc is buggy */
-     smp_num_cpus=1;
-+
-+  return smp_num_cpus;
- }
-+
-+void cpuinfo (void) { (void)__smp_num_cpus(); }
---- proc/sysinfo.h
-+++ proc/sysinfo.h	2018-04-04 11:30:51.841725161 +0000
-@@ -8,6 +8,8 @@ EXTERN_C_BEGIN
- 
- extern unsigned long long Hertz;   /* clock tick frequency */
- extern long smp_num_cpus;          /* number of CPUs */
-+extern long __smp_num_cpus(void);
-+#define smp_num_cpus __smp_num_cpus()
- extern int have_privs;             /* boolean, true if setuid or similar */
- extern long page_bytes;            /* this architecture's bytes per page */
- 

procps-ng-3.3.10-fdleak.dif

@@ -1,38 +0,0 @@
----
- vmstat.c |    7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
---- vmstat.c
-+++ vmstat.c	2018-04-04 11:16:07.577968520 +0000
-@@ -40,6 +40,7 @@
- #include <string.h>
- #include <sys/ioctl.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
- #include <termios.h>
- #include <unistd.h>
- #include <time.h>
-@@ -708,13 +709,12 @@ static void slabheader(void)
- 
- static void slabformat(void)
- {
--	FILE *fSlab;
-+	struct stat fSlab;
- 	struct slab_cache *slabs;
- 	unsigned long nSlab, i, j, k;
- 	const char format[] = "%-24s %6u %6u %6u %6u\n";
- 
--	fSlab = fopen("/proc/slabinfo", "rb");
--	if (!fSlab) {
-+	if (stat("/proc/slabinfo", &fSlab) < 0) {
- 		xwarnx(_("your kernel does not support slabinfo or your permissions are insufficient"));
- 		return;
- 	}
-@@ -746,7 +746,6 @@ static void slabformat(void)
- 		}
- 		free(slabs);
- 	}
--	fclose(fSlab);
- }
- 
- static void disksum_format(void)

procps-ng-3.3.10-integer-overflow.patch

@@ -1,61 +0,0 @@
----
- free.c         |   19 ++++++++++++++++---
- proc/sysinfo.c |    5 ++++-
- 2 files changed, 20 insertions(+), 4 deletions(-)
-
---- free.c
-+++ free.c	2021-02-10 09:58:35.409695062 +0000
-@@ -134,7 +134,7 @@ static const char *scale_size(unsigned l
- 		if (args.exponent > 1) {
- 			/* In desired scale. */
- 			snprintf(buf, sizeof(buf), "%ld",
--                 (long int)((size * 1024.0) / power(base, args.exponent-1))
-+                 (long int)(((long long int)size * 1024) / power(base, args.exponent-1))
- 			    );
- 			return buf;
- 		}
-@@ -381,15 +381,28 @@ int main(int argc, char **argv)
- 		 * to print the high info, even if it is zero.
- 		 */
- 		if (flags & FREE_LOHI) {
-+			unsigned long kb_low_used;
-+			unsigned long kb_high_used;
-+
-+			if (kb_low_total > kb_low_free)
-+				kb_low_used = kb_low_total - kb_low_free;
-+			else
-+				kb_low_used = 0;
-+
-+			if (kb_high_total > kb_high_free)
-+				kb_high_used = kb_high_total - kb_high_free;
-+			else
-+				kb_high_used = 0;
-+
- 			printf("%-9s", _("Low:"));
- 			printf("%11s", scale_size(kb_low_total, flags, args));
--			printf(" %11s", scale_size(kb_low_total - kb_low_free, flags, args));
-+			printf(" %11s", scale_size(kb_low_used, flags, args));
- 			printf(" %11s", scale_size(kb_low_free, flags, args));
- 			printf("\n");
- 
- 			printf("%-9s", _("High:"));
- 			printf("%11s", scale_size(kb_high_total, flags, args));
--			printf(" %11s", scale_size(kb_high_total - kb_high_free, flags, args));
-+			printf(" %11s", scale_size(kb_high_used, flags, args));
- 			printf(" %11s", scale_size(kb_high_free, flags, args));
- 			printf("\n");
- 		}
---- proc/sysinfo.c
-+++ proc/sysinfo.c	2021-02-10 10:00:35.227385913 +0000
-@@ -783,7 +783,10 @@ nextline:
-   kb_main_cached = kb_page_cache + kb_slab_reclaimable;
-   if ((ev=getenv("PS_FULL_CACHE")))
-     kb_main_cached += kb_swap_cached + kb_nfs_unstable;
--  kb_swap_used = kb_swap_total - kb_swap_free;
-+  if (kb_swap_total > kb_swap_free)
-+    kb_swap_used = kb_swap_total - kb_swap_free;
-+  else
-+    kb_swap_used = 0;
- 
-   /* if kb_main_available is greater than kb_main_total or our calculation of
-      mem_used overflows, that's symptomatic of running within a lxc container

procps-ng-3.3.10-large_pcpu.patch

@@ -1,19 +0,0 @@
----
- top/top.c |    6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
---- top/top.c
-+++ top/top.c	2018-04-04 12:09:16.087193018 +0000
-@@ -2404,7 +2404,11 @@ static void zap_fieldstab (void) {
-    Cpu_pmax = 99.9;
-    if (Rc.mode_irixps && smp_num_cpus > 1 && !Thread_mode) {
-       Cpu_pmax = 100.0 * smp_num_cpus;
--      if (smp_num_cpus > 10) {
-+      if (smp_num_cpus > 1000) {
-+	 if (Cpu_pmax > 9999999.0) Cpu_pmax = 9999999.0;
-+      } else if (smp_num_cpus > 100) {
-+	 if (Cpu_pmax > 999999.0) Cpu_pmax = 999999.0;
-+      } else if (smp_num_cpus > 10) {
-          if (Cpu_pmax > 99999.0) Cpu_pmax = 99999.0;
-       } else {
-          if (Cpu_pmax > 999.9) Cpu_pmax = 999.9;

procps-ng-3.3.17-logind.patch

@@ -1,407 +0,0 @@
-diff -ur procps-3.3.17/configure.ac procps-3.3.17-no-utmp/configure.ac
---- procps-3.3.17/configure.ac	2023-10-27 17:02:55.230522174 +0200
-+++ procps-3.3.17-no-utmp/configure.ac	2023-10-27 17:05:56.027565296 +0200
-@@ -214,6 +214,13 @@
- AS_IF([test "x$with_systemd" != "xno"], [
-   PKG_CHECK_MODULES([SYSTEMD], [libsystemd])
-   AC_DEFINE(WITH_SYSTEMD, 1, [enable systemd support])
-+
-+  # The functions needed to replace utmp with logind are only available
-+  # with systemd v254 or later.
-+  old_LIBS="$LIBS"
-+  LIBS="$LIBS $SYSTEMD_LIBS"
-+  AC_CHECK_FUNCS([sd_session_get_leader])
-+  LIBS="$old_LIBS"
- ])
- AM_CONDITIONAL([WITH_SYSTEMD], [test x$with_systemd != xno])
- 
-diff -ur procps-3.3.17/proc/whattime.c procps-3.3.17-no-utmp/proc/whattime.c
---- procps-3.3.17/proc/whattime.c	2021-02-09 11:11:25.000000000 +0100
-+++ procps-3.3.17-no-utmp/proc/whattime.c	2023-10-27 17:05:56.027565296 +0200
-@@ -38,6 +38,15 @@
- #include "whattime.h"
- #include "sysinfo.h"
- 
-+#ifdef WITH_SYSTEMD
-+#include <systemd/sd-daemon.h>
-+#include <systemd/sd-login.h>
-+#endif
-+#ifdef WITH_ELOGIND
-+#include <elogind/sd-daemon.h>
-+#include <elogind/sd-login.h>
-+#endif
-+
- static char buf[256];
- static double av[3];
- 
-@@ -98,6 +107,11 @@
- /* count the number of users */
- 
-     numuser = 0;
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
-+    if (sd_booted() > 0)
-+      numuser = sd_get_sessions(NULL);
-+    else {
-+#endif
-     setutent();
-     while ((utmpstruct = getutent())) {
-       if ((utmpstruct->ut_type == USER_PROCESS) &&
-@@ -105,6 +119,10 @@
-         numuser++;
-     }
-     endutent();
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
-+       }
-+#endif
-+
- 
-     pos += sprintf(buf + pos, "%2d user%s, ", numuser, numuser == 1 ? "" : "s");
- 
-Datei procps-3.3.17/screen.620TQo/23075..f05 ist ein Socket, während Datei procps-3.3.17-no-utmp/screen.620TQo/23075..f05 ein Socket ist.
-diff -ur procps-3.3.17/w.c procps-3.3.17-no-utmp/w.c
---- procps-3.3.17/w.c	2023-10-27 17:02:55.194521966 +0200
-+++ procps-3.3.17-no-utmp/w.c	2023-10-27 18:10:00.371042829 +0200
-@@ -56,11 +56,22 @@
- #include <time.h>
- #include <unistd.h>
- #ifdef HAVE_UTMPX_H
--#	include <utmpx.h>
-+#include <utmpx.h>
-+#ifndef HAVE_UT_HOSTSIZE_IN_UTMPX
-+#include <utmp.h>
-+#endif
- #else
- #	include <utmp.h>
- #endif
- #include <arpa/inet.h>
-+#ifdef WITH_SYSTEMD
-+#      include <systemd/sd-login.h>
-+#      include <systemd/sd-daemon.h>
-+#endif
-+#ifdef WITH_ELOGIND
-+#      include <elogind/sd-login.h>
-+#      include <elogind/sd-daemon.h>
-+#endif
- 
- static int ignoreuser = 0;	/* for '-u' */
- static int oldstyle = 0;	/* for '-o' */
-@@ -72,12 +83,6 @@
- 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
-@@ -198,7 +203,25 @@
- 
- 
- /* This routine prints either the hostname or the IP address of the remote */
--static void print_from(const utmp_t *restrict const u, const int ip_addresses, const int fromlen) {
-+static void print_from(
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+		       const char *session,
-+#endif
-+		       const utmp_t *restrict const u, const int ip_addresses, const int fromlen) {
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+        if (session) {
-+	    char *host = NULL;
-+	    int r;
-+
-+	    r = sd_session_get_remote_host(session, &host);
-+	    if (r < 0 || host == NULL)
-+	        print_host("", 0, fromlen);
-+	    else {
-+	        print_host(host, strlen(host), fromlen == 0?strlen(host):fromlen);
-+		free(host);
-+	    }
-+	} else {
-+#endif
- 	char buf[fromlen + 1];
- 	char buf_ipv6[INET6_ADDRSTRLEN];
- 	int len;
-@@ -243,6 +266,9 @@
- #else
- 	print_host(u->ut_host, UT_HOSTSIZE, fromlen);
- #endif
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+	}
-+#endif
- }
- 
- 
-@@ -341,7 +367,11 @@
-  * the user for that login session is doing currently. This the
-  * essential core of 'w'.
-  */
--static const proc_t *getproc(const utmp_t * restrict const u,
-+static const proc_t *getproc(
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+			     const char *session,
-+#endif
-+			     const utmp_t * restrict const u,
- 			     const char *restrict const tty,
- 			     unsigned long long *restrict const jcpu,
- 			     int *restrict const found_utpid)
-@@ -351,9 +381,16 @@
- 	const proc_t *best = NULL;
- 	const proc_t *secondbest = NULL;
- 	unsigned uid = ~0U;
-+	pid_t ut_pid = -1;
- 
- 	*found_utpid = 0;
- 	if (!ignoreuser) {
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+        if (session) {
-+            if (sd_session_get_uid(session, &uid) < 0)
-+                return 0;
-+        } else {
-+#endif
- 		char buf[UT_NAMESIZE + 1];
- 		/* pointer to static data */
- 		struct passwd *passwd_data;
-@@ -364,12 +401,21 @@
- 			return NULL;
- 		uid = passwd_data->pw_uid;
- 		/* OK to have passwd_data go out of scope here */
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+	}
-+#endif
- 	}
- 	line = tty_to_dev(tty);
- 	*jcpu = 0;
-+	if (u)
-+	  ut_pid = u->ut_pid;
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+	else
-+	  sd_session_get_leader(session, &ut_pid);
-+#endif
- 	for (; *pptr; pptr++) {
--		const proc_t *restrict const tmp = *pptr;
--		if (unlikely(tmp->tgid == u->ut_pid)) {
-+	    const proc_t *restrict const tmp = *pptr;
-+	    if (unlikely(tmp->tgid == ut_pid)) {
- 			*found_utpid = 1;
-             if (!best)
-                 best = tmp;
-@@ -393,7 +439,11 @@
- 	return best ? best : secondbest;
- }
- 
--static void showinfo(utmp_t * u, int formtype, int maxcmd, int from,
-+static void showinfo(
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+		     const char *session, const char *name,
-+#endif
-+		     utmp_t * u, int formtype, int maxcmd, int from,
- 		     int userlen, int fromlen, const int ip_addresses)
- {
- 	unsigned long long jcpu;
-@@ -402,14 +452,36 @@
- 	char uname[UT_NAMESIZE + 1] = "", tty[5 + UT_LINESIZE + 1] = "/dev/";
- 	const proc_t *best;
- 
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+	if (session) {
-+	  char *sd_tty;
-+
-+	  if (sd_session_get_tty(session, &sd_tty) >= 0) {
-+            for (i = 0; i < strlen (sd_tty); i++)
-+	      /* clean up tty if garbled */
-+	      if (isalnum(sd_tty[i]) || (sd_tty[i] == '/'))
-+		tty[i + 5] = sd_tty[i];
-+	      else
-+		tty[i + 5] = '\0';
-+	    free(sd_tty);
-+	  }
-+	} else {
-+#endif
- 	for (i = 0; i < UT_LINESIZE; i++)
- 		/* clean up tty if garbled */
- 		if (isalnum(u->ut_line[i]) || (u->ut_line[i] == '/'))
- 			tty[i + 5] = u->ut_line[i];
- 		else
- 			tty[i + 5] = '\0';
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+	}
-+#endif
- 
--	best = getproc(u, tty + 5, &jcpu, &ut_pid_found);
-+	best = getproc(
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+		       session,
-+#endif
-+		       u, tty + 5, &jcpu, &ut_pid_found);
- 
- 	/*
- 	 * just skip if stale utmp entry (i.e. login proc doesn't
-@@ -420,26 +492,56 @@
- 	if (!ut_pid_found)
- 		return;
- 
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+        if (name)
-+	        strncpy(uname, name, UT_NAMESIZE);
-+	else
-+#endif
-+	        strncpy(uname, u->ut_user, UT_NAMESIZE);
- 	/* force NUL term for printf */
--	strncpy(uname, u->ut_user, UT_NAMESIZE);
-+	uname[UT_NAMESIZE] = '\0';
- 
- 	if (formtype) {
--		int utlnlen = 8;
--		if (formtype > 1) {
--			userlen = strnlen(uname, UT_NAMESIZE);
--			fromlen = strnlen(u->ut_host, UT_HOSTSIZE);
--			utlnlen = strnlen(u->ut_line, UT_LINESIZE);
--			maxcmd = MAX_CMD_WIDTH;
-+	    int utlnlen = 8;
-+	    if (formtype > 1) {
-+	        userlen = strnlen(uname, UT_NAMESIZE);
-+		if (u) {
-+		  fromlen = strnlen(u->ut_host, UT_HOSTSIZE);
-+		  utlnlen = strnlen(u->ut_line, UT_LINESIZE);
-+		} else {
-+		  fromlen = 0;
-+		  utlnlen = strlen (tty+5);
- 		}
--		printf("%-*.*s%-*.*s", userlen + 1, userlen, uname, utlnlen + 1, utlnlen, u->ut_line);
-+		maxcmd = MAX_CMD_WIDTH;
-+	    }
-+	    printf("%-*.*s%-*.*s", userlen + 1, userlen, uname, utlnlen + 1, utlnlen, tty+5);
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+	    if (session) {
-+	        uint64_t ltime;
-+
- 		if (from)
--			print_from(u, ip_addresses, fromlen);
-+		    print_from(session, NULL, ip_addresses, fromlen);
-+
-+		sd_session_get_start_time(session, &ltime);
-+		print_logintime(ltime/((uint64_t) 1000000ULL), stdout);
-+	    } else {
-+#endif
-+	        if (from)
-+		    print_from(
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+			       NULL,
-+#endif
-+			       u, ip_addresses, fromlen);
-+
- #ifdef HAVE_UTMPX_H
- 		print_logintime(u->ut_tv.tv_sec, stdout);
- #else
- 		print_logintime(u->ut_time, stdout);
- #endif
--		if (*u->ut_line == ':')
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+	    }
-+#endif
-+	    if (u && *u->ut_line == ':')
- 			/* idle unknown for xdm logins */
- 			printf(" ?xdm? ");
- 		else
-@@ -454,11 +556,15 @@
- 		} else
- 			printf("   ?   ");
- 	} else {
--		printf("%-*.*s%-9.8s", userlen + 1, userlen, u->ut_user,
--		       u->ut_line);
-+		printf("%-*.*s%-9.8s", userlen + 1, userlen, uname,
-+		       tty+5);
- 		if (from)
--			print_from(u, ip_addresses, fromlen);
--		if (*u->ut_line == ':')
-+		  print_from(
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+			     session,
-+#endif
-+			     u, ip_addresses, fromlen);
-+		if (u && *u->ut_line == ':')
- 			/* idle unknown for xdm logins */
- 			printf(" ?xdm? ");
- 		else
-@@ -635,7 +741,40 @@
- 		else
- 			printf(_("   IDLE WHAT\n"));
- 	}
--
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+	if (sd_booted() > 0) {
-+		char **sessions_list;
-+		int sessions;
-+		int i;
-+
-+		sessions = sd_get_sessions (&sessions_list);
-+		if (sessions < 0 && sessions != -ENOENT)
-+			error(EXIT_FAILURE, -sessions, _("error getting sessions"));
-+
-+		if (sessions >= 0) {
-+			for (int i = 0; i < sessions; i++) {
-+				char *name;
-+				int r;
-+
-+				if ((r = sd_session_get_username(sessions_list[i], &name)) < 0)
-+					error(EXIT_FAILURE, -r, _("get user name failed"));
-+
-+				if (user) {
-+					if (!strcmp(name, user))
-+						showinfo(sessions_list[i], name, NULL, longform,
-+							 maxcmd, from, userlen, fromlen,
-+							 ip_addresses);
-+				} else {
-+					showinfo(sessions_list[i], name, NULL, longform, maxcmd,
-+						 from, userlen, fromlen, ip_addresses);
-+				}
-+				free(name);
-+				free(sessions_list[i]);
-+			}
-+			free(sessions_list);
-+		}
-+	} else {
-+#endif
- #ifdef HAVE_UTMPX_H
- 	setutxent();
- #else
-@@ -654,7 +793,11 @@
- 			if (u->ut_type != USER_PROCESS)
- 				continue;
- 			if (!strncmp(u->ut_user, user, UT_NAMESIZE))
--				showinfo(u, longform, maxcmd, from, userlen,
-+				showinfo(
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+					 NULL, NULL,
-+#endif
-+					 u, longform, maxcmd, from, userlen,
- 					 fromlen, ip_addresses);
- 		}
- 	} else {
-@@ -669,7 +812,11 @@
- 			if (u->ut_type != USER_PROCESS)
- 				continue;
- 			if (*u->ut_user)
--				showinfo(u, longform, maxcmd, from, userlen,
-+				showinfo(
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+					 NULL, NULL,
-+#endif
-+					 u, longform, maxcmd, from, userlen,
- 					 fromlen, ip_addresses);
- 		}
- 	}
-@@ -678,6 +825,9 @@
- #else
- 	endutent();
- #endif
-+#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-+	}
-+#endif
- 
- 	return EXIT_SUCCESS;
- }

procps-ng-3.3.8-accuracy.dif

@@ -1,99 +0,0 @@
----
- ps/common.h |    1 +
- ps/global.c |    5 ++++-
- ps/output.c |   19 ++++++++++---------
- 3 files changed, 15 insertions(+), 10 deletions(-)
-
---- ps/common.h
-+++ ps/common.h	2018-04-04 11:14:33.915688098 +0000
-@@ -303,6 +303,7 @@ extern int             running_only;
- extern int             screen_cols;
- extern int             screen_rows;
- extern time_t          seconds_since_boot;
-+extern unsigned long long jiffies_since_boot;
- extern selection_node *selection_list;
- extern unsigned        simple_select;
- extern sort_node      *sort_list;
---- ps/global.c
-+++ ps/global.c	2018-04-04 11:14:33.915688098 +0000
-@@ -78,6 +78,7 @@ int             prefer_bsd_defaults = -1
- int             screen_cols = -1;
- int             screen_rows = -1;
- time_t          seconds_since_boot = -1;
-+unsigned long long  jiffies_since_boot = -1;
- selection_node *selection_list = (selection_node *)0xdeadbeef;
- unsigned        simple_select = 0xffffffff;
- sort_node      *sort_list = (sort_node *)0xdeadbeef; /* ready-to-use sort list */
-@@ -361,6 +362,7 @@ static const char *set_personality(void)
- /************ Call this to reinitialize everything ***************/
- void reset_global(void){
-   static proc_t p;
-+  double uptime_secs;
-   reset_selection_list();
-   look_up_our_self(&p);
-   set_screen_size();
-@@ -383,7 +385,8 @@ void reset_global(void){
-   negate_selection      = 0;
-   page_size             = getpagesize();
-   running_only          = 0;
--  seconds_since_boot    = uptime(0,0);
-+  seconds_since_boot    = uptime(&uptime_secs,0);
-+  jiffies_since_boot	= ((long double)uptime_secs * Hertz);
-   selection_list        = NULL;
-   simple_select         = 0;
-   sort_list             = NULL;
---- ps/output.c
-+++ ps/output.c	2018-04-04 11:14:33.915688098 +0000
-@@ -134,6 +134,7 @@ static int sr_ ## NAME (const proc_t* P,
- #define cook_time(P) (P->utime + P->stime) / Hertz
- 
- #define cook_etime(P) (((unsigned long long)seconds_since_boot >= (P->start_time / Hertz)) ? ((unsigned long long)seconds_since_boot - (P->start_time / Hertz)) : 0)
-+#define cook_jtime(P) (((unsigned long long)jiffies_since_boot >= (P->start_time)) ? ((unsigned long long)jiffies_since_boot - (P->start_time)) : 0)
- 
- #define CMP_COOKED_TIME(NAME) \
- static int sr_ ## NAME (const proc_t* P, const proc_t* Q) { \
-@@ -507,11 +508,11 @@ static int pr_etimes(char *restrict cons
- static int pr_c(char *restrict const outbuf, const proc_t *restrict const pp){
-   unsigned long long total_time;   /* jiffies used by this process */
-   unsigned pcpu = 0;               /* scaled %cpu, 99 means 99% */
--  unsigned long long seconds;      /* seconds of process life */
-+  unsigned long long jiffies;      /* jiffies of process life */
-   total_time = pp->utime + pp->stime;
-   if(include_dead_children) total_time += (pp->cutime + pp->cstime);
--  seconds = cook_etime(pp);
--  if(seconds) pcpu = (total_time * 100ULL / Hertz) / seconds;
-+  jiffies = cook_jtime(pp);
-+  if(jiffies) pcpu = (total_time * 100ULL) / jiffies;
-   if (pcpu > 99U) pcpu = 99U;
-   return snprintf(outbuf, COLWID, "%2u", pcpu);
- }
-@@ -519,11 +520,11 @@ static int pr_c(char *restrict const out
- static int pr_pcpu(char *restrict const outbuf, const proc_t *restrict const pp){
-   unsigned long long total_time;   /* jiffies used by this process */
-   unsigned pcpu = 0;               /* scaled %cpu, 999 means 99.9% */
--  unsigned long long seconds;      /* seconds of process life */
-+  unsigned long long jiffies;      /* jiffies of process life */
-   total_time = pp->utime + pp->stime;
-   if(include_dead_children) total_time += (pp->cutime + pp->cstime);
--  seconds = cook_etime(pp);
--  if(seconds) pcpu = (total_time * 1000ULL / Hertz) / seconds;
-+  jiffies = cook_jtime(pp);
-+  if(jiffies) pcpu = (total_time * 1000ULL) / jiffies;
-   if (pcpu > 999U)
-     return snprintf(outbuf, COLWID, "%u", pcpu/10U);
-   return snprintf(outbuf, COLWID, "%u.%u", pcpu/10U, pcpu%10U);
-@@ -532,11 +533,11 @@ static int pr_pcpu(char *restrict const
- static int pr_cp(char *restrict const outbuf, const proc_t *restrict const pp){
-   unsigned long long total_time;   /* jiffies used by this process */
-   unsigned pcpu = 0;               /* scaled %cpu, 999 means 99.9% */
--  unsigned long long seconds;      /* seconds of process life */
-+  unsigned long long jiffies;      /* jiffies of process life */
-   total_time = pp->utime + pp->stime;
-   if(include_dead_children) total_time += (pp->cutime + pp->cstime);
--  seconds = cook_etime(pp);
--  if(seconds) pcpu = (total_time * 1000ULL / Hertz) / seconds;
-+  jiffies = cook_jtime(pp);
-+  if(jiffies) pcpu = (total_time * 1000ULL) / jiffies;
-   if (pcpu > 999U) pcpu = 999U;
-   return snprintf(outbuf, COLWID, "%3u", pcpu);
- }

procps-ng-3.3.8-bnc634840.patch

@@ -1,29 +0,0 @@
-Do not setup SIGHUP signal handler if we are in the batch mode
-
-Top enables a signal handler for the SIGHUP signal (loss of terminal).  While
-this makes sense for top's default interactive mode, it doesn't make any sense
-for batch mode. If you run top in nohup just to collect data over time and
-disconnect top finishes which is not what one would expect.
-Index: procps-3.2.8/top.c
-
----
- top/top.c |    8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
---- top/top.c
-+++ top/top.c	2018-04-04 11:33:59.278280201 +0000
-@@ -3691,7 +3691,13 @@ static void before (char *me) {
-    sa.sa_flags = 0;
-    for (i = SIGRTMAX; i; i--) {
-       switch (i) {
--         case SIGALRM: case SIGHUP:  case SIGINT:
-+         case SIGHUP:
-+            if (Batch)
-+              sa.sa_handler = SIG_IGN;
-+            else
-+              sa.sa_handler = sig_endpgm;
-+            break;
-+         case SIGALRM: case SIGINT:
-          case SIGPIPE: case SIGQUIT: case SIGTERM:
-          case SIGUSR1: case SIGUSR2:
-             sa.sa_handler = sig_endpgm;

procps-ng-3.3.9-watch.patch

@@ -1,14 +0,0 @@
----
- proc/libprocps.sym |    1 +
- 1 file changed, 1 insertion(+)
-
---- proc/libprocps.sym
-+++ proc/libprocps.sym	2016-07-11 12:45:32.463107052 +0000
-@@ -13,6 +13,7 @@ global:
- 	get_ns_id;
- 	get_ns_name;
- 	get_pid_digits;
-+	get_proc_stats;
- 	get_slabinfo;
- 	getbtime;
- 	getdiskstat;