From: Craig Small <csmall@users.sourceforge.net>
Date: Sat, 19 May 2012 08:15:40 +0000 (+1000)
Subject: Merge branch 'master' of ssh://psmisc.git.sourceforge.net/gitroot/psmisc/psmisc
X-Git-Tag: v22.17~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=945ed93da31cacd45985af597f324cc6e5f23107;p=psmisc

Merge branch 'master' of ssh://psmisc.git.sourceforge.net/gitroot/psmisc/psmisc

Conflicts:
	ChangeLog
	src/fuser.c
---

945ed93da31cacd45985af597f324cc6e5f23107
diff --cc ChangeLog
index e2275d0,baba19e..d740ef1
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,11 +1,15 @@@
 +Changes in 22.17 (unreleased)
 +================
+ 	* Make it possible to use --enable-timeout-stat as well as
+ 	  --enable-timeout-stat=static for a static background process which
+ 	  does the final stat system calls
+ 	* Do not mix HAVE_TIMEOUT_STAT with WITH_TIMEOUT_STAT
+ 	* Add timeout.c/timeout.h for static background process which is able
+ 	  to read the file name from pipe, does the stat(2) system call, and
+ 	  writes the result back to a pipe.
+ 	* Really add ASCII null at command string in add_proc() of pstree.c
 +	* fuser uses correct timeout_stat define Debian #661723
++	* fuser is not compiled on hurd-i386 Debian #673485
  
  Changes in 22.16
  ================