summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi-Wen Hsu <lwhsu@FreeBSD.org>2013-07-05 19:15:48 +0000
committerLi-Wen Hsu <lwhsu@FreeBSD.org>2013-07-05 19:15:48 +0000
commitae47aa07fb6adfb457a6aa6d45f675eed2f996cd (patch)
tree28ad1726bfeeeb0f2899c568576e59179c7c0128
parent- Remove broken mirror and add two new ones. (diff)
- Update to 1.521 [1] [2]
- Improve rc script, use `su -l` for execuing jenkins for fresh environment [3] PR: ports/178948 [1] ports/179456 [2] ports/178197 [3] Submitted by: Volodymyr Kostyrko <c.kworr@gmail.com> [1] skreuzer [2] Mikhail Krasilnikov <mk@dvaslona.ru> [3]
Notes
Notes: svn path=/head/; revision=322350
-rw-r--r--UIDs2
-rw-r--r--devel/jenkins/Makefile2
-rw-r--r--devel/jenkins/distinfo4
-rw-r--r--devel/jenkins/files/jenkins.in10
4 files changed, 14 insertions, 4 deletions
diff --git a/UIDs b/UIDs
index b144fd6e0644..c0cb0d351943 100644
--- a/UIDs
+++ b/UIDs
@@ -196,7 +196,7 @@ bnetd:*:700:700::0:0:Bnetd user:/nonexistent:/usr/sbin/nologin
bopm:*:717:717::0:0:Blitzed Open Proxy Monitor:/nonexistent:/bin/sh
openxpki:*:777:777::0:0:OpenXPKI Owner:/nonexistent:/usr/sbin/nologin
puppet:*:814:814::0:0:Puppet Daemon:/nonexistent:/usr/sbin/nologin
-jenkins:*:818:818::0:0:Jenkins CI:/usr/local/jenkins:/usr/sbin/nologin
+jenkins:*:818:818::0:0:Jenkins CI:/usr/local/jenkins:/bin/sh
openacs:*:820:820::0:0:OpenACS Daemon User:/nonexistent:/usr/sbin/nologin
dotlrn:*:821:821::0:0:.LRN Daemon User:/nonexistent:/usr/sbin/nologin
polw:*:825:825::0:0:Policyd-weight Cache Owner:/nonexistent:/sbin/nologin
diff --git a/devel/jenkins/Makefile b/devel/jenkins/Makefile
index 04e4c9ad00ef..3a1ce0578fc0 100644
--- a/devel/jenkins/Makefile
+++ b/devel/jenkins/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= jenkins
-PORTVERSION= 1.514
+PORTVERSION= 1.521
CATEGORIES= devel java
MASTER_SITES= http://mirrors.jenkins-ci.org/war/${PORTVERSION}/
DISTNAME= jenkins
diff --git a/devel/jenkins/distinfo b/devel/jenkins/distinfo
index ce8b690d397e..d51cb937c008 100644
--- a/devel/jenkins/distinfo
+++ b/devel/jenkins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jenkins/1.514/jenkins.war) = a1511e3926dbead09f9f4cf7a3f81e0953a415e070d800c04755ae8efd056475
-SIZE (jenkins/1.514/jenkins.war) = 56824686
+SHA256 (jenkins/1.521/jenkins.war) = a48d8f82de2c96e09977f22b1bbb024c13066b2e75e734a0c5aa1cf980ade88c
+SIZE (jenkins/1.521/jenkins.war) = 61308761
diff --git a/devel/jenkins/files/jenkins.in b/devel/jenkins/files/jenkins.in
index 5558e4dc3556..901b7370550b 100644
--- a/devel/jenkins/files/jenkins.in
+++ b/devel/jenkins/files/jenkins.in
@@ -64,6 +64,7 @@ command_args="-p ${pidfile} ${java_cmd} -DJENKINS_HOME=${jenkins_home} ${jenkins
required_files="${java_cmd}"
start_precmd="jenkins_prestart"
+start_cmd="jenkins_command start"
jenkins_prestart() {
if [ ! -f "${jenkins_log_file}" ]; then
@@ -79,4 +80,13 @@ jenkins_prestart() {
fi
}
+jenkins_command()
+{
+ check_startmsgs && echo "Starting ${name}."
+ su -l ${jenkins_user} -c "exec ${command} ${command_args} ${rc_arg}"
+}
+
+export HOME=${jenkins_home}
+cd ${HOME}
+
run_rc_command "$1"