[packages/psmisc] fix fuser hang
jajcus
jajcus at pld-linux.org
Fri Apr 22 15:01:50 CEST 2016
commit b7af75b7da3d0d57e7573eb4919026f47560e156
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Fri Apr 22 15:01:06 2016 +0200
fix fuser hang
Fix broken --enable-timeout-stat, which would case even 'fuser --help'
to hang on some systems.
fuser-hang.patch | 12 ++++++++++++
psmisc.spec | 4 +++-
2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/psmisc.spec b/psmisc.spec
index 0792628..4caae25 100644
--- a/psmisc.spec
+++ b/psmisc.spec
@@ -14,7 +14,7 @@ Summary(tr.UTF-8): /proc dosya sistemi için ps tipi araçlar
Summary(uk.UTF-8): Утиліти роботи з процесами
Name: psmisc
Version: 22.21
-Release: 1
+Release: 2
License: GPL v2+
Group: Applications/System
Source0: http://downloads.sourceforge.net/psmisc/%{name}-%{version}.tar.gz
@@ -22,6 +22,7 @@ Source0: http://downloads.sourceforge.net/psmisc/%{name}-%{version}.tar.gz
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 9add7665e440bbd6b0b4f9293ba8b86d
Patch0: %{name}-pl.po-update.patch
+Patch1: fuser-hang.patch
URL: http://psmisc.sourceforge.net/
BuildRequires: autoconf >= 2.68
BuildRequires: automake >= 1:1.10
@@ -88,6 +89,7 @@ göndermek için gerekli programları içerir.
%prep
%setup -q
#%patch0 -p1
+%patch1 -p1
%build
%{__gettextize}
diff --git a/fuser-hang.patch b/fuser-hang.patch
new file mode 100644
index 0000000..29b5e99
--- /dev/null
+++ b/fuser-hang.patch
@@ -0,0 +1,12 @@
+diff -dur psmisc-22.21.orig/src/fuser.c psmisc-22.21/src/fuser.c
+--- psmisc-22.21.orig/src/fuser.c 2014-01-31 14:07:32.000000000 +0100
++++ psmisc-22.21/src/fuser.c 2016-04-22 14:59:25.000000000 +0200
+@@ -1871,7 +1871,7 @@
+ len = write(pipes[1], buf, sizeof(struct stat));
+ while (len < 0 && errno == EINTR);
+ close(pipes[1]);
+- exit(ret);
++ _exit(ret);
+ default:
+ close(pipes[1]);
+ if (sigsetjmp(jenv, 1)) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/psmisc.git/commitdiff/b7af75b7da3d0d57e7573eb4919026f47560e156
More information about the pld-cvs-commit
mailing list