diff --git a/SOURCES/procps-ng-3.3.10-pgrep-uid-conversion-overflow.patch b/SOURCES/procps-ng-3.3.10-pgrep-uid-conversion-overflow.patch new file mode 100644 index 0000000..7a27833 --- /dev/null +++ b/SOURCES/procps-ng-3.3.10-pgrep-uid-conversion-overflow.patch @@ -0,0 +1,21 @@ +diff -up ./pgrep.c.ori ./pgrep.c +--- ./pgrep.c.ori 2014-09-23 13:40:36.000000000 +0200 ++++ ./pgrep.c 2020-04-24 14:51:43.106245282 +0200 +@@ -274,7 +274,7 @@ static int conv_uid (const char *restric + xwarnx(_("invalid user name: %s"), name); + return 0; + } +- e->num = pwd->pw_uid; ++ e->num = (int) pwd->pw_uid; + return 1; + } + +@@ -291,7 +291,7 @@ static int conv_gid (const char *restric + xwarnx(_("invalid group name: %s"), name); + return 0; + } +- e->num = grp->gr_gid; ++ e->num = (int) grp->gr_gid; + return 1; + } + diff --git a/SOURCES/procps-ng-3.3.10-vmstat-manpage-blocked-io.patch b/SOURCES/procps-ng-3.3.10-vmstat-manpage-blocked-io.patch new file mode 100644 index 0000000..4992d99 --- /dev/null +++ b/SOURCES/procps-ng-3.3.10-vmstat-manpage-blocked-io.patch @@ -0,0 +1,12 @@ +diff -up ./vmstat.8.ori ./vmstat.8 +--- ./vmstat.8.ori 2020-05-19 16:08:39.788516855 +0200 ++++ ./vmstat.8 2020-05-19 16:09:33.138186296 +0200 +@@ -93,7 +93,7 @@ Display help and exit. + .B "Procs" + .nf + r: The number of runnable processes (running or waiting for run time). +-b: The number of processes in uninterruptible sleep. ++b: Number of processes blocked waiting for I/O to complete. + .fi + .PP + .SS diff --git a/SPECS/procps-ng.spec b/SPECS/procps-ng.spec index 37dccae..b261d87 100644 --- a/SPECS/procps-ng.spec +++ b/SPECS/procps-ng.spec @@ -4,7 +4,7 @@ Summary: System and process monitoring utilities Name: procps-ng Version: 3.3.10 -Release: 27%{?dist} +Release: 28%{?dist} License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ Group: Applications/System URL: https://sourceforge.net/projects/procps-ng/ @@ -34,6 +34,8 @@ Patch19: procps-ng-3.3.10-CVE-2018-1122.patch Patch20: procps-ng-3.3.10-recognize_sched_deadline.patch Patch21: procps-ng-3.3.10-free-counts-unreclaim-slabs-in-avail-mem.patch Patch22: procps-ng-3.3.10-top-segv-on-double-exit.patch +Patch23: procps-ng-3.3.10-pgrep-uid-conversion-overflow.patch +Patch24: procps-ng-3.3.10-vmstat-manpage-blocked-io.patch Requires(post): /sbin/ldconfig @@ -123,6 +125,8 @@ Internationalization pack for procps-ng %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 +%patch24 -p1 %build @@ -204,6 +208,11 @@ rmdir %{buildroot}/share %{_datadir}/locale/* %changelog +* Fri Apr 24 2020 Jan Rybar - 3.3.10-28 +- pgrep: uid/gid conversion overflow +- vmstat: manpage line about I/O blocked procs unclear +- Resolves: rhbz#1624514, rhbz#1796043 + * Thu Aug 08 2019 Jan Rybar - 3.3.10-27 - top: segfault if killed by sigterm in batch mode - Resolves: rhbz#1737552