From nobody Sat Dec 4 12:09:15 2021 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 6083C18BEC60; Sat, 4 Dec 2021 12:09:23 +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 4J5pQR27D0z3lLQ; Sat, 4 Dec 2021 12:09:18 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 16B8223DCC; Sat, 4 Dec 2021 12:09:16 +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 1B4C9FN0077935; Sat, 4 Dec 2021 12:09:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B4C9Fgg077934; Sat, 4 Dec 2021 12:09:15 GMT (envelope-from git) Date: Sat, 4 Dec 2021 12:09:15 GMT Message-Id: <202112041209.1B4C9Fgg077934@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: 59c3b95df7f3 - main - www/gitlab-ce: update to 14.5.1 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: 59c3b95df7f36c76360bcbf889e040df9260702f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638619759; 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=6fTUmuL/yyu6MXXftQjcSTArpcZZ4+oSxZfCwky8UZI=; b=b8qMwJj92afU2lWC/LOVpDCQb2wkjNZGIDoK3JA7mqx6K8pSaWAUDHmVYxw/76KsoGasKl e8b/yZjkfK4WaCzUuKZ/RdYCsMjRKLopQLzikv1M3n5Z5hrMSdZOAypvx2s/02KtMZthiz ZUOdRIT2tnETkNMBmG4yTOs7eIaiZ8Y+Ij0RCu4AQN3vnN8ksdGAvZNLYL3EWQ2INlVKKK lSrxAuDi/hQTUlITOka7M8nV4oe+ia5Dk6FncRH+e873JM0gb4eTUZl6enEJqyH2chIck1 MvyzqQfR0Z6o+28Lb5AhLIVNweCpucqCct0aYgLuSMFl0MgeTxU7sL6UwyNExg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638619759; a=rsa-sha256; cv=none; b=kOqagimC470gtExb2eo4qopcXrfatKBvbYQrnoux51jsdIFN7hi71oSry1KuleO/ZDRU8J NoClHCpsrg9/J2rLT3lf3kntQIhKe1BdnLlw3c5RuYQ5soaSHQf4fD00ffes0BbuRkdf1E /zr3VPIELBOWCurHOXDMr9hYLCrThA6tPV6Hu4fZ0LU6YMU4XDwiEGeKswU+hRMtyUabQY L3kiBdeFKZhk2254bd8I3w+BsifebFylEkHGTTwJya+nH3vnz0WJrB1WXBmQa7Xc/9fEHq 4MUit2903r/aamtdH01B8BtXzQEnet//mOTien10EtJaKBgt9cGwkXDVupT+4A== 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=59c3b95df7f36c76360bcbf889e040df9260702f commit 59c3b95df7f36c76360bcbf889e040df9260702f Author: Matthias Fechner AuthorDate: 2021-12-04 08:56:54 +0000 Commit: Matthias Fechner CommitDate: 2021-12-04 12:07:29 +0000 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/ --- www/gitlab-ce/Makefile | 25 ++++++++++--------- www/gitlab-ce/distinfo | 6 ++--- www/gitlab-ce/files/patch-Gemfile | 28 ++++++++++++---------- www/gitlab-ce/files/patch-bin_background__jobs | 6 ++--- .../files/patch-config_gitlab.yml.example | 12 +++++----- www/gitlab-ce/pkg-message | 4 ++-- 6 files changed, 43 insertions(+), 38 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 8db64ab527ec..0b079d4da7bc 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,8 +1,8 @@ # Created by: Torsten Zuehlsdorff 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 index c970922dd18f..6e72135e3fca 100644 --- 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 index d331a496098a..260e33f1bc43 100644 --- 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,7 +9,7 @@ # 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' @@ -17,7 +17,7 @@ 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,7 +92,7 @@ -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 @@ -98,11 +100,11 @@ - 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 index 8ede44b924f3..552f9367a5ce 100644 --- a/www/gitlab-ce/files/patch-bin_background__jobs +++ b/www/gitlab-ce/files/patch-bin_background__jobs @@ -1,6 +1,6 @@ ---- 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 @@ -8,4 +8,4 @@ + ${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 index 367f017a1be4..ee2087c0b875 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 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 index 6fa2671da9c8..faedfb188f16 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/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: