From nobody Thu Jan 23 10:00:37 2025 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 4YdxK25TCLz5khHx; Thu, 23 Jan 2025 10:00:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YdxK16dpcz3tlZ; Thu, 23 Jan 2025 10:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737626437; 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=+SVM+knJQK4gvkE6zdybNJjRdjcQRai9ue34881kWo8=; b=sR8yLeOuMaBs8B+7PHG31SkLAtOfq7jMj5pInGMuqqpN4Wj05ODqBkXBksySTJJC8IzXKq 1ocy+UACYPBBws3R1GNVecTnLaqex6q6v0pLNNR+81L+M3CeNmHzGn6Y4n2ljnr+kpFQLB XFs9jy8X8LTorXaCeghhCDzq05PraWhRiJeAG8VVZ4jQAxxaUh2mS1Vh6FmJZDDmevRIwQ MsR+hVlNYr2h8q7iyDQeCoYfM0hqHEx4hElHR2khQiEFATg5uyy2gDAb8CGZfTGLOyrLc8 QFDOPo++dZPMtKaz4pAdJ3QJ75stK0JK4jtge0IQfcwP38r1IkcFr8+5S+YnsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737626437; 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=+SVM+knJQK4gvkE6zdybNJjRdjcQRai9ue34881kWo8=; b=Tg3uT3HnhCdcP++miFIkxLYad8xnacfFKdA6iZ1CkMVs6gI3Nu2XCD6OBIZTZ8BRByLhxl bQZhPDtkGqvJ0FwHkRgGN8141yh0X8VVbiIoEi9x4q63dtWu2d1kjIsfJiPxWDa9nUboku SD3i0wVj8cVFDC1SWUb82O6uQ+tSCyxRymZOnENAmM3oJMeE9k6s/4FoChGaLyqw6NIvCm M30FRU8eieD7Z95qQh0J0CzNMPzGgoDdwqdw+b6mrxxX2es27fvPnPG6RgFf2Fr5sxAfm9 DswZSg1W6Eon/bygrvLRSNIDAujRkabDNzKR91WXuS+OfYTTsGxN2HfI5MnpMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737626437; a=rsa-sha256; cv=none; b=ycHvc6WJhXE0jteAXBpAkwdS0zcw7gp/AfUz4bjW1H4LwUlIE7SBBwJ+biT5KxnvzadPPF 7SyJiMd3qHFZT7Jf6m6+heHQRFTZiGrzNPIqCbD8SzObgueRIlt/tnLXWyKC7IiE32ctK5 g4ihTQJNqi/dfucXoMpvtoMX6UaxhfgzbRyzGQN4Jph/14sReC43Yigd6BwHPeBrimjX8K Um879SXoWNCUlLGRsul2QwpwJTjMho7lb3pylpto/dJRHCvIhP96uMNDJzO5peb8ejtAkv TDhLFmLZclQGn92OSAeVlWvRHJqJGlAlH+k1m0w+V8lsegcPoPcHk8d6aqtG9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YdxK15zfbzZlt; Thu, 23 Jan 2025 10:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50NA0bgJ087802; Thu, 23 Jan 2025 10:00:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50NA0bvq087799; Thu, 23 Jan 2025 10:00:37 GMT (envelope-from git) Date: Thu, 23 Jan 2025 10:00:37 GMT Message-Id: <202501231000.50NA0bvq087799@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: 2ee435364571 - 2025Q1 - www/gitlab: Update "kerberos off" patch for gitlab 17.8.0 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: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-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/2025Q1 X-Git-Reftype: branch X-Git-Commit: 2ee4353645712f915995756b36597d6853970d68 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ee4353645712f915995756b36597d6853970d68 commit 2ee4353645712f915995756b36597d6853970d68 Author: Vladimir Druzenko AuthorDate: 2025-01-17 21:21:24 +0000 Commit: Matthias Fechner 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