From nobody Mon Nov 07 15:42:08 2022 X-Original-To: dev-commits-ports-all@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 4N5b813HG1z4hGMJ; Mon, 7 Nov 2022 15:42:09 +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 4N5b811Qd9z3jH0; Mon, 7 Nov 2022 15:42:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667835729; 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=1YsiyreKjegSOFSZ2QlPOkporkq5KhywNVtCFsEjZNA=; b=t/yn0y6tReea7w6PI3bZfbLqU7ccFkx0RtTiBm9gS7kXlHs8PnPnGdr9N6YvwLc6+ifOvB LLZS6vmbCkiWFxZMNVgegb0ctKmcBJf0+OUmeWDk9J29T2DdTHQa+w0ndudxbc6PnZ6PSP 03T23wtSfYLvQzlmLLW+gvNwFfyJbpQY6xh7a3XnQRDyCa7FkPXDKncsORA5EcB657WDuE LFo3abQRNjdpKQUam7WeVeeAz0eNXpKIWNTMdo25HR5w2C0p3S1I8EPJofcZRgU/Juh7gm +RGUSChW1Li/GZgipvHpwccryLAv/gC7gNK5UdAZXKeSGt6PWzjtGmsnrQQwqA== 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 4N5b80424Mz16Cx; Mon, 7 Nov 2022 15:42:08 +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 2A7Fg86W066587; Mon, 7 Nov 2022 15:42:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A7Fg8BV066586; Mon, 7 Nov 2022 15:42:08 GMT (envelope-from git) Date: Mon, 7 Nov 2022 15:42:08 GMT Message-Id: <202211071542.2A7Fg8BV066586@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: 31523ef38156 - main - www/gitlab-ce: Major upgrade to 15.4.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 31523ef381563b463919675f4dc3a7d62a381f94 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667835729; 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=1YsiyreKjegSOFSZ2QlPOkporkq5KhywNVtCFsEjZNA=; b=ENDWVAq5cY8vkf3tbIpk0Wk7SZUE2JfoIzaujjp7gLJjFOQuxa10gk33pglzRy0SGhQiHB RQLbUZl4za4RgLictHssd8xpe6mwKhd3lHOf+eyLNKOlwtoVuSVqZWs0jCPaewonPg4WqV SMSVSSZemoeuEkmEYAQBAGah5mIqeZWpTzHRBGYW3xZxcRovFO427VAtxZLsuGOUd1pIT4 xpgj0t86wLz1GPT34dpVv2oP1NqLILxsn8+tI9DkGuKZKS2F3uZuT2rCZzbhId17dBsHjw Mxyyh6vY54S9WRr5FZ9PSR0ybZUlQ7RczulA7yGA/ablZGIOs9o6hgX6h0vRAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667835729; a=rsa-sha256; cv=none; b=DUIBO5RwLEoT5ygB5PxNpJzVIrEZUn4A6idOr/RM8txJ0R73IMMAlPjq24pUGXE6PoXlnC SzNR1/mmc3EXnhasoXqAjmu+1bcLMzBvN6HB1F/Y7RIdjbjYMhtc6RjPggOXp4XkZ/0neo iZjI422lhfnkOqiku07pNg0Ab1nALBc2cBIXt96AyFrM8cMUbUbeHa/+nWpDXhE6DFICeJ DD0oj6Ujh8Zor8yh/L57efeT6O3M4CRBPGr14ZyBJ4RMDTdG6Z45IxRtgJ9JhuY+NLcjyg JY8TBhHYSMjvBzHJMofx2v7FhrHoPGN7R7bcjzsWN0MKPMadgyA2bfFJgCE0yQ== 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=31523ef381563b463919675f4dc3a7d62a381f94 commit 31523ef381563b463919675f4dc3a7d62a381f94 Author: Matthias Fechner AuthorDate: 2022-10-20 15:37:46 +0000 Commit: Matthias Fechner CommitDate: 2022-11-07 15:41:49 +0000 www/gitlab-ce: Major upgrade to 15.4.2 Changelog: https://about.gitlab.com/releases/2022/09/22/gitlab-15-4-released/ https://about.gitlab.com/releases/2022/09/29/security-release-gitlab-15-4-1-released/ https://about.gitlab.com/releases/2022/09/29/security-release-gitlab-15-4-1-released/ --- www/gitlab-ce/Makefile | 53 ++++++------- www/gitlab-ce/distinfo | 6 +- www/gitlab-ce/files/patch-Gemfile | 91 ++++++++-------------- .../files/patch-config_gitlab.yml.example | 14 ++-- .../files/patch-config_initializers_1__settings.rb | 4 +- ..._gems_bundler-checksum_bundler-checksum.gemspec | 11 +++ ...vendor_gems_omniauth-cas3_omniauth-cas3.gemspec | 11 --- ...or_gems_omniauth-gitlab_omniauth-gitlab.gemspec | 8 +- ...th-google-oauth2_omniauth-google-oauth2.gemspec | 11 +++ ...or_gems_omniauth__crowd_omniauth__crowd.gemspec | 11 --- www/gitlab-ce/pkg-message | 4 +- 11 files changed, 97 insertions(+), 127 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 190c23998c24..39af76ded4e6 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitlab-ce -PORTVERSION= 15.3.4 -PORTREVISION= 1 +PORTVERSION= 15.4.2 +PORTREVISION= 0 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # see https://gitlab.com/gitlab-org/gitlab/-/issues/350866 MY_DEPENDS= git>=2.32.0:devel/git \ gitaly>=${PORTVERSION}:devel/gitaly \ - gitlab-elasticsearch-indexer>=3.0.1:textproc/gitlab-elasticsearch-indexer \ + gitlab-elasticsearch-indexer>=3.0.2:textproc/gitlab-elasticsearch-indexer \ gitlab-agent>=15.2.0:net/gitlab-agent \ gitlab-metrics-exporter>0:devel/gitlab-metrics-exporter \ gitlab-pages>=1.61.0:www/gitlab-pages \ @@ -30,7 +30,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-bootsnap112>=1.12.0<1.13:devel/rubygem-bootsnap112 \ 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.61.0<2.70:devel/rubygem-view_component-rails61 \ + rubygem-view_component-rails61>=2.71.0<2.72:devel/rubygem-view_component-rails61 \ rubygem-default_value_for>=3.4.0<3.5.0:devel/rubygem-default_value_for \ rubygem-pg>=1.4.0<1.5:databases/rubygem-pg \ rubygem-rugged>=1.2<2:devel/rubygem-rugged \ @@ -38,29 +38,27 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-faraday1>=1.10.0<2:www/rubygem-faraday1 \ rubygem-marginalia>=1.10.0<1.11:databases/rubygem-marginalia \ rubygem-declarative_policy>=1.1.0<1.2:security/rubygem-declarative_policy \ - rubygem-devise-rails61>=4.7.2<4.9:devel/rubygem-devise-rails61 \ + 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.5.0.rc2<5.6:security/rubygem-doorkeeper \ rubygem-doorkeeper-openid_connect>=1.7.5<1.8: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>=1.8.0<3:security/rubygem-omniauth \ + rubygem-omniauth-rails_csrf_protection>=0:security/rubygem-omniauth-rails_csrf_protection \ + rubygem-omniauth>=2.1.0<3:security/rubygem-omniauth \ rubygem-omniauth-auth0>=3.0.0<3.1.0:net/rubygem-omniauth-auth0 \ rubygem-omniauth-azure-activedirectory-v2>=1.0<2:net/rubygem-omniauth-azure-activedirectory-v2 \ - rubygem-omniauth-azure-oauth2>=0.0.9<0.1.0:net/rubygem-omniauth-azure-oauth2 \ 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>=1.0.1<1.1:security/rubygem-omniauth-alicloud \ rubygem-omniauth-facebook>=4.0.0:net/rubygem-omniauth-facebook \ - rubygem-omniauth-github>=1.4.0<3.0:net/rubygem-omniauth-github \ - rubygem-omniauth-google-oauth2>=0.6.0<0.7.0:net/rubygem-omniauth-google-oauth2 \ + rubygem-omniauth-github>=2.0.0<2.1:net/rubygem-omniauth-github \ rubygem-omniauth-oauth2-generic>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic \ - rubygem-omniauth-saml>=1.10<3.0:security/rubygem-omniauth-saml \ + rubygem-omniauth-saml>=2.0.0<3:security/rubygem-omniauth-saml \ rubygem-omniauth-shibboleth>=1.3.0<1.4.0:security/rubygem-omniauth-shibboleth \ rubygem-omniauth-twitter>=1.4<2.0:net/rubygem-omniauth-twitter \ rubygem-omniauth-authentiq>=0.3.3<0.4.0:net/rubygem-omniauth-authentiq \ - rubygem-gitlab-omniauth-openid-connect>=0.9.1<0.11.0:net/rubygem-gitlab-omniauth-openid-connect \ - rubygem-omniauth-salesforce>=1.0.5<1.1.0:net/rubygem-omniauth-salesforce \ + rubygem-gitlab-omniauth-openid-connect>=0.10.0<0.11.0:net/rubygem-gitlab-omniauth-openid-connect \ rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \ rubygem-rack-oauth2>=1.21.2<1.22.0:security/rubygem-rack-oauth2 \ rubygem-jwt>=2.1.0<3:www/rubygem-jwt \ @@ -124,27 +122,27 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \ rubygem-creole>=0.5.0<0.6.0:textproc/rubygem-creole \ rubygem-wikicloth081>=0.8.1<0.8.2:textproc/rubygem-wikicloth081 \ - rubygem-asciidoctor>=2.0.15<2.1.0:textproc/rubygem-asciidoctor \ + rubygem-asciidoctor>=2.0.17<2.1.0:textproc/rubygem-asciidoctor \ rubygem-asciidoctor-include-ext>=0.4.0<0.5.0:textproc/rubygem-asciidoctor-include-ext \ - rubygem-asciidoctor-plantuml00>=0.0.12<0.1:textproc/rubygem-asciidoctor-plantuml00 \ + rubygem-asciidoctor-plantuml00>=0.0.16<0.1:textproc/rubygem-asciidoctor-plantuml00 \ rubygem-asciidoctor-kroki>=0.5.0<0.6:textproc/rubygem-asciidoctor-kroki \ rubygem-rouge329>=3.29.0<3.30:textproc/rubygem-rouge329 \ rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \ rubygem-bootstrap_form>=4.2.0<4.3.0:devel/rubygem-bootstrap_form \ - rubygem-nokogiri>=1.13.6<1.14:textproc/rubygem-nokogiri \ + rubygem-nokogiri>=1.13.8<1.14:textproc/rubygem-nokogiri \ rubygem-escape_utils>=1.1<2.0:textproc/rubygem-escape_utils \ rubygem-icalendar>=0:devel/rubygem-icalendar \ - rubygem-diffy>=3.3<4:textproc/rubygem-diffy \ + rubygem-diffy>=3.4<4:textproc/rubygem-diffy \ rubygem-diff_match_patch>=0.1.0<0.2.0:textproc/rubygem-diff_match_patch \ rubygem-rack>=2.2.4<2.3,3:www/rubygem-rack \ rubygem-rack-timeout>=0.6.0<0.7:www/rubygem-rack-timeout \ - rubygem-puma>=5.6.2<5.7:www/rubygem-puma \ + rubygem-puma>=5.6.5<5.7:www/rubygem-puma \ rubygem-puma_worker_killer>=0.3.1:www/rubygem-puma_worker_killer \ rubygem-sd_notify>=0.1.0<0.2:devel/rubygem-sd_notify \ rubygem-state_machines-activerecord>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord \ rubygem-acts-as-taggable-on>=9.0<10:www/rubygem-acts-as-taggable-on \ - rubygem-sidekiq64>=6.4<6.5:devel/rubygem-sidekiq64 \ - rubygem-sidekiq-cron-sidekiq64>=1.2<2.0:devel/rubygem-sidekiq-cron-sidekiq64 \ + rubygem-sidekiq64>=6.4.0<6.5:devel/rubygem-sidekiq64 \ + rubygem-sidekiq-cron-sidekiq64>=1.4.0<1.5:devel/rubygem-sidekiq-cron-sidekiq64 \ rubygem-redis-namespace18>=1.8.1<1.9.0:databases/rubygem-redis-namespace18 \ rubygem-gitlab-sidekiq-fetcher>=0.8.0<0.9:devel/rubygem-gitlab-sidekiq-fetcher \ rubygem-fugit>=1.2.1<2:devel/rubygem-fugit \ @@ -156,7 +154,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-version_sorter>=2.2.4<2.3.0:textproc/rubygem-version_sorter \ rubygem-js_regex>=3.7<4.0:textproc/rubygem-js_regex \ rubygem-device_detector>=0:devel/rubygem-device_detector \ - rubygem-redis4>=4.4.0<5:databases/rubygem-redis4 \ + rubygem-redis4>=4.7.0<5:databases/rubygem-redis4 \ rubygem-connection_pool>=2.2.5<3.0:net/rubygem-connection_pool \ rubygem-redis-actionpack-rails61>=5.3.0<5.4:databases/rubygem-redis-actionpack-rails61 \ rubygem-discordrb-webhooks>=3.4<4.0:net-im/rubygem-discordrb-webhooks \ @@ -171,7 +169,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-sanitize>=6.0<7:textproc/rubygem-sanitize \ rubygem-babosa>=1.0.4<1.1.0:textproc/rubygem-babosa \ rubygem-loofah218>=2.18.0<2.19:textproc/rubygem-loofah218 \ - rubygem-licensee>=9.14.1<9.15:devel/rubygem-licensee \ + 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.5.4<1:devel/rubygem-ruby-magic \ rubygem-fast_blank>=0:devel/rubygem-fast_blank \ @@ -195,7 +193,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-pg_query>=2.1.3<2.2:databases/rubygem-pg_query \ rubygem-premailer-rails-rails61>=1.10.3<1.11:mail/rubygem-premailer-rails-rails61 \ rubygem-gitlab-labkit>=0.24.0<0.25:devel/rubygem-gitlab-labkit \ - rubygem-thrift>=0.14.0:devel/rubygem-thrift \ + rubygem-thrift>=0.16.0:devel/rubygem-thrift \ rubygem-ruby_parser>=3.15<4.0:devel/rubygem-ruby_parser \ rubygem-rails-i18n-rails61>=7.0<8:devel/rubygem-rails-i18n-rails61 \ rubygem-gettext_i18n_rails>=1.8.0<1.9.0:devel/rubygem-gettext_i18n_rails \ @@ -204,18 +202,17 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-batch-loader>=2.0.1<2.1:devel/rubygem-batch-loader \ rubygem-peek-rails61>=1.1.0<2.0:devel/rubygem-peek-rails61 \ rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \ - rubygem-method_source>=1.0<2:devel/rubygem-method_source \ rubygem-webrick>=1.7.0:www/rubygem-webrick \ rubygem-prometheus-client-mmap>=0.16.0<0.17.0: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.5.0<3.6:devel/rubygem-gitlab-dangerfiles \ + rubygem-gitlab-dangerfiles>=3.5.2<3.6:devel/rubygem-gitlab-dangerfiles \ rubygem-octokit>=4.20<5.0:net/rubygem-octokit \ rubygem-gitlab-mail_room>=0.0.9<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-ruby-prof>=1.3.0<1.4.0:devel/rubygem-ruby-prof \ - rubygem-stackprof>=0.2.15<0.3:devel/rubygem-stackprof \ + rubygem-stackprof>=0.2.21<0.3:devel/rubygem-stackprof \ rubygem-rbtrace>=0.4.14<1.0:devel/rubygem-rbtrace \ rubygem-memory_profiler>=0.9<1.0:devel/rubygem-memory_profiler \ rubygem-benchmark-memory>=0.1<1.0:benchmarks/rubygem-benchmark-memory \ @@ -226,8 +223,8 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-sys-filesystem>=1.4.3<1.5:sysutils/rubygem-sys-filesystem \ rubygem-net-ntp>0:net/rubygem-net-ntp \ rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \ - rubygem-spamcheck>=0.1.0<0.2:net/rubygem-spamcheck \ - rubygem-gitaly>=15.3.0.pre.rc3<15.4.0:net/rubygem-gitaly \ + rubygem-spamcheck>=1.0.0<1.1:net/rubygem-spamcheck \ + rubygem-gitaly>=15.4.0.pre.rc2<15.5.0:net/rubygem-gitaly \ rubygem-kas-grpc>=0.0.2,1<0.0.3,1:net/rubygem-kas-grpc \ rubygem-grpc142>=1.42.0<1.43:net/rubygem-grpc142 \ rubygem-google-protobuf319>=3.19.4<3.20:devel/rubygem-google-protobuf319 \ @@ -277,7 +274,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= a347a04b6129dea62767a196124bebbf338077c9 +GL_COMMIT= ef309cf1466c3d2a9297d735c7127fcaf0c08d48 USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 7ea960ca4170..6b400a70785b 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664808004 -SHA256 (gitlab-org-gitlab-foss-a347a04b6129dea62767a196124bebbf338077c9_GL0.tar.gz) = 8d02a9f66fd6fb83f8fbbb52d7aec317a50fa16ea22121021a21281749943f54 -SIZE (gitlab-org-gitlab-foss-a347a04b6129dea62767a196124bebbf338077c9_GL0.tar.gz) = 100648659 +TIMESTAMP = 1665829453 +SHA256 (gitlab-org-gitlab-foss-ef309cf1466c3d2a9297d735c7127fcaf0c08d48_GL0.tar.gz) = 2dd2c29d42a1d6ee106fb2ad5ddd77f660c27adaafe86ff95009f1b8002e23f0 +SIZE (gitlab-org-gitlab-foss-ef309cf1466c3d2a9297d735c7127fcaf0c08d48_GL0.tar.gz) = 101266813 diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 324d026c4f43..d3a84596b30e 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,56 +1,30 @@ ---- Gemfile.orig 2022-09-29 08:38:14 UTC +--- Gemfile.orig 2022-10-04 13:45:39 UTC +++ Gemfile -@@ -17,47 +17,47 @@ gem 'default_value_for', '~> 3.4.0' - gem 'default_value_for', '~> 3.4.0' - - # Supported DBs --gem 'pg', '~> 1.4.0' -+gem 'pg', '~> 1.4' - - gem 'rugged', '~> 1.2' - gem 'grape-path-helpers', '~> 1.7.1' - --gem 'faraday', '~> 1.0' -+gem 'faraday', '~> 1.10.2' - gem 'marginalia', '~> 1.10.0' - - # Authorization - gem 'declarative_policy', '~> 1.1.0' - - # Authentication libraries --gem 'devise', '~> 4.7.2' -+gem 'devise', '>= 4.7.2' - gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' - gem 'bcrypt', '~> 3.1', '>= 3.1.14' - gem 'doorkeeper', '~> 5.5.0.rc2' - gem 'doorkeeper-openid_connect', '~> 1.7.5' - gem 'rexml', '~> 3.2.5' +@@ -40,18 +40,18 @@ gem 'rexml', '~> 3.2.5' gem 'ruby-saml', '~> 1.13.0' --gem 'omniauth', '~> 1.8' + gem 'omniauth-rails_csrf_protection' + gem 'omniauth', '~> 2.1.0' -gem 'omniauth-auth0', '~> 2.0.0' -+gem 'omniauth', '>= 2.0' -+gem 'omniauth-auth0', '~> 3.0.0' ++gem 'omniauth-auth0', '>= 2.0.0' gem 'omniauth-azure-activedirectory-v2', '~> 1.0' - gem 'omniauth-azure-oauth2', '~> 0.0.9' # See vendor/gems/omniauth-azure-oauth2/README.md + gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md gem 'omniauth-cas3', '~> 1.1.4', path: 'vendor/gems/omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md gem 'omniauth-dingtalk-oauth2', '~> 1.0' gem 'omniauth-alicloud', '~> 1.0.1' -gem 'omniauth-facebook', '~> 4.0.0' --gem 'omniauth-github', '~> 1.4' +-gem 'omniauth-github', '2.0.0' +gem 'omniauth-facebook', '~> 9.0.0' -+gem 'omniauth-github', '~> 2.0' ++gem 'omniauth-github', '~> 2.0.0' gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md - gem 'omniauth-google-oauth2', '~> 0.6.0' + gem 'omniauth-google-oauth2', '~> 1.0.1', path: 'vendor/gems/omniauth-google-oauth2' # See gem README.md gem 'omniauth-oauth2-generic', '~> 0.2.2' --gem 'omniauth-saml', '~> 1.10' -+gem 'omniauth-saml', '~> 2.1' +-gem 'omniauth-saml', '~> 2.0.0' ++gem 'omniauth-saml', '~> 2.0' gem 'omniauth-shibboleth', '~> 1.3.0' gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md - gem 'omniauth-authentiq', '~> 0.3.3' --gem 'gitlab-omniauth-openid-connect', '~> 0.9.0', require: 'omniauth_openid_connect' -+gem 'gitlab-omniauth-openid-connect', '~> 0.10.0', require: 'omniauth_openid_connect' - gem 'omniauth-salesforce', '~> 1.0.5' +@@ -60,7 +60,7 @@ gem 'gitlab-omniauth-openid-connect', '~> 0.10.0', req + 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.2' -gem 'jwt', '~> 2.1.0' @@ -58,7 +32,7 @@ # Kerberos authentication. EE-only gem 'gssapi', group: :kerberos -@@ -93,7 +93,7 @@ gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omni +@@ -96,7 +96,7 @@ gem 'gpgme', '~> 2.0.19' # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap' @@ -67,7 +41,7 @@ # API gem 'grape', '~> 1.5.2' -@@ -205,10 +205,10 @@ gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidek +@@ -208,10 +208,10 @@ gem 'redis-namespace', '~> 1.8.1' gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch' # Cron Parser @@ -80,16 +54,16 @@ # Colored output to console gem 'rainbow', '~> 3.0' -@@ -233,7 +233,7 @@ gem 'device_detector' +@@ -236,7 +236,7 @@ gem 'js_regex', '~> 3.7' gem 'device_detector' # Redis --gem 'redis', '~> 4.4.0' -+gem 'redis', '>= 4.4.0' +-gem 'redis', '~> 4.7.0' ++gem 'redis', '~> 4.8.0' gem 'connection_pool', '~> 2.0' # Redis session store -@@ -269,7 +269,7 @@ gem 'babosa', '~> 1.0.4' +@@ -272,7 +272,7 @@ gem 'sanitize', '~> 6.0' gem 'babosa', '~> 1.0.4' # Sanitizes SVG input @@ -97,8 +71,8 @@ +gem 'loofah', '~> 2.19.0' # Working with license - gem 'licensee', '~> 9.14.1' -@@ -335,118 +335,24 @@ gem 'peek', '~> 1.1' + # Detects the open source license the repository includes +@@ -338,119 +338,23 @@ gem 'batch-loader', '~> 2.0.1' gem 'peek', '~> 1.1' # Snowplow events tracking @@ -106,7 +80,6 @@ +gem 'snowplow-tracker', '~> 0.8.0' # Metrics - gem 'method_source', '~> 1.0', require: false -gem 'webrick', '~> 1.6.1', require: false +gem 'webrick', '~> 1.7.0', require: false gem 'prometheus-client-mmap', '~> 0.16', require: 'prometheus/client' @@ -114,15 +87,15 @@ gem 'warning', '~> 1.3.0' -group :development do -- gem 'lefthook', '~> 1.1.0', require: false +- gem 'lefthook', '~> 1.1.1', require: false - gem 'rubocop' -- gem 'solargraph', '~> 0.45.0', require: false +- gem 'solargraph', '~> 0.46.0', require: false - - gem 'letter_opener_web', '~> 2.0.0' -- gem 'lookbook' +- gem 'lookbook', '~> 1.0' - - # Better errors handler -- gem 'better_errors', '~> 2.9.0' +- gem 'better_errors', '~> 2.9.1' - - gem 'sprite-factory', '~> 1.7' -end @@ -149,12 +122,14 @@ - gem 'spring', '~> 2.1.0' - gem 'spring-commands-rspec', '~> 1.0.4' - -- gem 'gitlab-styles', '~> 7.1.0', require: false +- gem 'gitlab-styles', '~> 8.0.0', require: false - -- gem 'haml_lint', '~> 0.36.0', require: false +- gem 'haml_lint', '~> 0.40.0', require: false - gem 'bundler-audit', '~> 0.7.0.1', require: false - +- # Benchmarking & profiling - gem 'benchmark-ips', '~> 2.3.0', require: false +- gem 'benchmark-memory', '~> 0.1', require: false - - gem 'knapsack', '~> 1.21.1' - gem 'crystalball', '~> 0.7.0', require: false @@ -175,7 +150,7 @@ -end - group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.5.0', require: false + gem 'gitlab-dangerfiles', '~> 3.5.2', require: false end -group :development, :test, :coverage do @@ -219,7 +194,7 @@ gem 'octokit', '~> 4.15' # Updating this gem version here is deprecated. See: -@@ -495,7 +401,7 @@ gem 'toml-rb', '~> 2.0' +@@ -498,7 +402,7 @@ gem 'google-protobuf', '~> 3.21' gem 'toml-rb', '~> 2.0' # Feature toggles @@ -228,7 +203,7 @@ gem 'flipper-active_record', '~> 0.25.0' gem 'flipper-active_support_cache_store', '~> 0.25.0' gem 'unleash', '~> 3.2.2' -@@ -531,7 +437,7 @@ gem 'valid_email', '~> 0.1' +@@ -536,7 +440,7 @@ gem 'lockbox', '~> 0.6.2' gem 'valid_email', '~> 0.1' # JSON @@ -237,7 +212,7 @@ gem 'json_schemer', '~> 0.2.18' gem 'oj', '~> 3.13.21' gem 'multi_json', '~> 1.14.1' -@@ -551,3 +457,5 @@ gem 'error_tracking_open_api', path: 'vendor/gems/erro +@@ -556,3 +460,5 @@ 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_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index a99623890fb9..60c85ebbe32e 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 2022-07-21 14:01:52 UTC +--- config/gitlab.yml.example.orig 2022-10-04 13:45:39 UTC +++ config/gitlab.yml.example -@@ -1158,14 +1158,14 @@ production: &base +@@ -1174,14 +1174,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 -@@ -1200,12 +1200,12 @@ production: &base +@@ -1216,12 +1216,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -34,7 +34,7 @@ # Git over HTTP upload_pack: true -@@ -1220,13 +1220,13 @@ production: &base +@@ -1236,13 +1236,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 -@@ -1239,13 +1239,13 @@ production: &base +@@ -1255,13 +1255,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 -@@ -1266,18 +1266,18 @@ production: &base +@@ -1282,18 +1282,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: -@@ -1502,13 +1502,13 @@ test: +@@ -1518,13 +1518,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 7bf3581974c1..4b3228bed380 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 2021-09-21 10:06:28 UTC +--- config/initializers/1_settings.rb.orig 2022-10-04 13:45:39 UTC +++ config/initializers/1_settings.rb -@@ -185,11 +185,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi +@@ -206,11 +206,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-vendor_gems_bundler-checksum_bundler-checksum.gemspec b/www/gitlab-ce/files/patch-vendor_gems_bundler-checksum_bundler-checksum.gemspec new file mode 100644 index 000000000000..fb1f554cb0c8 --- /dev/null +++ b/www/gitlab-ce/files/patch-vendor_gems_bundler-checksum_bundler-checksum.gemspec @@ -0,0 +1,11 @@ +--- vendor/gems/bundler-checksum/bundler-checksum.gemspec.orig 2022-10-18 20:30:55 UTC ++++ vendor/gems/bundler-checksum/bundler-checksum.gemspec +@@ -15,7 +15,7 @@ Gem::Specification.new do |spec| + + spec.files = Dir['bin/*', 'lib/**/*.rb'] + spec.bindir = 'bin' +- spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } ++# spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } + spec.require_paths = ['lib'] + + spec.add_dependency 'bundler' diff --git a/www/gitlab-ce/files/patch-vendor_gems_omniauth-cas3_omniauth-cas3.gemspec b/www/gitlab-ce/files/patch-vendor_gems_omniauth-cas3_omniauth-cas3.gemspec deleted file mode 100644 index 650ea1731c22..000000000000 --- a/www/gitlab-ce/files/patch-vendor_gems_omniauth-cas3_omniauth-cas3.gemspec +++ /dev/null @@ -1,11 +0,0 @@ ---- vendor/gems/omniauth-cas3/omniauth-cas3.gemspec.orig 2022-10-04 14:28:17 UTC -+++ vendor/gems/omniauth-cas3/omniauth-cas3.gemspec -@@ -14,7 +14,7 @@ Gem::Specification.new do |gem| - gem.require_paths = ["lib"] - gem.version = Omniauth::Cas3::VERSION - -- gem.add_dependency 'omniauth', '~> 1.2', '< 3' -+ gem.add_dependency 'omniauth', '>= 1.2', '< 3' - gem.add_dependency 'nokogiri', '~> 1.7', '>= 1.7.1' - gem.add_dependency 'addressable', '~> 2.3' - diff --git a/www/gitlab-ce/files/patch-vendor_gems_omniauth-gitlab_omniauth-gitlab.gemspec b/www/gitlab-ce/files/patch-vendor_gems_omniauth-gitlab_omniauth-gitlab.gemspec index a3a9a40cd2d5..19df8b60e7be 100644 --- a/www/gitlab-ce/files/patch-vendor_gems_omniauth-gitlab_omniauth-gitlab.gemspec +++ b/www/gitlab-ce/files/patch-vendor_gems_omniauth-gitlab_omniauth-gitlab.gemspec @@ -1,12 +1,10 @@ ---- vendor/gems/omniauth-gitlab/omniauth-gitlab.gemspec.orig 2022-09-29 08:38:14 UTC +--- vendor/gems/omniauth-gitlab/omniauth-gitlab.gemspec.orig 2022-10-18 19:55:51 UTC +++ vendor/gems/omniauth-gitlab/omniauth-gitlab.gemspec -@@ -16,8 +16,8 @@ Gem::Specification.new do |gem| - gem.test_files = Dir['spec/**/*.rb'] +@@ -17,7 +17,7 @@ Gem::Specification.new do |gem| gem.require_paths = ['lib'] -- gem.add_dependency 'omniauth', '~> 1.0' + gem.add_dependency 'omniauth', '~> 2.0' - gem.add_dependency 'omniauth-oauth2', '~> 1.7.1' -+ gem.add_dependency 'omniauth', '~> 2.1' + gem.add_dependency 'omniauth-oauth2', '~> 1.7' gem.add_development_dependency 'rspec', '~> 3.1' gem.add_development_dependency 'rspec-its', '~> 1.0' diff --git a/www/gitlab-ce/files/patch-vendor_gems_omniauth-google-oauth2_omniauth-google-oauth2.gemspec b/www/gitlab-ce/files/patch-vendor_gems_omniauth-google-oauth2_omniauth-google-oauth2.gemspec new file mode 100644 index 000000000000..bbaa46861c4b --- /dev/null +++ b/www/gitlab-ce/files/patch-vendor_gems_omniauth-google-oauth2_omniauth-google-oauth2.gemspec @@ -0,0 +1,11 @@ +--- vendor/gems/omniauth-google-oauth2/omniauth-google-oauth2.gemspec.orig 2022-10-18 20:00:19 UTC ++++ vendor/gems/omniauth-google-oauth2/omniauth-google-oauth2.gemspec +@@ -23,7 +23,7 @@ Gem::Specification.new do |gem| + gem.add_runtime_dependency 'jwt', '>= 2.0' + gem.add_runtime_dependency 'oauth2', '~> 2.0' + gem.add_runtime_dependency 'omniauth', '~> 2.0' +- gem.add_runtime_dependency 'omniauth-oauth2', '~> 1.7.1' ++ gem.add_runtime_dependency 'omniauth-oauth2', '~> 1.7' + + gem.add_development_dependency 'rake', '~> 12.0' + gem.add_development_dependency 'rspec', '~> 3.6' diff --git a/www/gitlab-ce/files/patch-vendor_gems_omniauth__crowd_omniauth__crowd.gemspec b/www/gitlab-ce/files/patch-vendor_gems_omniauth__crowd_omniauth__crowd.gemspec deleted file mode 100644 index 106296200a90..000000000000 --- a/www/gitlab-ce/files/patch-vendor_gems_omniauth__crowd_omniauth__crowd.gemspec +++ /dev/null @@ -1,11 +0,0 @@ ---- vendor/gems/omniauth_crowd/omniauth_crowd.gemspec.orig 2022-08-12 14:59:10 UTC -+++ vendor/gems/omniauth_crowd/omniauth_crowd.gemspec -@@ -15,7 +15,7 @@ Gem::Specification.new do |gem| - gem.require_paths = ["lib"] - gem.version = OmniAuth::Crowd::VERSION - -- gem.add_runtime_dependency 'omniauth', '~> 1.0', '< 3' -+ gem.add_runtime_dependency 'omniauth', '>= 1.0', '< 3' - gem.add_runtime_dependency 'nokogiri', '>= 1.4.4' - gem.add_runtime_dependency 'activesupport', '>= 0' - gem.add_development_dependency(%q, [">= 0"]) diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message index 84fd4695c0e3..8fe52484aa15 100644 --- a/www/gitlab-ce/pkg-message +++ b/www/gitlab-ce/pkg-message @@ -6,7 +6,7 @@ Gitlab was installed successfully. You now need to set up the various components of Gitlab, so please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/15.2-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/15.4-freebsd.md EOM type: install } @@ -20,7 +20,7 @@ EOM If you just installed an major upgrade of GitLab, for example you switched from 14.5.x to 14.6.x, please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/15.1-15.2-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/15.3-15.4-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at: