[SCM] jenkins packaging branch, master, updated. debian/1.424.3+dfsg-1-5-g5e71d81

[James Page]

The following commit has been merged in the master branch:
commit 5e71d813a8456f95c7d17b49f38fe7085b2497b1
Author: James Page <james.page at ubuntu.com>
Date:   Tue Mar 27 09:18:33 2012 +0100

    Switch upstart configurations to use start-stop-daemon to allow
    
    * Switch upstart configurations to use start-stop-daemon to allow
    * d/jenkins-slave.upstart.in: Ensure /var/run/jenkins exists before
      trying to download the jenkins slave.jar file to it.
      Thanks to Al Stone for providing this fix.

diff --git a/debian/changelog b/debian/changelog
index 7473572..e6def44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,16 @@
-jenkins (1.424.6+dfsg-1) UNRELEASED; urgency=low
+jenkins (1.424.6+dfsg-1) unstable; urgency=low
 
   * New upstream release, fixing XSS security vulnerability (Closes: #664057):
     - d/control: Add new dependency on libowasp-java-html-sanitizer-java.
     - d/maven.rules: Add new rule to use artifacts 
       from libowasp-java-html-sanitizer-java.
-  * Switch upstart configuration to use start-stop-daemon to allow
+  * Switch upstart configurations to use start-stop-daemon to allow
     desktop systems to shutdown.
+  * d/jenkins-slave.upstart.in: Ensure /var/run/jenkins exists before
+    trying to download the jenkins slave.jar file to it.
+    Thanks to Al Stone for providing this fix.
 
- -- James Page <james.page at ubuntu.com>  Tue, 20 Mar 2012 13:05:03 +0000
+ -- James Page <james.page at ubuntu.com>  Tue, 27 Mar 2012 09:17:51 +0100
 
 jenkins (1.424.3+dfsg-1) unstable; urgency=low
 
diff --git a/debian/jenkins-slave.upstart.in b/debian/jenkins-slave.upstart.in
index fe96dd7..248f825 100644
--- a/debian/jenkins-slave.upstart.in
+++ b/debian/jenkins-slave.upstart.in
@@ -7,13 +7,13 @@ stop on runlevel [!2345]
 pre-start script
     [ -r /etc/default/jenkins-slave ] && . /etc/default/jenkins-slave
     [ -n "$JENKINS_URL" ] || { stop; exit 0; }
-    $JENKINS_ROOT/bin/download-slave.sh $JENKINS_URL
     mkdir $JENKINS_RUN  > /dev/null 2>&1  || true
     chown -R $JENKINS_USER $JENKINS_RUN || true
+    $JENKINS_ROOT/bin/download-slave.sh $JENKINS_URL
 end script
 
 script
     [ -r /etc/default/jenkins-slave ] && . /etc/default/jenkins-slave
-    exec su -l $JENKINS_USER --shell=/bin/bash -c \
-         "$JAVA $JAVA_ARGS -jar $JENKINS_RUN/slave.jar $JENKINS_ARGS" 
+    exec start-stop-daemon --start -c $JENKINS_USER --exec $JAVA --name jenkins-slave \
+        -- $JAVA_ARGS -jar $JENKINS_RUN/slave.jar $JENKINS_ARGS 
 end script

-- 
jenkins packaging