From nobody Thu Mar 10 16:55:18 2022 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 D81551A14F05; Thu, 10 Mar 2022 16:55:18 +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 4KDwD65k8kz4QpF; Thu, 10 Mar 2022 16:55:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646931318; 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=zZHhz2g5ScRDv4lrxssLIOLoBo/ZVPAVdaULCttiq/Y=; b=ZW9uqYzghxspTqTmS80UbxMkF850VT7oaxSZge8iOHiq5It/kHkL5uq01mLiyGSG1Sd3wq ZD25QqgLIDWgGBitCwsnWlWhb3IxPS1Zt01TYOaU78icLztDXCLyF+E55ZRm+v5Ovkeq74 qPlb5iAUnUU3RGPYN/xF9moNB8bF6ZbEMRP4M33MJYxdHGg1tqvYTKMtSvA/nJtkxVK2Rp 5Y1tqIMstZ+iGMgh7za/uVsSs/U9q6lmyJcQp6BlQf+fAsjpMxRgZT9rYaMB5K5lJitE1a PIyKNfXCcvYJ/4B/0YZCjKOyCB649m12+QFFxUJDLKmeY8P6OApY5QUEEpNxgQ== 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 9676EC0D; Thu, 10 Mar 2022 16:55:18 +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 22AGtIQR074853; Thu, 10 Mar 2022 16:55:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22AGtIUG074852; Thu, 10 Mar 2022 16:55:18 GMT (envelope-from git) Date: Thu, 10 Mar 2022 16:55:18 GMT Message-Id: <202203101655.22AGtIUG074852@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: ccc9d98b47ff - main - www/gitlab-ce: add option to remove kerberos dep 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: ccc9d98b47ff35cda47a10094e7777d962c48108 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646931318; 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=zZHhz2g5ScRDv4lrxssLIOLoBo/ZVPAVdaULCttiq/Y=; b=rQ6fAJ0nf8L/cCyiS2UAe5vQdT0D5OO1BilgpPNhbveDAWof88FKsDK1/PpJYsOaahY0S1 NK2/IbFW+jItAJB4pEdPzvZVu1qcODCHgfxU2VjCSUvV/cMUQVuveEsosbE8/5x79BntsQ T7pFzMTckShT4Z9q328K1EuNpthTCM+/XcnJ2sTv1Qp+TUiVJ4gT8T0OtblQrFg1pA3Tr8 FZYL2V5slYLjGk6EYB1ueXBm46SQgUdRfCK67s97wiq1isqxIl6XXLa3UCK7b0KyNdDTDV kD+iF9WACnr1OT4cfCLM2ilsP14WyjNUXkcni68eQ4Hs/Jk/53iyaktbF+buqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646931318; a=rsa-sha256; cv=none; b=GwXVkjY61v6hYFKLiyZbbRYMyYw6JrzwDHXRs2vnr7kV9UbcPtXxZOxFbIEXPPYw1K+aj5 ogK/qSSGsazZPuBffqXTEySW3XjtqW1agkrV7v7dGq53aZGEXcjKgNss5XeGT6qbyIgUPI eQEWdvMyU7DpFeGnFgyQwAlKhTNSQwAkf4P0bm2fkCZwVFpGmjY4pyuuZ5+GCgPfRwL2ZM ihSr8OBkUZRIWQGiMAtlJnGRbkjIlKsogEJsH7Bmnt4gBz/+XSHt4UfI5qCoHrQZfu+i+0 GVwT0e7TbJhjbTR0svedocpVVzHI+sNpHOaiyObSWjDy0aKtY2MLmyyYaEgBqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=ccc9d98b47ff35cda47a10094e7777d962c48108 commit ccc9d98b47ff35cda47a10094e7777d962c48108 Author: VVD AuthorDate: 2022-03-10 16:47:12 +0000 Commit: Matthias Fechner CommitDate: 2022-03-10 16:47:12 +0000 www/gitlab-ce: add option to remove kerberos dep I understand that this option can be helpful, but I do not suggest to use it. If it breaks due to new version and the patch does not apply anymore, please send a PR then I will update this feature accordingly. But I will not testbuild gitlab with many option combinations. PR: 262191 --- www/gitlab-ce/Makefile | 10 ++++++++-- www/gitlab-ce/files/extra-patch-Gemfile-kerberos-off | 11 +++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index c4700a883383..69a66f822686 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -2,7 +2,7 @@ PORTNAME= gitlab-ce PORTVERSION= 14.8.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -53,7 +53,6 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-omniauth-github>=1.4.0<2.0:net/rubygem-omniauth-github \ rubygem-omniauth-gitlab>=1.0.2<1.1.0:security/rubygem-omniauth-gitlab \ rubygem-omniauth-google-oauth2>=0.6.0<0.7.0:net/rubygem-omniauth-google-oauth2 \ - rubygem-omniauth-kerberos>=0.3.0<0.4.0:net/rubygem-omniauth-kerberos \ rubygem-omniauth-oauth2-generic>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic \ rubygem-omniauth-saml>=1.10<2.0:security/rubygem-omniauth-saml \ rubygem-omniauth-shibboleth>=1.3.0<1.4.0:security/rubygem-omniauth-shibboleth \ @@ -284,6 +283,13 @@ NO_BUILD= yes NO_ARCH= yes +OPTIONS_DEFINE= KERBEROS +OPTIONS_DEFAULT= KERBEROS + +KERBEROS_BUILD_DEPENDS= rubygem-omniauth-kerberos>=0.3.0<0.4.0:net/rubygem-omniauth-kerberos +KERBEROS_RUN_DEPENDS= rubygem-omniauth-kerberos>=0.3.0<0.4.0:net/rubygem-omniauth-kerberos +KERBEROS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Gemfile-kerberos-off + post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config/gitlab.yml.example \ ${WRKSRC}/config/puma.rb.example \ diff --git a/www/gitlab-ce/files/extra-patch-Gemfile-kerberos-off b/www/gitlab-ce/files/extra-patch-Gemfile-kerberos-off new file mode 100644 index 000000000000..7e641a198558 --- /dev/null +++ b/www/gitlab-ce/files/extra-patch-Gemfile-kerberos-off @@ -0,0 +1,11 @@ +--- Gemfile.orig 2022-01-21 10:23:10 UTC ++++ Gemfile +@@ -43,7 +43,7 @@ + gem 'omniauth-github', '~> 1.4' + gem 'omniauth-gitlab', '~> 1.0.2' + gem 'omniauth-google-oauth2', '~> 0.6.0' +-gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos ++#gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos + gem 'omniauth-oauth2-generic', '~> 0.2.2' + gem 'omniauth-saml', '~> 1.10' + gem 'omniauth-shibboleth', '~> 1.3.0'