aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Druzenko <vvd@FreeBSD.org>2026-01-10 10:59:35 +0000
committerVladimir Druzenko <vvd@FreeBSD.org>2026-01-10 11:04:54 +0000
commit48dac81824c735728f64f094c5fad14083b37e93 (patch)
tree2ced245a99a8cd27d68f90e13ae679608a2f5ab3
parenta21412a7a0bebd31e24fb3fa812233b6e429ba33 (diff)
devel/forgejo-runner: Update 9.1.0 => 12.5.0
Changelogs: https://code.forgejo.org/forgejo/runner/releases/tag/v9.1.1 https://code.forgejo.org/forgejo/runner/releases/tag/v10.0.0 https://code.forgejo.org/forgejo/runner/releases/tag/v10.0.1 https://code.forgejo.org/forgejo/runner/releases/tag/v11.0.0 https://code.forgejo.org/forgejo/runner/releases/tag/v11.1.0 https://code.forgejo.org/forgejo/runner/releases/tag/v11.1.1 https://code.forgejo.org/forgejo/runner/releases/tag/v11.1.2 https://code.forgejo.org/forgejo/runner/releases/tag/v11.2.0 https://code.forgejo.org/forgejo/runner/releases/tag/v11.3.0 https://code.forgejo.org/forgejo/runner/releases/tag/v11.3.1 https://code.forgejo.org/forgejo/runner/releases/tag/v12.0.0 https://code.forgejo.org/forgejo/runner/releases/tag/v12.0.1 https://code.forgejo.org/forgejo/runner/releases/tag/v12.1.0 https://code.forgejo.org/forgejo/runner/releases/tag/v12.1.1 https://code.forgejo.org/forgejo/runner/releases/tag/v12.1.2 https://code.forgejo.org/forgejo/runner/releases/tag/v12.2.0 https://code.forgejo.org/forgejo/runner/releases/tag/v12.3.0 https://code.forgejo.org/forgejo/runner/releases/tag/v12.3.1 https://code.forgejo.org/forgejo/runner/releases/tag/v12.4.0 https://code.forgejo.org/forgejo/runner/releases/tag/v12.5.0 Fix rc.d script: - DATADIR (/var/db/act_runner) is not created with the correct ownership - The log dir (/var/log/act_runner) is not created at all, which prevents the service from starting. - The pid cannot be created in /var/run/act_runner.pid because the daemon is started with an unprivileged user. - The service cannot start using daemon(1) because it cannot set the environment. PR: 291630 Approved by: Daniel Morante <daniel@morante.net> (maintainer, timeout 4 weeks) Co-authored-by: João Santiago <me@jcpsantiago.xyz>
-rw-r--r--devel/forgejo-runner/Makefile33
-rw-r--r--devel/forgejo-runner/distinfo12
-rw-r--r--devel/forgejo-runner/files/act_runner.in13
-rw-r--r--devel/forgejo-runner/pkg-plist6
4 files changed, 37 insertions, 27 deletions
diff --git a/devel/forgejo-runner/Makefile b/devel/forgejo-runner/Makefile
index 73d2988c15b4..c12b1c420997 100644
--- a/devel/forgejo-runner/Makefile
+++ b/devel/forgejo-runner/Makefile
@@ -1,44 +1,53 @@
PORTNAME= act_runner
DISTVERSIONPREFIX= v
-DISTVERSION= 9.1.0
-PORTREVISION= 6
+DISTVERSION= 12.5.0
CATEGORIES= devel
PKGNAMEPREFIX= forgejo-
-PATCH_SITES= https://code.forgejo.org/forgejo/runner/commit/
-PATCHFILES= 34731a41be456d5b6328d8c118ba8e0b6c6a226b.diff:-p1
-
MAINTAINER= daniel@morante.net
COMMENT= Act runner is a runner for Forgejo based on the Gitea Act runner
WWW= https://code.forgejo.org/forgejo/runner
-LICENSE= MIT APACHE20
+LICENSE= APACHE20 MIT
LICENSE_COMB= multi
LICENSE_FILE_APACHE20= ${WRKSRC}/act/container/DOCKER_LICENSE
LICENSE_FILE_MIT= ${WRKSRC}/LICENSE
-USES= go:modules
+USES= go:1.25+,modules
USE_RC_SUBR= ${PORTNAME}
-GO_MODULE= code.forgejo.org/forgejo/runner/v9
+GO_MODULE= code.forgejo.org/forgejo/runner/v${DISTVERSION:R:R}
GO_BUILDFLAGS= -ldflags "${LD_FLAG_STRING}"
-LD_FLAG_STRING= -s ${LD_FLAG_X_PREFIX}.version=${DISTVERSION}
+LD_FLAG_STRING= -s ${LD_FLAG_X_PREFIX}.version=${DISTVERSION}
LD_FLAG_X_PREFIX= -X ${GO_MODULE}/internal/pkg/ver
DATADIR= /var/db/${PORTNAME}
+LOGDIR= /var/log/${PORTNAME}
+PIDDIR= /var/run/${PORTNAME}
+SUB_LIST= ACT_RUNNER_USER=${ACT_RUNNER_USER} \
+ LOGDIR=${LOGDIR} \
+ PIDDIR=${PIDDIR}
ACT_RUNNER_USER?= ${PORTNAME}
ACT_RUNNER_GROUP?= ${PORTNAME}
.if ${ACT_RUNNER_USER} == ${PORTNAME}
-USERS= ${ACT_RUNNER_USER}
+USERS= ${ACT_RUNNER_USER}
.endif
.if ${ACT_RUNNER_GROUP} == ${PORTNAME}
-GROUPS= ${ACT_RUNNER_GROUP}
+GROUPS= ${ACT_RUNNER_GROUP}
.endif
+PLIST_SUB= ACT_RUNNER_GROUP=${ACT_RUNNER_GROUP} \
+ ACT_RUNNER_USER=${ACT_RUNNER_USER} \
+ LOGDIR=${LOGDIR} \
+ PIDDIR=${PIDDIR}
+
post-install:
- ${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${ETCDIR}
+ ${MKDIR} ${STAGEDIR}${DATADIR} \
+ ${STAGEDIR}${ETCDIR} \
+ ${STAGEDIR}${LOGDIR} \
+ ${STAGEDIR}${PIDDIR}
${INSTALL_DATA} ${BUILD_WRKSRC}/internal/pkg/config/config.example.yaml \
${STAGEDIR}${ETCDIR}/act_runner.conf.sample
diff --git a/devel/forgejo-runner/distinfo b/devel/forgejo-runner/distinfo
index d14519ac11f9..f98159670201 100644
--- a/devel/forgejo-runner/distinfo
+++ b/devel/forgejo-runner/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1755498518
-SHA256 (go/devel_forgejo-runner/act_runner-v9.1.0/v9.1.0.mod) = 18d6c2c0fe0ff15434a5a60eb0a26d3c17ad1103d9e93f4c1272d551fcb756a7
-SIZE (go/devel_forgejo-runner/act_runner-v9.1.0/v9.1.0.mod) = 4728
-SHA256 (go/devel_forgejo-runner/act_runner-v9.1.0/v9.1.0.zip) = c7b6012a46048aeddb49e0429a20fdc72905974667516fcf0884af8007c4ac02
-SIZE (go/devel_forgejo-runner/act_runner-v9.1.0/v9.1.0.zip) = 3878583
-SHA256 (go/devel_forgejo-runner/act_runner-v9.1.0/34731a41be456d5b6328d8c118ba8e0b6c6a226b.diff) = fe7da83cfa0170b819ced458bafec9dd4b8353b275256409e269153d65b3fe8a
-SIZE (go/devel_forgejo-runner/act_runner-v9.1.0/34731a41be456d5b6328d8c118ba8e0b6c6a226b.diff) = 3891
+TIMESTAMP = 1768000000
+SHA256 (go/devel_forgejo-runner/act_runner-v12.5.0/v12.5.0.mod) = b8fca1dc7dd652a75be57ad987fc4241f1015979baa9f76d247e16b838f37bb0
+SIZE (go/devel_forgejo-runner/act_runner-v12.5.0/v12.5.0.mod) = 4799
+SHA256 (go/devel_forgejo-runner/act_runner-v12.5.0/v12.5.0.zip) = 6a01aa47dd64fc0ac488efcefe321cf40be3a686e24ec8972068dab42db5177a
+SIZE (go/devel_forgejo-runner/act_runner-v12.5.0/v12.5.0.zip) = 4034031
diff --git a/devel/forgejo-runner/files/act_runner.in b/devel/forgejo-runner/files/act_runner.in
index 7bb6e2a96978..c2ece16aec1f 100644
--- a/devel/forgejo-runner/files/act_runner.in
+++ b/devel/forgejo-runner/files/act_runner.in
@@ -16,19 +16,17 @@ rcvar="act_runner_enable"
load_rc_config "${name}"
-: ${act_runner_user:="act_runner"}
: ${act_runner_enable:="NO"}
: ${act_runner_facility:="daemon"}
: ${act_runner_priority:="debug"}
: ${act_runner_config:="%%ETCDIR%%/act_runner.conf"}
-: ${act_runner_cache_dir:="%%DATADIR%%"}
-: ${act_runner_log_dir:="/var/log/act_runner"}
-: ${act_runner_log_file:="${act_runner_log_dir}/act_runner.log"}
+: ${act_runner_log_dir:="%%LOGDIR%%"}
+: ${act_runner_log_file:="${name}.log"}
: ${act_runner_args:="-c ${act_runner_config} daemon"}
command="/usr/sbin/daemon"
-pidfile="/var/run/${name}.pid"
+pidfile="%%PIDDIR%%/${name}.pid"
exec_path="%%PREFIX%%/bin/act_runner"
required_files=${act_runner_config}
@@ -48,8 +46,9 @@ act_runner_prestart() {
command_args=" -r -S -l ${act_runner_facility} -s ${act_runner_priority} \
-T ${name} \
- -u ${act_runner_user} -P ${pidfile} \
- -o ${act_runner_log_file} \
+ -P ${pidfile} \
+ -o ${act_runner_log_dir}/${act_runner_log_file} \
+ -u %%ACT_RUNNER_USER%% \
${exec_path} ${act_runner_args}"
run_rc_command "$1"
diff --git a/devel/forgejo-runner/pkg-plist b/devel/forgejo-runner/pkg-plist
index a56480528e5e..aeb1f157fde2 100644
--- a/devel/forgejo-runner/pkg-plist
+++ b/devel/forgejo-runner/pkg-plist
@@ -1,3 +1,7 @@
bin/act_runner
@sample %%ETCDIR%%/act_runner.conf.sample
-@dir(%%ACT_RUNNER_USER%%,%%ACT_RUNNER_GROUP%%,750) %%DATADIR%%
+@owner %%ACT_RUNNER_USER%%
+@group %%ACT_RUNNER_GROUP%%
+@dir %%DATADIR%%
+@dir %%LOGDIR%%
+@dir %%PIDDIR%%