From nobody Thu Apr 13 11:05:22 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxxZC3YSQz44mwW; Thu, 13 Apr 2023 11:05:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxxZC1lB0z3QLN; Thu, 13 Apr 2023 11:05:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681383923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=svbb40ikCSjWkrfjBKslFOtERl4WpVBUFkB/RDPeY/k=; b=lX6L4nRgG6uRBqJxf1+t0YYWJ/Ar8oyXTi7PX6vWg+Lx7Clx8XGcf4vi9hwQY6LlSNYMRF Zu+vv6DPysj3zISzUNH5EJ6ZooMQq1KotLLUuUE7AV99utK9Ihq+J03KrxJaC3am6rT/1I CM7lowgaZlkkHwmPWt0kvKCsicSRL1hMbBjX4iP6AT4JINtYAl+ktdYqR4M82QUJiBqJdm ANpVjVzHD6S26yo4fwIZ/Y1PByea586iqwWnWXy5O00MD30phCqYVdZaUsJ9n7ax0qM7ND BQYY9liJpuh81m8JwvlWiqphRImkhyWrVUz3xkCzZZDe3F6QiqGW+BJxsLfB/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681383923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=svbb40ikCSjWkrfjBKslFOtERl4WpVBUFkB/RDPeY/k=; b=Gi4Ctkuv7V88bf3tsiV4d7jKcHqkeBftuHfYxD94OB7BTAfme6sYaUeYWanTXGQu0sZKHt 5lELqau20v/QUjY/eK5xPypqQ/WMx1ug3hi2GD9zt8vpaqFLuKIJ/BhtwkdT5Fzhlo6SUy dTZpCfx08X9NwXEUAD6/5hMgU+TWv1bb+31AlvqeisbYYf5/l5RXzBbhdrW3IewVK1W9oa 8M2awtbjquzVBcZmar/WN4UPLKRRRT/pDyKbF4vIaSstLyUZKBZJkM2TDQ/HGmODJh2a+k xGXpGty91HHOj9hfKWTaGSzy44Q02uGqNpZBaG2MHds2lu+3bMHsaVblFwQIUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681383923; a=rsa-sha256; cv=none; b=sx96jV/xptLdwz/vSkV7VH6/mM2gjAJSgjnTI25MLfd2Zrd1K7IYGFCXR5BcZpLxBceuxL r5dcdRoo6s/+wA3VT3xN32u6ZjMzI5gTSMZ+ZBV5F2yiQBND3Hh2pEBZ/qRS3uH4qIESQH jI9HaZTmL/feNc5nYtjfydSAyZQ0KolOIPK3t6quXgCc/UUvsYdupZ5Wv7g6lcBGMYwcc5 TLUbuC/bHsCTsd9JNXhXGRVDhM04jnHQM2AZ65l4h7kYOonB1ug/3eR65VfKY6AKsdTxLy bTrKojNqnYzfQRtonhfLiPhR2Uij8AcUL23nAkFEcz8pok8n+yUS47DMrBpd4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxxZB3Trkzg4j; Thu, 13 Apr 2023 11:05:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33DB5MGJ026038; Thu, 13 Apr 2023 11:05:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33DB5Mot026037; Thu, 13 Apr 2023 11:05:22 GMT (envelope-from git) Date: Thu, 13 Apr 2023 11:05:22 GMT Message-Id: <202304131105.33DB5Mot026037@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 3883c6afd6b0 - 2023Q2 - devel/gitlab-shell: disable GSSAPI support List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 3883c6afd6b0073b20f48da64dda0410e612b89e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=3883c6afd6b0073b20f48da64dda0410e612b89e commit 3883c6afd6b0073b20f48da64dda0410e612b89e Author: Matthias Fechner AuthorDate: 2023-04-12 13:36:01 +0000 Commit: Matthias Fechner 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