git: 3883c6afd6b0 - 2023Q2 - devel/gitlab-shell: disable GSSAPI support
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 13 Apr 2023 11:05:22 UTC
The branch 2023Q2 has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3883c6afd6b0073b20f48da64dda0410e612b89e
commit 3883c6afd6b0073b20f48da64dda0410e612b89e
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2023-04-12 13:36:01 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2023-04-13 10:43:04 +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
(cherry picked from commit bb2923418ee7549ccd24eafbc6f7a78e12307c6f)
(cherry picked from commit b5a874168ae078116b48f335b35967b31ff29be6)
---
devel/gitlab-shell/Makefile | 10 +++++++---
devel/gitlab-shell/distinfo | 10 +++++-----
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index 545273a42cea..637b2a421b3d 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gitlab-shell
-PORTVERSION= 14.17.0
+PORTVERSION= 14.18.0
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= mfechner@FreeBSD.org
@@ -8,14 +9,17 @@ WWW= https://gitlab.com/gitlab-org/gitlab-shell
LICENSE= MIT
-BUILD_DEPENDS= heimdal>=0:security/heimdal
+# 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
USES= gmake go:modules,no_targets pkgconfig
+CGO_ENABLED= 0
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-shell/tags
-GL_COMMIT= 336c4a51aa332b0cc1c68798003a1d82ab4a9cc3
+GL_COMMIT= f76503aeb40e6e4702d9697a29ff38fad4a0352f
USERS= git
GROUPS= git
diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo
index 9d3737595318..7c5f32c01472 100644
--- a/devel/gitlab-shell/distinfo
+++ b/devel/gitlab-shell/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1676995009
-SHA256 (go/devel_gitlab-shell/gitlab-org-gitlab-shell-336c4a51aa332b0cc1c68798003a1d82ab4a9cc3_GL0/go.mod) = 2332a94b5447fe9baba937fe9efe9f6ae2aadcc60b17e91561658e052587cc51
-SIZE (go/devel_gitlab-shell/gitlab-org-gitlab-shell-336c4a51aa332b0cc1c68798003a1d82ab4a9cc3_GL0/go.mod) = 4369
-SHA256 (go/devel_gitlab-shell/gitlab-org-gitlab-shell-336c4a51aa332b0cc1c68798003a1d82ab4a9cc3_GL0/gitlab-org-gitlab-shell-336c4a51aa332b0cc1c68798003a1d82ab4a9cc3_GL0.tar.gz) = f0c5a4aeee0baa18f94d489b4bc2b163124ac9e2c2e77abc77a7dc199d5ef4fa
-SIZE (go/devel_gitlab-shell/gitlab-org-gitlab-shell-336c4a51aa332b0cc1c68798003a1d82ab4a9cc3_GL0/gitlab-org-gitlab-shell-336c4a51aa332b0cc1c68798003a1d82ab4a9cc3_GL0.tar.gz) = 140045
+TIMESTAMP = 1681105424
+SHA256 (go/devel_gitlab-shell/gitlab-org-gitlab-shell-f76503aeb40e6e4702d9697a29ff38fad4a0352f_GL0/go.mod) = 4b85b773dab7c239d16d7a0ca5a4087fee478bea88cbd31ee77a69ffb50facae
+SIZE (go/devel_gitlab-shell/gitlab-org-gitlab-shell-f76503aeb40e6e4702d9697a29ff38fad4a0352f_GL0/go.mod) = 4621
+SHA256 (go/devel_gitlab-shell/gitlab-org-gitlab-shell-f76503aeb40e6e4702d9697a29ff38fad4a0352f_GL0/gitlab-org-gitlab-shell-f76503aeb40e6e4702d9697a29ff38fad4a0352f_GL0.tar.gz) = 42c53b4244bfe718b0f13bad63034bdee6a751b22caf3ff7ebd402c6db1fd47e
+SIZE (go/devel_gitlab-shell/gitlab-org-gitlab-shell-f76503aeb40e6e4702d9697a29ff38fad4a0352f_GL0/gitlab-org-gitlab-shell-f76503aeb40e6e4702d9697a29ff38fad4a0352f_GL0.tar.gz) = 143964