git: b1c6bdab1b1e - main - www/gitlab-ce: major upgrade to 15.5.4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 22 Nov 2022 09:39:17 UTC
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b1c6bdab1b1e3686e7d6612ac5a6aaa5fb0dc22c
commit b1c6bdab1b1e3686e7d6612ac5a6aaa5fb0dc22c
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2022-11-20 16:57:37 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2022-11-22 09:38:30 +0000
www/gitlab-ce: major upgrade to 15.5.4
Changelog:
https://about.gitlab.com/releases/2022/10/22/gitlab-15-5-released/
https://about.gitlab.com/releases/2022/10/24/gitlab-15-5-1-released/
https://about.gitlab.com/releases/2022/11/02/security-release-gitlab-15-5-2-released/
https://about.gitlab.com/releases/2022/11/08/gitlab-15-5-3-released/
https://about.gitlab.com/releases/2022/11/14/gitlab-15-5-4-released/
---
www/gitlab-ce/Makefile | 67 +++++++++---------
www/gitlab-ce/distinfo | 6 +-
www/gitlab-ce/files/patch-Gemfile | 81 +++++++++++++---------
.../files/patch-config_gitlab.yml.example | 14 ++--
.../files/patch-config_initializers_1__settings.rb | 4 +-
...or_gems_omniauth-gitlab_omniauth-gitlab.gemspec | 11 ---
...th-google-oauth2_omniauth-google-oauth2.gemspec | 11 ---
www/gitlab-ce/pkg-message | 4 +-
www/gitlab-workhorse/Makefile | 4 +-
www/gitlab-workhorse/distinfo | 10 +--
10 files changed, 107 insertions(+), 105 deletions(-)
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 1a545beb6e38..9d760dbc841e 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-ce
-PORTVERSION= 15.4.4
+PORTVERSION= 15.5.4
PORTREVISION= 0
CATEGORIES= www devel
@@ -16,11 +16,11 @@ 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.2:textproc/gitlab-elasticsearch-indexer \
- gitlab-agent>=15.2.0:net/gitlab-agent \
+ gitlab-elasticsearch-indexer>=3.0.3:textproc/gitlab-elasticsearch-indexer \
+ gitlab-agent>=15.5.1:net/gitlab-agent \
gitlab-metrics-exporter>0:devel/gitlab-metrics-exporter \
gitlab-pages>=1.61.0:www/gitlab-pages \
- gitlab-shell>=14.9.4:devel/gitlab-shell \
+ gitlab-shell>=14.12.0:devel/gitlab-shell \
gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \
redis>=6.0.14:databases/redis \
yarn>=1.10.0:www/yarn \
@@ -28,15 +28,17 @@ MY_DEPENDS= git>=2.32.0:devel/git \
bash>0:shells/bash \
rubygem-rails61>=6.1.6.1<6.1.7:www/rubygem-rails61 \
rubygem-bootsnap112>=1.12.0<1.13:devel/rubygem-bootsnap112 \
+ rubygem-openssl221>=2.2.1<2.2.2:security/rubygem-openssl221 \
+ rubygem-ipaddr122>=1.2.2<1.2.3:net/rubygem-ipaddr122 \
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.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-pg>=1.4.3<1.5:databases/rubygem-pg \
rubygem-rugged>=1.2<2:devel/rubygem-rugged \
rubygem-grape-path-helpers>=1.7.1<1.8:devel/rubygem-grape-path-helpers \
rubygem-faraday1>=1.10.0<2:www/rubygem-faraday1 \
- rubygem-marginalia>=1.10.0<1.11:databases/rubygem-marginalia \
+ rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \
rubygem-declarative_policy>=1.1.0<1.2:security/rubygem-declarative_policy \
rubygem-devise-rails61>=4.8.1<4.9:devel/rubygem-devise-rails61 \
rubygem-bcrypt>=3.1.14<3.2:security/rubygem-bcrypt \
@@ -44,15 +46,15 @@ MY_DEPENDS= git>=2.32.0:devel/git \
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-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-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>=1.0.1<1.1:security/rubygem-omniauth-alicloud \
+ rubygem-omniauth-alicloud>=2.0.0<2.1:security/rubygem-omniauth-alicloud \
rubygem-omniauth-facebook>=4.0.0:net/rubygem-omniauth-facebook \
- rubygem-omniauth-github>=2.0.0<2.1:net/rubygem-omniauth-github \
+ 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-shibboleth>=1.3.0<1.4.0:security/rubygem-omniauth-shibboleth \
@@ -60,7 +62,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-omniauth-authentiq>=0.3.3<0.4.0:net/rubygem-omniauth-authentiq \
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-rack-oauth2>=1.21.3<1.22.0:security/rubygem-rack-oauth2 \
rubygem-jwt>=2.1.0<3:www/rubygem-jwt \
rubygem-gssapi>0:security/rubygem-gssapi \
rubygem-recaptcha>=4.11<5.0:devel/rubygem-recaptcha \
@@ -68,7 +70,6 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-invisible_captcha>=1.1.0<1.2.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-attr_encrypted>=3.1.0<3.2.0:security/rubygem-attr_encrypted \
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 \
@@ -81,6 +82,8 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-grape15>=1.5.2<1.6:devel/rubygem-grape15 \
rubygem-grape-entity>=0.10.0<0.11.0,1:devel/rubygem-grape-entity \
rubygem-rack-cors>=1.1.1<1.2.0:www/rubygem-rack-cors \
+ rubygem-grape-swagger>=1.5.0<1.6:devel/rubygem-grape-swagger \
+ rubygem-grape-swagger-entity>=0.5.1<0.6:devel/rubygem-grape-swagger-entity \
rubygem-graphql>=1.13.12<1.14:devel/rubygem-graphql \
rubygem-graphiql-rails>=1.8<2:devel/rubygem-graphiql-rails \
rubygem-apollo_upload_server>=2.1.0<2.2:net/rubygem-apollo_upload_server \
@@ -106,7 +109,7 @@ MY_DEPENDS= git>=2.32.0: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-core3131>=3.131.0<3.132:devel/rubygem-aws-sdk-core3131 \
+ rubygem-aws-sdk-core>=3.159.0<3.160:devel/rubygem-aws-sdk-core \
rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \
rubygem-aws-sdk-s3>=1.114.0<1.115:devel/rubygem-aws-sdk-s3 \
rubygem-faraday_middleware-aws-sigv403>=0.3.0<0.4:devel/rubygem-faraday_middleware-aws-sigv403 \
@@ -115,7 +118,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-deckar01-task_list=2.3.1:www/rubygem-deckar01-task_list \
rubygem-gitlab-markup>=1.8.0<1.9.0:textproc/rubygem-gitlab-markup \
rubygem-github-markup17>=1.7.0<1.8.0:textproc/rubygem-github-markup17 \
- rubygem-commonmarker>=0.23.4<0.24:textproc/rubygem-commonmarker \
+ rubygem-commonmarker>=0.23.6<0.24:textproc/rubygem-commonmarker \
rubygem-kramdown23>=2.3.1<2.4:textproc/rubygem-kramdown23 \
rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \
rubygem-rdoc63>=6.3.2<7:devel/rubygem-rdoc63 \
@@ -130,27 +133,26 @@ MY_DEPENDS= git>=2.32.0:devel/git \
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.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.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-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 \
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.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-sidekiq-cron-sidekiq64>=1.8.0<1.9:devel/rubygem-sidekiq-cron-sidekiq64 \
+ rubygem-redis-namespace>=1.9.0<1.10.0:databases/rubygem-redis-namespace \
rubygem-gitlab-sidekiq-fetcher>=0.8.0<0.9:devel/rubygem-gitlab-sidekiq-fetcher \
rubygem-fugit>=1.2.1<2:devel/rubygem-fugit \
rubygem-httparty>=0.16.4<1:www/rubygem-httparty \
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.4.0<1.5.0:devel/rubygem-re2 \
+ rubygem-re2>=1.5.0<1.6.0:devel/rubygem-re2 \
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 \
@@ -168,14 +170,14 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-kubeclient>=4.9.3<4.10.0:www/rubygem-kubeclient \
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-loofah>=2.19.0<2.20: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.5.4<1:devel/rubygem-ruby-magic \
rubygem-fast_blank>=0:devel/rubygem-fast_blank \
rubygem-gitlab-chronic>=0.10.5<0.11.0:devel/rubygem-gitlab-chronic \
rubygem-gitlab_chronic_duration>=0.10.6.2<0.10.7:devel/rubygem-gitlab_chronic_duration \
- rubygem-rack-proxy>=0.7.2<0.8.0:www/rubygem-rack-proxy \
+ rubygem-rack-proxy>=0.7.4<0.8.0:www/rubygem-rack-proxy \
rubygem-sassc-rails-rails61>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails61 \
rubygem-autoprefixer-rails1025>=10.2.5.1<10.2.6:textproc/rubygem-autoprefixer-rails1025 \
rubygem-terser>=1.0.2:textproc/rubygem-terser \
@@ -185,14 +187,14 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-request_store>=1.5.1<2.0:devel/rubygem-request_store \
rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \
rubygem-gitlab-license>=2.2.1<2.3:devel/rubygem-gitlab-license \
- rubygem-rack-attack>=6.6.0<6.7:www/rubygem-rack-attack \
+ rubygem-rack-attack>=6.6.1<6.7:www/rubygem-rack-attack \
rubygem-sentry-raven>=3.1<4.0:devel/rubygem-sentry-raven \
rubygem-sentry-ruby>=5.1.1<5.2:devel/rubygem-sentry-ruby \
rubygem-sentry-rails>=5.1.1<5.2:devel/rubygem-sentry-rails \
rubygem-sentry-sidekiq>=5.1.1<5.2:devel/rubygem-sentry-sidekiq \
- rubygem-pg_query>=2.1.3<2.2:databases/rubygem-pg_query \
+ rubygem-pg_query>=2.1.4<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-gitlab-labkit>=0.24.0<0.29:devel/rubygem-gitlab-labkit \
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 \
@@ -211,7 +213,6 @@ MY_DEPENDS= git>=2.32.0:devel/git \
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.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 \
@@ -224,11 +225,11 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-net-ntp>0:net/rubygem-net-ntp \
rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \
rubygem-spamcheck>=1.0.0<1.1:net/rubygem-spamcheck \
- rubygem-gitaly>=15.4.0.pre.rc2<15.5.0:net/rubygem-gitaly \
+ rubygem-gitaly>=15.5.2<15.6.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 \
- rubygem-toml-rb>=2.0.1<3:www/rubygem-toml-rb \
+ rubygem-google-protobuf>=3.21.0<4:devel/rubygem-google-protobuf \
+ rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \
rubygem-flipper>=0.25.0<0.26:devel/rubygem-flipper \
rubygem-flipper-active_record-rails61>=0.25.0<0.26:databases/rubygem-flipper-active_record-rails61 \
rubygem-flipper-active_support_cache_store-rails61>=0.25.0<0.26:devel/rubygem-flipper-active_support_cache_store-rails61 \
@@ -240,7 +241,6 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-countries>=3.0.0<4.0.0:devel/rubygem-countries \
rubygem-retriable>=3.1.2<3.2.0:devel/rubygem-retriable \
rubygem-lru_redux>0:devel/rubygem-lru_redux \
- rubygem-erubi19>=1.9.0<1.10:www/rubygem-erubi19 \
rubygem-mail>=2.7.1<2.7.2,2:mail/rubygem-mail \
rubygem-lockbox>=0.6.2<0.7:security/rubygem-lockbox \
rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \
@@ -253,7 +253,10 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \
rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1 \
rubygem-ed25519>=1.3.0<1.4:security/rubygem-ed25519 \
- rubygem-parser>=0:devel/rubygem-parser
+ 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-CFPropertyList>=0:devel/rubygem-CFPropertyList
BUILD_DEPENDS= gem:devel/ruby-gems \
${MY_DEPENDS}
@@ -274,7 +277,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= 6442864a274d88d16ee303e78b3c3d1aed79265c
+GL_COMMIT= ee1b34560d908f44af7ed9b3fbc8c56595bbae81
USERS= git
GROUPS= git
@@ -303,6 +306,8 @@ do-install:
${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample
(cd ${WRKSRC} && ${RM} Gemfile.lock && bundle install --local)
${RM} -R ${WRKSRC}/workhorse
+ # Has only a Gemfile.lock, so remove it, is maybe fixed by a newer version
+ ${RM} -R ${WRKSRC}/vendor/gems/omniauth-google-oauth2
${FIND} ${WRKSRC} -name '*.orig' -delete
${FIND} ${WRKSRC} -name '*.bak' -delete
${FIND} ${WRKSRC} -name '*.gitkeep' -delete
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index 8f77ef14d95a..38d1265d50ad 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667627413
-SHA256 (gitlab-org-gitlab-foss-6442864a274d88d16ee303e78b3c3d1aed79265c_GL0.tar.gz) = 28b525b4c1f686a20d33b4c2e518f7a86f66e56264f1f6f4637e2fec13c461aa
-SIZE (gitlab-org-gitlab-foss-6442864a274d88d16ee303e78b3c3d1aed79265c_GL0.tar.gz) = 101273593
+TIMESTAMP = 1668836508
+SHA256 (gitlab-org-gitlab-foss-ee1b34560d908f44af7ed9b3fbc8c56595bbae81_GL0.tar.gz) = 651c6a6d1837824a9d8b023c2b93bcab4979ba0446c9b31e7f82b34abe739492
+SIZE (gitlab-org-gitlab-foss-ee1b34560d908f44af7ed9b3fbc8c56595bbae81_GL0.tar.gz) = 97980260
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index d3a84596b30e..cd674634bdf5 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,38 +1,38 @@
---- Gemfile.orig 2022-10-04 13:45:39 UTC
+--- Gemfile.orig 2022-11-11 19:24:20 UTC
+++ Gemfile
-@@ -40,18 +40,18 @@ gem 'rexml', '~> 3.2.5'
+@@ -57,18 +57,18 @@ gem 'doorkeeper-openid_connect', '~> 1.7.5'
+ gem 'rexml', '~> 3.2.5'
gem 'ruby-saml', '~> 1.13.0'
- gem 'omniauth-rails_csrf_protection'
gem 'omniauth', '~> 2.1.0'
-gem 'omniauth-auth0', '~> 2.0.0'
+gem 'omniauth-auth0', '>= 2.0.0'
- gem 'omniauth-azure-activedirectory-v2', '~> 1.0'
+ 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-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-alicloud', '~> 2.0.0'
-gem 'omniauth-facebook', '~> 4.0.0'
--gem 'omniauth-github', '2.0.0'
-+gem 'omniauth-facebook', '~> 9.0.0'
-+gem 'omniauth-github', '~> 2.0.0'
+-gem 'omniauth-github', '2.0.1'
++gem 'omniauth-facebook', '>= 4.0.0'
++gem 'omniauth-github', '~> 2.0.1'
gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md
- gem 'omniauth-google-oauth2', '~> 1.0.1', path: 'vendor/gems/omniauth-google-oauth2' # See gem 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-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
-@@ -60,7 +60,7 @@ gem 'gitlab-omniauth-openid-connect', '~> 0.10.0', req
+@@ -77,7 +77,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 'rack-oauth2', '~> 1.21.3'
-gem 'jwt', '~> 2.1.0'
+gem 'jwt', '~> 2.5.0'
# Kerberos authentication. EE-only
gem 'gssapi', group: :kerberos
-@@ -96,7 +96,7 @@ gem 'gpgme', '~> 2.0.19'
+@@ -113,7 +113,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'
@@ -41,7 +41,14 @@
# API
gem 'grape', '~> 1.5.2'
-@@ -208,10 +208,10 @@ gem 'redis-namespace', '~> 1.8.1'
+@@ -220,16 +220,16 @@ gem 'state_machines-activerecord', '~> 0.8.0'
+ gem 'acts-as-taggable-on', '~> 9.0'
+
+ # Background jobs
+-gem 'sidekiq', '~> 6.4.0'
++gem 'sidekiq', '~> 6.4.0'
+ gem 'sidekiq-cron', '~> 1.8.0'
+ gem 'redis-namespace', '~> 1.9.0'
gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch'
# Cron Parser
@@ -54,7 +61,7 @@
# Colored output to console
gem 'rainbow', '~> 3.0'
-@@ -236,7 +236,7 @@ gem 'js_regex', '~> 3.7'
+@@ -254,7 +254,7 @@ gem 'js_regex', '~> 3.7'
gem 'device_detector'
# Redis
@@ -63,16 +70,16 @@
gem 'connection_pool', '~> 2.0'
# Redis session store
-@@ -272,7 +272,7 @@ gem 'sanitize', '~> 6.0'
- gem 'babosa', '~> 1.0.4'
+@@ -340,7 +340,7 @@ gem 'pg_query', '~> 2.1.4'
+ gem 'premailer-rails', '~> 1.10.3'
- # Sanitizes SVG input
--gem 'loofah', '~> 2.18.0'
-+gem 'loofah', '~> 2.19.0'
+ # LabKit: Tracing and Correlation
+-gem 'gitlab-labkit', '~> 0.24.0'
++gem 'gitlab-labkit', '~> 0.24'
+ gem 'thrift', '>= 0.16.0'
- # Working with license
- # Detects the open source license the repository includes
-@@ -338,119 +338,23 @@ gem 'batch-loader', '~> 2.0.1'
+ # I18n
+@@ -356,119 +356,23 @@ gem 'batch-loader', '~> 2.0.1'
gem 'peek', '~> 1.1'
# Snowplow events tracking
@@ -87,12 +94,12 @@
gem 'warning', '~> 1.3.0'
-group :development do
-- gem 'lefthook', '~> 1.1.1', require: false
+- gem 'lefthook', '~> 1.1.3', require: false
- gem 'rubocop'
-- gem 'solargraph', '~> 0.46.0', require: false
+- gem 'solargraph', '~> 0.47.2', require: false
-
- gem 'letter_opener_web', '~> 2.0.0'
-- gem 'lookbook', '~> 1.0'
+- gem 'lookbook', '~> 1.0', '>= 1.0.8'
-
- # Better errors handler
- gem 'better_errors', '~> 2.9.1'
@@ -122,7 +129,7 @@
- gem 'spring', '~> 2.1.0'
- gem 'spring-commands-rspec', '~> 1.0.4'
-
-- gem 'gitlab-styles', '~> 8.0.0', require: false
+- gem 'gitlab-styles', '~> 9.0.0', require: false
-
- gem 'haml_lint', '~> 0.40.0', require: false
- gem 'bundler-audit', '~> 0.7.0.1', require: false
@@ -146,7 +153,7 @@
-
- gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup'
-
-- gem 'pact', '~> 1.12'
+- gem 'pact', '~> 1.63'
-end
-
group :development, :test, :danger do
@@ -194,8 +201,17 @@
gem 'octokit', '~> 4.15'
# Updating this gem version here is deprecated. See:
-@@ -498,7 +402,7 @@ gem 'google-protobuf', '~> 3.21'
- gem 'toml-rb', '~> 2.0'
+@@ -503,7 +407,7 @@ gem 'ssh_data', '~> 1.3'
+ gem 'spamcheck', '~> 1.0.0'
+
+ # Gitaly GRPC protocol definitions
+-gem 'gitaly', '~> 15.4.0-rc2'
++gem 'gitaly', '>= 15.4.0-rc2'
+
+ # KAS GRPC protocol definitions
+ gem 'kas-grpc', '~> 0.0.2'
+@@ -515,7 +419,7 @@ gem 'google-protobuf', '~> 3.21'
+ gem 'toml-rb', '~> 2.2.0'
# Feature toggles
-gem 'flipper', '~> 0.25.0'
@@ -203,7 +219,7 @@
gem 'flipper-active_record', '~> 0.25.0'
gem 'flipper-active_support_cache_store', '~> 0.25.0'
gem 'unleash', '~> 3.2.2'
-@@ -536,7 +440,7 @@ gem 'lockbox', '~> 0.6.2'
+@@ -551,7 +455,7 @@ gem 'lockbox', '~> 0.6.2'
gem 'valid_email', '~> 0.1'
# JSON
@@ -212,9 +228,12 @@
gem 'json_schemer', '~> 0.2.18'
gem 'oj', '~> 3.13.21'
gem 'multi_json', '~> 1.14.1'
-@@ -556,3 +460,5 @@ gem 'ed25519', '~> 1.3.0'
+@@ -571,6 +475,8 @@ 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'
+
+gem 'parser'
+
+ # Vulnerability advisories
+ gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite'
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example
index 60c85ebbe32e..47ef297541dc 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-10-04 13:45:39 UTC
+--- config/gitlab.yml.example.orig 2022-11-11 19:24:20 UTC
+++ config/gitlab.yml.example
-@@ -1174,14 +1174,14 @@ production: &base
+@@ -1179,14 +1179,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
-@@ -1216,12 +1216,12 @@ production: &base
+@@ -1221,12 +1221,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -34,7 +34,7 @@
# Git over HTTP
upload_pack: true
-@@ -1236,13 +1236,13 @@ production: &base
+@@ -1241,13 +1241,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
-@@ -1255,13 +1255,13 @@ production: &base
+@@ -1260,13 +1260,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
-@@ -1282,18 +1282,18 @@ production: &base
+@@ -1287,18 +1287,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:
-@@ -1518,13 +1518,13 @@ test:
+@@ -1523,13 +1523,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 4b3228bed380..b08117571cdf 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 2022-10-04 13:45:39 UTC
+--- config/initializers/1_settings.rb.orig 2022-11-11 19:24:20 UTC
+++ config/initializers/1_settings.rb
-@@ -206,11 +206,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi
+@@ -207,11 +207,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_omniauth-gitlab_omniauth-gitlab.gemspec b/www/gitlab-ce/files/patch-vendor_gems_omniauth-gitlab_omniauth-gitlab.gemspec
deleted file mode 100644
index 19df8b60e7be..000000000000
--- a/www/gitlab-ce/files/patch-vendor_gems_omniauth-gitlab_omniauth-gitlab.gemspec
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/gems/omniauth-gitlab/omniauth-gitlab.gemspec.orig 2022-10-18 19:55:51 UTC
-+++ vendor/gems/omniauth-gitlab/omniauth-gitlab.gemspec
-@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
- gem.require_paths = ['lib']
-
- gem.add_dependency 'omniauth', '~> 2.0'
-- gem.add_dependency 'omniauth-oauth2', '~> 1.7.1'
-+ gem.add_dependency 'omniauth-oauth2', '~> 1.7'
- gem.add_development_dependency 'rspec', '~> 3.1'
- gem.add_development_dependency 'rspec-its', '~> 1.0'
- gem.add_development_dependency 'simplecov'
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
deleted file mode 100644
index bbaa46861c4b..000000000000
--- a/www/gitlab-ce/files/patch-vendor_gems_omniauth-google-oauth2_omniauth-google-oauth2.gemspec
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/pkg-message b/www/gitlab-ce/pkg-message
index 8fe52484aa15..6d3d02a3f570 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.4-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/15.5-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.3-15.4-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/15.4-15.5-freebsd.md
If you just installed an minor upgrade of GitLab please follow
the instructions in the guide at:
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index b07cb92f0c58..d990623b2bde 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-workhorse
-PORTVERSION= 15.4.4
+PORTVERSION= 15.5.4
PORTREVISION= 0
DISTVERSIONPREFIX= v
CATEGORIES= www
@@ -25,7 +25,7 @@ USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
GL_PROJECT= gitlab-foss
# Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
-GL_COMMIT= 6442864a274d88d16ee303e78b3c3d1aed79265c
+GL_COMMIT= ee1b34560d908f44af7ed9b3fbc8c56595bbae81
# for go dependencies
# Gitlab hosts there dependencies on their own platform and not on go-proxy
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index bd89d75aaa6f..61ed238bd6c4 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1667627373
-SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-6442864a274d88d16ee303e78b3c3d1aed79265c_GL0/go.mod) = 62de61822cf0c662b35a03c0c836c06b6471962c94ab82908ccfdda989929ce7
-SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-6442864a274d88d16ee303e78b3c3d1aed79265c_GL0/go.mod) = 6134
-SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-6442864a274d88d16ee303e78b3c3d1aed79265c_GL0/gitlab-org-gitlab-foss-6442864a274d88d16ee303e78b3c3d1aed79265c_GL0.tar.gz) = 28b525b4c1f686a20d33b4c2e518f7a86f66e56264f1f6f4637e2fec13c461aa
-SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-6442864a274d88d16ee303e78b3c3d1aed79265c_GL0/gitlab-org-gitlab-foss-6442864a274d88d16ee303e78b3c3d1aed79265c_GL0.tar.gz) = 101273593
+TIMESTAMP = 1668836587
+SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ee1b34560d908f44af7ed9b3fbc8c56595bbae81_GL0/go.mod) = d5b6ced60bc032bc69300e405a6788e953abf6a9b29bbd2099f1aeffe6ebfd0e
+SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ee1b34560d908f44af7ed9b3fbc8c56595bbae81_GL0/go.mod) = 6131
+SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ee1b34560d908f44af7ed9b3fbc8c56595bbae81_GL0/gitlab-org-gitlab-foss-ee1b34560d908f44af7ed9b3fbc8c56595bbae81_GL0.tar.gz) = 651c6a6d1837824a9d8b023c2b93bcab4979ba0446c9b31e7f82b34abe739492
+SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ee1b34560d908f44af7ed9b3fbc8c56595bbae81_GL0/gitlab-org-gitlab-foss-ee1b34560d908f44af7ed9b3fbc8c56595bbae81_GL0.tar.gz) = 97980260