git: 85e9f07dc482 - 2023Q1 - sysutils/rundeck3: update to 3.4.10

From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Sun, 19 Feb 2023 11:04:01 UTC
The branch 2023Q1 has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=85e9f07dc4825233016c5be1c4b6f22be622c569

commit 85e9f07dc4825233016c5be1c4b6f22be622c569
Author:     Ruben van Staveren <ruben@verweg.com>
AuthorDate: 2023-02-15 13:34:40 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-02-19 11:03:21 +0000

    sysutils/rundeck3: update to 3.4.10
    
     - use logging facilities of daemon(8) to enable log rotation
     - simplify DISTNAME generation
    
    Changelog: https://docs.rundeck.com/docs/history/3_4_x/version-3.4.10.html
    
    MFH:            2023Q1
    PR:             261748
    Security:       27c822a0-addc-11ed-a9ee-dca632b19f10
    Reported by:    ruben@verweg.com
    Approved by:    eduardo (mentor)
    Differential Revision: https://reviews.freebsd.org/D38634
    
    (cherry picked from commit df09fa81db51c5a68a948c7a7984d380a6460649)
---
 sysutils/rundeck3/Makefile         | 9 ++++-----
 sysutils/rundeck3/distinfo         | 6 +++---
 sysutils/rundeck3/files/rundeck.in | 2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/sysutils/rundeck3/Makefile b/sysutils/rundeck3/Makefile
index 3573be10b1d0..a8af06bf9500 100644
--- a/sysutils/rundeck3/Makefile
+++ b/sysutils/rundeck3/Makefile
@@ -1,10 +1,9 @@
 PORTNAME=	rundeck
-DISTVERSION=	3.4.9
-DISTVERSIONSUFFIX=	20211221
+DISTVERSION=	3.4.10
+DISTVERSIONSUFFIX=	-20220118
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/${DISTNAME}.war/artifacts/${DISTNAME}.war/download?/
 PKGNAMESUFFIX=	3
-DISTNAME=	${PORTNAME}-${DISTVERSION}-${DISTVERSIONSUFFIX}
 EXTRACT_SUFX=	.war
 
 MAINTAINER=	daniel.tihanyi@tetragir.com
@@ -41,10 +40,10 @@ RUNDECK_LOG_FILE?=	${RUNDECK_LOGDIR}/rundeck.log
 RUNDECK_LOG4J=		log4j2.properties
 RUNDECK_CONFIG_DIR=	${RUNDECK_HOME}/server/config
 
-.if ${RUNDECK_USER} == "rundeck"
+.if ${RUNDECK_USER} == rundeck
 USERS=		rundeck
 .endif
-.if ${RUNDECK_GROUP} == "rundeck"
+.if ${RUNDECK_GROUP} == rundeck
 GROUPS=		rundeck
 .endif
 
diff --git a/sysutils/rundeck3/distinfo b/sysutils/rundeck3/distinfo
index 266a3349a77e..95661123ee53 100644
--- a/sysutils/rundeck3/distinfo
+++ b/sysutils/rundeck3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1640189772
-SHA256 (rundeck-3.4.9-20211221.war) = 1f05cf0e68c021cf36e59171b5e4ce7e299098ad837610070341f85188ac805c
-SIZE (rundeck-3.4.9-20211221.war) = 196646454
+TIMESTAMP = 1645191085
+SHA256 (rundeck-3.4.10-20220118.war) = 7726747a55e8a503726056aecc5505aefea435927f653ebd2fc619a9aa2f3720
+SIZE (rundeck-3.4.10-20220118.war) = 199264838
diff --git a/sysutils/rundeck3/files/rundeck.in b/sysutils/rundeck3/files/rundeck.in
index 60e78bcb13d9..a213a4c873d8 100644
--- a/sysutils/rundeck3/files/rundeck.in
+++ b/sysutils/rundeck3/files/rundeck.in
@@ -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.war ${rundeck_args} > ${rundeck_log_file} 2>&1"
+command_args="-p ${pidfile} -H -o ${rundeck_log_file} ${java_cmd} ${rundeck_java_opts} -jar %%DATADIR%%/rundeck.war ${rundeck_args}"
 required_files="${java_cmd}"
 
 start_precmd="rundeck_prestart"