Browse code
Add pstree patch for proper fclose
Change-Id: Ib2f0aea3bbc7a49913eb6ca626f74ff30ce84505
Reviewed-on: http://photon-jenkins.eng.vmware.com/768
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: suezzelur <anishs@vmware.com>
suezzelur authored on 2016/04/29 08:20:02Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,16 @@ |
| 0 |
+diff -ru psmisc-22.21/src/pstree.c psmisc-22.21-new/src/pstree.c |
|
| 1 |
+--- psmisc-22.21/src/pstree.c 2014-02-01 21:59:07.000000000 -0800 |
|
| 2 |
+@@ -816,10 +816,10 @@ |
|
| 3 |
+ return threadname; |
|
| 4 |
+ } |
|
| 5 |
+ } |
|
| 6 |
++ fclose(file); |
|
| 7 |
+ } |
|
| 8 |
+ /* Fall back to old method */ |
|
| 9 |
+ sprintf(threadname, "{%.*s}", COMM_LEN, comm);
|
|
| 10 |
+- fclose(file); |
|
| 11 |
+ return threadname; |
|
| 12 |
+ } |
|
| 13 |
+ |
|
| 14 |
+ |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Displays information about running processes |
| 2 | 2 |
Name: psmisc |
| 3 | 3 |
Version: 22.21 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
License: GPLv2+ |
| 6 | 6 |
URL: http://psmisc.sourceforge.net/ |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -12,12 +12,14 @@ Source0: http://prdownloads.sourceforge.net/psmisc/%{name}-%{version}.tar.gz
|
| 12 | 12 |
BuildRequires: ncurses-devel |
| 13 | 13 |
Requires: ncurses |
| 14 | 14 |
Patch0: fuser_typo.patch |
| 15 |
+Patch1: psmisc-22.21-incorrect-fclose.patch |
|
| 15 | 16 |
%description |
| 16 | 17 |
The Psmisc package contains programs for displaying information |
| 17 | 18 |
about running processes. |
| 18 | 19 |
%prep |
| 19 | 20 |
%setup -q |
| 20 | 21 |
%patch0 -p1 |
| 22 |
+%patch1 -p1 |
|
| 21 | 23 |
%build |
| 22 | 24 |
./configure \ |
| 23 | 25 |
--prefix=%{_prefix}
|
| ... | ... |
@@ -36,6 +38,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
|
| 36 | 36 |
%{_bindir}/*
|
| 37 | 37 |
%{_mandir}/*/*
|
| 38 | 38 |
%changelog |
| 39 |
+* Thu Apr 28 2016 Anish Swaminathan <anishs@vmware.com> 22.21-3 |
|
| 40 |
+- Add patch for incorrect fclose in pstree |
|
| 39 | 41 |
* Fri Mar 11 2016 Kumar Kaushik <kaushikk@vmware.com> 22.21-2 |
| 40 | 42 |
- Adding patch for type in fuser binary. |
| 41 | 43 |
* Tue Jan 12 2016 Anish Swaminathan <anishs@vmware.com> 22.21-1 |