From nobody Sun May 28 17:04:48 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 4QTlQ91Hl0z4Xd9S; Sun, 28 May 2023 17:04:49 +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 4QTlQ90vmQz3hRk; Sun, 28 May 2023 17:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685293489; 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=ZGoR26c93AwLjO+/saUX+NvkQt7BBgv39l5cgPxFqkw=; b=gyWyXSkztBfZWvQu6mDQO1JXnUQeqBhZsQiQjV9zUHDFRowXzKQu7RCGpR52evIljnT7Ix qB76NtCtEScTmwUhsfM/9vIApO+orGrifJxYl8wwUBV/vmfluBeN2heu8a91JcAo4Jxi5X o43iwwNTU+4HEm8kD5OoDvHSSsqXhukyv1I7XJu3ABcMXvnAWlHbfVbYRstT5RupX8jWYG MG1pLwXb+736HTZaH08ZDatY1LLpa8ubmATTTXgY86vuk7s9nEyuO2dmJYU7GM8jvVl6+E S5RpUmKfF5kXUQTVoBMRPB6K79aRegOwG5oUoXDglZpT3q8Kp6Cir9rv3LFGew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685293489; 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=ZGoR26c93AwLjO+/saUX+NvkQt7BBgv39l5cgPxFqkw=; b=x9OCU1mA8E7NCdGo/PeNjrJP7beb5UN0SMNOUGj/Jkr65+kybcIVr8BAH2sZL/UudCkMZS t1y6Va/DOMh7mS2h5S1GADyTEFevlZA3RaASIQxt2zZiQJVUBN2BktFSdk06T2hvO12/jj F2oDhuMSplc772BoG3Os/5Gls2kJaaEInJGg/eSXGkko+YLU9YcRHuh4qitGW7HCBCmiYP b5U7m7EdIUvqTcICn1yWKQkuQx8Fp4fLiECpMPvUIUYp+aBGBffpzFxLHL5RlRzPlriDbM G71vJljfx1hRCkfcR9n38gz++zxoDx9sLIIB2JxiXRZzg+aCNIWCmaPatfWuFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685293489; a=rsa-sha256; cv=none; b=xMLzDyeQCdRwMhdEMaCjBJ8zQH4YmDuLj46XYXOCK7SdvfQQc2PNt1NQ3N4uoTT9mBaRmb SsEMMvSC//eJpDw/ft1AU6IASRSMjDd/79ydNkA7D6YAQRRmlZ/PCp208pe60Jg90lpQ8x rFDRRaAChgk68yBhvP43BG2qqU8VhJ6eSHNlAMytVLSvzFtWOnJvnikefcDrA54GZf44/R mxSAYeGUQBD8NCAGb7J9M2pycJgykTzi/nEkyDrI2OJtbNgLKxSzGMizUhH17adv3CLG3N twCG8Q761xHZVdxXF0gT1gUF7WD/QrB5j1k0LXgXpqMSGoywv6/kfI77NbZyAw== 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 4QTlQ86wVYzdLB; Sun, 28 May 2023 17:04:48 +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 34SH4mg9064405; Sun, 28 May 2023 17:04:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34SH4mps064404; Sun, 28 May 2023 17:04:48 GMT (envelope-from git) Date: Sun, 28 May 2023 17:04:48 GMT Message-Id: <202305281704.34SH4mps064404@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: 62db6915cf9a - main - www/gitlab-ce: major upgrade to 16.0.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: 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: 62db6915cf9a609c50f053bd2f0a714dab43c954 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=62db6915cf9a609c50f053bd2f0a714dab43c954 commit 62db6915cf9a609c50f053bd2f0a714dab43c954 Author: Matthias Fechner AuthorDate: 2023-05-28 07:12:43 +0000 Commit: Matthias Fechner CommitDate: 2023-05-28 17:03:49 +0000 www/gitlab-ce: major upgrade to 16.0.0 Changelog: https://about.gitlab.com/releases/2023/05/22/gitlab-16-0-released/ --- www/gitlab-ce/Makefile | 45 ++++++++++----------- www/gitlab-ce/distinfo | 6 +-- www/gitlab-ce/files/gitlab.in | 13 +----- www/gitlab-ce/files/patch-Gemfile | 47 +++++++++------------- .../files/patch-config_database.yml.postgresql | 31 +++++++------- .../files/patch-config_gitlab.yml.example | 14 +++---- .../files/patch-config_initializers_1__settings.rb | 4 +- www/gitlab-ce/files/patch-config_puma.rb.example | 6 +-- 8 files changed, 73 insertions(+), 93 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 59ca72208a5c..a8145aa854bc 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,6 +1,5 @@ PORTNAME= gitlab-ce -PORTVERSION= 15.11.3 -PORTREVISION= 4 +PORTVERSION= 16.0.0 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -19,11 +18,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # mail/rubygem-net-pop is required as ruby 3.1 removed it MY_DEPENDS= git>=2.39.2:devel/git \ gitaly>=${PORTVERSION}:devel/gitaly \ - gitlab-elasticsearch-indexer>=4.3.0:textproc/gitlab-elasticsearch-indexer \ - gitlab-agent>=15.11.0:net/gitlab-agent \ + gitlab-elasticsearch-indexer>=4.3.1:textproc/gitlab-elasticsearch-indexer \ + gitlab-agent>=16.0.1:net/gitlab-agent \ gitlab-metrics-exporter>0:devel/gitlab-metrics-exporter \ gitlab-pages>=${PORTVERSION}:www/gitlab-pages \ - gitlab-shell>=14.18.0:devel/gitlab-shell \ + gitlab-shell>=14.20.0:devel/gitlab-shell \ gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \ redis>=6.2.11:databases/redis \ yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \ @@ -34,12 +33,13 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \ rubygem-rails61>=6.1.7.2<6.1.8:www/rubygem-rails61 \ rubygem-bootsnap>=1.16.0<1.17:devel/rubygem-bootsnap \ - rubygem-openssl2>=2.2.2<2.3:security/rubygem-openssl2 \ + rubygem-openssl>=3.0<4:security/rubygem-openssl \ rubygem-ipaddr>=1.2.5<1.3:net/rubygem-ipaddr \ rubygem-responders-rails61>=3.0<4.0:www/rubygem-responders-rails61 \ rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \ - rubygem-view_component-rails61>=2.74.1<2.75:devel/rubygem-view_component-rails61 \ - rubygem-pg14>=1.4.5<1.5:databases/rubygem-pg14 \ + rubygem-view_component-rails61>=2.82.0<2.83:devel/rubygem-view_component-rails61 \ + rubygem-pg>=1.5.3<1.6:databases/rubygem-pg \ + rubygem-neighbor>=0.2.3<0.3:databases/rubygem-neighbor \ rubygem-rugged>=1.5<2:devel/rubygem-rugged \ rubygem-grape-path-helpers>=1.7.1<1.8:devel/rubygem-grape-path-helpers \ rubygem-faraday1>=1.10.0<3:www/rubygem-faraday1 \ @@ -48,20 +48,19 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-devise-rails61>=4.8.1<4.9:devel/rubygem-devise-rails61 \ rubygem-bcrypt>=3.1.14<3.2:security/rubygem-bcrypt \ rubygem-doorkeeper>=5.6.6<6:security/rubygem-doorkeeper \ - rubygem-doorkeeper-openid_connect>=1.8.5<2:security/rubygem-doorkeeper-openid_connect \ + rubygem-doorkeeper-openid_connect>=1.8.6<2:security/rubygem-doorkeeper-openid_connect \ rubygem-rexml>=3.2.5<3.3:textproc/rubygem-rexml \ rubygem-ruby-saml>=1.13.0<1.14:security/rubygem-ruby-saml \ rubygem-omniauth>=2.1.0<3:security/rubygem-omniauth \ rubygem-omniauth-auth0>=3.1.0<3.2.0:net/rubygem-omniauth-auth0 \ rubygem-omniauth-azure-activedirectory-v2>=2.0<3:net/rubygem-omniauth-azure-activedirectory-v2 \ - rubygem-omniauth-cas3-oauth2>=1.1.4<1.2.0:security/rubygem-omniauth-cas3-oauth2 \ rubygem-omniauth-dingtalk-oauth2>=1.0.1<2:security/rubygem-omniauth-dingtalk-oauth2 \ rubygem-omniauth-alicloud>=2.0.1<2.1:security/rubygem-omniauth-alicloud \ rubygem-omniauth-facebook>=4.0.0:net/rubygem-omniauth-facebook \ rubygem-omniauth-github>=2.0.1<2.1:net/rubygem-omniauth-github \ rubygem-omniauth-google-oauth2>=1.1<2:net/rubygem-omniauth-google-oauth2 \ rubygem-omniauth-oauth2-generic>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic \ - rubygem-omniauth-saml>=2.0.0<3:security/rubygem-omniauth-saml \ + rubygem-omniauth-saml>=2.1.0<3:security/rubygem-omniauth-saml \ rubygem-omniauth-twitter>=1.4<2.0:net/rubygem-omniauth-twitter \ rubygem-omniauth_openid_connect>=0.6.1<0.7.0:net/rubygem-omniauth_openid_connect \ rubygem-openid_connect>=1.3.1<1.3.2:net/rubygem-openid_connect \ @@ -74,7 +73,6 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-invisible_captcha>=2.0.0<2.1.0:graphics/rubygem-invisible_captcha \ rubygem-devise-two-factor-rails61>=4.0.2<4.1:security/rubygem-devise-two-factor-rails61 \ rubygem-rqrcode-rails3>=0.1.7<0.2.0:www/rubygem-rqrcode-rails3 \ - rubygem-u2f0>=0.2.1<0.3.0:net/rubygem-u2f0 \ rubygem-validates_hostname>=1.0.11<1.1.0:dns/rubygem-validates_hostname \ rubygem-rubyzip>=2.3.2<2.4:archivers/rubygem-rubyzip \ rubygem-acme-client>=2.0.9<3:security/rubygem-acme-client \ @@ -120,9 +118,9 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-elasticsearch-model713>=7.2<8:textproc/rubygem-elasticsearch-model713 \ rubygem-elasticsearch-rails>=7.2<8:textproc/rubygem-elasticsearch-rails \ rubygem-elasticsearch-api713>=7.13.3<7.13.4:textproc/rubygem-elasticsearch-api713 \ - rubygem-aws-sdk-core3171>=3.171.0<3.172:devel/rubygem-aws-sdk-core3171 \ + rubygem-aws-sdk-core>=3.172.0<3.173:devel/rubygem-aws-sdk-core \ rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \ - rubygem-aws-sdk-s31121>=1.121.0<1.122:devel/rubygem-aws-sdk-s31121 \ + rubygem-aws-sdk-s3>=1.122.0<1.123:devel/rubygem-aws-sdk-s3 \ rubygem-faraday_middleware-aws-sigv403>=0.3.0<0.4:devel/rubygem-faraday_middleware-aws-sigv403 \ rubygem-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \ rubygem-html-pipeline>=2.14.3<2.15:textproc/rubygem-html-pipeline \ @@ -145,7 +143,7 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-icalendar>=0:devel/rubygem-icalendar \ rubygem-diffy>=3.4<4:textproc/rubygem-diffy \ rubygem-diff_match_patch>=0.1.0<0.2.0:textproc/rubygem-diff_match_patch \ - rubygem-rack22>=2.2.6.4<2.3,3:www/rubygem-rack22 \ + rubygem-rack227>=2.2.7<2.3:www/rubygem-rack227 \ rubygem-rack-timeout>=0.6.3<0.7:www/rubygem-rack-timeout \ rubygem-puma>=5.6.5<5.7:www/rubygem-puma \ rubygem-puma_worker_killer>=0.3.1:www/rubygem-puma_worker_killer \ @@ -159,7 +157,6 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-httparty020>=0.20.0<0.21:www/rubygem-httparty020 \ rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \ rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \ - rubygem-settingslogic>=2.0.9<2.1.0:devel/rubygem-settingslogic \ rubygem-re2>=1.6.0<1.7.0:devel/rubygem-re2 \ rubygem-semver_dialects>=1.2.1<1.3:devel/rubygem-semver_dialects \ rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \ @@ -177,9 +174,10 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-ruby-fogbugz>=0.3.0<0.4.0:devel/rubygem-ruby-fogbugz \ rubygem-kubeclient>=4.11.0<4.12.0:www/rubygem-kubeclient \ rubygem-ruby-openai37>=3.7<4:www/rubygem-ruby-openai37 \ + rubygem-circuitbox>=2.0.0<2.1:www/rubygem-circuitbox \ rubygem-sanitize>=6.0<7:textproc/rubygem-sanitize \ rubygem-babosa>=1.0.4<1.1.0:textproc/rubygem-babosa \ - rubygem-loofah220>=2.20.0<2.21:textproc/rubygem-loofah220 \ + rubygem-loofah>=2.21.0<2.22:textproc/rubygem-loofah \ rubygem-licensee>=9.15<10:devel/rubygem-licensee \ rubygem-charlock_holmes>=0.7.7<0.8.0:textproc/rubygem-charlock_holmes \ rubygem-ruby-magic>=0.6<1:devel/rubygem-ruby-magic \ @@ -203,7 +201,7 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-sentry-sidekiq>=5.8.0<5.9:devel/rubygem-sentry-sidekiq \ rubygem-pg_query>=2.2.1<3:databases/rubygem-pg_query \ rubygem-premailer-rails-rails61>=1.10.3<1.11:mail/rubygem-premailer-rails-rails61 \ - rubygem-gitlab-labkit>=0.31.1<0.32:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.32.0<0.33:devel/rubygem-gitlab-labkit \ rubygem-thrift>=0.16.0:devel/rubygem-thrift \ rubygem-ruby_parser>=3.20<4.0:devel/rubygem-ruby_parser \ rubygem-rails-i18n-rails61>=7.0<8:devel/rubygem-rails-i18n-rails61 \ @@ -214,15 +212,15 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-peek-rails61>=1.1.0<2.0:devel/rubygem-peek-rails61 \ rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \ rubygem-webrick>=1.8.1<1.9:www/rubygem-webrick \ - rubygem-prometheus-client-mmap>=0.19<1:devel/rubygem-prometheus-client-mmap \ + rubygem-prometheus-client-mmap>=0.23<1:devel/rubygem-prometheus-client-mmap \ rubygem-warning>=1.3.0<1.4:devel/rubygem-warning \ rubygem-license_finder>=7.0.0<8:devel/rubygem-license_finder \ - rubygem-gitlab-dangerfiles>=3.9.0<3.10:devel/rubygem-gitlab-dangerfiles \ + rubygem-gitlab-dangerfiles>=3.10.0<3.11:devel/rubygem-gitlab-dangerfiles \ rubygem-octokit5>=4.20<6.0:net/rubygem-octokit5 \ rubygem-gitlab-mail_room>=0.0.23<0.1.0:mail/rubygem-gitlab-mail_room \ rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \ rubygem-html2text>=0:textproc/rubygem-html2text \ - rubygem-stackprof>=0.2.23<0.3:devel/rubygem-stackprof \ + rubygem-stackprof>=0.2.25<0.3:devel/rubygem-stackprof \ rubygem-rbtrace>=0.4.14<1.0:devel/rubygem-rbtrace \ rubygem-memory_profiler>=1.0<2.0:devel/rubygem-memory_profiler \ rubygem-benchmark-memory>=0.1<1.0:benchmarks/rubygem-benchmark-memory \ @@ -235,7 +233,7 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \ rubygem-spamcheck>=1.3.0<1.4:net/rubygem-spamcheck \ rubygem-gitaly>=15.9.0.pre.rc3<15.10.0:net/rubygem-gitaly \ - rubygem-kas-grpc>=0.0.2,1<0.0.3,1:net/rubygem-kas-grpc \ + rubygem-kas-grpc>=0.1.0,1<0.2.0,1:net/rubygem-kas-grpc \ rubygem-grpc>=1.42.0<2:net/rubygem-grpc \ rubygem-google-protobuf322>=3.22.3<4:devel/rubygem-google-protobuf322 \ rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \ @@ -266,6 +264,7 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-parser>=0:devel/rubygem-parser \ rubygem-cvss-suite>=3.0.1<3.1:security/rubygem-cvss-suite \ rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \ + rubygem-devfile>=0.0.17.p.a1<0.0.18:net/rubygem-devfile \ rubygem-CFPropertyList>=3.0.0<3.1:devel/rubygem-CFPropertyList \ rubygem-app_store_connect>=0:net/rubygem-app_store_connect \ rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \ @@ -291,7 +290,7 @@ USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT= 332cca52b7eceafe5626d2f7ac0e3c58bfa528e1 +GL_COMMIT= 917d3f7ad12438a8ec7177d32114073ec479998a USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 080cb83ddb7f..525eaffaaff2 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1683982072 -SHA256 (gitlab-org-gitlab-foss-332cca52b7eceafe5626d2f7ac0e3c58bfa528e1_GL0.tar.gz) = 951cbc5b3edbf42975c3355902f3d348c3faafe405266b9c1c1ca49989d127f7 -SIZE (gitlab-org-gitlab-foss-332cca52b7eceafe5626d2f7ac0e3c58bfa528e1_GL0.tar.gz) = 102158349 +TIMESTAMP = 1684513035 +SHA256 (gitlab-org-gitlab-foss-917d3f7ad12438a8ec7177d32114073ec479998a_GL0.tar.gz) = a06b905e9fe9575ee049223c149ac20d7bd75e95dd0efea66ee43f24c9692363 +SIZE (gitlab-org-gitlab-foss-917d3f7ad12438a8ec7177d32114073ec479998a_GL0.tar.gz) = 101229788 diff --git a/www/gitlab-ce/files/gitlab.in b/www/gitlab-ce/files/gitlab.in index e517add8901b..1783a33acda9 100644 --- a/www/gitlab-ce/files/gitlab.in +++ b/www/gitlab-ce/files/gitlab.in @@ -98,12 +98,7 @@ gitaly_enabled=true gitaly_dir="%%PREFIX%%/share/gitaly" gitaly_pid_path="$pid_path/gitaly.pid" gitaly_log="$app_root/log/gitaly.log" - -if [ -z "$SIDEKIQ_WORKERS" ]; then - sidekiq_pid_path="$pid_path/sidekiq.pid" -else - sidekiq_pid_path="$pid_path/sidekiq-cluster.pid" -fi +sidekiq_pid_path="$pid_path/sidekiq-cluster.pid" ### Init Script functions ## Gets the pids from the files @@ -204,12 +199,6 @@ gitlab_init(){ exit 1 fi chown git "${app_root}"/Gemfile.lock - # echo "Regenerate Gitaly Gemfile.lock" - rm -f "${gitaly_dir}"/ruby/Gemfile.lock - if ! su -l root -c "cd ${gitaly_dir}/ruby && %%LOCALBASE%%/bin/bundle install --local --quiet"; then - echo "Could not create Gemfile.lock for gitaly, please report this using FreeBSD Bugtracker, https://bugs.freebsd.org/" - exit 1 - fi eval su - "$app_user" -c $(echo \")%%LOCALBASE%%/etc/rc.d/gitlab "${service_args}"$(echo \"); exit; fi diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index f2e5f409a3d3..c754348f488d 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,15 +1,6 @@ ---- Gemfile.orig 2023-05-10 10:38:54 UTC +--- Gemfile.orig 2023-05-18 16:48:55 UTC +++ Gemfile -@@ -19,7 +19,7 @@ gem 'bootsnap', '~> 1.16.0', require: false - - # Pin openssl to match the version bundled with our supported Rubies. - # See https://stdgems.org/openssl/#gem-version. --gem 'openssl', '2.2.2' -+gem 'openssl', '~> 2.2.2' - gem 'ipaddr', '~> 1.2.5' - - # Responders respond_to and respond_with -@@ -35,7 +35,7 @@ gem 'pg', '~> 1.4.6' +@@ -35,7 +35,7 @@ gem 'neighbor', '~> 0.2.3' gem 'rugged', '~> 1.5' gem 'grape-path-helpers', '~> 1.7.1' @@ -18,8 +9,8 @@ gem 'marginalia', '~> 1.11.1' # Authorization -@@ -56,18 +56,18 @@ gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor - gem 'omniauth-cas3', '~> 1.1.4', path: 'vendor/gems/omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md +@@ -55,8 +55,8 @@ gem 'omniauth-azure-activedirectory-v2', '~> 2.0' + gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md gem 'omniauth-dingtalk-oauth2', '~> 1.0' gem 'omniauth-alicloud', '~> 2.0.1' -gem 'omniauth-facebook', '~> 4.0.0' @@ -29,10 +20,7 @@ gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md gem 'omniauth-google-oauth2', '~> 1.1' gem 'omniauth-oauth2-generic', '~> 0.2.2' --gem 'omniauth-saml', '~> 2.0.0' -+gem 'omniauth-saml', '~> 2.0' - gem 'omniauth-twitter', '~> 1.4' - gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md +@@ -66,7 +66,7 @@ gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/o gem 'omniauth_openid_connect', '~> 0.6.1' # Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem. # See https://docs.gitlab.com/ee/development/emails.html#rationale. @@ -41,7 +29,7 @@ gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md gem 'omniauth-atlassian-oauth2', '~> 0.2.0' gem 'rack-oauth2', '~> 1.21.3' -@@ -153,7 +153,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.7.0', require: 'fog/a +@@ -151,7 +151,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.7.0', require: 'fog/a # for Google storage gem 'google-cloud-storage', '~> 1.44.0' @@ -50,7 +38,7 @@ gem 'google-apis-compute_v1', '~> 0.57.0' gem 'google-apis-container_v1', '~> 0.43.0' gem 'google-apis-container_v1beta1', '~> 0.43.0' -@@ -279,7 +279,7 @@ gem 'slack-messenger', '~> 2.3.4' +@@ -274,7 +274,7 @@ gem 'slack-messenger', '~> 2.3.4' gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat' # Asana integration @@ -59,20 +47,20 @@ # FogBugz integration gem 'ruby-fogbugz', '~> 0.3.0' -@@ -371,114 +371,17 @@ gem 'prometheus-client-mmap', '~> 0.19', require: 'pro +@@ -367,115 +367,17 @@ gem 'prometheus-client-mmap', '~> 0.23', require: 'pro gem 'warning', '~> 1.3.0' -group :development do -- gem 'lefthook', '~> 1.3.10', require: false +- gem 'lefthook', '~> 1.3.13', require: false - gem 'rubocop' - gem 'solargraph', '~> 0.47.2', require: false - - gem 'letter_opener_web', '~> 2.0.0' -- gem 'lookbook', '~> 1.5', '>= 1.5.3' +- gem 'lookbook', '~> 2.0', '>= 2.0.1' - - # Better errors handler -- gem 'better_errors', '~> 2.9.1' +- gem 'better_errors', '~> 2.10.0' - - gem 'sprite-factory', '~> 1.7' - @@ -127,7 +115,7 @@ -end - group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.9.0', require: false + gem 'gitlab-dangerfiles', '~> 3.10.0', require: false end -group :development, :test, :coverage do @@ -152,7 +140,8 @@ - gem 'capybara', '~> 3.39' - gem 'capybara-screenshot', '~> 1.0.26' -- gem 'selenium-webdriver', '~> 3.142', '>= 3.142.7' +- # 4.9.1 drops Ruby 2.7 support. We can upgrade further after we drop Ruby 2.7 support. +- gem 'selenium-webdriver', '= 4.9.0' - - gem 'graphlyte', '~> 1.0.0' - @@ -175,9 +164,9 @@ gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room' gem 'email_reply_trimmer', '~> 0.1' -@@ -514,14 +417,14 @@ gem 'gitaly', '~> 15.9.0-rc3' +@@ -511,14 +413,14 @@ gem 'gitaly', '~> 15.9.0-rc3' # KAS GRPC protocol definitions - gem 'kas-grpc', '~> 0.0.2' + gem 'kas-grpc', '~> 0.1.0' -gem 'grpc', '~> 1.42.0' +gem 'grpc', '~> 1.42' @@ -192,7 +181,7 @@ gem 'flipper-active_record', '~> 0.25.0' gem 'flipper-active_support_cache_store', '~> 0.25.0' gem 'unleash', '~> 3.2.2' -@@ -535,7 +438,7 @@ gem 'grape_logging', '~> 1.8' +@@ -532,7 +434,7 @@ gem 'grape_logging', '~> 1.8' gem 'gitlab-net-dns', '~> 0.9.2' # Countries list @@ -201,7 +190,7 @@ gem 'retriable', '~> 3.1.2' -@@ -582,6 +485,11 @@ gem 'ed25519', '~> 1.3.0' +@@ -579,6 +481,11 @@ gem 'ed25519', '~> 1.3.0' # Error Tracking OpenAPI client # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature gem 'error_tracking_open_api', path: 'vendor/gems/error_tracking_open_api' diff --git a/www/gitlab-ce/files/patch-config_database.yml.postgresql b/www/gitlab-ce/files/patch-config_database.yml.postgresql index 25d933f3d56c..775a4dd2ff27 100644 --- a/www/gitlab-ce/files/patch-config_database.yml.postgresql +++ b/www/gitlab-ce/files/patch-config_database.yml.postgresql @@ -1,9 +1,9 @@ ---- config/database.yml.postgresql.orig 2023-02-21 16:38:51 UTC +--- config/database.yml.postgresql.orig 2023-05-18 16:48:55 UTC +++ config/database.yml.postgresql @@ -26,13 +26,6 @@ production: - # username: git - # password: "secure password" - # host: localhost + username: git + password: "secure password" + host: localhost - geo: - adapter: postgresql - encoding: unicode @@ -15,9 +15,9 @@ # # Development specific @@ -57,13 +50,6 @@ development: - # host: localhost - # variables: - # statement_timeout: 15s + host: localhost + variables: + statement_timeout: 15s - geo: - adapter: postgresql - encoding: unicode @@ -29,9 +29,9 @@ # # Staging specific @@ -84,13 +70,6 @@ staging: - # username: git - # password: "secure password" - # host: localhost + username: git + password: "secure password" + host: localhost - geo: - adapter: postgresql - encoding: unicode @@ -42,10 +42,10 @@ # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". -@@ -117,10 +96,3 @@ test: &test - # prepared_statements: false - # variables: - # statement_timeout: 15s +@@ -117,13 +96,6 @@ test: &test + prepared_statements: false + variables: + statement_timeout: 15s - geo: - adapter: postgresql - encoding: unicode @@ -53,3 +53,6 @@ - username: postgres - password: - host: localhost + embedding: + adapter: postgresql + encoding: unicode diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index 2c4a43dcf25f..da5cd9176063 100644 --- a/www/gitlab-ce/files/patch-config_gitlab.yml.example +++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example @@ -1,6 +1,6 @@ ---- config/gitlab.yml.example.orig 2023-04-05 16:11:51 UTC +--- config/gitlab.yml.example.orig 2023-05-18 16:48:55 UTC +++ config/gitlab.yml.example -@@ -1204,14 +1204,14 @@ production: &base +@@ -1192,14 +1192,14 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -18,7 +18,7 @@ # archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600) # keep_time: 604800 # default: 0 (forever) (in seconds) # pg_schema: public # default: nil, it means that all schemas will be backed up -@@ -1246,12 +1246,12 @@ production: &base +@@ -1234,12 +1234,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -34,7 +34,7 @@ # Git over HTTP upload_pack: true -@@ -1266,13 +1266,13 @@ production: &base +@@ -1254,13 +1254,13 @@ production: &base workhorse: # File that contains the secret key for verifying access for gitlab-workhorse. # Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app). @@ -50,7 +50,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1290,13 +1290,13 @@ production: &base +@@ -1278,13 +1278,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -66,7 +66,7 @@ ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1317,18 +1317,18 @@ production: &base +@@ -1305,18 +1305,18 @@ production: &base # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq. sidekiq_exporter: @@ -92,7 +92,7 @@ # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. web_exporter: -@@ -1553,13 +1553,13 @@ test: +@@ -1541,13 +1541,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: diff --git a/www/gitlab-ce/files/patch-config_initializers_1__settings.rb b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb index 39479e99c34a..21f09d5a97e4 100644 --- a/www/gitlab-ce/files/patch-config_initializers_1__settings.rb +++ b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb @@ -1,6 +1,6 @@ ---- config/initializers/1_settings.rb.orig 2023-04-05 16:11:51 UTC +--- config/initializers/1_settings.rb.orig 2023-05-18 16:48:55 UTC +++ config/initializers/1_settings.rb -@@ -209,11 +209,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi +@@ -203,11 +203,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi Settings.gitlab['user'] ||= 'git' # External configuration may cause the ssh user to differ from the GitLab user Settings.gitlab['ssh_user'] ||= Settings.gitlab.user diff --git a/www/gitlab-ce/files/patch-config_puma.rb.example b/www/gitlab-ce/files/patch-config_puma.rb.example index 54d27a5b7c80..f96f8dd8abae 100644 --- a/www/gitlab-ce/files/patch-config_puma.rb.example +++ b/www/gitlab-ce/files/patch-config_puma.rb.example @@ -1,4 +1,4 @@ ---- config/puma.rb.example.orig 2022-11-21 09:46:38 UTC +--- config/puma.rb.example.orig 2023-05-18 16:48:55 UTC +++ config/puma.rb.example @@ -5,11 +5,11 @@ # The default is "config.ru". @@ -32,8 +32,8 @@ on_restart do # Signal application hooks that we're about to restart -@@ -81,7 +81,7 @@ wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LES - nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true' +@@ -85,7 +85,7 @@ if Gem::Version.new(Puma::Const::PUMA_VERSION).canonic + end # Use json formatter -require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"