git: cf105741a2b2 - main - sysutils/rundeck: Update 5.8.0 => 5.15.0, take maintainership

From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Tue, 09 Sep 2025 21:06:54 UTC
The branch main has been updated by vvd:

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

commit cf105741a2b230a725eee98d460ec9dc9ff15e37
Author:     Xavier Humbert <xavier@groumpf.org>
AuthorDate: 2025-09-09 20:43:42 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-09-09 20:43:42 +0000

    sysutils/rundeck: Update 5.8.0 => 5.15.0, take maintainership
    
    Release Notes:
    https://docs.rundeck.com/docs/history/5_x/version-5.9.0.html
    https://docs.rundeck.com/docs/history/5_x/version-5.10.0.html
    https://docs.rundeck.com/docs/history/5_x/version-5.10.1.html
    https://docs.rundeck.com/docs/history/5_x/version-5.11.0.html
    https://docs.rundeck.com/docs/history/5_x/version-5.12.0.html
    https://docs.rundeck.com/docs/history/5_x/version-5.13.0.html
    https://docs.rundeck.com/docs/history/5_x/version-5.14.0.html
    https://docs.rundeck.com/docs/history/5_x/version-5.14.1.html
    https://docs.rundeck.com/docs/history/5_x/version-5.15.0.html
    
    Improve port:
    - Add EXTRACT_ONLY= - no need to unpack war file.
    - New version support JAVA 11 and 17 only.
    - Remove CONFLICTS_INSTALL=rundeck2 - it has been removed from ports.
    - Parametrize rundeck with ${PORTNAME}.
    - Fix plist: RUNDECK_USER can be changed, but the name of the installed
      war file will always be ${PORTNAME}.war.
    
    PR:             289391
    Security:       CVE-2024-52046
    Security:       CVE-2023-45288
    Security:       CVE-2024-47554
    Security:       CVE-2025-24970
    Security:       CVE-2023-3635
    Security:       CVE-2024-7254
    Security:       CVE-2024-6104
    Security:       CVE-2024-45337
    Security:       CVE-2025-22870
    Security:       CVE-2024-24786
    Security:       CVE-2024-57699
    Security:       CVE-2019-17571
    Security:       CVE-2025-22228
    Security:       CVE-2025-48734
    Security:       CVE-2025-48976
    Security:       CVE-2025-7783
    Security:       CVE-2025-55163
    Security:       CVE-2024-21538
    Security:       CVE-2022-38749
    Security:       CVE-2024-25710
    Security:       CVE-2019-5427
    Security:       CVE-2024-8184
    Security:       CVE-2020-26939
    Security:       CVE-2025-4949
    Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org>
    MFH:            2025Q3
---
 sysutils/rundeck/Makefile  | 46 ++++++++++++++++++++++++----------------------
 sysutils/rundeck/distinfo  |  6 +++---
 sysutils/rundeck/pkg-plist |  2 +-
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/sysutils/rundeck/Makefile b/sysutils/rundeck/Makefile
index ee32a9505a00..a3ac778146e7 100644
--- a/sysutils/rundeck/Makefile
+++ b/sysutils/rundeck/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	rundeck
-DISTVERSION=	5.8.0
-DISTVERSIONSUFFIX=	-20241205
+DISTVERSION=	5.15.0
+DISTVERSIONSUFFIX=	-20250902
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/${DISTNAME}.war/artifacts/${DISTNAME}.war/download?/
 EXTRACT_SUFX=	.war
+EXTRACT_ONLY=	#
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	xavier@groumpf.org
 COMMENT=	Web-console for dispatching commands and scripts to your nodes
-WWW=		https://rundeck.org
+WWW=		https://www.rundeck.com/
 
 LICENSE=	APACHE20
 
 USES=		cpe java
 CPE_VENDOR=	pagerduty
