From owner-svn-ports-all@freebsd.org Tue Mar 20 05:31:11 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 085C0F539F3; Tue, 20 Mar 2018 05:31:11 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B29617FF38; Tue, 20 Mar 2018 05:31:10 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 94EB518D66; Tue, 20 Mar 2018 05:31:10 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2K5VA02085637; Tue, 20 Mar 2018 05:31:10 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2K5VAIZ085634; Tue, 20 Mar 2018 05:31:10 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201803200531.w2K5VAIZ085634@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Tue, 20 Mar 2018 05:31:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465065 - in head/devel/jenkins: . files X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: in head/devel/jenkins: . files X-SVN-Commit-Revision: 465065 X-SVN-Commit-Repository: ports 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.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Mar 2018 05:31:11 -0000 Author: lwhsu Date: Tue Mar 20 05:31:10 2018 New Revision: 465065 URL: https://svnweb.freebsd.org/changeset/ports/465065 Log: - Update to 2.112 - Pet rclint Modified: head/devel/jenkins/Makefile head/devel/jenkins/distinfo head/devel/jenkins/files/jenkins.in Modified: head/devel/jenkins/Makefile ============================================================================== --- head/devel/jenkins/Makefile Tue Mar 20 05:13:24 2018 (r465064) +++ head/devel/jenkins/Makefile Tue Mar 20 05:31:10 2018 (r465065) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jenkins -PORTVERSION= 2.110 +PORTVERSION= 2.112 CATEGORIES= devel java MASTER_SITES= http://mirrors.jenkins-ci.org/war/${PORTVERSION}/ DISTNAME= jenkins Modified: head/devel/jenkins/distinfo ============================================================================== --- head/devel/jenkins/distinfo Tue Mar 20 05:13:24 2018 (r465064) +++ head/devel/jenkins/distinfo Tue Mar 20 05:31:10 2018 (r465065) @@ -1,3 +1,3 @@ -TIMESTAMP = 1520305953 -SHA256 (jenkins/2.110/jenkins.war) = 3a6a13a2a8f88cdf8afb9945d427d97c85a9b6d3f6cfa3b994cb47e2c8125fa5 -SIZE (jenkins/2.110/jenkins.war) = 74585998 +TIMESTAMP = 1521523660 +SHA256 (jenkins/2.112/jenkins.war) = 085f597edeb0d49d54d7653f3742ba31ed72b8a1a2b053d2eb23fd806c6a5393 +SIZE (jenkins/2.112/jenkins.war) = 74601396 Modified: head/devel/jenkins/files/jenkins.in ============================================================================== --- head/devel/jenkins/files/jenkins.in Tue Mar 20 05:13:24 2018 (r465064) +++ head/devel/jenkins/files/jenkins.in Tue Mar 20 05:31:10 2018 (r465065) @@ -43,12 +43,13 @@ . /etc/rc.subr -name="jenkins" +name=jenkins +desc="Jenkins automation server" rcvar=jenkins_enable load_rc_config "${name}" -: ${jenkins_enable="NO"} +: ${jenkins_enable:=NO} : ${jenkins_home="%%JENKINS_HOME%%"} : ${jenkins_args="--webroot=${jenkins_home}/war --httpPort=8180 --prefix=/jenkins"} : ${jenkins_java_home="%%JAVA_HOME%%"} @@ -56,21 +57,20 @@ load_rc_config "${name}" : ${jenkins_group="%%JENKINS_GROUP%%"} : ${jenkins_log_file="%%JENKINS_LOG_FILE%%"} -pidfile="/var/run/jenkins/jenkins.pid" -command="/usr/sbin/daemon" +pidfile=/var/run/jenkins/jenkins.pid +command=/usr/sbin/daemon java_cmd="${jenkins_java_home}/bin/java" procname="${java_cmd}" command_args="-p ${pidfile} ${java_cmd} -DJENKINS_HOME=${jenkins_home} ${jenkins_java_opts} -jar %%DATADIR%%/jenkins.war ${jenkins_args} >> ${jenkins_log_file} 2>&1" required_files="${java_cmd}" -start_precmd="jenkins_prestart" -start_cmd="jenkins_start" +start_precmd=jenkins_prestart +start_cmd=jenkins_start -jenkins_prestart() { +jenkins_prestart() +{ if [ ! -f "${jenkins_log_file}" ]; then - touch "${jenkins_log_file}" - chown "${jenkins_user}:${jenkins_group}" "${jenkins_log_file}" - chmod 640 "${jenkins_log_file}" + install -o "${jenkins_user}" -g "${jenkins_group}" -m 640 /dev/null "${jenkins_log_file}" fi if [ ! -d "/var/run/jenkins" ]; then install -d -o "${jenkins_user}" -g "${jenkins_group}" -m 750 "/var/run/jenkins"