www/gitlab-ce: update to 14.5.1

Changelog: https://about.gitlab.com/releases/2021/11/22/gitlab-14-5-released/ https://about.gitlab.com/releases/2021/12/01/gitlab-14-5-1-released/
freebsd · Dec 4, 2021 · 59c3b95 · 59c3b95
1 parent ea705ae
commit 59c3b95
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 38 deletions.
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
@@ -1,8 +1,8 @@
 # Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
 
 PORTNAME=	gitlab-ce
-PORTVERSION=	14.4.2
-PORTREVISION=	2
+PORTVERSION=	14.5.1
+PORTREVISION=	0
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -17,24 +17,24 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	gitaly>=${PORTVERSION}:devel/gitaly \
 	gitlab-elasticsearch-indexer>=2.16.0:textproc/gitlab-elasticsearch-indexer \
 	gitlab-agent>=14.4.0:net/gitlab-agent \
-	gitlab-pages>=1.46.0:www/gitlab-pages \
-	gitlab-shell>=13.21.1:devel/gitlab-shell \
+	gitlab-pages>=1.48.0:www/gitlab-pages \
+	gitlab-shell>=13.22.0:devel/gitlab-shell \
 	gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \
 	redis>=6.0.14:databases/redis \
 	yarn>=1.10.0:www/yarn \
 	gtar>0:archivers/gtar \
 	bash>0:shells/bash \
 	rubygem-rails61>=6.1.4.1<6.1.4.2:www/rubygem-rails61 \
-	rubygem-bootsnap14>=1.4.6<2.0:devel/rubygem-bootsnap14 \
+	rubygem-bootsnap>=1.9.1<1.10:devel/rubygem-bootsnap \
 	rubygem-responders-rails61>=3.0<4.0:www/rubygem-responders-rails61 \
 	rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \
 	rubygem-default_value_for>=3.4.0<3.5.0:devel/rubygem-default_value_for \
 	rubygem-pg>=1.2.3<2:databases/rubygem-pg \
-	rubygem-rugged>=1.1<2:devel/rubygem-rugged \
+	rubygem-rugged>=1.2<2:devel/rubygem-rugged \
 	rubygem-grape-path-helpers>=1.7.0<1.8:devel/rubygem-grape-path-helpers \
 	rubygem-faraday>=1.0<2:www/rubygem-faraday \
 	rubygem-marginalia>=1.10.0<1.11:databases/rubygem-marginalia \
-	rubygem-declarative_policy>=1.0.0<1.1:security/rubygem-declarative_policy \
+	rubygem-declarative_policy>=1.1.0<1.2:security/rubygem-declarative_policy \
 	rubygem-devise47-rails61>=4.7.2<4.8:devel/rubygem-devise47-rails61 \
 	rubygem-bcrypt>=3.1.14<3.2:security/rubygem-bcrypt \
 	rubygem-doorkeeper>=5.5.0.rc2<5.6:security/rubygem-doorkeeper \
@@ -46,6 +46,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	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>=1.1.4<1.2.0:security/rubygem-omniauth-cas3 \
+	rubygem-omniauth-dingtalk-oauth2>=1.0<2:security/rubygem-omniauth-dingtalk-oauth2 \
 	rubygem-omniauth-facebook4>=4.0.0<4.1.0:net/rubygem-omniauth-facebook4 \
 	rubygem-omniauth-github>=1.4.0<2.0:net/rubygem-omniauth-github \
 	rubygem-omniauth-gitlab>=1.0.2<1.1.0:security/rubygem-omniauth-gitlab \
@@ -138,6 +139,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-rack-timeout>=0.5.1<0.6:www/rubygem-rack-timeout \
 	rubygem-puma>=5.3.1<5.4: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>=7.0<8.0:www/rubygem-acts-as-taggable-on \
 	rubygem-sidekiq>=6.2.2<6.3:devel/rubygem-sidekiq \
@@ -179,7 +181,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-autoprefixer-rails1025>=10.2.5.1<10.2.6:textproc/rubygem-autoprefixer-rails1025 \
 	rubygem-terser>=1.0.2:textproc/rubygem-terser \
 	rubygem-addressable>=2.8<3:www/rubygem-addressable \
