Attachment 231916 Details for Bug 261748 – Extending previous patch with Rundeck 3.4.10 update, as well as small fix

[patch] Extending previous patch with Rundeck 3.4.10 update, as well as small fix

rundeck.diff (text/plain), 2.19 KB, created by Daniel Tihanyi on 2022-02-18 14:11:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Tihanyi

Created: 2022-02-18 14:11:09 UTC

Size: 2.19 KB

patch

obsolete

>diff --git a/sysutils/rundeck3/Makefile b/sysutils/rundeck3/Makefile
>index 5e423a1cf..8a975067f 100644
>--- a/sysutils/rundeck3/Makefile
>+++ b/sysutils/rundeck3/Makefile
>@@ -1,6 +1,6 @@
> 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
>@@ -32,6 +32,14 @@ SUB_LIST+=	JAVA_HOME=${JAVA_HOME} \
> 		RUNDECK_LOGDIR=${RUNDECK_LOGDIR} \
> 		RUNDECK_USER=${RUNDECK_USER}
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${OSVERSION} < 1203000
>+SUB_LIST+=	DAEMON_H_FLAG=""
>+.else
>+SUB_LIST+=	DAEMON_H_FLAG="-H "
>+.endif
>+
> RUNDECK_HOME=		${PREFIX}/rundeck
> RUNDECK_USER?=		rundeck
> RUNDECK_GROUP?=		rundeck
>@@ -64,4 +72,4 @@ post-install:
> 		${WRKDIR}/${RUNDECK_LOG4J} \
> 		${STAGEDIR}${RUNDECK_CONFIG_DIR}/${RUNDECK_LOG4J}
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff --git a/sysutils/rundeck3/distinfo b/sysutils/rundeck3/distinfo
>index 266a3349a..95661123e 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 60e78bcb1..bccbf638d 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} %%DAEMON_H_FLAG%%-o ${rundeck_log_file} ${java_cmd} ${rundeck_java_opts} -jar %%DATADIR%%/rundeck.war ${rundeck_args}"
> required_files="${java_cmd}"
> 
> start_precmd="rundeck_prestart"

Flags:

daniel.tihanyi: maintainer-approval+

Actions: View | Diff

Attachments on bug 261748: 231579 | 231916