import psmisc-23.1-5.el8
This commit is contained in:
parent
d885142aaa
commit
18a1d7a149
17
SOURCES/psmisc-23.1-pstree-consecutive-NULs.patch
Normal file
17
SOURCES/psmisc-23.1-pstree-consecutive-NULs.patch
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
diff -up ./src/pstree.c.ori ./src/pstree.c
|
||||||
|
--- ./src/pstree.c.ori 2017-06-12 02:24:29.089210495 +0200
|
||||||
|
+++ ./src/pstree.c 2020-07-03 21:24:47.257760342 +0200
|
||||||
|
@@ -530,8 +530,12 @@ static void set_args(PROC * this, const
|
||||||
|
}
|
||||||
|
this->argc = 0;
|
||||||
|
for (i = 0; i < size - 1; i++)
|
||||||
|
- if (!args[i])
|
||||||
|
+ if (!args[i]) {
|
||||||
|
this->argc++;
|
||||||
|
+ /* now skip consecutive NUL */
|
||||||
|
+ while(!args[i] && (i < size -1 ))
|
||||||
|
+ i++;
|
||||||
|
+ }
|
||||||
|
if (!this->argc)
|
||||||
|
return;
|
||||||
|
if (!(this->argv = malloc(sizeof(char *) * this->argc))) {
|
@ -2,7 +2,7 @@
|
|||||||
Summary: Utilities for managing processes on your system
|
Summary: Utilities for managing processes on your system
|
||||||
Name: psmisc
|
Name: psmisc
|
||||||
Version: 23.1
|
Version: 23.1
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
URL: https://gitlab.com/psmisc/psmisc
|
URL: https://gitlab.com/psmisc/psmisc
|
||||||
@ -12,6 +12,7 @@ Source: https://sourceforge.net/projects/%{name}/files/%{name}/%{name}-%{version
|
|||||||
#The following has been reworked by upstream in a different way ... we'll see
|
#The following has been reworked by upstream in a different way ... we'll see
|
||||||
#Patch1: psmisc-22.13-fuser-silent.patch
|
#Patch1: psmisc-22.13-fuser-silent.patch
|
||||||
Patch2: psmisc-23.1-no-nullptr-sanity-stalls-nfs.patch
|
Patch2: psmisc-23.1-no-nullptr-sanity-stalls-nfs.patch
|
||||||
|
Patch3: psmisc-23.1-pstree-consecutive-NULs.patch
|
||||||
|
|
||||||
BuildRequires: libselinux-devel
|
BuildRequires: libselinux-devel
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
@ -31,6 +32,7 @@ command shows the path of log files owned by a given process.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --prefix=%{_prefix} --enable-selinux
|
%configure --prefix=%{_prefix} --enable-selinux
|
||||||
@ -69,6 +71,10 @@ mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT%{_sbindir}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jul 03 2020 Jan Rybar <jrybar@redhat.com> - 23.1-5
|
||||||
|
- pstree -al incorrectly handles large empty cmdline
|
||||||
|
- Resolves: rhbz#1715509
|
||||||
|
|
||||||
* Wed Jun 12 2019 Jan Rybar <jrybar@redhat.com> - 23.1-4
|
* Wed Jun 12 2019 Jan Rybar <jrybar@redhat.com> - 23.1-4
|
||||||
- backport of patch fixing fuser stalling NFS on non-existent file
|
- backport of patch fixing fuser stalling NFS on non-existent file
|
||||||
- Resolves: rhbz#1693785
|
- Resolves: rhbz#1693785
|
||||||
|
Loading…
Reference in New Issue
Block a user