-	rubygem-gemojione>=3.3<4.0:graphics/rubygem-gemojione \
+	rubygem-tanuki_emoji>=0.5<1:graphics/rubygem-tanuki_emoji \
 	rubygem-gon-rails61>=6.4.0<6.5:www/rubygem-gon-rails61 \
 	rubygem-request_store>=1.5<2.0:devel/rubygem-request_store \
 	rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \
@@ -223,7 +225,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-ed25519>=1.2<2.0:security/rubygem-ed25519 \
 	rubygem-bcrypt_pbkdf>=1.0<2.0:security/rubygem-bcrypt_pbkdf \
 	rubygem-spamcheck>=0.1.0<0.2:net/rubygem-spamcheck \
-	rubygem-gitaly>=14.3.0.pre.rc2<14.4.0:net/rubygem-gitaly \
+	rubygem-gitaly>=14.4.0.pre.rc43<14.5.0:net/rubygem-gitaly \
 	rubygem-kas-grpc>=0.0.2,1<0.0.3,1:net/rubygem-kas-grpc \
 	rubygem-grpc142>=1.30.2<2:net/rubygem-grpc142 \
 	rubygem-google-protobuf>=3.19.0<3.20:devel/rubygem-google-protobuf \
@@ -250,7 +252,8 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-yajl-ruby>=1.4.1<1.5:devel/rubygem-yajl-ruby \
 	rubygem-webauthn>=2.3<3:security/rubygem-webauthn \
 	rubygem-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \
-	rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1
+	rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1 \
+	rubygem-ipynbdiff>=0.3.7<0.3.8:devel/rubygem-ipynbdiff
 
 BUILD_DEPENDS=	gem:devel/ruby-gems \
 	${MY_DEPENDS}
@@ -271,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=	1ce86e92f81869fc38ece6ae212b5ea9d5ffd405
+GL_COMMIT=	9d9ee598bc514eaee681b40cdff4d12a3a8f412a
 
 USERS=	git
 GROUPS=	git

diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636563242
-SHA256 (gitlab-org-gitlab-foss-1ce86e92f81869fc38ece6ae212b5ea9d5ffd405_GL0.tar.gz) = c7c26d75cce1030d6f8a61ae8b81ca6bfc92910eb30b0a1941ab6ac4f45b45e7
-SIZE (gitlab-org-gitlab-foss-1ce86e92f81869fc38ece6ae212b5ea9d5ffd405_GL0.tar.gz) = 94877267
+TIMESTAMP = 1638528162
+SHA256 (gitlab-org-gitlab-foss-9d9ee598bc514eaee681b40cdff4d12a3a8f412a_GL0.tar.gz) = 8ea6451b84e2966f3bb8f20dd65b697dc38778bd810e44d1150dfc89016ab773
+SIZE (gitlab-org-gitlab-foss-9d9ee598bc514eaee681b40cdff4d12a3a8f412a_GL0.tar.gz) = 102147890
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
@@ -1,6 +1,6 @@
---- Gemfile.orig	2021-11-08 11:58:53 UTC
+--- Gemfile.orig	2021-12-01 10:42:56 UTC
 +++ Gemfile
-@@ -88,7 +88,7 @@ gem 'gpgme', '~> 2.0.19'
+@@ -89,7 +89,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.1.1', require: 'omniauth-ldap'
@@ -9,15 +9,15 @@
 
  # API
  gem 'grape', '~> 1.5.2'
-@@ -102,7 +102,6 @@ gem 'graphql', '~> 1.11.8'
+@@ -103,7 +103,6 @@ gem 'graphql', '~> 1.11.8'
  # https://gitlab.com/gitlab-org/gitlab/issues/31747
  gem 'graphiql-rails', '~> 1.4.10'
  gem 'apollo_upload_server', '~> 2.1.0'
 -gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
  gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
 
  gem 'hashie'
-@@ -328,110 +327,19 @@ gem 'batch-loader', '~> 2.0.1'
+@@ -330,112 +329,14 @@ gem 'batch-loader', '~> 2.0.1'
  gem 'peek', '~> 1.1'
 
  # Snowplow events tracking
@@ -35,13 +35,15 @@
 -  gem 'lefthook', '~> 0.7.0', require: false
 -  gem 'solargraph', '~> 0.43', require: false
 -
--  gem 'letter_opener_web', '~> 1.4.1'
+-  gem 'letter_opener_web', '~> 2.0.0'
 -
 -  # Better errors handler
 -  gem 'better_errors', '~> 2.9.0'
 -
 -  # thin instead webrick
 -  gem 'thin', '~> 1.8.0'
+-
+-  gem 'sprite-factory', '~> 1.7'
 -end
 -
 -group :development, :test do
@@ -66,7 +68,7 @@
 -  gem 'spring', '~> 2.1.0'
 -  gem 'spring-commands-rspec', '~> 1.0.4'
 -
--  gem 'gitlab-styles', '~> 6.3.0', require: false
+-  gem 'gitlab-styles', '~> 6.4.0', require: false
 -
 -  gem 'haml_lint', '~> 0.36.0', require: false
 -  gem 'bundler-audit', '~> 0.7.0.1', require: false
@@ -90,19 +92,19 @@
 -end
 -
 -group :development, :test, :danger do
--  gem 'gitlab-dangerfiles', '~> 2.3.0', require: false
+-  gem 'gitlab-dangerfiles', '~> 2.5.0', require: false
 -end
 -
 -group :development, :test, :coverage do
 -  gem 'simplecov', '~> 0.18.5', require: false
 -  gem 'simplecov-cobertura', '~> 1.3.1', require: false
 -end
 -
- # Gems required in omnibus-gitlab pipeline
- group :development, :test, :omnibus do
-   gem 'license_finder', '~> 6.0', require: false
- end
- 
+-# Gems required in omnibus-gitlab pipeline
+-group :development, :test, :omnibus do
+-  gem 'license_finder', '~> 6.0', require: false
+-end
+-
 -group :test do
 -  gem 'fuubar', '~> 2.2.0'
 -  gem 'rspec-retry', '~> 0.6.1'
@@ -129,7 +131,7 @@
  gem 'octokit', '~> 4.15'
 
  # https://gitlab.com/gitlab-org/gitlab/issues/207207
-@@ -479,9 +387,9 @@ gem 'gitaly', '~> 14.3.0.pre.rc2'
+@@ -483,9 +384,9 @@ gem 'gitaly', '~> 14.4.0.pre.rc43'
  # KAS GRPC protocol definitions
  gem 'kas-grpc', '~> 0.0.2'
 

diff --git a/www/gitlab-ce/files/patch-bin_background__jobs b/www/gitlab-ce/files/patch-bin_background__jobs
@@ -1,11 +1,11 @@
---- bin/background_jobs.orig	2021-10-27 21:39:44 UTC
+--- bin/background_jobs.orig	2021-12-01 10:42:56 UTC
 +++ bin/background_jobs
-@@ -56,7 +56,7 @@ start_sidekiq()
+@@ -58,7 +58,7 @@ start_sidekiq()
      processes_args+=("${sidekiq_queues}")
    done
 
 -  ${cmd} bin/sidekiq-cluster "${processes_args[@]}" -P $sidekiq_pidfile -e $RAILS_ENV "$@" 2>&1 | tee -a $sidekiq_logfile
 +  ${cmd} bin/sidekiq-cluster "${processes_args[@]}" -P $sidekiq_pidfile -e $RAILS_ENV "$@" 2>&1 >> $sidekiq_logfile
  }
 
- action="$1"
+ cleanup()
diff --git 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	2021-10-28 07:49:38 UTC
+--- config/gitlab.yml.example.orig	2021-12-01 10:42:56 UTC
 +++ config/gitlab.yml.example
-@@ -1130,14 +1130,14 @@ production: &base
+@@ -1133,14 +1133,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
-@@ -1186,12 +1186,12 @@ production: &base
+@@ -1189,12 +1189,12 @@ production: &base
 
    ## GitLab Shell settings
    gitlab_shell:
@@ -34,7 +34,7 @@
 
      # Git over HTTP
      upload_pack: true
-@@ -1206,13 +1206,13 @@ production: &base
+@@ -1209,13 +1209,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
-@@ -1225,13 +1225,13 @@ production: &base
+@@ -1228,13 +1228,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
-@@ -1461,13 +1461,13 @@ test:
+@@ -1464,13 +1464,13 @@ test:
          gitaly_address: unix:tmp/tests/gitaly/praefect.socket
 
    gitaly:

diff --git 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/14.4-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/14.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 12.6.x to 12.7.x, please follow the instructions in the guide at:
 
-https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/14.3-14.4-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/14.4-14.5-freebsd.md
 
 If you just installed an minor upgrade of GitLab please follow
 the instructions in the guide at: