From nobody Fri Jan 17 21:25:46 2025 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 4YZXpL4qfFz5kG0j; Fri, 17 Jan 2025 21:25:46 +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 4YZXpL31yMz4D55; Fri, 17 Jan 2025 21:25:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737149146; 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=vBOQvS6yVfip4FsSxTSDtHcZpvfesXHLA0zt1JvVs68=; b=Bjyjkx97b5+0vZoMJT7F8TRvqHYw2KSHSj9G6/qIQTtPPtFykrXZWrsiUPjtm6IHBsbxCg dHT9WxwwySllJq2/4k/fM54HY2ZlVoYSVmq7n7PGa7r5XRfOWyMHiwUc/YvZKe4a5HnjpL 9s3yapU9dA8u1eoP3SgZFpcMmMctfwFc0C4e/T6lzY9jbPuEFC0xMe3L5XYPTO5KPvVUJw vDZ7Fnv3js42/C9Lr7NAgxhLjL/awwfTsv4nD+OR821QBYqqDrpsxECpnMqBbTAcpYUwVp /PnZ0agebreTg3mBpoQkiiwMoqi9DlQU2Ypv3FSlTIFeK6ndu5fvJr9TValS/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737149146; 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=vBOQvS6yVfip4FsSxTSDtHcZpvfesXHLA0zt1JvVs68=; b=Ix9/7JENBTjyMS+3sVErbkk2no7PH0Zs2BGCSeNedqv0ZkP0hZEK8QVyTX04cDxi2+xMPH Unvj+NQaqFSOoQ06rw/0nY3t+Un7l38J4YcuPt6+7HAJFmN4HbDCpJMVv6206y4L55g5OC DAQjpoLPa/0ZQhG+xRHOFZwJBfJ79/mYON0wKUu+mXX8S1AoPP1o71xLGFpOS0tqukMn32 +1mvN2RAh0UPtVpumI8HOUSoiWEcfBZOu+FbpGb9Q2IyXUo28N1jJcDhmBbLLwpQGxxtwf vDChG6FBPaTkEoZWKa7PI6OODUTSafLkg/VVsBRuZIziPXWGHmTqc4XyiUUQ2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737149146; a=rsa-sha256; cv=none; b=ear41bLoFwEsxgCvj1MvRGeeP8kxhqnYDPivXpa+aRAVDwnYfZQ2i7BeriTXoZbXv1w8sk xn2tBmZPi5Jqi0EODjGtp7TKR32WkjjQrPeoRQ9qTT9SUDwVMoybG7xH9T2EZ+QDyA9q/F FfWpl/EQs5xbA4W9uUrB6sEazd6B3U29qH8GpiSnPqcFCmNlm/iMY7YtCxTpZiqe1V4qOx HFXQ7+v4vm5oGRf7pi+Mk97bw1/eijC1iZJh8g0sRdI6C4eVk1eTTmUswdZn+PWguY51JL 3RBhyLwQQGa0sdilp9UupVQFrtKmjscClfdMA/okrkddo6ZJPuM/bDlApuwJkQ== 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 4YZXpL2KhTzbMj; Fri, 17 Jan 2025 21:25:46 +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 50HLPkEc028355; Fri, 17 Jan 2025 21:25:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HLPkUW028352; Fri, 17 Jan 2025 21:25:46 GMT (envelope-from git) Date: Fri, 17 Jan 2025 21:25:46 GMT Message-Id: <202501172125.50HLPkUW028352@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 3a8d1d9e8cd3 - main - www/gitlab: Update "kerberos off" patch for gitlab 17.8.0 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a8d1d9e8cd37adb5e765cd329b29bef815e543b Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=3a8d1d9e8cd37adb5e765cd329b29bef815e543b commit 3a8d1d9e8cd37adb5e765cd329b29bef815e543b Author: Vladimir Druzenko AuthorDate: 2025-01-17 21:21:24 +0000 Commit: Vladimir Druzenko CommitDate: 2025-01-17 21:21:24 +0000 www/gitlab: Update "kerberos off" patch for gitlab 17.8.0 Approved by: mfechner (maintainer, implicit) --- 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