From owner-svn-ports-head@freebsd.org Thu May 7 11:10:41 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A14242C3913; Thu, 7 May 2020 11:10:41 +0000 (UTC) (envelope-from tagattie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49HrNd3sHkz40lg; Thu, 7 May 2020 11:10:41 +0000 (UTC) (envelope-from tagattie@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 7FB4FFFE6; Thu, 7 May 2020 11:10:41 +0000 (UTC) (envelope-from tagattie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 047BAfYe016683; Thu, 7 May 2020 11:10:41 GMT (envelope-from tagattie@FreeBSD.org) Received: (from tagattie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 047BAdh7016675; Thu, 7 May 2020 11:10:39 GMT (envelope-from tagattie@FreeBSD.org) Message-Id: <202005071110.047BAdh7016675@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tagattie set sender to tagattie@FreeBSD.org using -f From: Hiroki Tagato Date: Thu, 7 May 2020 11:10:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r534258 - in head: . sysutils sysutils/rundeck sysutils/rundeck2 sysutils/rundeck3 sysutils/rundeck3/files X-SVN-Group: ports-head X-SVN-Commit-Author: tagattie X-SVN-Commit-Paths: in head: . sysutils sysutils/rundeck sysutils/rundeck2 sysutils/rundeck3 sysutils/rundeck3/files X-SVN-Commit-Revision: 534258 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 May 2020 11:10:41 -0000 Author: tagattie Date: Thu May 7 11:10:39 2020 New Revision: 534258 URL: https://svnweb.freebsd.org/changeset/ports/534258 Log: There is rundeck version 3 available and version 2 is still supported. So it is good to have both versions in the ports. This commit is to: - Add rundeck ver. 3 as rundeck3 - Preserve rundeck ver. 2 as rundeck2 for users who want to stay in version 2 - Pass maintainership to submitter PR: 246022 246023 Submitted by: Daniel Tihanyi Approved by: arcade@b1t.name (maintainer), pizzamig (mentor) Added: head/sysutils/rundeck2/ - copied from r534257, head/sysutils/rundeck/ head/sysutils/rundeck3/ - copied from r534230, head/sysutils/rundeck/ Deleted: head/sysutils/rundeck/ Modified: head/MOVED head/sysutils/Makefile head/sysutils/rundeck2/Makefile head/sysutils/rundeck2/pkg-plist head/sysutils/rundeck3/Makefile head/sysutils/rundeck3/distinfo head/sysutils/rundeck3/files/rundeck.in head/sysutils/rundeck3/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Thu May 7 10:58:35 2020 (r534257) +++ head/MOVED Thu May 7 11:10:39 2020 (r534258) @@ -15006,3 +15006,4 @@ deskutils/osynctool||2020-05-06|Abandonware, website d devel/libopensync||2020-05-06|Abandonware, website disappeared deskutils/libopensync-plugin-vformat-devel||2020-05-06|Abandonware, website disappeared devel/py-ipykernel|devel/py-ipykernel5|2020-05-07|Has expired: Old version, use devel/py-ipykernel5 instead +sysutils/rundeck|sysutils/rundeck2|2020-05-07|Rename to avoid confusion with sysutils/rundeck3 Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Thu May 7 10:58:35 2020 (r534257) +++ head/sysutils/Makefile Thu May 7 11:10:39 2020 (r534258) @@ -1144,7 +1144,8 @@ SUBDIR += rubygem-winrm-elevated SUBDIR += rubygem-winrm-fs SUBDIR += rubygem-yell - SUBDIR += rundeck + SUBDIR += rundeck2 + SUBDIR += rundeck3 SUBDIR += runit SUBDIR += runit-faster SUBDIR += runwhen Modified: head/sysutils/rundeck2/Makefile ============================================================================== --- head/sysutils/rundeck/Makefile Thu May 7 10:58:35 2020 (r534257) +++ head/sysutils/rundeck2/Makefile Thu May 7 11:10:39 2020 (r534258) @@ -4,16 +4,19 @@ PORTNAME= rundeck DISTVERSION= 2.11.14 CATEGORIES= sysutils java MASTER_SITES= http://dl.bintray.com/rundeck/rundeck-maven/ +PKGNAMESUFFIX= 2 DISTNAME= rundeck-launcher-${PORTVERSION} EXTRACT_SUFX= .jar -MAINTAINER= arcade@b1t.name +MAINTAINER= daniel.tihanyi@tetragir.com COMMENT= Web-console for dispatching commands and scripts to your nodes LICENSE= APACHE20 USE_JAVA= yes JAVA_VERSION= 1.8+ + +CONFLICTS_INSTALL= rundeck3 NO_ARCH= yes NO_BUILD= yes Modified: head/sysutils/rundeck2/pkg-plist ============================================================================== --- head/sysutils/rundeck/pkg-plist Thu May 7 10:58:35 2020 (r534257) +++ head/sysutils/rundeck2/pkg-plist Thu May 7 11:10:39 2020 (r534258) @@ -1,3 +1,3 @@ %%DATADIR%%/rundeck-launcher.jar -@dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%,755) rundeck/server/lib -@dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%,755) rundeck/server +@dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%) rundeck/server/lib +@dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%) rundeck/server Modified: head/sysutils/rundeck3/Makefile ============================================================================== --- head/sysutils/rundeck/Makefile Thu May 7 01:45:10 2020 (r534230) +++ head/sysutils/rundeck3/Makefile Thu May 7 11:10:39 2020 (r534258) @@ -1,13 +1,15 @@ # $FreeBSD$ PORTNAME= rundeck -DISTVERSION= 2.11.14 +DISTVERSION= 3.2.6 +DISTVERSIONSUFFIX= 20200427 CATEGORIES= sysutils java MASTER_SITES= http://dl.bintray.com/rundeck/rundeck-maven/ -DISTNAME= rundeck-launcher-${PORTVERSION} -EXTRACT_SUFX= .jar +PKGNAMESUFFIX= 3 +DISTNAME= ${PORTNAME}-${DISTVERSION}-${DISTVERSIONSUFFIX} +EXTRACT_SUFX= .war -MAINTAINER= arcade@b1t.name +MAINTAINER= daniel.tihanyi@tetragir.com COMMENT= Web-console for dispatching commands and scripts to your nodes LICENSE= APACHE20 @@ -15,6 +17,8 @@ LICENSE= APACHE20 USE_JAVA= yes JAVA_VERSION= 1.8+ +CONFLICTS_INSTALL= rundeck2 + NO_ARCH= yes NO_BUILD= yes @@ -40,6 +44,6 @@ SUB_LIST+= RUNDECK_HOME=${RUNDECK_HOME} RUNDECK_USER=$ do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${RUNDECK_HOME}/server/lib ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \ - ${STAGEDIR}${DATADIR}/rundeck-launcher${EXTRACT_SUFX} + ${STAGEDIR}${DATADIR}/rundeck${EXTRACT_SUFX} .include Modified: head/sysutils/rundeck3/distinfo ============================================================================== --- head/sysutils/rundeck/distinfo Thu May 7 01:45:10 2020 (r534230) +++ head/sysutils/rundeck3/distinfo Thu May 7 11:10:39 2020 (r534258) @@ -1,3 +1,3 @@ -TIMESTAMP = 1570615790 -SHA256 (rundeck-launcher-2.11.14.jar) = 53b3436cf7234f8fd26986e0b35bb5d42569570ca99e8580c6a616ae98b6973f -SIZE (rundeck-launcher-2.11.14.jar) = 102513074 +TIMESTAMP = 1588154995 +SHA256 (rundeck-3.2.6-20200427.war) = a866c32d866d7b28470e439eeb8c490625d2b116dcc0451a17e198891573cafb +SIZE (rundeck-3.2.6-20200427.war) = 165490944 Modified: head/sysutils/rundeck3/files/rundeck.in ============================================================================== --- head/sysutils/rundeck/files/rundeck.in Thu May 7 01:45:10 2020 (r534230) +++ head/sysutils/rundeck3/files/rundeck.in Thu May 7 11:10:39 2020 (r534258) @@ -58,7 +58,7 @@ pidfile="/var/run/rundeck/rundeck.pid" command="/usr/sbin/daemon" java_cmd="${rundeck_java_home}/bin/java" procname="${java_cmd}" -command_args="-p ${pidfile} ${java_cmd} ${rundeck_java_opts} -jar %%DATADIR%%/rundeck-launcher.jar ${rundeck_args} > ${rundeck_log_file} 2>&1" +command_args="-p ${pidfile} ${java_cmd} ${rundeck_java_opts} -jar %%DATADIR%%/rundeck.war ${rundeck_args} > ${rundeck_log_file} 2>&1" required_files="${java_cmd}" start_precmd="rundeck_prestart" Modified: head/sysutils/rundeck3/pkg-plist ============================================================================== --- head/sysutils/rundeck/pkg-plist Thu May 7 01:45:10 2020 (r534230) +++ head/sysutils/rundeck3/pkg-plist Thu May 7 11:10:39 2020 (r534258) @@ -1,3 +1,3 @@ -%%DATADIR%%/rundeck-launcher.jar -@dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%,755) rundeck/server/lib -@dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%,755) rundeck/server +%%DATADIR%%/rundeck.war +@dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%) rundeck/server/lib +@dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%) rundeck/server