From nobody Tue May 31 15:50:00 2022 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 915201B65CF0; Tue, 31 May 2022 15:50:00 +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 4LCGtw3d3Gz4dpb; Tue, 31 May 2022 15:50:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654012200; 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=F1qJ7UKL9VHcjF5cOuemS1OykbMxZmaFb0COrY+WQ54=; b=Pm/oGmg7pvsBOgX8tzlr6GH1Ir5uvy8qwsUrSQChWiCPgotolEEmD7ac+XyvUsr4qCMF9r C+wlvpqzDg7cPyMtqvFZ7stsfbNipZvhASrqi81L6fXFO8TggPhHY4B/MhIwdhtLFWsOM1 8ARwijxdGcN/iS4crAwV/kpzcqBiemfVhjDjkFiyECAMGHajOB+Vd80DBh5i1sJR6qye26 FzrrOZhwS/633NlXa8mLz9pc8bNq0fPBlPeSAFuMB8KOrKi6y7A228dLjcf1cqJmKdENP/ VOk15mstFJLXQelm+Kncmvhpc0EusICb6z4MAFyvxG7ewup8bMdwtfCRQKk6Kw== 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 5843C66BF; Tue, 31 May 2022 15:50:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24VFo0N3002689; Tue, 31 May 2022 15:50:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24VFo0CI002674; Tue, 31 May 2022 15:50:00 GMT (envelope-from git) Date: Tue, 31 May 2022 15:50:00 GMT Message-Id: <202205311550.24VFo0CI002674@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: e6e83842d974 - main - www/gitlab-ce: added possibility to disabled 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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6e83842d9749824da4e2da42f13b89883e73858 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654012200; 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=F1qJ7UKL9VHcjF5cOuemS1OykbMxZmaFb0COrY+WQ54=; b=fK5go642hoenG7SgRA3cjQGYrfEUKTAKvwCvLq2ovpYx5F6K+Vz1XCofxVlL+pNS7gOI5F 8ydCBdkgkdNJil4o+/UbPqV7f2bQneXIhs7xneJ3BBNcDrhtBT8X4/72tPpJFohLZ/xZuY YMvYbYMcr3nsYArmyjaKgnAHmk8nZfO42h93cU+1ks60IK92BDy+UkclfELJqe7tV+L1fb 5nfez0xA+SNVESF8woqHymtCETVDXIeRoIA0ncAdmL3MErJWGdcBCjHQLKud5+jppTuQim DxfGdqlHp9K+upr9dRyZN5FkYldLk0QxgA/vYx5pZLVMGQkvklZ74xlG7AKLOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654012200; a=rsa-sha256; cv=none; b=MTfNX7HZee41lOLVLEOeLD+pw2MIZksdO5CCCTJYbiEFbXeL6k2PHbf5lLdF6xMqriV4G5 r7+owue7OdbfnaG8B8P3KKg6tFfTajx8DnRSkzN3OMVKSFOa2cmYtTqwzzzKFeqmRvJjCL I0iKpxdUkZLHPPM7q+njqdjImYpIVWhIdE/K70wib0mweQBckNui9WRT8lbXYAY+K2NViS Cpddhmt8DQJgT380odN5dwc8PD3hmgkY98fDXVne1o/KK9aZNSXPa0mrG0/W+Wj5Vu+YbJ OJWevQdaW7P3YzYXKM/glM2WFFZMRYCtoZe+lEDLZz1FDN+lmg1FSxSjucIxSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=e6e83842d9749824da4e2da42f13b89883e73858 commit e6e83842d9749824da4e2da42f13b89883e73858 Author: VVD AuthorDate: 2022-05-31 15:43:06 +0000 Commit: Matthias Fechner 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'