[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, squeeze-2.6.2, updated. debian/2.6.2-2-9-gcbbc2fd

[Micah Anderson]

The following commit has been merged in the squeeze-2.6.2 branch:
commit 910b3d3cc4dc53e97cb753dcdf43d484db51d0dc
Author: Micah Anderson <micah at riseup.net>
Date:   Thu Dec 2 19:08:45 2010 -0500

    fix #605512 by removing the PID file in the initscript during stop
    
    Conflicts:
    
    	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index a4fc67a..3758d00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ puppet (2.6.2-3) unstable; urgency=high
   * Fix remote resource vulnerability when auth.conf is missing
 
   [ Micah Anderson ]
+  * Remove the puppetqd PID file on stop (Closes: #605512)
+  * Add ext/puppetstoredconfigclean to puppetmaster:/usr/sbin
   * Patch ext/logcheck/puppet to handle new puppet-master 
     Compiled log lines (Closes: #602336)
 
diff --git a/debian/puppetmaster.puppetqd.init b/debian/puppetmaster.puppetqd.init
index a8d1982..802629f 100644
--- a/debian/puppetmaster.puppetqd.init
+++ b/debian/puppetmaster.puppetqd.init
@@ -43,6 +43,7 @@ start_puppet_queue() {
 
 stop_puppet_queue() {
     start-stop-daemon --stop --quiet --oknodo --pidfile ${PIDFILE}
+    rm -f ${PIDFILE}
 }
 
 status_puppet_queue() {

-- 
Puppet packaging for Debian