Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Apr 2023 14:48:59 GMT
From:      Matthias Fechner <mfechner@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: bb2923418ee7 - main - devel/gitlab-shell: disable GSSAPI support
Message-ID:  <202304121448.33CEmxYR019280@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mfechner:

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

commit bb2923418ee7549ccd24eafbc6f7a78e12307c6f
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2023-04-12 13:36:01 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2023-04-12 14:31:54 +0000

    devel/gitlab-shell: disable GSSAPI support
    
    It currently has a conflict between heimdal this port uses
    and krb5 which is required by rubygem-timfel-krb5.
    the heimdal port and krb5 as installing conflict binaries and
    can therefor not exist both.
    
    Problem is reported upstream:
    https://gitlab.com/gitlab-org/gitlab/-/issues/405678
---
 devel/gitlab-shell/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index 5e7bf1465a2a..637b2a421b3d 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gitlab-shell
 PORTVERSION=	14.18.0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -10,9 +11,10 @@ LICENSE=	MIT
 
 # GSSAPI support can maybe be removed by disable CGO:
 # https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/720
-BUILD_DEPENDS=	heimdal>=0:security/heimdal
+#BUILD_DEPENDS=	heimdal>=0:security/heimdal
 
 USES=		gmake go:modules,no_targets pkgconfig
+CGO_ENABLED=	0
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304121448.33CEmxYR019280>