git: ce82ccc154af - main - sysutils/rundeck3: Update to 3.4.8

The branch main has been updated by lwhsu:

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

commit ce82ccc154af7173dbae0bee58a35d835a8a5055
Author:     Daniel Tihanyi <daniel.tihanyi@tetragir.com>
AuthorDate: 2021-12-18 15:14:25 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-12-18 15:14:25 +0000

    sysutils/rundeck3: Update to 3.4.8
    
    Release notes for Rundeck 3.4.5:
      https://docs.rundeck.com/docs/history/3_4_x/version-3.4.5.html
    Release notes for Rundeck 3.4.6:
      https://docs.rundeck.com/docs/history/3_4_x/version-3.4.6.html
    Release notes for Rundeck 3.4.7:
      https://docs.rundeck.com/docs/history/3_4_x/version-3.4.7.html
      (including preliminary, but not final log4j vulnerability fix)
    Release notes for Rundeck 3.4.8:
      https://docs.rundeck.com/docs/history/3_4_x/version-3.4.8.html
      (including final log4j vulnerability fix for CVE-2021-44228 and CVE-2021-45046)
    
    Also pet portclippy
    
    PR:             260500
---
 sysutils/rundeck3/Makefile | 46 ++++++++++++++++++++++++----------------------
 sysutils/rundeck3/distinfo |  6 +++---
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/sysutils/rundeck3/Makefile b/sysutils/rundeck3/Makefile
index d830f814aed1..b50ab2267841 100644
--- a/sysutils/rundeck3/Makefile
+++ b/sysutils/rundeck3/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	rundeck
-DISTVERSION=	3.4.4
-DISTVERSIONSUFFIX=	20210920
+DISTVERSION=	3.4.8
+DISTVERSIONSUFFIX=	20211214
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/${DISTNAME}.war/artifacts/${DISTNAME}.war/download?/
 PKGNAMESUFFIX=	3
@@ -12,43 +12,45 @@ COMMENT=	Web-console for dispatching commands and scripts to your nodes
 
 LICENSE=	APACHE20
 
+USES=		cpe
+CPE_VENDOR=	pagerduty
 USE_JAVA=	yes
 JAVA_VERSION=	8 11
+USE_RC_SUBR=	rundeck
 
 CONFLICTS_INSTALL=	rundeck2
 
 NO_ARCH=	yes
 NO_BUILD=	yes
+SUB_FILES=	${RUNDECK_LOG4J}
+SUB_LIST+=	JAVA_HOME=${JAVA_HOME} \
+		RUNDECK_CONFIG_DIR=${RUNDECK_CONFIG_DIR} \
+		RUNDECK_GROUP=${RUNDECK_GROUP} \
+		RUNDECK_HOME=${RUNDECK_HOME} \
+		RUNDECK_LOG4J=${RUNDECK_LOG4J} \
+		RUNDECK_LOG_FILE=${RUNDECK_LOG_FILE} \
+		RUNDECK_LOGDIR=${RUNDECK_LOGDIR} \
+		RUNDECK_USER=${RUNDECK_USER}
 
-USES=		cpe
-CPE_VENDOR=	pagerduty
-USE_RC_SUBR=	rundeck
-
-RUNDECK_HOME=	${PREFIX}/rundeck
-RUNDECK_USER?=	rundeck
-RUNDECK_GROUP?=	rundeck
+RUNDECK_HOME=		${PREFIX}/rundeck
+RUNDECK_USER?=		rundeck
+RUNDECK_GROUP?=		rundeck
 RUNDECK_LOGDIR?=	/var/log/rundeck
 RUNDECK_LOG_FILE?=	${RUNDECK_LOGDIR}/rundeck.log
-RUNDECK_LOG4J=	log4j2.properties
+RUNDECK_LOG4J=		log4j2.properties
 RUNDECK_CONFIG_DIR=	${RUNDECK_HOME}/server/config
 
 .if ${RUNDECK_USER} == "rundeck"
-USERS=	rundeck
+USERS=		rundeck
 .endif
 .if ${RUNDECK_GROUP} == "rundeck"
-GROUPS=	rundeck
+GROUPS=		rundeck
 .endif
 
-PLIST_SUB=	RUNDECK_USER=${RUNDECK_USER} RUNDECK_GROUP=${RUNDECK_GROUP} \
-		RUNDECK_LOGDIR=${RUNDECK_LOGDIR} RUNDECK_HOME=${RUNDECK_HOME}
-
-SUB_FILES=	${RUNDECK_LOG4J}
-SUB_LIST+=	RUNDECK_HOME=${RUNDECK_HOME} RUNDECK_USER=${RUNDECK_USER} \
-		RUNDECK_GROUP=${RUNDECK_GROUP} JAVA_HOME=${JAVA_HOME} \
-		RUNDECK_LOG_FILE=${RUNDECK_LOG_FILE} \
-		RUNDECK_LOG4J=${RUNDECK_LOG4J} \
-		RUNDECK_CONFIG_DIR=${RUNDECK_CONFIG_DIR} \
-		RUNDECK_LOGDIR=${RUNDECK_LOGDIR}
+PLIST_SUB=	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
diff --git a/sysutils/rundeck3/distinfo b/sysutils/rundeck3/distinfo
index 3ce28325d93a..89ff8ca7332d 100644
--- a/sysutils/rundeck3/distinfo
+++ b/sysutils/rundeck3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633441576
-SHA256 (rundeck-3.4.4-20210920.war) = 623c3cce9f5c151b22acdc13e519989283979a93cc6eae612693265e3a04e34f
-SIZE (rundeck-3.4.4-20210920.war) = 179199783
+TIMESTAMP = 1639749579
+SHA256 (rundeck-3.4.8-20211214.war) = 82b33e8d87ff3a080565726ee3e3bf4da04f57a19a458e7e9e89943b9a6954e5
+SIZE (rundeck-3.4.8-20211214.war) = 196646648