From owner-svn-ports-all@FreeBSD.ORG  Fri Jul  5 19:15:49 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5A25E784;
 Fri,  5 Jul 2013 19:15:49 +0000 (UTC)
 (envelope-from lwhsu@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3C1071DC3;
 Fri,  5 Jul 2013 19:15:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r65JFnpv045887;
 Fri, 5 Jul 2013 19:15:49 GMT (envelope-from lwhsu@svn.freebsd.org)
Received: (from lwhsu@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r65JFml9045883;
 Fri, 5 Jul 2013 19:15:48 GMT (envelope-from lwhsu@svn.freebsd.org)
Message-Id: <201307051915.r65JFml9045883@svn.freebsd.org>
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Date: Fri, 5 Jul 2013 19:15:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322350 - in head: . devel/jenkins devel/jenkins/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jul 2013 19:15:49 -0000

Author: lwhsu
Date: Fri Jul  5 19:15:48 2013
New Revision: 322350
URL: http://svnweb.freebsd.org/changeset/ports/322350

Log:
  - 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]

Modified:
  head/UIDs
  head/devel/jenkins/Makefile
  head/devel/jenkins/distinfo
  head/devel/jenkins/files/jenkins.in

Modified: head/UIDs
==============================================================================
--- head/UIDs	Fri Jul  5 19:12:56 2013	(r322349)
+++ head/UIDs	Fri Jul  5 19:15:48 2013	(r322350)
@@ -196,7 +196,7 @@ bnetd:*:700:700::0:0:Bnetd user:/nonexis
 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

Modified: head/devel/jenkins/Makefile
==============================================================================
--- head/devel/jenkins/Makefile	Fri Jul  5 19:12:56 2013	(r322349)
+++ head/devel/jenkins/Makefile	Fri Jul  5 19:15:48 2013	(r322350)
@@ -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

Modified: head/devel/jenkins/distinfo
==============================================================================
--- head/devel/jenkins/distinfo	Fri Jul  5 19:12:56 2013	(r322349)
+++ head/devel/jenkins/distinfo	Fri Jul  5 19:15:48 2013	(r322350)
@@ -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

Modified: head/devel/jenkins/files/jenkins.in
==============================================================================
--- head/devel/jenkins/files/jenkins.in	Fri Jul  5 19:12:56 2013	(r322349)
+++ head/devel/jenkins/files/jenkins.in	Fri Jul  5 19:15:48 2013	(r322350)
@@ -64,6 +64,7 @@ command_args="-p ${pidfile} ${java_cmd} 
 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"