From e404016675a772b5b5c9b6ae37e3541b5ab8f030 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 20 Dec 2022 10:14:57 +0000 Subject: [PATCH] Auto sync2gitlab import of procps-ng-3.3.15-11.el8.src.rpm --- procps-ng-3.3.15-ps-select.patch | 39 ++++++++++++++++++++++++++++++++ procps-ng.spec | 7 +++++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 procps-ng-3.3.15-ps-select.patch diff --git a/procps-ng-3.3.15-ps-select.patch b/procps-ng-3.3.15-ps-select.patch new file mode 100644 index 0000000..f48d13b --- /dev/null +++ b/procps-ng-3.3.15-ps-select.patch @@ -0,0 +1,39 @@ +From 06995518605fed7a1a29551be0eff01b2f9e89b7 Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Tue, 13 Dec 2022 16:02:50 -0500 +Subject: [PATCH] + +--- + ps/common.h | 2 +- + ps/select.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ps/common.h b/ps/common.h +index 905d320..fc4d3a8 100644 +--- a/ps/common.h ++++ b/ps/common.h +@@ -189,7 +189,7 @@ typedef union sel_union { + uid_t uid; + gid_t gid; + dev_t tty; +- char cmd[64]; /* this is _not_ \0 terminated */ ++ char cmd[16]; /* this is _not_ \0 terminated */ + } sel_union; + + typedef struct selection_node { +diff --git a/ps/select.c b/ps/select.c +index f58ca25..e12982d 100644 +--- a/ps/select.c ++++ b/ps/select.c +@@ -117,7 +117,7 @@ static int proc_was_listed(proc_t *buf){ + break; case SEL_SESS: return_if_match(session,pid); + + break; case SEL_COMM: i=sn->n; while(i--) +- if(!strncmp( buf->cmd, (*(sn->u+i)).cmd, 63 )) return 1; ++ if(!strncmp( buf->cmd, (*(sn->u+i)).cmd, 15 )) return 1; + + + +-- +2.31.1 + diff --git a/procps-ng.spec b/procps-ng.spec index 061d7f1..9b98f5a 100644 --- a/procps-ng.spec +++ b/procps-ng.spec @@ -4,7 +4,7 @@ Summary: System and process monitoring utilities Name: procps-ng Version: 3.3.15 -Release: 10%{?dist} +Release: 11%{?dist} License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ Group: Applications/System URL: https://sourceforge.net/projects/procps-ng/ @@ -26,6 +26,7 @@ Patch7: procps-ng-3.3.15-vmstat-omit-first-report.patch Patch8: procps-ng-3.3.15-sysctl-config-dir-order.patch Patch9: procps-ng-3.3.15-pgrep-uid-gid-overflow.patch Patch10: procps-ng-3.3.15-display-sig-unsafe.patch +Patch11: procps-ng-3.3.15-ps-select.patch BuildRequires: ncurses-devel BuildRequires: libtool @@ -168,6 +169,10 @@ ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof %files i18n -f %{name}.lang %changelog +* Tue Dec 13 2022 Kyle Walker - 3.3.15-11 +- ps: revert increase command name length to 64 ____ (catch up) +- Resolves: rhbz#2144978 + * Wed Nov 23 2022 Jan Rybar - 3.3.15-10 - display.c: backport: async-signal-unsafe handler deadlocks on SIGHUP - Resolves: rhbz#2141696