git: e6e83842d974 - main - www/gitlab-ce: added possibility to disabled kerberos
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 31 May 2022 15:50:00 UTC
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=e6e83842d9749824da4e2da42f13b89883e73858 commit e6e83842d9749824da4e2da42f13b89883e73858 Author: VVD <vvd@unislabs.com> AuthorDate: 2022-05-31 15:43:06 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2022-05-31 15:49:39 +0000 www/gitlab-ce: added possibility to disabled kerberos As this does not change the behaviour of port, no revision bump. PR: 263688 --- www/gitlab-ce/Makefile | 8 +++++++- www/gitlab-ce/files/extra-patch-Gemfile-kerberos-off | 11 +++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 038e9f7b9c11..4855c342d9c3 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -69,7 +69,6 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-rack-oauth2>=1.16.0<1.17.0:security/rubygem-rack-oauth2 \ rubygem-jwt21>=2.1.0<2.2.0:www/rubygem-jwt21 \ rubygem-gssapi>0:security/rubygem-gssapi \ - rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5 \ rubygem-recaptcha>=4.11<5.0:devel/rubygem-recaptcha \ rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \ rubygem-invisible_captcha>=1.1.0<1.2.0:graphics/rubygem-invisible_captcha \ @@ -291,6 +290,13 @@ NO_BUILD= yes NO_ARCH= yes +OPTIONS_DEFINE= KERBEROS +OPTIONS_DEFAULT= KERBEROS + +KERBEROS_BUILD_DEPENDS= rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5 +KERBEROS_RUN_DEPENDS= rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5 +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..d80c80415ef3 --- /dev/null +++ b/www/gitlab-ce/files/extra-patch-Gemfile-kerberos-off @@ -0,0 +1,11 @@ +--- Gemfile.orig ++++ Gemfile +@@ -60,7 +60,7 @@ + + # Kerberos authentication. EE-only + gem 'gssapi', group: :kerberos +-gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos ++#gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos + + # Spam and anti-bot protection + gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'