From 22e45a74065bbc2cfaa790890ff09ad59ef374cf Mon Sep 17 00:00:00 2001
From: Giorgio Peron <giorgio.peron@gmail.com>
Date: Sat, 28 Jul 2012 23:02:12 -0500
Subject: system/jenkins: Updated for version 1.474.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 system/jenkins/files/jenkinsd.sh       | 4 ++--
 system/jenkins/files/logrotate.jenkins | 3 ++-
 system/jenkins/files/rc.jenkins        | 1 +
 system/jenkins/jenkins.SlackBuild      | 9 ++++++---
 system/jenkins/jenkins.info            | 6 +++---
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/system/jenkins/files/jenkinsd.sh b/system/jenkins/files/jenkinsd.sh
index f10ed4f9abaf..87d6aa432a54 100644
--- a/system/jenkins/files/jenkinsd.sh
+++ b/system/jenkins/files/jenkinsd.sh
@@ -29,7 +29,7 @@ JENKINS_LOG_FILE="/var/log/jenkins/jenkins.log"
 JENKINS_CONSOLELOG_FILE="/var/log/jenkins/jenkins_console.log"
 JENKINS_PID_DIR="/var/run/jenkins/"
 JENKINS_PID_FILE="$JENKINS_PID_DIR/jenkins.pid"
-JENKINS_WEBAPPSDIR="/var/lib/jenkins/apps/"
+#JENKINS_WEBAPPSDIR="/var/lib/jenkins/apps/"
 JENKINS_WEBROOT="/var/lib/jenkins/webroot/"
 JENKINS_HOME="/var/lib/jenkins"
 OPT_ARGS=""
@@ -84,7 +84,7 @@ if [ "$JENKINS_LOG_FILE" != "" ] ; then
 fi
 
 if [ "$JENKINS_WEBAPPSDIR" != "" ] ; then
-  JENKINS_WEBAPPSDIR_ARG="--webapssDir=$JENKINS_WEBAPPSDIR"
+  JENKINS_WEBAPPSDIR_ARG="--webappsDir=$JENKINS_WEBAPPSDIR"
 fi
 
 if [ "$JENKINS_WEBROOT" != "" ] ; then
diff --git a/system/jenkins/files/logrotate.jenkins b/system/jenkins/files/logrotate.jenkins
index f6b40db07baf..f1bc7f0f11e3 100644
--- a/system/jenkins/files/logrotate.jenkins
+++ b/system/jenkins/files/logrotate.jenkins
@@ -1,4 +1,5 @@
 /var/log/jenkins/jenkins.log /var/log/jenkins/jenkins_console.log {
+    su jenkins jenkins
     compress
     dateext
     maxage 365
@@ -8,6 +9,6 @@
     missingok
     create 644
     postrotate
-     kill -s SIGALRM `cat /var/run/jenkins.pid`
+     kill -s SIGALRM $(cat /var/run/jenkins.pid)
     endscript
 }
diff --git a/system/jenkins/files/rc.jenkins b/system/jenkins/files/rc.jenkins
index d13e3912aa20..3d83b42444af 100644
--- a/system/jenkins/files/rc.jenkins
+++ b/system/jenkins/files/rc.jenkins
@@ -36,6 +36,7 @@ jenkins_start() {
     exit 1
   else
     echo "Starting jenkins daemon..."
+    install -o jenkins:jenkins -m 0755 -d /var/run/jenkins
     jenkinsd 2>/dev/null 1>&2 || exit 1
   fi
 }
diff --git a/system/jenkins/jenkins.SlackBuild b/system/jenkins/jenkins.SlackBuild
index e29ddc7b43d7..d3a9e1fabb68 100644
--- a/system/jenkins/jenkins.SlackBuild
+++ b/system/jenkins/jenkins.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jenkins
 
-# Copyright 2008-2011  Giorgio Peron
+# Copyright 2012  Giorgio Peron Campodarsego, PD, Italy giorgio.peron@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jenkins
-VERSION=${VERSION:-1.421}
+VERSION=${VERSION:-1.474}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,7 +70,7 @@ cp $CWD/files/logrotate.$PRGNAM $PKG/etc/logrotate.d/$PRGNAM.new
 mkdir -p $PKG/etc/rc.d
 cp $CWD/files/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
 
-mkdir -p $PKG/var/lib/$PRGNAM
+mkdir -p $PKG/var/lib/$PRGNAM/apps
 chown jenkins.jenkins $PKG/var/lib/jenkins
 
 mkdir -p $PKG/var/log/$PRGNAM
@@ -78,6 +78,9 @@ touch $PKG/var/log/jenkins/jenkins.log.new
 touch $PKG/var/log/jenkins/jenkins_console.log.new
 chown -R jenkins.jenkins $PKG/var/log/jenkins
 
+# We can't depend on this directory persisting across reboots, since /var/run
+# is often on tmpfs (or even linked to /run), so we'll create this in the
+# init script's start() function too...   --rworkman
 mkdir -p $PKG/var/run/jenkins
 chown jenkins:jenkins $PKG/var/run/jenkins
 
diff --git a/system/jenkins/jenkins.info b/system/jenkins/jenkins.info
index f860ca0cdf77..062c424ab63f 100644
--- a/system/jenkins/jenkins.info
+++ b/system/jenkins/jenkins.info
@@ -1,8 +1,8 @@
 PRGNAM="jenkins"
-VERSION="1.421"
+VERSION="1.474"
 HOMEPAGE="http://jenkins-ci.org"
-DOWNLOAD="http://ftp-nyc.osuosl.org/pub/jenkins/war/1.421/jenkins.war"
-MD5SUM="cca7962041b280e233b5c680ed9a6c9c"
+DOWNLOAD="http://ftp-nyc.osuosl.org/pub/jenkins/war/1.474/jenkins.war"
+MD5SUM="9c70bd281f5d04550371fe91da6ec9a6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Giorgio Peron"
-- 
cgit v1.2.3