-USE_RC_SUBR=	rundeck
-
-CONFLICTS_INSTALL=	rundeck2
+JAVA_VERSION=	11 17
+USE_RC_SUBR=	${PORTNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	${RUNDECK_LOG4J}
-SUB_LIST+=	JAVA_HOME=${JAVA_HOME} \
+SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
 		RUNDECK_CONFIG_DIR=${RUNDECK_CONFIG_DIR} \
 		RUNDECK_GROUP=${RUNDECK_GROUP} \
 		RUNDECK_HOME=${RUNDECK_HOME} \
@@ -29,31 +29,33 @@ SUB_LIST+=	JAVA_HOME=${JAVA_HOME} \
 		RUNDECK_LOGDIR=${RUNDECK_LOGDIR} \
 		RUNDECK_USER=${RUNDECK_USER}
 
-RUNDECK_HOME=		${PREFIX}/rundeck
-RUNDECK_USER?=		rundeck
-RUNDECK_GROUP?=		rundeck
-RUNDECK_LOGDIR?=	/var/log/rundeck
-RUNDECK_LOG_FILE?=	${RUNDECK_LOGDIR}/rundeck.log
+RUNDECK_HOME=		${PREFIX}/${PORTNAME}
+RUNDECK_USER?=		${PORTNAME}
+RUNDECK_GROUP?=		${PORTNAME}
+RUNDECK_LOGDIR?=	/var/log/${PORTNAME}
+RUNDECK_LOG_FILE?=	${RUNDECK_LOGDIR}/${PORTNAME}.log
 RUNDECK_LOG4J=		log4j2.properties
 RUNDECK_CONFIG_DIR=	${RUNDECK_HOME}/server/config
 
-.if ${RUNDECK_USER} == rundeck
-USERS=		rundeck
+.if ${RUNDECK_USER} == ${PORTNAME}
+USERS=		${PORTNAME}
 .endif
-.if ${RUNDECK_GROUP} == rundeck
-GROUPS=		rundeck
+.if ${RUNDECK_GROUP} == ${PORTNAME}
+GROUPS=		${PORTNAME}
 .endif
 
-PLIST_SUB=	RUNDECK_GROUP=${RUNDECK_GROUP} \
+PLIST_SUB=	NAME=${PORTNAME}${EXTRACT_SUFX} \
+		RUNDECK_GROUP=${RUNDECK_GROUP} \
 		RUNDECK_HOME=${RUNDECK_HOME} \
 		RUNDECK_LOGDIR=${RUNDECK_LOGDIR} \
 		RUNDECK_USER=${RUNDECK_USER}
 
 do-install:
-	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${RUNDECK_HOME}/server/lib
-	${MKDIR} ${STAGEDIR}${RUNDECK_LOGDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
-		${STAGEDIR}${DATADIR}/rundeck${EXTRACT_SUFX}
+	${MKDIR} ${STAGEDIR}${DATADIR} \
+		 ${STAGEDIR}${RUNDECK_HOME}/server/lib \
+		 ${STAGEDIR}${RUNDECK_LOGDIR}
+	${INSTALL_DATA} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
+		${STAGEDIR}${DATADIR}/${PORTNAME}${EXTRACT_SUFX}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${RUNDECK_CONFIG_DIR}
diff --git a/sysutils/rundeck/distinfo b/sysutils/rundeck/distinfo
index c61c5dd207d3..d5aa633641c3 100644
--- a/sysutils/rundeck/distinfo
+++ b/sysutils/rundeck/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1736003337
-SHA256 (rundeck-5.8.0-20241205.war) = 7ea991633981b5e8998c29818f7d09e912c1ce0660c0b705cd428d148b07d8c4
-SIZE (rundeck-5.8.0-20241205.war) = 283983129
+TIMESTAMP = 1757398193
+SHA256 (rundeck-5.15.0-20250902.war) = dcd9697744a5e8d087f9334f36787b349c7339950d42f2aea7214e40e749b2da
+SIZE (rundeck-5.15.0-20250902.war) = 252813304
diff --git a/sysutils/rundeck/pkg-plist b/sysutils/rundeck/pkg-plist
index 9e600baeb302..4198ba38416d 100644
--- a/sysutils/rundeck/pkg-plist
+++ b/sysutils/rundeck/pkg-plist
@@ -8,4 +8,4 @@
 @dir %%RUNDECK_LOGDIR%%
 @owner
 @group
-%%DATADIR%%/%%RUNDECK_USER%%.war
+%%DATADIR%%/%%NAME%%