git: 548798bd6284 - main - devel/gitlab-runner: fix pipeline errors

From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Sun, 23 Nov 2025 20:16:06 UTC
The branch main has been updated by mfechner:

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

commit 548798bd62843b70db2268085eba959fffcf64d6
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2025-11-23 20:13:57 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2025-11-23 20:15:39 +0000

    devel/gitlab-runner: fix pipeline errors
    
    Running pipelines with shell executor stops with error:
    fatal: unable to get password from user
    
    See also here:
    https://gitlab.com/gitlab-org/gitlab-runner/-/issues/39130
    https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/5961
---
 devel/gitlab-runner/Makefile | 5 +++--
 devel/gitlab-runner/distinfo | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/devel/gitlab-runner/Makefile b/devel/gitlab-runner/Makefile
index 9fb82d0004d0..a50a10ff618f 100644
--- a/devel/gitlab-runner/Makefile
+++ b/devel/gitlab-runner/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	gitlab-runner
 DISTVERSIONPREFIX=	v
 DISTVERSION=	18.6.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerx64 \
 		https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerarm
 DISTFILES=	prebuilt-x86_64.tar.xz:dockerx64 \
 		prebuilt-arm.tar.xz:dockerarm
 
-#PATCH_SITES=	https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/
-#PATCHFILES+=	5958.patch:-p1 # https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/5958, Permission denied in pipeline
+PATCH_SITES=	https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/
+PATCHFILES+=	5961.patch:-p1 # https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/5961, Fix "unable to get password from user" errors in shell executor
 #PATCH_SITES=	https://gitlab.com/mfechner/gitlab-runner/-/commit/
 #PATCHFILES+=	2f12af03ccd5fe875d583ddc8b976329b635fd22.patch:-p1
 
diff --git a/devel/gitlab-runner/distinfo b/devel/gitlab-runner/distinfo
index 953f88ea9fb2..21e737fe99a5 100644
--- a/devel/gitlab-runner/distinfo
+++ b/devel/gitlab-runner/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1763794400
+TIMESTAMP = 1763928380
 SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.6.1/prebuilt-x86_64.tar.xz) = b0dccc53f415962dde3f5a7e6f1ab068b8da5484a7fefdae2c5e39d8bb6c637e
 SIZE (go/devel_gitlab-runner/gitlab-runner-v18.6.1/prebuilt-x86_64.tar.xz) = 9594352
 SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.6.1/prebuilt-arm.tar.xz) = 5018c6b661ebf4b9c661593548e45394c553bbd4082b5ef744a39a1f7f1fee32
@@ -7,3 +7,5 @@ SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.6.1/go.mod) = 82fa95d31cd697359
 SIZE (go/devel_gitlab-runner/gitlab-runner-v18.6.1/go.mod) = 13992
 SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.6.1/gitlab-runner-v18.6.1.tar.bz2) = 18ff6f31daba6afb697c3c6c2cb0e542f5d2e9e5c8a088e4b0c6b91abcd9ff37
 SIZE (go/devel_gitlab-runner/gitlab-runner-v18.6.1/gitlab-runner-v18.6.1.tar.bz2) = 2097455
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.6.1/5961.patch) = 532ba5d8ee60cc81b6ae76564e9f14384192557b221f0d78a5d209e195e0958f
+SIZE (go/devel_gitlab-runner/gitlab-runner-v18.6.1/5961.patch) = 8331