From nobody Wed Apr 12 14:48:59 2023 X-Original-To: dev-commits-ports-main@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 4PxQZh31Pfz44tH7; Wed, 12 Apr 2023 14:49:00 +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 4PxQZg4DXvz4Tcq; Wed, 12 Apr 2023 14:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681310939; 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=65KzaPJcdnZXPmMkdxDu75IXnRrOkavaJMsOzQOIZeI=; b=u+crEnwTvWP9Ebuoe+3tP1r9glaqtgttKQLCP3whKkpChTFDkon0Zqzn2+eCPslAGHoKQa +yVMXuXS9FRvj4MJFsXH37/0DpEkKAQRJdjwkV52aJ3Uhr1ukQEU+lI8kc691Qvxoa9E93 h93eZAsRcEZB0iF+AlLtLY+Pva9H8vtdehqDBU4Yz8qW393TXOsdSknWH/GC9NLS4qG/rK kHmIZh7/Bzdmxv+gVZaVU+VXYs3lK4R0uvVF+ACD54ZiWYw43UgiBlla0Ja0XAZA4X9j9F VROnkhdmdkmn45mCzHJVlsLQo3QEEUE8WPzdAIq/j0zaXg+AOFRtpjoX8PFW6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681310939; 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=65KzaPJcdnZXPmMkdxDu75IXnRrOkavaJMsOzQOIZeI=; b=aVfAb5OTAmI78BBfGIfT6A4Oc8Dbx7mDVreL2iOwfTGRDV7B8FaluVi9JKEc1oUgeUlbDE NnBY7BREHWB6UCEGwBiqq3PNLwX6v9fGVW1FaK+cV3EVI2H7qlMv4sVINGW1cLsN7qWOWc HiHsk2xgzjGjqwsoFcYGAmKnKlooZxx5HWb59GDCCm9vWuEUpBli6c9X3QNxrW8iLeM4KE x8WlEdPg189tlT4a368zBXrkljCPNCHF316ke+QItgUcSZwUUc15x71+pR/lKYNGdVJOhE BEvLEY5lznpxMvw7i57jomBWxaUYsBnqgdnzFcP5gFiaryfk/MrBSJq+RoTN9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681310939; a=rsa-sha256; cv=none; b=WAF59BNYZPQZ9le/Ky6S6XxVIB5YI0ChFBHMXkb5oZOg/H3+S5Tcvi0CFaraTljsO7ILzG uEFaBb2gnd4GJOQ4+fsuVy1gRwzH3xFnFHs+2TrKRTbGTHxRw7ABwDoYq3+7KP0I4efKoE 88IXenNuv+lBHYutvyzQ8V7o+4T8M52GWG1QRq+VdmXsK1RepmkdwsRtLgwVOHpN38lAsd poE0VS191J6uZ5mjlfIOw4WJ1uVd1H1/KHvkltxQ4cwuzX0wFl/cyT2REVT6nxcEvYKAnh 1T97uO9vZy9H3+5/x8iypwS84o9tzJ6YfAaUHynVGgMuzFuEBWNIXbIp7CBd6g== 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 4PxQZg3KRHz13qv; Wed, 12 Apr 2023 14:48:59 +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 33CEmxQl019281; Wed, 12 Apr 2023 14:48:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CEmxYR019280; Wed, 12 Apr 2023 14:48:59 GMT (envelope-from git) Date: Wed, 12 Apr 2023 14:48:59 GMT Message-Id: <202304121448.33CEmxYR019280@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: bb2923418ee7 - main - devel/gitlab-shell: disable GSSAPI support List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: bb2923418ee7549ccd24eafbc6f7a78e12307c6f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=bb2923418ee7549ccd24eafbc6f7a78e12307c6f commit bb2923418ee7549ccd24eafbc6f7a78e12307c6f Author: Matthias Fechner AuthorDate: 2023-04-12 13:36:01 +0000 Commit: Matthias Fechner 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