Date: Thu, 23 Jan 2025 10:00:37 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 2ee435364571 - 2025Q1 - www/gitlab: Update "kerberos off" patch for gitlab 17.8.0 Message-ID: <202501231000.50NA0bvq087799@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2025Q1 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ee4353645712f915995756b36597d6853970d68 commit 2ee4353645712f915995756b36597d6853970d68 Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2025-01-17 21:21:24 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2025-01-23 09:48:21 +0000 www/gitlab: Update "kerberos off" patch for gitlab 17.8.0 Approved by: mfechner (maintainer, implicit) (cherry picked from commit 3a8d1d9e8cd37adb5e765cd329b29bef815e543b) --- www/gitlab/files/extra-patch-Gemfile-kerberos-off | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/www/gitlab/files/extra-patch-Gemfile-kerberos-off b/www/gitlab/files/extra-patch-Gemfile-kerberos-off index b6cbffee72e0..7aa7aae469eb 100644 --- a/www/gitlab/files/extra-patch-Gemfile-kerberos-off +++ b/www/gitlab/files/extra-patch-Gemfile-kerberos-off @@ -1,11 +1,11 @@ --- Gemfile.orig +++ Gemfile -@@ -96,7 +96,7 @@ +@@ -120,7 +120,7 @@ gem 'gssapi', '~> 1.3.1', group: :kerberos, feature_ca # Kerberos authentication. EE-only - gem 'gssapi', '~> 1.3.1', group: :kerberos # rubocop:todo Gemfile/MissingFeatureCategory --gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos # rubocop:todo Gemfile/MissingFeatureCategory -+#gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos # rubocop:todo Gemfile/MissingFeatureCategory + gem 'gssapi', '~> 1.3.1', group: :kerberos, feature_category: :system_access +-gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos, feature_category: :system_access ++#gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos, feature_category: :system_access # Spam and anti-bot protection - gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails', feature_category: :insider_threat
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501231000.50NA0bvq087799>