Date: Fri, 23 Feb 2024 15:09:15 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 59be68bbd4de - 2024Q1 - www/gitlab-ce: major upgrade to 16.8.0 Message-ID: <202402231509.41NF9FcJ028043@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q1 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=59be68bbd4de1f4d391a16d566ed42113c32cb0e commit 59be68bbd4de1f4d391a16d566ed42113c32cb0e Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2024-01-26 07:02:52 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2024-02-23 14:20:35 +0000 www/gitlab-ce: major upgrade to 16.8.0 Changelog: https://about.gitlab.com/releases/2024/01/18/gitlab-16-8-released/ (cherry picked from commit 58afc6159911340bb4b8b5c39d0983eb70f35526) --- devel/gitaly/Makefile | 4 +- devel/gitaly/distinfo | 10 ++--- devel/gitaly/files/patch-config.toml.example | 52 +++++++++++++--------- net/gitlab-agent/Makefile | 2 +- net/gitlab-agent/distinfo | 10 ++--- textproc/gitlab-elasticsearch-indexer/Makefile | 3 +- textproc/gitlab-elasticsearch-indexer/distinfo | 10 ++--- www/gitlab-ce/Makefile | 35 ++++++++------- www/gitlab-ce/distinfo | 6 +-- www/gitlab-ce/files/patch-Gemfile | 44 +++++++++--------- .../files/patch-config_gitlab.yml.example | 18 ++++---- www/gitlab-ce/pkg-message | 4 +- www/gitlab-pages/Makefile | 2 +- www/gitlab-pages/distinfo | 10 ++--- www/gitlab-workhorse/Makefile | 2 +- www/gitlab-workhorse/distinfo | 10 ++--- 16 files changed, 118 insertions(+), 104 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index e7d0c8236cbe..d0a38d763d39 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -DISTVERSION= 16.7.5 +DISTVERSION= 16.8.0 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE # define dependencies that are required for build and run under MY_DEPENDS -MY_DEPENDS= git>=2.42.0:devel/git +MY_DEPENDS= git>=2.43.0:devel/git BUILD_DEPENDS= bash>0:shells/bash \ ${LOCALBASE}/bin/cmake:devel/cmake-core \ pcre2>0:devel/pcre2 \ diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index b3c4f7e79a35..1f446374abc8 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1707409945 -SHA256 (go/devel_gitaly/gitaly-v16.7.5/go.mod) = 116d784159802d477662fb34b1165c4f02fd8caf8ac72718b2c518745dc0ebc3 -SIZE (go/devel_gitaly/gitaly-v16.7.5/go.mod) = 10585 -SHA256 (go/devel_gitaly/gitaly-v16.7.5/gitaly-v16.7.5.tar.bz2) = d747bd250ccfcd6a5dc882dcb000dbe5ba8a6941796c96df055762081c35a6d0 -SIZE (go/devel_gitaly/gitaly-v16.7.5/gitaly-v16.7.5.tar.bz2) = 2531724 +TIMESTAMP = 1705827282 +SHA256 (go/devel_gitaly/gitaly-v16.8.0/go.mod) = 114e8afe5f7e9000677d449a0d55972d9845f8c237cfc3eb98d673cf886006a7 +SIZE (go/devel_gitaly/gitaly-v16.8.0/go.mod) = 10585 +SHA256 (go/devel_gitaly/gitaly-v16.8.0/gitaly-v16.8.0.tar.bz2) = b8f0009b58afb95984fa280bcab8eafd98e6a0d740478735a8df44f93ccee40c +SIZE (go/devel_gitaly/gitaly-v16.8.0/gitaly-v16.8.0.tar.bz2) = 2554011 diff --git a/devel/gitaly/files/patch-config.toml.example b/devel/gitaly/files/patch-config.toml.example index eecaf610290f..a2098b52a366 100644 --- a/devel/gitaly/files/patch-config.toml.example +++ b/devel/gitaly/files/patch-config.toml.example @@ -1,7 +1,7 @@ ---- config.toml.example.orig 2023-12-20 08:48:30 UTC +--- config.toml.example.orig 2024-01-17 10:05:29 UTC +++ config.toml.example @@ -2,10 +2,10 @@ - # For Gitaly documentation, see https://docs.gitlab.com/ee/administration/gitaly/ + # For Gitaly documentation, see https://docs.gitlab.com/ee/administration/gitaly/. # A path which Gitaly should open a Unix socket. -socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" @@ -13,20 +13,20 @@ # # Optional. The directory where Gitaly can create all files required to # # properly operate at runtime. If not set, Gitaly will create a directory in -@@ -39,9 +39,9 @@ bin_dir = "/home/git/gitaly/_build/bin" - # # Path to the key. +@@ -40,9 +40,9 @@ bin_dir = "/home/git/gitaly/_build/bin" # key_path = '/home/git/key.pem' --# # Git settings + # # Git settings -# [git] +-# # Path to Git binary. If not set, is resolved using PATH. -# bin_path = "/usr/bin/git" -+# Git settings +[git] ++# Path to Git binary. If not set, is resolved using PATH. +bin_path = "%%PREFIX%%/bin/git" + # # Maximum number of cached 'cat-file' processes, which constitute a pair of 'git cat-file --batch' and + # # 'git cat-file --batch-check' processes. Defaults to '100'. # catfile_cache_size = 100 - # - # [[git.config]] -@@ -53,7 +53,7 @@ bin_dir = "/home/git/gitaly/_build/bin" +@@ -58,7 +58,7 @@ bin_dir = "/home/git/gitaly/_build/bin" # # The name of the storage name = "default" # # The path to the storage. @@ -35,30 +35,38 @@ # # You can optionally configure more storages for this Gitaly instance to serve up # -@@ -63,9 +63,9 @@ path = "/home/git/repositories" +@@ -68,9 +68,9 @@ path = "/home/git/repositories" # - # # You can optionally configure Gitaly to output JSON-formatted log messages to stdout + # # Optional. Configure Gitaly to output JSON-formatted log messages to stdout. -# [logging] -+[logging] - # # The directory where Gitaly stores extra log files +-# # Directory where Gitaly stores extra log files. -dir = "/home/git/gitlab/log" ++[logging] ++# Directory where Gitaly stores extra log files. +dir = "%%PREFIX%%/www/gitlab-ce/log" + # # Log format. Either 'text' or 'json'. # format = "json" - # # Optional. Set log level to only log entries with that severity or above - # # One of, in order: debug, info, warn, errror, fatal, panic -@@ -80,11 +80,11 @@ dir = "/home/git/gitlab/log" - # grpc_latency_buckets = [0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 300.0, 1500.0] - + # # Optional. Set log level to only log entries with that severity or above. +@@ -91,18 +91,18 @@ sentry_environment = "" + # # Custom Git hooks that are used to perform tasks based on changes performed in any repository. [hooks] + # # Directory where custom Git hooks are installed. If left unset, no custom hooks are used. -custom_hooks_dir = "/home/git/custom_hooks" +custom_hooks_dir = "%%PREFIX%%/git/custom_hooks" + # # Gitaly must connect to the GitLab application to perform access checks when a user performs a change. [gitlab] --secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret" + # # URL of the GitLab server. -url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" -+secret_file = "%%PREFIX%%/share/gitlab-shell/.gitlab_shell_secret" +url = "http+unix://%2Fusr%2Flocal%2Fwww%2Fgitlab-ce%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" - # Only needed if a UNIX socket is used in `url` and GitLab is configured to - # use a relative path (e.g. /gitlab). + # # 'relative_url_root' is only needed if a UNIX socket is used in 'url' and GitLab is configured to + # # use a relative path. For example, '/gitlab'. # relative_url_root = '/' + # # Path of the file containing the secret token used to authenticate with GitLab. Use either 'secret_token' or 'secret' + # # but not both. +-secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret" ++secret_file = "%%PREFIX%%/share/gitlab-shell/.gitlab_shell_secret" + # # Secret token used to authenticate with GitLab. + # secret = "" + diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile index 014701799253..d6d6a326385e 100644 --- a/net/gitlab-agent/Makefile +++ b/net/gitlab-agent/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-agent -PORTVERSION= 16.7.0 +PORTVERSION= 16.8.0 DISTVERSIONPREFIX= v CATEGORIES= net diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index 372c6fa9c41f..77e75b418290 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1703590039 -SHA256 (go/net_gitlab-agent/gitlab-agent-v16.7.0/v16.7.0.mod) = ead54d88689a5a6c3007e0d1015c209fb87caac4b2efd6debd3e60aca3d7b0cf -SIZE (go/net_gitlab-agent/gitlab-agent-v16.7.0/v16.7.0.mod) = 7185 -SHA256 (go/net_gitlab-agent/gitlab-agent-v16.7.0/v16.7.0.zip) = e668cf4cd9e26162b8d2cdcfdb0a8410c381406a239261e3d880d6aaa9f6a048 -SIZE (go/net_gitlab-agent/gitlab-agent-v16.7.0/v16.7.0.zip) = 1230473 +TIMESTAMP = 1706246360 +SHA256 (go/net_gitlab-agent/gitlab-agent-v16.8.0/v16.8.0.mod) = 096d0a40c53e3e0cfb3ab7c82ba0a0a3560b9f28f997669c2e92c1a6aa5805ba +SIZE (go/net_gitlab-agent/gitlab-agent-v16.8.0/v16.8.0.mod) = 7238 +SHA256 (go/net_gitlab-agent/gitlab-agent-v16.8.0/v16.8.0.zip) = d68f6448e9f950605925a628b45f1ca86e371a18253a8a78091bdac4ae20374b +SIZE (go/net_gitlab-agent/gitlab-agent-v16.8.0/v16.8.0.zip) = 1226400 diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile index c5ff24aac12a..2e34d589282d 100644 --- a/textproc/gitlab-elasticsearch-indexer/Makefile +++ b/textproc/gitlab-elasticsearch-indexer/Makefile @@ -1,6 +1,5 @@ PORTNAME= gitlab-elasticsearch-indexer -PORTVERSION= 4.5.0 -PORTREVISION= 1 +PORTVERSION= 4.6.0 DISTVERSIONPREFIX= v CATEGORIES= textproc diff --git a/textproc/gitlab-elasticsearch-indexer/distinfo b/textproc/gitlab-elasticsearch-indexer/distinfo index c84e88220d00..d038eb887b1c 100644 --- a/textproc/gitlab-elasticsearch-indexer/distinfo +++ b/textproc/gitlab-elasticsearch-indexer/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1700763661 -SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.5.0/go.mod) = 1b4e18ed56e2774615bf8c5bdbf2133be0366917d4907fbc7e27b3f82b8f0ba1 -SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.5.0/go.mod) = 4653 -SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.5.0/gitlab-elasticsearch-indexer-v4.5.0.tar.bz2) = 6e48387f8118bdee6d6c7b0bc856f5d02e8890a4f557373b377ac5fcd778aea0 -SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.5.0/gitlab-elasticsearch-indexer-v4.5.0.tar.bz2) = 59249 +TIMESTAMP = 1705862004 +SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.6.0/go.mod) = 1e09030556aa2aff46f7acd2d2fd6dd9366a2c4e8e0bddaa0bb041d9722d2c91 +SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.6.0/go.mod) = 4722 +SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.6.0/gitlab-elasticsearch-indexer-v4.6.0.tar.bz2) = c26b442198a4010019527ab6488329dce99f12d8cb5a528ed7e5dcfb5da912c4 +SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.6.0/gitlab-elasticsearch-indexer-v4.6.0.tar.bz2) = 59537 diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 539966a4feb3..a93600a2d77b 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-ce -PORTVERSION= 16.7.5 +PORTVERSION= 16.8.0 DISTVERSIONPREFIX= v CATEGORIES= www devel @@ -24,8 +24,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # mail/rubygem-net-pop is required as ruby 3.1 removed it MY_DEPENDS= git>=2.41.0:devel/git \ gitaly>=${PORTVERSION}:devel/gitaly \ - gitlab-elasticsearch-indexer>=4.5.0:textproc/gitlab-elasticsearch-indexer \ - gitlab-agent>=16.7.0:net/gitlab-agent \ + gitlab-elasticsearch-indexer>=4.6.0:textproc/gitlab-elasticsearch-indexer \ + gitlab-agent>=16.8.0:net/gitlab-agent \ gitlab-pages>=${PORTVERSION}:www/gitlab-pages \ gitlab-shell>=14.32.0:devel/gitlab-shell \ gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \ @@ -37,7 +37,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-net-pop>=0:mail/rubygem-net-pop \ rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \ rubygem-rails70>=7.0.8<7.1:www/rubygem-rails70 \ - rubygem-bootsnap>=1.17.0<1.18:devel/rubygem-bootsnap \ + rubygem-bootsnap>=1.17.1<1.18:devel/rubygem-bootsnap \ rubygem-openssl>=3.0<4:security/rubygem-openssl \ rubygem-ipaddr>=1.2.5<1.3:net/rubygem-ipaddr \ rubygem-responders-rails70>=3.0<4.0:www/rubygem-responders-rails70 \ @@ -86,11 +86,11 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-gpgme>=2.0.23<2.1.0:security/rubygem-gpgme \ rubygem-gitlab_omniauth-ldap>=2.2.0<2.3.0:net/rubygem-gitlab_omniauth-ldap \ rubygem-net-ldap017>=0.17.1<0.18:net/rubygem-net-ldap017 \ - rubygem-grape17>=1.7.0<1.8:devel/rubygem-grape17 \ + rubygem-grape>=2.0.0<2.1:devel/rubygem-grape \ rubygem-grape-entity>=0.10.0<0.11.0,1:devel/rubygem-grape-entity \ - rubygem-grape-swagger16>=1.6.1<1.7:devel/rubygem-grape-swagger16 \ + rubygem-grape-swagger>=2.0.1<2.1:devel/rubygem-grape-swagger \ rubygem-grape-swagger-entity>=0.5.1<0.6:devel/rubygem-grape-swagger-entity \ - rubygem-grape-path-helpers>=1.7.1<1.8:devel/rubygem-grape-path-helpers \ + rubygem-grape-path-helpers>=2.0.0<2.1:devel/rubygem-grape-path-helpers \ rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \ rubygem-graphql>=2.0.27<2.1:devel/rubygem-graphql \ rubygem-graphql-docs>=4.0.0<4.1.0:devel/rubygem-graphql-docs \ @@ -125,9 +125,9 @@ MY_DEPENDS= git>=2.41.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-core>=3.190.0<4:devel/rubygem-aws-sdk-core \ + rubygem-aws-sdk-core>=3.190<4:devel/rubygem-aws-sdk-core \ rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \ - rubygem-aws-sdk-s3>=1.141.0<2:devel/rubygem-aws-sdk-s3 \ + rubygem-aws-sdk-s3>=1.142.0<2: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 +145,8 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-asciidoctor-kroki>=0.8.0<0.9:textproc/rubygem-asciidoctor-kroki \ rubygem-rouge>=4.2.0<4.3:textproc/rubygem-rouge \ rubygem-truncato>=0.7.12<0.8.0:textproc/rubygem-truncato \ - rubygem-nokogiri>=1.15.5<2:textproc/rubygem-nokogiri \ + rubygem-nokogiri>=1.16<2:textproc/rubygem-nokogiri \ + rubygem-gitlab-glfm-markdown>=0.0.10<0.1:textproc/rubygem-gitlab-glfm-markdown \ rubygem-icalendar>=0:devel/rubygem-icalendar \ rubygem-diffy>=3.4<4:textproc/rubygem-diffy \ rubygem-rack22>=2.2.8,3<2.3,3:www/rubygem-rack22 \ @@ -154,13 +155,13 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \ rubygem-state_machines-activerecord08>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord08 \ rubygem-acts-as-taggable-on>=10.0<11:www/rubygem-acts-as-taggable-on \ - rubygem-sidekiq6>=6.5.10<6.6:devel/rubygem-sidekiq6 \ + rubygem-sidekiq71>=7.1.6<7.2:devel/rubygem-sidekiq71 \ rubygem-sidekiq-cron-rails70>=1.12.0<1.13:devel/rubygem-sidekiq-cron-rails70 \ rubygem-fugit18>=1.8.1<1.9:devel/rubygem-fugit18 \ rubygem-httparty>=0.21.0<0.22:www/rubygem-httparty \ rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \ rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \ - rubygem-re2>=2.5.0<2.6:devel/rubygem-re2 \ + rubygem-re2>=2.6.0<2.6.1:devel/rubygem-re2 \ rubygem-semver_dialects>=1.5<2:devel/rubygem-semver_dialects \ rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \ rubygem-js_regex>=3.8<4.0:textproc/rubygem-js_regex \ @@ -168,7 +169,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-redis4>=4.8.0<4.8.2:databases/rubygem-redis4 \ rubygem-redis-namespace110>=1.10.0<1.11:databases/rubygem-redis-namespace110 \ rubygem-connection_pool>=2.4.1<3.0:net/rubygem-connection_pool \ - rubygem-redis-actionpack-rails70>=5.3.0<5.4:databases/rubygem-redis-actionpack-rails70 \ + rubygem-redis-actionpack-rails70>=5.4.0<5.5:databases/rubygem-redis-actionpack-rails70 \ rubygem-discordrb-webhooks>=3.4<4.0:net-im/rubygem-discordrb-webhooks \ rubygem-jira-ruby21>=2.1.4<2.2:devel/rubygem-jira-ruby21 \ rubygem-atlassian-jwt>=0.2.0<0.3.0:www/rubygem-atlassian-jwt \ @@ -203,7 +204,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-sentry-sidekiq>=5.10.0<5.11:devel/rubygem-sentry-sidekiq \ rubygem-pg_query>=4.2.3<4.3:databases/rubygem-pg_query \ rubygem-premailer-rails110-rails70>=1.10.3<1.11:mail/rubygem-premailer-rails110-rails70 \ - rubygem-gitlab-labkit>=0.34.0<0.35:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.35.0<0.36:devel/rubygem-gitlab-labkit \ rubygem-thrift>=0.16.0:devel/rubygem-thrift \ rubygem-rails-i18n-rails70>=7.0<8:devel/rubygem-rails-i18n-rails70 \ rubygem-gettext_i18n_rails111>=1.11.0<1.12.0:devel/rubygem-gettext_i18n_rails111 \ @@ -235,7 +236,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-gitaly>=16.7.0.rc1<16.8.0:net/rubygem-gitaly \ rubygem-kas-grpc>=0.3.0,1<0.4.0,1:net/rubygem-kas-grpc \ rubygem-grpc>=1.58.0<2:net/rubygem-grpc \ - rubygem-google-protobuf>=3.25.1<4:devel/rubygem-google-protobuf \ + rubygem-google-protobuf>=3.25.2<4:devel/rubygem-google-protobuf \ rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \ rubygem-flipper026>=0.26.2<0.27:devel/rubygem-flipper026 \ rubygem-flipper-active_record-rails70>=0.26.2<0.27:databases/rubygem-flipper-active_record-rails70 \ @@ -273,7 +274,8 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-net-http011>=0.1.1<0.1.2:www/rubygem-net-http011 \ rubygem-duo_api>=1.3<2:security/rubygem-duo_api \ rubygem-gitlab-sdk>0:devel/rubygem-gitlab-sdk \ - rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 + rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 \ + rubygem-parallel>=1.22<2:sysutils/rubygem-parallel BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} @@ -315,6 +317,7 @@ SHEBANG_FILES= scripts/build_qa_image \ scripts/frontend/execute-on-staged-files.sh \ scripts/frontend/start_storybook.sh \ scripts/partitioning/generate-fk \ + scripts/validate-monorepo-gem \ .lefthook/pre-push/merge_conflicts \ qa/gdk/entrypoint \ qa/bin/test diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index dd3a8adeabc7..9ec1dab8197e 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707410021 -SHA256 (gitlab-foss-v16.7.5.tar.bz2) = e923a0ad4d9efcbc836d65a5ab69d12b0737ff5d6c4c047188f844788ad465e0 -SIZE (gitlab-foss-v16.7.5.tar.bz2) = 99352795 +TIMESTAMP = 1705828549 +SHA256 (gitlab-foss-v16.8.0.tar.bz2) = 6d90540e97b73f6e6953ef2aa9aa6ce846837efd2879dc2fbaf7640ca942f52d +SIZE (gitlab-foss-v16.8.0.tar.bz2) = 100003151 diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 8ee00491f7a2..e22528190161 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2023-12-20 08:52:18 UTC +--- Gemfile.orig 2024-01-17 10:09:09 UTC +++ Gemfile @@ -58,7 +58,7 @@ gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/Miss @@ -33,15 +33,15 @@ gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory --gem 'aws-sdk-core', '~> 3.190.0' # rubocop:todo Gemfile/MissingFeatureCategory +-gem 'aws-sdk-core', '~> 3.190.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-core', '~> 3.190' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory --gem 'aws-sdk-s3', '~> 1.141.0' # rubocop:todo Gemfile/MissingFeatureCategory -+gem 'aws-sdk-s3', '~> 1.141' # rubocop:todo Gemfile/MissingFeatureCategory +-gem 'aws-sdk-s3', '~> 1.142.0' # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'aws-sdk-s3', '~> 1.142' # rubocop:todo Gemfile/MissingFeatureCategory gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory -@@ -391,93 +391,10 @@ gem 'prometheus-client-mmap', '~> 1.0', '>= 1.0.2', re +@@ -392,134 +392,15 @@ gem 'prometheus-client-mmap', '~> 1.1', require: 'prom gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -60,7 +60,7 @@ - - gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'ruby-lsp', "~> 0.13.1", require: false, feature_category: :tooling +- gem 'ruby-lsp', "~> 0.13.2", require: false, feature_category: :tooling - - gem 'ruby-lsp-rails', "~> 0.2.8", feature_category: :tooling - @@ -70,7 +70,7 @@ -group :development, :test do - gem 'deprecation_toolkit', '~> 1.5.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'bullet', '~> 7.1.2' # rubocop:todo Gemfile/MissingFeatureCategory -- gem 'parser', '~> 3.2', '>= 3.2.2.4' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'parser', '~> 3.3', '>= 3.3.0.2' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'pry-byebug' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'pry-rails', '~> 0.3.9' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'pry-shell', '~> 0.6.4' # rubocop:todo Gemfile/MissingFeatureCategory @@ -78,7 +78,7 @@ - gem 'awesome_print', require: false # rubocop:todo Gemfile/MissingFeatureCategory - - gem 'database_cleaner-active_record', '~> 2.1.0', feature_category: :database -- gem 'factory_bot_rails', '~> 6.2.0' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'factory_bot_rails', '~> 6.4.3' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'rspec-rails', '~> 6.1.0', feature_category: :shared - - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) @@ -89,7 +89,7 @@ - - gem 'gitlab-styles', '~> 11.0.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'haml_lint', '~> 0.52', require: false # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'haml_lint', '~> 0.53', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory - - # Benchmarking & profiling @@ -111,7 +111,7 @@ - - gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'pact', '~> 1.63' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'pact', '~> 1.64' # rubocop:todo Gemfile/MissingFeatureCategory - - # For now we only use vite in development / test, and not for production builds - # See: https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/106 @@ -126,7 +126,7 @@ end -group :development, :test, :coverage do -- gem 'simplecov', '~> 0.21', require: false, feature_category: :tooling +- gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling - gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling - gem 'simplecov-cobertura', '~> 2.1.0', require: false, feature_category: :tooling - gem 'undercover', '~> 0.4.4', require: false, feature_category: :tooling @@ -135,10 +135,14 @@ # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do gem 'license_finder', '~> 7.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory -@@ -489,36 +406,6 @@ group :development, :test, :monorepo do - gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling end +-# Gems required in various pipelines +-group :development, :test, :monorepo do +- gem 'gitlab-rspec', path: 'gems/gitlab-rspec' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling +-end +- -group :test do - gem 'fuubar', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling @@ -161,27 +165,27 @@ - gem 'test-prof', '~> 1.3.1' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory -- gem 'axe-core-rspec' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'axe-core-rspec', '~> 4.8.0', feature_category: :tooling - - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'gitlab_quality-test_tooling', '~> 1.9.0', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 1.11.0', require: false, feature_category: :tooling -end - gem 'octokit', '~> 6.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared -@@ -556,7 +443,7 @@ gem 'gitaly', '~> 16.7.0-rc1', feature_category: :gita +@@ -557,7 +438,7 @@ gem 'gitaly', '~> 16.7.0-rc1', feature_category: :gita # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.3.0', feature_category: :deployment_management -gem 'grpc', '~> 1.58.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'grpc', '~> 1.58' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'google-protobuf', '~> 3.25', '>= 3.25.1' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'google-protobuf', '~> 3.25', '>= 3.25.2' # rubocop:todo Gemfile/MissingFeatureCategory -@@ -577,7 +464,7 @@ gem 'grape_logging', '~> 1.8', feature_category: :api +@@ -578,7 +459,7 @@ gem 'grape_logging', '~> 1.8', feature_category: :api gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory # Countries list @@ -190,7 +194,7 @@ gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory -@@ -643,6 +530,7 @@ gem 'app_store_connect' # rubocop:todo Gemfile/Missing +@@ -644,6 +525,7 @@ gem 'app_store_connect' # rubocop:todo Gemfile/Missing gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory # BufferedIO patch @@ -198,7 +202,7 @@ # Updating this version will require updating scripts/allowed_warnings.txt gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/MissingFeatureCategory # Lock this until we make DNS rebinding work with the updated net-http: -@@ -650,5 +538,11 @@ gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/ +@@ -651,5 +533,11 @@ gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/ gem 'net-http', '= 0.1.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index cea4c406e5d0..c02d76328794 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-12-20 08:52:18 UTC +--- config/gitlab.yml.example.orig 2024-01-17 10:09:09 UTC +++ config/gitlab.yml.example -@@ -456,7 +456,7 @@ production: &base +@@ -463,7 +463,7 @@ production: &base ## GitLab Pages pages: enabled: false @@ -9,7 +9,7 @@ # The location where pages are stored (default: shared/pages). # path: shared/pages -@@ -466,9 +466,9 @@ production: &base +@@ -473,9 +473,9 @@ production: &base host: example.com port: 80 # Set to 443 if you serve the pages with HTTPS https: false # Set to true if you serve the pages with HTTPS @@ -22,7 +22,7 @@ # File that contains the shared secret key for verifying access for gitlab-pages. # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app). -@@ -1194,13 +1194,13 @@ production: &base +@@ -1201,13 +1201,13 @@ production: &base repositories: storages: # You must have at least a `default` storage path. default: @@ -38,7 +38,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 -@@ -1235,12 +1235,12 @@ production: &base +@@ -1242,12 +1242,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -54,7 +54,7 @@ # Git over HTTP upload_pack: true -@@ -1255,13 +1255,13 @@ production: &base +@@ -1262,13 +1262,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). @@ -70,7 +70,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1285,13 +1285,13 @@ production: &base +@@ -1292,13 +1292,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -86,7 +86,7 @@ ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1312,18 +1312,18 @@ production: &base +@@ -1319,18 +1319,18 @@ production: &base # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq. sidekiq_exporter: @@ -112,7 +112,7 @@ # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. web_exporter: -@@ -1548,13 +1548,13 @@ test: +@@ -1555,13 +1555,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 34446375033b..c8e063367e96 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/16.7-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/16.8-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/16.6-16.7-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/16.7-16.8-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at: diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile index 3222f72cd67f..0623edddb045 100644 --- a/www/gitlab-pages/Makefile +++ b/www/gitlab-pages/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-pages -PORTVERSION= 16.7.5 +PORTVERSION= 16.8.0 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES+= https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/ diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index cff1a8a50e62..556264216867 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1707410402 -SHA256 (go/www_gitlab-pages/gitlab-pages-v16.7.5/go.mod) = 2e395b62e4dae09814ebcaee28a9d1382514e09e3882ba7046ca8aa90f432ff2 -SIZE (go/www_gitlab-pages/gitlab-pages-v16.7.5/go.mod) = 3322 -SHA256 (go/www_gitlab-pages/gitlab-pages-v16.7.5/gitlab-pages-v16.7.5.tar.bz2) = 92d2b524b41f1dc20499a7810a510d9e8090cd136abb026621d565e8529b0aa4 -SIZE (go/www_gitlab-pages/gitlab-pages-v16.7.5/gitlab-pages-v16.7.5.tar.bz2) = 206498 +TIMESTAMP = 1705828540 +SHA256 (go/www_gitlab-pages/gitlab-pages-v16.8.0/go.mod) = a921362a600558c9a7399ca1f3bfe7763d81dd49dd66f8a010c4a1810ff26a8c +SIZE (go/www_gitlab-pages/gitlab-pages-v16.8.0/go.mod) = 3295 +SHA256 (go/www_gitlab-pages/gitlab-pages-v16.8.0/gitlab-pages-v16.8.0.tar.bz2) = 08a93bc0624832bea5c84a96f27854b875de5a0c9dcc0626862be6cef0684e73 +SIZE (go/www_gitlab-pages/gitlab-pages-v16.8.0/gitlab-pages-v16.8.0.tar.bz2) = 211369 diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index 4a81315702ec..a1323ba20ce5 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-workhorse -PORTVERSION= 16.7.5 +PORTVERSION= 16.8.0 DISTVERSIONPREFIX= v CATEGORIES= www diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 83f307733aab..810533d1445c 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1707409946 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.7.5/go.mod) = e98235bbbe2ee568f1461c6d08170eadf46e36fdadd6bd089d35c21367fe2759 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.7.5/go.mod) = 6689 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.7.5/gitlab-foss-v16.7.5.tar.bz2) = e923a0ad4d9efcbc836d65a5ab69d12b0737ff5d6c4c047188f844788ad465e0 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.7.5/gitlab-foss-v16.7.5.tar.bz2) = 99352795 +TIMESTAMP = 1705827469 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.8.0/go.mod) = 4ef98c9480dc69d9ac8f0438a9964432a977593dd48d6006f2b7363fcb7f1c74 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.8.0/go.mod) = 6610 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.8.0/gitlab-foss-v16.8.0.tar.bz2) = 6d90540e97b73f6e6953ef2aa9aa6ce846837efd2879dc2fbaf7640ca942f52d +SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.8.0/gitlab-foss-v16.8.0.tar.bz2) = 100003151
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402231509.41NF9FcJ028043>