[Pkg-fedora-ds-maintainers] 389-ds-base: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/389-ds-base.dirsrv.init |    7 +++++++
 debian/changelog               |    2 ++
 2 files changed, 9 insertions(+)

New commits:
commit c7d8ec3f1fd7af7540924d018436573ebd43d8a7
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Wed Oct 3 17:12:30 2012 +0300

    dirsrv.init: Fix stop() to remove the pidfile only when the process is finished. (Closes: #689389)

diff --git a/debian/389-ds-base.dirsrv.init b/debian/389-ds-base.dirsrv.init
index 5a81a7c..e4c6acb 100644
--- a/debian/389-ds-base.dirsrv.init
+++ b/debian/389-ds-base.dirsrv.init
@@ -115,6 +115,13 @@ stop() {
         if [ -f $PIDFILE ]; then
 	    log_action_begin_msg "Shutting down 389 DS instance $INSTANCE: "
 	    start-stop-daemon -K -p $PIDFILE -x $EXEC
+            PID=`cat $PIDFILE`
+            RETVAL=0
+            while [ $RETVAL -eq 0 ]; do
+                sleep 0.5
+                kill -0 $PID > /dev/null 2>&1
+                RETVAL=$?
+            done
             rm -f $PIDFILE
             log_end_msg $?
 	fi
diff --git a/debian/changelog b/debian/changelog
index bf0a038..676650e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@
 
   * New upstream release.
   * Add fix-cve-2012-4450.diff. (Closes: #688942)
+  * dirsrv.init: Fix stop() to remove the pidfile only when the process
+    is finished. (Closes: #689389)
 
  -- Timo Aaltonen <tjaalton at ubuntu.com>  Thu, 27 Sep 2012 11:11:38 +0300