diff options
Diffstat (limited to 'www')
28 files changed, 198 insertions, 178 deletions
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index aa17d4c45bb4..a4256f8b6aec 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1763010408 -SHA256 (go/www_gitlab-pages/gitlab-pages-v18.5.2/go.mod) = ac8a9352d8b2a358be9c716c703e89a2b1623b7abd3d9738213b2e0d50baef8b -SIZE (go/www_gitlab-pages/gitlab-pages-v18.5.2/go.mod) = 3416 -SHA256 (go/www_gitlab-pages/gitlab-pages-v18.5.2/gitlab-pages-v18.5.2.tar.bz2) = b46609913beaa016b08718977dab4d87bfc56a87a123aa6325f7e85d33696a20 -SIZE (go/www_gitlab-pages/gitlab-pages-v18.5.2/gitlab-pages-v18.5.2.tar.bz2) = 236830 +TIMESTAMP = 1763614388 +SHA256 (go/www_gitlab-pages/gitlab-pages-v18.6.0/go.mod) = 01a4fafec3c597505de06cc4dc76a706e78e461b21562113750dfec75e9458c2 +SIZE (go/www_gitlab-pages/gitlab-pages-v18.6.0/go.mod) = 3416 +SHA256 (go/www_gitlab-pages/gitlab-pages-v18.6.0/gitlab-pages-v18.6.0.tar.bz2) = e74a8dfdb8fea931886c48cf242299988615136ac003d84762e6435e8fbb6efb +SIZE (go/www_gitlab-pages/gitlab-pages-v18.6.0/gitlab-pages-v18.6.0.tar.bz2) = 236677 diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index cd43c18e5307..8d31232d84cc 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1763010422 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.5.2/go.mod) = 39650d5ecf720c85d09f111d574d56810f1d80074f1efb4fabac0db4c369d717 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.5.2/go.mod) = 9343 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.5.2/gitlab-foss-v18.5.2.tar.bz2) = 9bfd39dc3f34dec8af17f55bda6aa6217600be016e8c498804f7c3568064ee8c -SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.5.2/gitlab-foss-v18.5.2.tar.bz2) = 122917718 +TIMESTAMP = 1763614433 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.6.0/go.mod) = 11c339bb0fbbc0ad18e7e636a2f3cd686ea3425805f0ed0db5f629008a1d6952 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.6.0/go.mod) = 9356 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.6.0/gitlab-foss-v18.6.0.tar.bz2) = 2a7891b1347e730d26dbe6acf3dd7197a289694e3aa0d1bc2af6e5c6b322cc55 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.6.0/gitlab-foss-v18.6.0.tar.bz2) = 126821552 diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index d1d6371587c8..cf17c23d70a0 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -29,17 +29,17 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # mail/rubygem-net-pop is required as ruby 3.1 removed it #gitlab-zoekt-indexer>=0.16.0:textproc/gitlab-zoekt-indexer MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ - gitlab-elasticsearch-indexer>=5.9.4:textproc/gitlab-elasticsearch-indexer \ + gitlab-elasticsearch-indexer>=5.10.1:textproc/gitlab-elasticsearch-indexer \ gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \ gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \ gitlab-shell>=14.45.3:devel/gitlab-shell \ gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \ - gitlab-zoekt-indexer>=1.6.2:textproc/gitlab-zoekt-indexer \ + gitlab-zoekt-indexer>=1.7.6:textproc/gitlab-zoekt-indexer \ redis>=6.2.11:databases/redis \ yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \ gtar>0:archivers/gtar \ bash>0:shells/bash \ - rubygem-parser>=3.3.9.0:devel/rubygem-parser \ + rubygem-parser>=3.3.10.0:devel/rubygem-parser \ rubygem-net-smtp>=0:mail/rubygem-net-smtp \ rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \ rubygem-net-pop>=0:mail/rubygem-net-pop \ @@ -49,8 +49,8 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-drb-gitlab>=2.2.3<3:devel/rubygem-drb-gitlab \ rubygem-bootsnap>=1.18.6<1.19:devel/rubygem-bootsnap \ rubygem-ffi>=1.17.2<2:devel/rubygem-ffi \ - rubygem-openssl>=3.3.2<4:security/rubygem-openssl \ - rubygem-gitlab-secret_detection>=0.35.1<1:security/rubygem-gitlab-secret_detection \ + rubygem-openssl>=3.3.2<3.4:security/rubygem-openssl \ + rubygem-gitlab-secret_detection>=0.38.0<1:security/rubygem-gitlab-secret_detection \ rubygem-responders-rails-gitlab>=3.0<4.0:www/rubygem-responders-rails-gitlab \ rubygem-sprockets-gitlab>=3.7.5<3.8:devel/rubygem-sprockets-gitlab \ rubygem-sprockets-rails-rails-gitlab>=3.5.2<3.6:devel/rubygem-sprockets-rails-rails-gitlab \ @@ -76,7 +76,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-omniauth-azure-activedirectory-v2>=2.0<3:net/rubygem-omniauth-azure-activedirectory-v2 \ rubygem-omniauth-alicloud>=3.0.0<3.1:security/rubygem-omniauth-alicloud \ rubygem-omniauth-github-gitlab>=2.0.1<2.1:net/rubygem-omniauth-github-gitlab \ - rubygem-omniauth-google-oauth2-gitlab>=1.1<2:net/rubygem-omniauth-google-oauth2-gitlab \ + rubygem-omniauth-google-oauth2-gitlab>=1.2.1<2:net/rubygem-omniauth-google-oauth2-gitlab \ rubygem-omniauth-oauth2-generic-gitlab>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic-gitlab \ rubygem-omniauth-shibboleth-redux-gitlab>=2.0<3:security/rubygem-omniauth-shibboleth-redux-gitlab \ rubygem-omniauth_openid_connect>=0.8.0<0.9:net/rubygem-omniauth_openid_connect \ @@ -130,7 +130,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-google-apis-container_v1beta1>=0.91.0<0.92:devel/rubygem-google-apis-container_v1beta1 \ rubygem-google-apis-cloudbilling_v1>=0.22.0<0.23:devel/rubygem-google-apis-cloudbilling_v1 \ rubygem-google-apis-cloudresourcemanager_v1-gitlab>=0.44.0<0.45:devel/rubygem-google-apis-cloudresourcemanager_v1-gitlab \ - rubygem-google-apis-iam_v1-gitlab>=0.73.0<0.74:devel/rubygem-google-apis-iam_v1-gitlab \ + rubygem-google-apis-iam_v1-gitlab>=0.79.0<0.80:devel/rubygem-google-apis-iam_v1-gitlab \ rubygem-google-apis-serviceusage_v1>=0.28.0<0.29:devel/rubygem-google-apis-serviceusage_v1 \ rubygem-google-apis-sqladmin_v1beta4-gitlab>=0.41.0<0.42:devel/rubygem-google-apis-sqladmin_v1beta4-gitlab \ rubygem-google-apis-androidpublisher_v3-gitlab>=0.86.0<0.87:devel/rubygem-google-apis-androidpublisher_v3-gitlab \ @@ -184,10 +184,10 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \ rubygem-js_regex>=3.13.0<4.0:textproc/rubygem-js_regex \ rubygem-device_detector>=1.1.3:devel/rubygem-device_detector \ - rubygem-redis-gitlab>=5.4.0<5.4.1:databases/rubygem-redis-gitlab \ + rubygem-redis-gitlab>=5.4.1<5.5:databases/rubygem-redis-gitlab \ rubygem-redis-client>=0.26.1<1:databases/rubygem-redis-client \ rubygem-redis-cluster-client>=0.13.5<1:databases/rubygem-redis-cluster-client \ - rubygem-redis-clustering-gitlab>=5.4.0<5.4.1:databases/rubygem-redis-clustering-gitlab \ + rubygem-redis-clustering-gitlab>=5.4.1<5.5:databases/rubygem-redis-clustering-gitlab \ rubygem-connection_pool>=2.5.4<2.6:net/rubygem-connection_pool \ rubygem-redis-actionpack-rails-gitlab>=5.5.0<5.6:databases/rubygem-redis-actionpack-rails-gitlab \ rubygem-jira-ruby-gitlab>=2.3.0<2.4:devel/rubygem-jira-ruby-gitlab \ @@ -208,19 +208,19 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-rack-proxy>=0.7.7<0.8.0:www/rubygem-rack-proxy \ rubygem-cssbundling-rails-rails-gitlab>=1.4.3<1.5:www/rubygem-cssbundling-rails-rails-gitlab \ rubygem-terser>=1.0.2<1.0.3:textproc/rubygem-terser \ - rubygem-click_house-client>=0.8.0<0.9:databases/rubygem-click_house-client \ + rubygem-click_house-client>=0.8.2<0.9:databases/rubygem-click_house-client \ rubygem-addressable>=2.8<3:www/rubygem-addressable \ rubygem-gon-rails-gitlab>=6.5.0<6.6:www/rubygem-gon-rails-gitlab \ rubygem-request_store>=1.7.0<1.8:devel/rubygem-request_store \ rubygem-base32>=0.3.4<0.4.0:converters/rubygem-base32 \ rubygem-gitlab-license>=2.6<3:devel/rubygem-gitlab-license \ - rubygem-rack-attack>=6.7.0<6.8:www/rubygem-rack-attack \ + rubygem-rack-attack>=6.8.0<6.9:www/rubygem-rack-attack \ rubygem-sentry-ruby>=5.23.0<5.24:devel/rubygem-sentry-ruby \ rubygem-sentry-rails>=5.23.0<5.24:devel/rubygem-sentry-rails \ rubygem-sentry-sidekiq>=5.23.0<5.24:devel/rubygem-sentry-sidekiq \ rubygem-pg_query>=6.1.0<6.2:databases/rubygem-pg_query \ rubygem-premailer-rails-rails-gitlab>=1.12.0<1.13:mail/rubygem-premailer-rails-rails-gitlab \ - rubygem-gitlab-labkit>=0.42.0<0.43:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.42.2<0.43:devel/rubygem-gitlab-labkit \ rubygem-thrift>=0.22.0,1<0.23,1:devel/rubygem-thrift \ rubygem-rails-i18n-rails-gitlab>=7.0.9<8:devel/rubygem-rails-i18n-rails-gitlab \ rubygem-gettext_i18n_rails>=1.13.0<1.14:devel/rubygem-gettext_i18n_rails \ @@ -279,9 +279,9 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-net-ntp>0:net/rubygem-net-ntp \ rubygem-ssh_data>=2.0<3:security/rubygem-ssh_data \ rubygem-spamcheck>=1.3.3<1.4:net/rubygem-spamcheck \ - rubygem-gitaly>=18.4.1:net/rubygem-gitaly \ + rubygem-gitaly>=18.6.0:net/rubygem-gitaly \ rubygem-gitlab-kas-grpc>=${GITLAB_KAS_GRPC_VERSION}:net/rubygem-gitlab-kas-grpc \ - rubygem-grpc-gitlab>=1.75.0<1.76:net/rubygem-grpc-gitlab \ + rubygem-grpc-gitlab>=1.76.0<1.77:net/rubygem-grpc-gitlab \ rubygem-google-protobuf3>=3.25.8<4:devel/rubygem-google-protobuf3 \ rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \ rubygem-flipper-gitlab>=0.28.0<0.29:devel/rubygem-flipper-gitlab \ @@ -295,7 +295,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-countries>=4.1.3<4.2.0:devel/rubygem-countries \ rubygem-retriable>=3.1.2<3.2.0:devel/rubygem-retriable \ rubygem-lru_redux>0:devel/rubygem-lru_redux \ - rubygem-mail>=2.8.1<2.8.2,2:mail/rubygem-mail \ + rubygem-mail-gitlab>=2.9.0<2.9.1:mail/rubygem-mail-gitlab \ rubygem-lockbox>=1.4.1<1.5:security/rubygem-lockbox \ rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \ rubygem-jsonb_accessor>=1.4<2:www/rubygem-jsonb_accessor \ @@ -320,12 +320,12 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-net-protocol>=0.2.2<0.3:net/rubygem-net-protocol \ rubygem-nkf>=0.2.0<0.3:net/rubygem-nkf \ rubygem-net-http-gitlab>=0.6.0<0.6.1:www/rubygem-net-http-gitlab \ - rubygem-uri-gitlab>=0.13.2<0.13.3:net/rubygem-uri-gitlab \ + rubygem-uri-gitlab>=0.13.3<0.13.4:net/rubygem-uri-gitlab \ rubygem-duo_api>=1.4<2:security/rubygem-duo_api \ rubygem-gitlab-sdk>=0.3.0<0.4:devel/rubygem-gitlab-sdk \ rubygem-paper_trail>=16.0<17:devel/rubygem-paper_trail \ rubygem-i18n_data>=0.13.1<1:devel/rubygem-i18n_data \ - rubygem-gitlab-cloud-connector>=1.33<2:security/rubygem-gitlab-cloud-connector \ + rubygem-gitlab-cloud-connector>=1.35<2:security/rubygem-gitlab-cloud-connector \ rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 \ rubygem-parallel>=1.27.0<2:sysutils/rubygem-parallel \ rubygem-google-cloud-storage_transfer-gitlab>=1.2.0<1.3:net/rubygem-google-cloud-storage_transfer-gitlab \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 1c759292e321..646a93dc3e95 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,18 +1,19 @@ -GITLAB_VERSION= 18.5.2 -GITLAB_PORTREVISION= 1 +GITLAB_VERSION= 18.6.0 +GITLAB_PORTREVISION= 0 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml # and from https://gitlab.com/gitlab-org/git/-/tags GITLAB_GIT_VERSION= 2.50.0 -GITLAB_GIT_MASTER_VERSION= 23466173824c0a0f835c0d790c2f38156ae6284a # return something like x.yy GITLAB_GIT_VERSION_SHORT= ${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/} +GITLAB_GIT_MASTER_VERSION= 419c72cb8ada252b260efc38ff91fe201de7c8c3 +GITLAB_GIT_PREV_VERSION= 23466173824c0a0f835c0d790c2f38156ae6284a # Overwrite version for gitlab-kas-grpc -GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION} -#GITLAB_KAS_GRPC_VERSION= 18.2.1 +#GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION} +GITLAB_KAS_GRPC_VERSION= 18.5.2 # Rails version -RAILS_VERSION= 7.1.5.2 +RAILS_VERSION= 7.1.6 diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index 3032f717c2d3..341c68edb483 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1763010355 -SHA256 (gitlab-foss-v18.5.2.tar.bz2) = 9bfd39dc3f34dec8af17f55bda6aa6217600be016e8c498804f7c3568064ee8c -SIZE (gitlab-foss-v18.5.2.tar.bz2) = 122917718 -TIMESTAMP = 1763010399 -SHA256 (gitlab-v18.5.2-ee.tar.bz2) = 3b281a0ee6b170de3befa46db60ac8b0da7663ac3b55225576741c947242d85b -SIZE (gitlab-v18.5.2-ee.tar.bz2) = 139293550 +TIMESTAMP = 1763647030 +SHA256 (gitlab-foss-v18.6.0.tar.bz2) = 2a7891b1347e730d26dbe6acf3dd7197a289694e3aa0d1bc2af6e5c6b322cc55 +SIZE (gitlab-foss-v18.6.0.tar.bz2) = 126821552 +TIMESTAMP = 1763647031 +SHA256 (gitlab-v18.6.0-ee.tar.bz2) = d1d07dcd0f79b244cf3d7d1acb5bd1b29d1dcc4aae3d11f932df8a51f62135fb +SIZE (gitlab-v18.6.0-ee.tar.bz2) = 143690179 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index f995a6f85547..cfe5cabc50e5 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2025-11-11 08:08:24 UTC +--- Gemfile.orig 2025-11-19 16:58:17 UTC +++ Gemfile @@ -169,7 +169,7 @@ gem 'graphql', '2.5.11', feature_category: :api @@ -18,7 +18,7 @@ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -477,141 +477,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared +@@ -476,141 +476,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared gem 'warning', '~> 1.5.0', feature_category: :shared @@ -57,7 +57,7 @@ -group :development, :test do - gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared - gem 'bullet', '~> 8.0.0', feature_category: :shared -- gem 'parser', '= 3.3.9.0', feature_category: :shared +- gem 'parser', '= 3.3.10.0', feature_category: :shared - gem 'pry-byebug', feature_category: :shared - gem 'pry-rails', '~> 0.3.9', feature_category: :shared - gem 'pry-shell', '~> 0.6.4', feature_category: :shared @@ -154,22 +154,22 @@ - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false, feature_category: :shared - -- gem 'gitlab_quality-test_tooling', '~> 2.20.0', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 2.26.0', require: false, feature_category: :tooling -end - gem 'octokit', '~> 9.0', feature_category: :importers # Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688 gem 'faraday-multipart', '~> 1.0', feature_category: :importers -@@ -645,7 +519,7 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside - gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat - - # Gitaly GRPC protocol definitions --gem 'gitaly', '~> 18.4.0.pre.rc1', feature_category: :gitaly -+gem 'gitaly', '~> 18.4', feature_category: :gitaly +@@ -647,7 +521,7 @@ gem 'gitaly', '~> 18.6.0.pre.rc1', feature_category: : + gem 'gitaly', '~> 18.6.0.pre.rc1', feature_category: :gitaly # KAS GRPC protocol definitions - gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management -@@ -671,7 +545,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : +-gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management ++gem 'gitlab-kas-grpc', '~> 18.5.2', feature_category: :deployment_management + + gem 'grpc', '~> 1.76.0', feature_category: :shared + +@@ -670,7 +544,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared # Countries list @@ -178,7 +178,7 @@ gem 'retriable', '~> 3.1.2', feature_category: :shared -@@ -756,10 +630,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -755,10 +629,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access @@ -194,4 +194,4 @@ -gem "i18n_data", "~> 0.13.1", feature_category: :system_access +gem "i18n_data", "~> 0.13", feature_category: :system_access - gem "gitlab-cloud-connector", "~> 1.26", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning + gem "gitlab-cloud-connector", "~> 1.35", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index d4e98d985eb3..fae18cb60868 100644 --- a/www/gitlab/files/patch-config_gitlab.yml.example +++ b/www/gitlab/files/patch-config_gitlab.yml.example @@ -1,6 +1,6 @@ ---- config/gitlab.yml.example.orig 2025-10-21 19:24:47 UTC +--- config/gitlab.yml.example.orig 2025-11-19 16:58:17 UTC +++ config/gitlab.yml.example -@@ -507,7 +507,7 @@ production: &base +@@ -508,7 +508,7 @@ production: &base ## GitLab Pages pages: enabled: false @@ -9,7 +9,7 @@ # The location where pages are stored (default: shared/pages). # path: shared/pages -@@ -1252,13 +1252,13 @@ production: &base +@@ -1253,13 +1253,13 @@ production: &base repositories: storages: # You must have at least a `default` storage path. default: @@ -25,7 +25,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 -@@ -1293,12 +1293,12 @@ production: &base +@@ -1294,12 +1294,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -41,7 +41,7 @@ # Git over HTTP upload_pack: true -@@ -1313,7 +1313,7 @@ production: &base +@@ -1314,7 +1314,7 @@ 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). diff --git a/www/gitlab/files/patch-config_puma.rb.example b/www/gitlab/files/patch-config_puma.rb.example index b3218c5ffa71..aa031d5fd82c 100644 --- a/www/gitlab/files/patch-config_puma.rb.example +++ b/www/gitlab/files/patch-config_puma.rb.example @@ -1,4 +1,4 @@ ---- config/puma.rb.example.orig 2025-01-22 04:13:11 UTC +--- config/puma.rb.example.orig 2025-11-19 16:58:17 UTC +++ config/puma.rb.example @@ -1,15 +1,20 @@ # frozen_string_literal: true @@ -37,9 +37,9 @@ -require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events" +require_relative "%%WWWDIR%%/lib/gitlab/cluster/lifecycle_events" - on_restart do - # Signal application hooks that we're about to restart -@@ -74,14 +79,14 @@ wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LES + if Gem::Version.new(Puma::Const::PUMA_VERSION) < Gem::Version.new('7.0') + Gitlab::Cluster::LifecycleEvents.set_puma_options @config.options +@@ -94,14 +99,14 @@ wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LES wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f # Use json formatter diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message index c11311173fd9..44d60ee23e86 100644 --- a/www/gitlab/pkg-message +++ b/www/gitlab/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.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.5-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.6-freebsd.md EOM type: install } @@ -18,9 +18,9 @@ EOM { message: <<EOM If you just installed an major upgrade of GitLab, for example you -switched from 18.4.x to 18.5.x, please follow the instructions in the guide at: +switched from 18.5.x to 18.6.x, please follow the instructions in the guide at: -https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.4-18.5-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.5-18.6-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at: diff --git a/www/grafana/Makefile b/www/grafana/Makefile index 7f85e0d1dde2..8593535dc9f5 100644 --- a/www/grafana/Makefile +++ b/www/grafana/Makefile @@ -1,7 +1,6 @@ PORTNAME= grafana DISTVERSIONPREFIX= v -DISTVERSION= 12.2.0 -PORTREVISION= 1 +DISTVERSION= 12.3.0 CATEGORIES= www MASTER_SITES= https://dl.grafana.com/oss/release/ \ https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod @@ -11,14 +10,19 @@ DISTFILES= grafana-${DISTVERSION}.linux-amd64${EXTRACT_SUFX} \ apps/advisor/go.mod:gomod \ apps/alerting/alertenrichment/go.mod:gomod \ apps/alerting/notifications/go.mod:gomod \ + apps/alerting/rules/go.mod:gomod \ + apps/correlations/go.mod:gomod \ apps/dashboard/go.mod:gomod \ + apps/example/go.mod:gomod \ apps/folder/go.mod:gomod \ apps/iam/go.mod:gomod \ apps/investigations/go.mod:gomod \ + apps/logsdrilldown/go.mod:gomod \ apps/playlist/go.mod:gomod \ apps/plugins/go.mod:gomod \ apps/preferences/go.mod:gomod \ apps/provisioning/go.mod:gomod \ + apps/scope/go.mod:gomod \ apps/secret/go.mod:gomod \ apps/shorturl/go.mod:gomod \ pkg/aggregator/go.mod:gomod \ @@ -44,12 +48,12 @@ ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 riscv64 RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss -USES= cpe go:modules +USES= cpe go:1.25,modules USE_GITHUB= yes USE_RC_SUBR= grafana -TAG= 92f1fba +TAG= 20051fb GO_MOD_DIST= github GO_MODULE= github.com/grafana/grafana diff --git a/www/grafana/distinfo b/www/grafana/distinfo index 268651d62cc7..7ed8edf918b9 100644 --- a/www/grafana/distinfo +++ b/www/grafana/distinfo @@ -1,53 +1,63 @@ -TIMESTAMP = 1758718446 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/grafana-12.2.0.linux-amd64.tar.gz) = c4f53551ed4887c792caeb9d02fa0c1a36e3db9ee8bdda32b1ced810cb135a93 -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/grafana-12.2.0.linux-amd64.tar.gz) = 189052083 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/go.mod) = 0b255e05f5c11677ee83dbf168f1d33ad92e651d1ba1410d7a66bc5c884dab4c -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/go.mod) = 42281 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/go.work) = b9bae14d2f21ac8bd5995834e8fa127ea7a19e4d8c7dfd8e35ae0c9708fe79a7 -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/go.work) = 945 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/advisor/go.mod) = 68a02a8bfb8102b38a4f74bb5ec2b71bd3371980e42910ad8e142f68431f1c7c -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/advisor/go.mod) = 16000 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/alerting/alertenrichment/go.mod) = c5796d991b9405dfedaf194f8bfcb7abb1ff023edef6a67d7aa185ce2c332065 -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/alerting/alertenrichment/go.mod) = 1569 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/alerting/notifications/go.mod) = d83fbc16cbe708bd5760f6ecc22c6d2cb7e12b8f082694da301aa93c8d2d9aa8 -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/alerting/notifications/go.mod) = 5599 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/dashboard/go.mod) = e84521de947c0fc02d1c7264b377c51f1fda1beebbefd7d8e8ce8bb5e5f68705 -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/dashboard/go.mod) = 7446 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/folder/go.mod) = b1ab486fcdd24cf8ee666d75c2851082f6e0b964fd113d724e6749da7859154e -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/folder/go.mod) = 3014 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/iam/go.mod) = aea61dc4fac1e3849b1d8f1c6132cf8c2ab7888b0191262b17b59a3c6c63fb99 -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/iam/go.mod) = 24604 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/investigations/go.mod) = bce30b9f0d197451f2f7756decaed1ad56fe4e406facaad3eb70bf315afd1faa -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/investigations/go.mod) = 4389 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/playlist/go.mod) = 2c07aeedc16ec973af816bd18ba9a81043a64392940202d7792fffca09e2425b -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/playlist/go.mod) = 4383 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/plugins/go.mod) = 97883819be50de2109060dbbb0b8b73d908c33ece668ce792c16281e12b81b60 -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/plugins/go.mod) = 4908 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/preferences/go.mod) = 3c8de820ca6ef8bd305c2ead4eb83d3e67082b1e89802d489af8470fb8da0700 -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/preferences/go.mod) = 3019 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/provisioning/go.mod) = 6f2533d249566925718e012afa795823a8b1fcfb2e03df72281069ab62a751de -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/provisioning/go.mod) = 4018 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/secret/go.mod) = 56a17eda75df435eb4e0ff46232586ccb6875e3ee40c19f2f3ed8ac11fd8270b -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/secret/go.mod) = 3145 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/shorturl/go.mod) = 6647a40217b11c9eb4f4b0939fc623d388609c2919c233526a6cc7bebb3e7130 -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/shorturl/go.mod) = 4415 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/aggregator/go.mod) = fd18148d210618ea58c6c59de67f3a0339bd93f2477c27d692c6bcff9af98598 -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/aggregator/go.mod) = 8387 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/apimachinery/go.mod) = 67b5df6d7fa2447b760a24a1abcf02284ea98f03f4919cf046ee6dc54fed037c -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/apimachinery/go.mod) = 2727 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/apiserver/go.mod) = 18ac2e8e5bc49321e979adc73ec9aef1b932559e042e102df93876726f9b9db2 -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/apiserver/go.mod) = 5267 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/build/go.mod) = 180df1e2cb9908d298b67e7d755b7414b23383e5d5e5a078e91588f633c67d65 -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/build/go.mod) = 3874 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/build/wire/go.mod) = d0c57407186b93a8535836ead25f09af959dd5ba85aaa2cf15f25df1ff9a0716 -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/build/wire/go.mod) = 330 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/codegen/go.mod) = 7422a59273900d092e04c375939b45f1804f251a34a1f00b94a75975af0d6673 -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/codegen/go.mod) = 2522 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/plugins/codegen/go.mod) = 633f43b1e790c818c60791a067ab0a824a9d64674cda06cf5040fc53a5228ff3 -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/plugins/codegen/go.mod) = 2233 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/promlib/go.mod) = ac80c72cc79c01b94a9115657d1acea9db872c413d357e8bddee840d52c99cf4 -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/promlib/go.mod) = 7301 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/semconv/go.mod) = 3adbc3e65b069ef48400ca53d368166f9455be319212b94839837bfea256a24c -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/semconv/go.mod) = 269 -SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/grafana-grafana-v12.2.0_GH0.tar.gz) = 0d55795b21cf5494e5e3ff33627f7bbb940de9298d0a0aa86831c2f2f15fef1e -SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/grafana-grafana-v12.2.0_GH0.tar.gz) = 42237954 +TIMESTAMP = 1763760973 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/grafana-12.3.0.linux-amd64.tar.gz) = dd34d03f8dbf815f153b638b793e6ab1b9d205b7c0a15dddd851332f0c9ac01c +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/grafana-12.3.0.linux-amd64.tar.gz) = 194822084 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/go.mod) = 158e8ed91ab5c21faf8ed0546cb60b6e380e14746c3de5b52a13668637b1b0fa +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/go.mod) = 44765 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/go.work) = 6ba41766d799f5c5f70fc6a896d3beb1b14051ffdaedce800ab19170a412734c +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/go.work) = 1041 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/advisor/go.mod) = 15306c4750f9f8dc498b28a8d226a9d386f94984ad41d4d24c3467ce01cf114d +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/advisor/go.mod) = 17094 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/alerting/alertenrichment/go.mod) = e0d6d3a90dc88400cd2c53f626862bbc59fa609f6597f54ac269425f95a56ad6 +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/alerting/alertenrichment/go.mod) = 1659 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/alerting/notifications/go.mod) = 81f49416bfa766e0a949faab2de29a7bf371ddd7e0f66fc21eaf25370c6d272a +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/alerting/notifications/go.mod) = 5637 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/alerting/rules/go.mod) = 0b5eaeb9f1be897740786bab99ff9dec4735dc81cf68e5fa20614b6d1c3c312d +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/alerting/rules/go.mod) = 4552 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/correlations/go.mod) = 5dc5458a53efe8686a4cc1c3af8b68f0e49858ac2cd176645048424d7d580dfd +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/correlations/go.mod) = 4550 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/dashboard/go.mod) = 7b1fe79ebbcca005fe397db432b95246d2d5e188dc5d9f8933e9a9349864cdb5 +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/dashboard/go.mod) = 6807 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/example/go.mod) = 9570474f6ca36cbca1725f9aa8f29f68528a263823c2a4e1985965e9614e77cc +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/example/go.mod) = 4981 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/folder/go.mod) = b885e04657084dfbedaaf8c8eab0f55d7ebbdd13fc92db651e6436ce9601c70c +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/folder/go.mod) = 3193 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/iam/go.mod) = f0e488374755688d4b9ac4c8e7612c019256e0a4ac07f01b8d7715a4964f4a69 +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/iam/go.mod) = 25926 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/investigations/go.mod) = c1ae7ccd2e5caa0ad2ef05f3dbb330da9c2e4d7dea6a911935f45a53930a850f +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/investigations/go.mod) = 4552 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/logsdrilldown/go.mod) = ddfcb54935d4a9190c794136562b9f5488f5df8ee07202f6f19c6ede231b76ca +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/logsdrilldown/go.mod) = 4571 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/playlist/go.mod) = 66d5668c438c728b6844fdefb46eb8dc96d1a0be5a4194fea47d4f7042f8a92b +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/playlist/go.mod) = 4534 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/plugins/go.mod) = bb520ee2be0168666b1a41f8b3d1480ac0d43b56fc55efbf9fefb954729f5c0f +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/plugins/go.mod) = 4969 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/preferences/go.mod) = 56c37d8dd58ddb9f8133839ce1fafc004c1c84216dec6349d8e32436f91e24a2 +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/preferences/go.mod) = 3186 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/provisioning/go.mod) = fe6398fdca9da2c46379ee8905ef90216a82c78d661a615fe1eb69f71d07fc1f +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/provisioning/go.mod) = 4193 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/scope/go.mod) = 5c589decdc408723f59286a86fc61ee7106547cd86d0ef4ff057bdfff3207e43 +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/scope/go.mod) = 1847 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/secret/go.mod) = c4b6f42d9f283ff3b4ba721e5f78eab3a7524d93527a6a9f7a774442bfa69005 +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/secret/go.mod) = 3324 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/shorturl/go.mod) = cfc5f7d19f158dbe5d0853462d000c10b36d2055fec98ee63be2f104858f0ae9 +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/apps/shorturl/go.mod) = 4982 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/pkg/aggregator/go.mod) = 78e1a4811b3a59befaf563efb21527afa261ada43b4e44b7efd595a2c2ceaf4a +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/pkg/aggregator/go.mod) = 7287 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/pkg/apimachinery/go.mod) = b68e61078dff5c3e1af86b410510c11bf5a0d9a05e01263960044c9b48f7dc9e +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/pkg/apimachinery/go.mod) = 2736 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/pkg/apiserver/go.mod) = c009d0972d4078bfec633c250b34acb30ccc88060c9f0173024b3f31edf5ebf8 +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/pkg/apiserver/go.mod) = 5367 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/pkg/build/go.mod) = 303e32758a1ac561082610d528730aa7ab2fb85c2240141046deb764a7d1ed3b +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/pkg/build/go.mod) = 3875 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/pkg/build/wire/go.mod) = dfd1edf7c84e488cb2edb944e6a742d2c3736465066de85c265b0b6f94ddb6f2 +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/pkg/build/wire/go.mod) = 330 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/pkg/codegen/go.mod) = 73cbbd1fe2c1f0f4ecf081ebaec15b51548703b5189a2f2bae0ef1fddcb63121 +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/pkg/codegen/go.mod) = 2583 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/pkg/plugins/codegen/go.mod) = e18ea6a3515a2a7fe8682a544312224b69f7b861d41309c862c050503ff7ce0a +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/pkg/plugins/codegen/go.mod) = 2294 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/pkg/promlib/go.mod) = 282f033fc9dcd4c5be7587452834774f6416160c5f26f74808240075b748d5c0 +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/pkg/promlib/go.mod) = 6271 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/pkg/semconv/go.mod) = 54d55d41b92adf4170b41a230fc12f29a4ece874d962ab309905a6b352842d8c +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/pkg/semconv/go.mod) = 269 +SHA256 (go/www_grafana/grafana-grafana-v12.3.0_GH0/grafana-grafana-v12.3.0_GH0.tar.gz) = 15c5d9368f570a0328a14ebfa062b1d269238f251fda22a49da3540a8162ff76 +SIZE (go/www_grafana/grafana-grafana-v12.3.0_GH0/grafana-grafana-v12.3.0_GH0.tar.gz) = 44722381 diff --git a/www/librewolf/Makefile b/www/librewolf/Makefile index 02b779d5ff50..fcd1048c1046 100644 --- a/www/librewolf/Makefile +++ b/www/librewolf/Makefile @@ -1,6 +1,7 @@ PORTNAME= librewolf DISTVERSION= 145.0.1 -LWPATCH= -1 +PORTREVISION= 1 +LWPATCH= -2 DISTVERSIONSUFFIX= ${LWPATCH}.source CATEGORIES= www wayland MASTER_SITES= https://gitlab.com/api/v4/projects/32320088/packages/generic/${PORTNAME}-source/${DISTVERSION}${LWPATCH}/ diff --git a/www/librewolf/distinfo b/www/librewolf/distinfo index f318aba75885..2c371d664fdb 100644 --- a/www/librewolf/distinfo +++ b/www/librewolf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1763643500 -SHA256 (librewolf-145.0.1-1.source.tar.gz) = 839c12e1f092997f2a457e3ee3dd925b037d4e3a5ba202d55009fe6ceeede9f3 -SIZE (librewolf-145.0.1-1.source.tar.gz) = 1031989392 +TIMESTAMP = 1763721696 +SHA256 (librewolf-145.0.1-2.source.tar.gz) = fd3b6acfbaaaf910a4804dcfb6a4ab79067efa39ec7ba09ea57517434a05113e +SIZE (librewolf-145.0.1-2.source.tar.gz) = 1031995520 diff --git a/www/rubygem-actioncable-gitlab/distinfo b/www/rubygem-actioncable-gitlab/distinfo index a23a9056f1ad..a130cf3bfbc3 100644 --- a/www/rubygem-actioncable-gitlab/distinfo +++ b/www/rubygem-actioncable-gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755146397 -SHA256 (rubygem/actioncable-7.1.5.2.gem) = 79dd467dab2351110fe1fc69e25cee0110bf11f0b9f30165b945b574eebd5e37 -SIZE (rubygem/actioncable-7.1.5.2.gem) = 48128 +TIMESTAMP = 1763614434 +SHA256 (rubygem/actioncable-7.1.6.gem) = ad428d5f0a810452160820ae3cf3d9d68d8f59e7c76de3bd1f1de2a5ad03c3da +SIZE (rubygem/actioncable-7.1.6.gem) = 48128 diff --git a/www/rubygem-actionpack-gitlab/Makefile b/www/rubygem-actionpack-gitlab/Makefile index c9a5845999ee..fb6d98d8d9f2 100644 --- a/www/rubygem-actionpack-gitlab/Makefile +++ b/www/rubygem-actionpack-gitlab/Makefile @@ -14,6 +14,7 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-actionview-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-actionview-gitlab \ rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \ + rubygem-cgi>=0:www/rubygem-cgi \ rubygem-nokogiri>=1.8.5:textproc/rubygem-nokogiri \ rubygem-racc>=0:devel/rubygem-racc \ rubygem-rack22>=2.2.4,3:www/rubygem-rack22 \ diff --git a/www/rubygem-actionpack-gitlab/distinfo b/www/rubygem-actionpack-gitlab/distinfo index 7cf6fd23dc4f..4be4b44bc606 100644 --- a/www/rubygem-actionpack-gitlab/distinfo +++ b/www/rubygem-actionpack-gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755146398 -SHA256 (rubygem/actionpack-7.1.5.2.gem) = a7bfedc8aaeb260778a358870120321a3146954497be465d534722c8c0d644fd -SIZE (rubygem/actionpack-7.1.5.2.gem) = 246272 +TIMESTAMP = 1763614435 +SHA256 (rubygem/actionpack-7.1.6.gem) = 3fa42da36fdcfc3690a711ed35ac5d527b87d3d676f8d111238aa399151203eb +SIZE (rubygem/actionpack-7.1.6.gem) = 246272 diff --git a/www/rubygem-rack-attack/Makefile b/www/rubygem-rack-attack/Makefile index 1f169385d4dc..b8fc4bf3cab1 100644 --- a/www/rubygem-rack-attack/Makefile +++ b/www/rubygem-rack-attack/Makefile @@ -1,5 +1,5 @@ PORTNAME= rack-attack -PORTVERSION= 6.7.0 +PORTVERSION= 6.8.0 CATEGORIES= www rubygems MASTER_SITES= RG @@ -9,7 +9,7 @@ WWW= https://github.com/kickstarter/rack-attack LICENSE= MIT -RUN_DEPENDS= rubygem-rack22>=1.0,3<3,3:www/rubygem-rack22 +RUN_DEPENDS= rubygem-rack22>=1.0,3<4,3:www/rubygem-rack22 USES= gem diff --git a/www/rubygem-rack-attack/distinfo b/www/rubygem-rack-attack/distinfo index 71f7b6d16c78..fd7b08784137 100644 --- a/www/rubygem-rack-attack/distinfo +++ b/www/rubygem-rack-attack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1693633595 -SHA256 (rubygem/rack-attack-6.7.0.gem) = 3ca47e8f66cd33b2c96af53ea4754525cd928ed3fa8da10ee6dad0277791d77c -SIZE (rubygem/rack-attack-6.7.0.gem) = 27136 +TIMESTAMP = 1763479727 +SHA256 (rubygem/rack-attack-6.8.0.gem) = f2499fdebf85bcc05573a22dff57d24305ac14ec2e4156cd3c28d47cafeeecf2 +SIZE (rubygem/rack-attack-6.8.0.gem) = 27136 diff --git a/www/rubygem-rails-gitlab/Makefile b/www/rubygem-rails-gitlab/Makefile index e065bb9c853f..ba7625fb5e63 100644 --- a/www/rubygem-rails-gitlab/Makefile +++ b/www/rubygem-rails-gitlab/Makefile @@ -28,11 +28,11 @@ RUN_DEPENDS= rubygem-actioncable-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/ru USES= cpe gem -NO_ARCH= yes - CPE_VENDOR= rubyonrails CPE_PRODUCT= ruby_on_rails +NO_ARCH= yes + PORTSCOUT= limit:^7\.1\. .include "${.CURDIR}/../../www/gitlab/Makefile.common" diff --git a/www/rubygem-rails-gitlab/distinfo b/www/rubygem-rails-gitlab/distinfo index 78a3bec1f6a1..f4dc67e0d529 100644 --- a/www/rubygem-rails-gitlab/distinfo +++ b/www/rubygem-rails-gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755146397 -SHA256 (rubygem/rails-7.1.5.2.gem) = a292087202c5babf4f4c39a8c37afda732117c481c619986ae1559446e927546 -SIZE (rubygem/rails-7.1.5.2.gem) = 7168 +TIMESTAMP = 1763614434 +SHA256 (rubygem/rails-7.1.6.gem) = 9a0a335e510de3daad7542cd791af3d8ff710c644e1da17ed12e96d2f28a7470 +SIZE (rubygem/rails-7.1.6.gem) = 7168 diff --git a/www/rubygem-railties-gitlab/Makefile b/www/rubygem-railties-gitlab/Makefile index 0ad939166601..91c4aa023e91 100644 --- a/www/rubygem-railties-gitlab/Makefile +++ b/www/rubygem-railties-gitlab/Makefile @@ -14,23 +14,25 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-actionpack-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actionpack-gitlab \ rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \ + rubygem-cgi>=0:www/rubygem-cgi \ rubygem-irb-gitlab>=0:devel/rubygem-irb-gitlab \ rubygem-rackup10>=1.0.0:www/rubygem-rackup10 \ rubygem-rake>=12.2:devel/rubygem-rake \ rubygem-thor>=1.2.2<2:devel/rubygem-thor \ + rubygem-tsort>=0.2:devel/rubygem-tsort \ rubygem-zeitwerk>=2.6<3:devel/rubygem-zeitwerk USES= gem shebangfix -NO_ARCH= yes - -PLIST_FILES= bin/rails +SHEBANG_FILES= lib/rails/generators/rails/app/templates/docker-entrypoint.tt CONFLICTS_INSTALL= rubygem-railties[0-9] rubygem-railties[0-9][0-9] +NO_ARCH= yes + PORTSCOUT= limit:^7\.1\. -SHEBANG_FILES= lib/rails/generators/rails/app/templates/docker-entrypoint.tt +PLIST_FILES= bin/rails .include "${.CURDIR}/../../www/gitlab/Makefile.common" .include <bsd.port.mk> diff --git a/www/rubygem-railties-gitlab/distinfo b/www/rubygem-railties-gitlab/distinfo index 69374c014da2..b0007c1be21f 100644 --- a/www/rubygem-railties-gitlab/distinfo +++ b/www/rubygem-railties-gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755146400 -SHA256 (rubygem/railties-7.1.5.2.gem) = af0ac89f0bfbb957c9fd12cc5a5561248b95b8df938758bfb553d6e916a9d621 -SIZE (rubygem/railties-7.1.5.2.gem) = 182272 +TIMESTAMP = 1763614438 +SHA256 (rubygem/railties-7.1.6.gem) = 2a10e97f2eaca66d11f0fef4b1f4d826e6ee28d4cf01ff16624420dd45e7de1c +SIZE (rubygem/railties-7.1.6.gem) = 182272 diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index c9ca44079825..5b63b440743a 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,13 +1,12 @@ PORTNAME= ungoogled-chromium -PORTVERSION= 142.0.7444.162 -PORTREVISION= 1 +PORTVERSION= 142.0.7444.175 PULSEMV= 16 PULSEV= ${PULSEMV}.1 UGVERSION= ${DISTVERSION}-1 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/:goo \ https://freedesktop.org/software/pulseaudio/releases/:pulseaudio -DISTFILES= chromium-${DISTVERSION}${EXTRACT_SUFX}:goo \ +DISTFILES= chromium-${DISTVERSION}-lite${EXTRACT_SUFX}:goo \ pulseaudio-${PULSEV}.tar.gz:pulseaudio USE_GITHUB= yes @@ -140,7 +139,6 @@ GN_ARGS+= build_with_tflite_lib=false \ enable_backup_ref_ptr_support=false \ enable_hangout_services_extension=false \ enable_mdns=false \ - enable_reading_list=false \ enable_remoting=false \ enable_reporting=false \ enable_service_discovery=false \ @@ -327,6 +325,7 @@ pre-configure: .endfor touch ${WRKDIR}/pulseaudio-${PULSEV}/src/pulse/version.h @${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \ + ${WRKSRC}/build/linux/strip_binary.gni \ ${WRKSRC}/build/rust/rust_bindgen.gni \ ${WRKSRC}/build/rust/rust_bindgen_generator.gni diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index a9891d777397..d6c293f46d27 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1762969883 -SHA256 (chromium-142.0.7444.162.tar.xz) = dbe84fedf3496ea1d47f0b19c60cbb442418f0f2191a78f54039cfd04b087b42 -SIZE (chromium-142.0.7444.162.tar.xz) = 7577065240 +TIMESTAMP = 1763744483 +SHA256 (chromium-142.0.7444.175-lite.tar.xz) = 619b37ab0273f72fac859fff8dd89fbf1b7ae7e7ccb8d67bc79281b24f683bc9 +SIZE (chromium-142.0.7444.175-lite.tar.xz) = 1711108684 SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (chromium-142.0.7444.162-testdata.tar.xz) = 7cd14d54a6343eff62eb44aa49227c82f26df3b44123211eb7b8c824891315e8 -SIZE (chromium-142.0.7444.162-testdata.tar.xz) = 932493864 -SHA256 (ungoogled-software-ungoogled-chromium-142.0.7444.162-142.0.7444.162-1_GH0.tar.gz) = 0db5f8a557400dc10538f60610328c9bb636135197db75feab753a23a96aadce -SIZE (ungoogled-software-ungoogled-chromium-142.0.7444.162-142.0.7444.162-1_GH0.tar.gz) = 650873 +SHA256 (chromium-142.0.7444.175-testdata.tar.xz) = 0db5f8a557400dc10538f60610328c9bb636135197db75feab753a23a96aadce +SIZE (chromium-142.0.7444.175-testdata.tar.xz) = 650873 +SHA256 (ungoogled-software-ungoogled-chromium-142.0.7444.175-142.0.7444.175-1_GH0.tar.gz) = ec3584995b6a69373fc06f6230602c1ebc68f802feedba44c962dc25bb896e33 +SIZE (ungoogled-software-ungoogled-chromium-142.0.7444.175-142.0.7444.175-1_GH0.tar.gz) = 650884 diff --git a/www/ungoogled-chromium/files/patch-build_linux_strip__binary.gni b/www/ungoogled-chromium/files/patch-build_linux_strip__binary.gni new file mode 100644 index 000000000000..e20656832e14 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-build_linux_strip__binary.gni @@ -0,0 +1,13 @@ +--- build/linux/strip_binary.gni.orig 2025-11-21 17:02:17 UTC ++++ build/linux/strip_binary.gni +@@ -21,8 +21,8 @@ template("strip_binary") { + "testonly", + ]) + action("${target_name}") { +- llvm_strip_binary = "${clang_base_path}/bin/llvm-strip" +- llvm_objcopy_binary = "${clang_base_path}/bin/llvm-objcopy" ++ llvm_strip_binary = "${LOCALBASE}/llvm${MODCLANG_VERSION}/bin/llvm-strip" ++ llvm_objcopy_binary = "${LOCALBASE}/llvm${MODCLANG_VERSION}/bin/llvm-objcopy" + script = "//build/linux/strip_binary.py" + + if (defined(invoker.stripped_binary_output)) { diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc index 0cc45b4bd118..6e7b31b73fc6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_features.cc.orig 2025-11-01 06:40:37 UTC +--- chrome/common/chrome_features.cc.orig 2025-11-21 17:02:17 UTC +++ chrome/common/chrome_features.cc @@ -86,7 +86,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, base::FEA #endif // BUILDFLAG(IS_MAC) @@ -36,7 +36,7 @@ // Controls whether Chrome Apps are supported. See https://crbug.com/1221251. // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome // Apps will not launch and will be marked in the UI as deprecated. -@@ -627,7 +627,7 @@ BASE_FEATURE(kGlicDisableWarming, base::FEATURE_ENABLE +@@ -625,7 +625,7 @@ BASE_FEATURE(kGlicWarming, base::FEATURE_DISABLED_BY_D // Killswitch that controls whether the guest WebContents visibility state is // set to hidden when the Glic panel is warming. BASE_FEATURE(kGlicGuestContentsVisibilityState, @@ -45,7 +45,7 @@ base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); -@@ -1088,7 +1088,7 @@ BASE_FEATURE(kKAnonymityServiceOHTTPRequests, base::FE +@@ -1086,7 +1086,7 @@ BASE_FEATURE(kKAnonymityServiceOHTTPRequests, base::FE // public keys. BASE_FEATURE(kKAnonymityServiceStorage, base::FEATURE_ENABLED_BY_DEFAULT); @@ -54,7 +54,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, base::FEATURE_DISABLED_BY_DEFAULT); // Values taken from the low-memory-monitor documentation and also apply to the // portal API: -@@ -1099,7 +1099,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -1097,7 +1097,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit &kLinuxLowMemoryMonitor, "critical_level", 255}; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h index 481073ed7c0b..d97f17375af3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h @@ -1,4 +1,4 @@ ---- chrome/common/chrome_features.h.orig 2025-11-01 06:40:37 UTC +--- chrome/common/chrome_features.h.orig 2025-11-21 17:02:17 UTC +++ chrome/common/chrome_features.h @@ -83,13 +83,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); #endif // BUILDFLAG(IS_MAC) @@ -25,7 +25,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kShortcutsNotApps); -@@ -808,7 +808,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -806,7 +806,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kKAnonymityServiceStorage); @@ -34,7 +34,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor); COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel; -@@ -816,7 +816,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -814,7 +814,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-gpu_webgpu_dawn__commit__hash.h b/www/ungoogled-chromium/files/patch-gpu_webgpu_dawn__commit__hash.h deleted file mode 100644 index b71fe1e25e53..000000000000 --- a/www/ungoogled-chromium/files/patch-gpu_webgpu_dawn__commit__hash.h +++ /dev/null @@ -1,11 +0,0 @@ ---- gpu/webgpu/dawn_commit_hash.h.orig 2025-11-01 06:40:37 UTC -+++ gpu/webgpu/dawn_commit_hash.h -@@ -0,0 +1,8 @@ -+/* Generated by lastchange.py, do not edit.*/ -+ -+#ifndef GPU_WEBGPU_DAWN_COMMIT_HASH_H_ -+#define GPU_WEBGPU_DAWN_COMMIT_HASH_H_ -+ -+#define DAWN_COMMIT_HASH "cee9cb0d67e749bf42f5e90cb3b8a6f525dbb920" -+ -+#endif // GPU_WEBGPU_DAWN_COMMIT_HASH_H_ |