From nobody Sat Nov 4 19:11:04 2023 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 4SN6f02cx5z50Fqj; Sat, 4 Nov 2023 19:11:04 +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 4SN6f027SXz3glL; Sat, 4 Nov 2023 19:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699125064; 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=DO5XwcIiXIEGCqVytAE4WjlDmUPXJOWTRRktqth5wr8=; b=SQ5c+osWSvmEtO9e61wobXI3hMMeJpjP4EBW9aUmFEWOEFFpPkTXk2/+fC4tAIjjOKhcyE YcU1MnqB+GJKUKRI397LIIQTvY+gjEDokPwvrvhtE6ahRuJMZqophrO984j0ahr+R+OIuX VNawu0btVB8IBmOKRclVyrpe+I8FkvuEF7w1HUzSvc+EHsm5b1WFKf3Jpwe5UM3Zzr8pOI vyH/7p0kuy3hpOXq5u6RnaB1RI7/wYvyUC5oCFRNt8vD5JBG9rusIAIUcLxSfjK1AlUCi+ HDtFvidrOFLTFHsH7IgE7OwBshTYAQXQSALThQLEKFKJ6FV5WVTkVzA8qLjjvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699125064; 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=DO5XwcIiXIEGCqVytAE4WjlDmUPXJOWTRRktqth5wr8=; b=dCnbAwaqj1T0rwYf6Xvpgqp7Po9NK32IASB/kQ8iZ8ES2XuGa7jdcS6M26x+YmiGBTJgXa NY6pYvBclyfGNR0xx/z8rnOfR/+Mhb4MBz8VOHT+V8JK6qIhR6sDTfy87MP9LiOMY9GaSw xWXlgQl7/xnvwKEXumxDVrDzCy0qJTfytn4tv0wM1Ds+68ejrW9NzsPYgn7SrRe4OKnSrj y85NGrT28MdCofjJxrQfs2Q/cA2Opk31kN+pFK747KgKMDLevS5yhNf/5MHHgKRXPVv6em IP9sWNv/ljtZcPzw7eFPDPKOPI+C/egEoerJk+dpl0cBYNsjhJYSUsMwz0SqXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699125064; a=rsa-sha256; cv=none; b=OX4+spQSEbazlNBh/ThODMXoesTEQb2sTotAnMNWtk19LhZ04QkfU7N5ckZ7pjlpgv3RMf JdvO2xD9AiaFzxsXPOlnm1Uw+jaD1IJDYsKS8L6LYb1Zp19uYbcZPnLQTTLOhQiZyxhxRs Fl+sVuU+yTDTUq1RLY52SFtStKT1l83Ults+1tZlpg8SmlJFTXpVebww41XuxTP5/HDmKy OyKL8Nne7H0aBX0CENuD4GQjW++ypsqiOnRIljr1dJCCDqtv+kQBUZ7oNv9av5Yyc9dudS oo3LrNqnESUcKtaDegJw24ca+wGgE8kQGTT5gb7KG0TIVOkJ6v5q6DBxsAUs0Q== 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 4SN6f01Crjz18B7; Sat, 4 Nov 2023 19:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A4JB4M2097589; Sat, 4 Nov 2023 19:11:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4JB4Uj097586; Sat, 4 Nov 2023 19:11:04 GMT (envelope-from git) Date: Sat, 4 Nov 2023 19:11:04 GMT Message-Id: <202311041911.3A4JB4Uj097586@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: 82a00282fd6e - main - www/gitlab-ce: update patch for turn off kerberos 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: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82a00282fd6e5d7b30f91ac6e54e033ac58c5463 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=82a00282fd6e5d7b30f91ac6e54e033ac58c5463 commit 82a00282fd6e5d7b30f91ac6e54e033ac58c5463 Author: Vladimir Druzenko AuthorDate: 2023-11-04 19:08:16 +0000 Commit: Vladimir Druzenko CommitDate: 2023-11-04 19:08:16 +0000 www/gitlab-ce: update patch for turn off kerberos Approved by: mfechner (maintainer), arrowd (mentor, implicit) --- www/gitlab-ce/files/extra-patch-Gemfile-kerberos-off | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/www/gitlab-ce/files/extra-patch-Gemfile-kerberos-off b/www/gitlab-ce/files/extra-patch-Gemfile-kerberos-off index 267fe8e44ff8..b6cbffee72e0 100644 --- a/www/gitlab-ce/files/extra-patch-Gemfile-kerberos-off +++ b/www/gitlab-ce/files/extra-patch-Gemfile-kerberos-off @@ -1,11 +1,11 @@ --- Gemfile.orig +++ Gemfile -@@ -79,7 +79,7 @@ +@@ -96,7 +96,7 @@ # Kerberos authentication. EE-only - gem 'gssapi', '~> 1.3.1', group: :kerberos --gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos -+#gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos + 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 # Spam and anti-bot protection - gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' + gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails' # rubocop:todo Gemfile/MissingFeatureCategory