From nobody Thu Apr 20 06:57:56 2023 X-Original-To: dev-commits-ports-branches@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 4Q27lT1fJZz46Q2Y; Thu, 20 Apr 2023 06:57:57 +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 4Q27lS2RqJz4D14; Thu, 20 Apr 2023 06:57:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681973876; 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=SVeiXj421HGnr0xR6ifdjGEULIYzQgvA/rv8tcDIeEM=; b=bR5Nl6Gk0Iy6nVs+Bo0/NCJhne/skOsDosaRhM2sNjjcIjfwQg1dVi9azhqBsfWplMr8zV cG/xr2av15c6UZvbLTP73RePS2JKTfD9meb3HL+XfFn9v8lU+vkS43VJHw4rjPk9VN9geU tRZkW/CQdBJ26epWGHMAyeSKw8aFM51NrFHe8+w+GoEA3drEAf7LaEt8brrxbmOqbot7B/ Pn2JQHgKKkvzged5xmRwESY/vbOUHBlIiGBMUTkEox5AqtdE8hfrryVP1aa3ZuAP2cN3hR bUyO/1pVdY6NELlI+ccofpx+gBODPpngtreTYA7gdRZU6V88HkG9IW5X4YYKIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681973876; 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=SVeiXj421HGnr0xR6ifdjGEULIYzQgvA/rv8tcDIeEM=; b=ciEUry68hIK/3Vw9sBS5BBFOS0bvf7BhD1mr1v06PhPuUdefQ+sCsqvCEayKoU7wk0MHTS NtAx6fzBTeGtgKYY+gwMTM2Ql+0aKK55LdMWfWsoGFJzQcJfL+mY91ncJkMDT/LC9Kh3rV CuRVl/bpema8AFEq/do62bu1upPfN9K9sx+GXvxTAAvjCfcXMPFJT2Z5e1NY3rphgfwQUA WmUD8rcfY7x2jcEn+pcaNX31vu1IIWFcX1QWDFcu0Q+XKipnHdOjDwEch2KrgTGUbIn7gY MI+7B0obxH4gKEC7X1/bKPY+7IaOwDJ3rPwo9lHYnkjwnY8+9Kre0ERX31t1sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681973876; a=rsa-sha256; cv=none; b=d/jPZM+uSJ+f1ypx7+/SCniF2NuyNf4MDKmvvfjtM5gD9DB4nUvq2XtkV2t7zkIL1Z+IyW RSABPnrUmM1/o3poyd6h53E5LWggzI8qBR8oFxgpXoc+B0mq17ps/wKuW3hRS+0DGO2jU6 yRnMuOt+V5y1Wi4W0+PK7astqM7J4uOmJFxnzcCcxov+tbO7bfsBCPJ3Nek+9cTcOgGTDA 41eppkgRlIqXuKjNm9xJnY06CFakY0eXvbOqMj/zeZgxRy2/Nngb38a1rKGX+iTHNfmoxV beWoGPbWY18LmgpghTUZMUSGfy5WmuqhIVWdpsItNgVsHyZFGBSJ1He39Ki6Sw== 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 4Q27lS1TsHzRf9; Thu, 20 Apr 2023 06:57:56 +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 33K6vuPi022869; Thu, 20 Apr 2023 06:57:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33K6vuOO022868; Thu, 20 Apr 2023 06:57:56 GMT (envelope-from git) Date: Thu, 20 Apr 2023 06:57:56 GMT Message-Id: <202304200657.33K6vuOO022868@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 567bc3aa5c22 - 2023Q2 - www/gitlab-ce: major update to 15.10.1 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q2 X-Git-Reftype: branch X-Git-Commit: 567bc3aa5c226cb64cd323db3f9391fa3f42931b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=567bc3aa5c226cb64cd323db3f9391fa3f42931b commit 567bc3aa5c226cb64cd323db3f9391fa3f42931b Author: Matthias Fechner AuthorDate: 2023-04-10 11:28:18 +0000 Commit: Matthias Fechner CommitDate: 2023-04-20 02:22:53 +0000 www/gitlab-ce: major update to 15.10.1 Changelog: https://about.gitlab.com/releases/2023/03/22/gitlab-15-10-released/ https://about.gitlab.com/releases/2023/03/30/security-release-gitlab-15-10-1-released/ (cherry picked from commit b5a874168ae078116b48f335b35967b31ff29be6) --- devel/gitaly/Makefile | 6 ++--- devel/gitaly/distinfo | 10 ++++----- devel/gitaly/files/patch-Makefile | 8 +++---- devel/gitaly/files/patch-ruby_Gemfile | 4 ++-- net/gitlab-agent/Makefile | 2 +- net/gitlab-agent/distinfo | 10 ++++----- www/gitlab-ce/Makefile | 41 +++++++++++++++++------------------ www/gitlab-ce/distinfo | 6 ++--- www/gitlab-pages/Makefile | 4 ++-- www/gitlab-pages/distinfo | 10 ++++----- www/gitlab-workhorse/Makefile | 4 ++-- www/gitlab-workhorse/distinfo | 10 ++++----- 12 files changed, 57 insertions(+), 58 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 1d0c6c49fc71..ccbaac3695d4 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -DISTVERSION= 15.9.4 +DISTVERSION= 15.10.1 PORTREVISION= 0 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -27,7 +27,7 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-gitaly>=15.5.0<15.10:net/rubygem-gitaly \ rubygem-gitlab-labkit>=0.31<1:devel/rubygem-gitlab-labkit \ rubygem-licensee>=9.15<10:devel/rubygem-licensee \ - rubygem-google-protobuf>=3.21.12<3.22:devel/rubygem-google-protobuf \ + rubygem-google-protobuf>=3.22.2<3.23:devel/rubygem-google-protobuf \ rubygem-nokogiri>=1.14.1<1.15:textproc/rubygem-nokogiri \ rubygem-license_finder>=7.0<8:devel/rubygem-license_finder \ rubygem-redis4>=4.8.0<5:databases/rubygem-redis4 @@ -49,7 +49,7 @@ MAKE_ENV+= ${GO_ENV} USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= c05835906e40380ebf9290e420b877bca37bf7f2 +GL_COMMIT= 267edbe4a3f5416d75b5f0213bbcee9012f7797d # for go dependencies # Gitlab hosts there dependencies on their own platform and not on go-proxy diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index dfef61d35658..7a9b5c250d35 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1680514334 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-c05835906e40380ebf9290e420b877bca37bf7f2_GL0/go.mod) = 605d47badb908e81ce1f6f50b9946a215c2600e2423f10239aa0885c92413a90 -SIZE (go/devel_gitaly/gitlab-org-gitaly-c05835906e40380ebf9290e420b877bca37bf7f2_GL0/go.mod) = 10219 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-c05835906e40380ebf9290e420b877bca37bf7f2_GL0/gitlab-org-gitaly-c05835906e40380ebf9290e420b877bca37bf7f2_GL0.tar.gz) = ec7d4174fdc6a865edf8b2b9eb924b407c167b6bab02fb438c9674edf2bd7dd7 -SIZE (go/devel_gitaly/gitlab-org-gitaly-c05835906e40380ebf9290e420b877bca37bf7f2_GL0/gitlab-org-gitaly-c05835906e40380ebf9290e420b877bca37bf7f2_GL0.tar.gz) = 3061484 +TIMESTAMP = 1681104389 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0/go.mod) = f9e62b5491c17780d343f8de6921e04e1012858cd7ad6de24a77d38e6d941235 +SIZE (go/devel_gitaly/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0/go.mod) = 10320 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0.tar.gz) = dfc2a54be503458235d45fe771de0402203ea81af176fd3786aadfdf21f499b1 +SIZE (go/devel_gitaly/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0/gitlab-org-gitaly-267edbe4a3f5416d75b5f0213bbcee9012f7797d_GL0.tar.gz) = 3096478 diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile index 5a2ec4e65496..326cc55a9afd 100644 --- a/devel/gitaly/files/patch-Makefile +++ b/devel/gitaly/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2023-02-21 16:36:17 UTC +--- Makefile.orig 2023-03-30 13:24:44 UTC +++ Makefile -@@ -546,7 +546,6 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a +@@ -563,7 +563,6 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a # step. Both Omnibus and CNG assume it is in the Gitaly root, not in # _build. Hence the '../' in front. ${RUBY_BUNDLE_FILE}: ${GITALY_RUBY_DIR}/Gemfile.lock ${GITALY_RUBY_DIR}/Gemfile @@ -8,7 +8,7 @@ ${Q}touch $@ ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE -@@ -587,7 +586,7 @@ ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BU +@@ -604,7 +603,7 @@ ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BU @ # This fallback is unique but non-deterministic, making it sufficient to avoid generating the @ # GNU build-id from the empty string and causing guaranteed collisions. ${Q}GO_BUILD_ID=$$(go tool buildid "$<" || openssl rand -hex 32) && \ @@ -17,7 +17,7 @@ if test "${OS}" = "Linux"; then \ go run "${SOURCE_DIR}"/tools/replace-buildid \ -input "$<" -input-build-id "${TEMPORARY_BUILD_ID}" \ -@@ -613,7 +612,6 @@ ${BUILD_DIR}/intermediate/gitaly: GO_BUILD_ +@@ -630,7 +629,6 @@ ${BUILD_DIR}/intermediate/gitaly: GO_BUILD_ ${BUILD_DIR}/intermediate/gitaly: remove-legacy-go-mod ${GITALY_PACKED_EXECUTABLES} ${BUILD_DIR}/intermediate/praefect: GO_BUILD_TAGS = ${SERVER_BUILD_TAGS} ${BUILD_DIR}/intermediate/gitaly-git2go: GO_BUILD_TAGS = ${GIT2GO_BUILD_TAGS} diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile index 40f422023aa7..f363f6758027 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -1,4 +1,4 @@ ---- ruby/Gemfile.orig 2023-02-21 16:36:17 UTC +--- ruby/Gemfile.orig 2023-03-30 13:24:44 UTC +++ ruby/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' @@ -17,7 +17,7 @@ +gem 'gitaly', '~> 15.5' # Labkit provides observability functionality - gem 'gitlab-labkit', '~> 0.31' + gem 'gitlab-labkit', '~> 0.31', '>= 0.31.1' @@ -26,18 +26,10 @@ gem 'nokogiri', '~> 1.14' # dependency and can thus be removed when the version constraint is gone. gem 'redis', '~> 4.8.0' diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile index cb18a00a8c0b..cca7f73142e4 100644 --- a/net/gitlab-agent/Makefile +++ b/net/gitlab-agent/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-agent -PORTVERSION= 15.9.0 +PORTVERSION= 15.10.0 DISTVERSIONPREFIX= v CATEGORIES= net diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index df38bab34e46..e70e95cf07cf 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1676993408 -SHA256 (go/net_gitlab-agent/gitlab-agent-v15.9.0/v15.9.0.mod) = 6370b2af4d14781d0fa2b04e0be596e478bf5dc3fa3a5b59f290ef4e66f737bc -SIZE (go/net_gitlab-agent/gitlab-agent-v15.9.0/v15.9.0.mod) = 10408 -SHA256 (go/net_gitlab-agent/gitlab-agent-v15.9.0/v15.9.0.zip) = ffce5d25931a1087ffa070e2f3201987213cf1b615a1db06d44c40c85bfc143a -SIZE (go/net_gitlab-agent/gitlab-agent-v15.9.0/v15.9.0.zip) = 929645 +TIMESTAMP = 1681107068 +SHA256 (go/net_gitlab-agent/gitlab-agent-v15.10.0/v15.10.0.mod) = f00388af7b9f07b62d8911d652a05544444616e9d6bf9f47dbbdcac10eda1ad5 +SIZE (go/net_gitlab-agent/gitlab-agent-v15.10.0/v15.10.0.mod) = 10459 +SHA256 (go/net_gitlab-agent/gitlab-agent-v15.10.0/v15.10.0.zip) = 35e97bc04748f49017cc56b71419f86a85236831b6770c5f00aa0eeb6fea67a4 +SIZE (go/net_gitlab-agent/gitlab-agent-v15.10.0/v15.10.0.zip) = 956645 diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index c080c03d0fb0..b0254fc2332e 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-ce -PORTVERSION= 15.9.4 +PORTVERSION= 15.10.1 PORTREVISION= 0 CATEGORIES= www devel @@ -20,10 +20,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE MY_DEPENDS= git>=2.39.2:devel/git \ gitaly>=${PORTVERSION}:devel/gitaly \ gitlab-elasticsearch-indexer>=4.1.0:textproc/gitlab-elasticsearch-indexer \ - gitlab-agent>=15.9.0:net/gitlab-agent \ + gitlab-agent>=15.10.0:net/gitlab-agent \ gitlab-metrics-exporter>0:devel/gitlab-metrics-exporter \ gitlab-pages>=${PORTVERSION}:www/gitlab-pages \ - gitlab-shell>=14.17.0:devel/gitlab-shell \ + gitlab-shell>=14.18.0:devel/gitlab-shell \ gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \ redis>=6.2.11:databases/redis \ yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \ @@ -39,7 +39,6 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-responders-rails61>=3.0<4.0:www/rubygem-responders-rails61 \ rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \ rubygem-view_component-rails61>=2.74.1<2.75:devel/rubygem-view_component-rails61 \ - rubygem-default_value_for>=3.4.0<3.5.0:devel/rubygem-default_value_for \ rubygem-pg>=1.4.5<1.5:databases/rubygem-pg \ rubygem-rugged>=1.5<2:devel/rubygem-rugged \ rubygem-grape-path-helpers>=1.7.1<1.8:devel/rubygem-grape-path-helpers \ @@ -99,12 +98,10 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-hamlit>=2.15.0<2.16:www/rubygem-hamlit \ rubygem-carrierwave>=1.3.2<2.0:www/rubygem-carrierwave \ rubygem-mini_magick410>=4.10.1<4.11:graphics/rubygem-mini_magick410 \ - rubygem-fog-aws>=3.15<4:net/rubygem-fog-aws \ + rubygem-fog-aws>=3.18<4:net/rubygem-fog-aws \ rubygem-fog-core210>=2.1.0<2.1.1:devel/rubygem-fog-core210 \ rubygem-fog-google>=1.19<2:net/rubygem-fog-google \ rubygem-fog-local>=0.8<1.0:net/rubygem-fog-local \ - rubygem-fog-openstack>=1.0<2.0:net/rubygem-fog-openstack \ - rubygem-fog-rackspace>=0.1.1<1.2.0:net/rubygem-fog-rackspace \ rubygem-fog-aliyun>=0.4<1.0:net/rubygem-fog-aliyun \ rubygem-gitlab-fog-azure-rm>=1.7.0<1.8:net/rubygem-gitlab-fog-azure-rm \ rubygem-google-cloud-storage>=1.44.0<1.45:net/rubygem-google-cloud-storage \ @@ -137,13 +134,13 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \ rubygem-creole>=0.5.0<0.6.0:textproc/rubygem-creole \ rubygem-wikicloth081>=0.8.1<0.8.2:textproc/rubygem-wikicloth081 \ - rubygem-asciidoctor>=2.0.17<2.1.0:textproc/rubygem-asciidoctor \ + rubygem-asciidoctor>=2.0.18<2.1.0:textproc/rubygem-asciidoctor \ rubygem-asciidoctor-include-ext>=0.4.0<0.5.0:textproc/rubygem-asciidoctor-include-ext \ rubygem-asciidoctor-plantuml00>=0.0.16<0.1:textproc/rubygem-asciidoctor-plantuml00 \ - rubygem-asciidoctor-kroki>=0.7.0<0.8:textproc/rubygem-asciidoctor-kroki \ - rubygem-rouge>=3.30.0<3.31:textproc/rubygem-rouge \ + rubygem-asciidoctor-kroki>=0.8.0<0.9:textproc/rubygem-asciidoctor-kroki \ + rubygem-rouge>=4.1.0<4.2:textproc/rubygem-rouge \ rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \ - rubygem-nokogiri>=1.14.1<1.15:textproc/rubygem-nokogiri \ + rubygem-nokogiri>=1.14.2<1.15:textproc/rubygem-nokogiri \ rubygem-icalendar>=0:devel/rubygem-icalendar \ rubygem-diffy>=3.4<4:textproc/rubygem-diffy \ rubygem-diff_match_patch>=0.1.0<0.2.0:textproc/rubygem-diff_match_patch \ @@ -177,12 +174,13 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-hangouts-chat>=0.0.5<0.1.0:net/rubygem-hangouts-chat \ rubygem-asana0>=0.10.13<0.11:www/rubygem-asana0 \ rubygem-ruby-fogbugz>=0.3.0<0.4.0:devel/rubygem-ruby-fogbugz \ + rubygem-kubeclient>=4.11.0<4.12.0:www/rubygem-kubeclient \ rubygem-sanitize>=6.0<7:textproc/rubygem-sanitize \ rubygem-babosa>=1.0.4<1.1.0:textproc/rubygem-babosa \ rubygem-loofah>=2.19.1<2.20:textproc/rubygem-loofah \ rubygem-licensee>=9.15<10:devel/rubygem-licensee \ rubygem-charlock_holmes>=0.7.7<0.8.0:textproc/rubygem-charlock_holmes \ - rubygem-ruby-magic>=0.5.4<1:devel/rubygem-ruby-magic \ + rubygem-ruby-magic>=0.6<1:devel/rubygem-ruby-magic \ rubygem-fast_blank>=0:devel/rubygem-fast_blank \ rubygem-gitlab-chronic>=0.10.5<0.11.0:devel/rubygem-gitlab-chronic \ rubygem-gitlab_chronic_duration>=0.10.6.2<0.10.7:devel/rubygem-gitlab_chronic_duration \ @@ -203,7 +201,7 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-sentry-sidekiq>=5.1.1<5.2:devel/rubygem-sentry-sidekiq \ rubygem-pg_query>=2.2.1<3:databases/rubygem-pg_query \ rubygem-premailer-rails-rails61>=1.10.3<1.11:mail/rubygem-premailer-rails-rails61 \ - rubygem-gitlab-labkit>=0.31.0<0.32:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.31.1<0.32:devel/rubygem-gitlab-labkit \ rubygem-thrift>=0.16.0:devel/rubygem-thrift \ rubygem-ruby_parser>=3.19<4.0:devel/rubygem-ruby_parser \ rubygem-rails-i18n-rails61>=7.0<8:devel/rubygem-rails-i18n-rails61 \ @@ -214,15 +212,15 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-peek-rails61>=1.1.0<2.0:devel/rubygem-peek-rails61 \ rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \ rubygem-webrick17>=1.7.0<1.8:www/rubygem-webrick17 \ - rubygem-prometheus-client-mmap>=0.17<1:devel/rubygem-prometheus-client-mmap \ + rubygem-prometheus-client-mmap>=0.19<1:devel/rubygem-prometheus-client-mmap \ rubygem-warning>=1.3.0<1.4:devel/rubygem-warning \ rubygem-license_finder>=7.0.0<8:devel/rubygem-license_finder \ - rubygem-gitlab-dangerfiles>=3.7.0<3.8:devel/rubygem-gitlab-dangerfiles \ + rubygem-gitlab-dangerfiles>=3.8.0<3.9:devel/rubygem-gitlab-dangerfiles \ rubygem-octokit>=4.20<5.0:net/rubygem-octokit \ rubygem-gitlab-mail_room>=0.0.9<0.1.0:mail/rubygem-gitlab-mail_room \ rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \ rubygem-html2text>=0:textproc/rubygem-html2text \ - rubygem-stackprof>=0.2.21<0.3:devel/rubygem-stackprof \ + rubygem-stackprof>=0.2.23<0.3:devel/rubygem-stackprof \ rubygem-rbtrace>=0.4.14<1.0:devel/rubygem-rbtrace \ rubygem-memory_profiler>=1.0<2.0:devel/rubygem-memory_profiler \ rubygem-benchmark-memory>=0.1<1.0:benchmarks/rubygem-benchmark-memory \ @@ -237,7 +235,7 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-gitaly>=15.9.0.pre.rc3<15.10.0:net/rubygem-gitaly \ rubygem-kas-grpc>=0.0.2,1<0.0.3,1:net/rubygem-kas-grpc \ rubygem-grpc142>=1.42.0<1.43:net/rubygem-grpc142 \ - rubygem-google-protobuf>=3.21.12<4:devel/rubygem-google-protobuf \ + rubygem-google-protobuf>=3.22.2<4:devel/rubygem-google-protobuf \ rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \ rubygem-flipper025>=0.25.0<0.26:devel/rubygem-flipper025 \ rubygem-flipper-active_record-rails61>=0.25.0<0.26:databases/rubygem-flipper-active_record-rails61 \ @@ -259,17 +257,18 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-oj-introspect>=0.7<1:devel/rubygem-oj-introspect \ rubygem-multi_json114>=1.14.1<1.15:devel/rubygem-multi_json114 \ rubygem-yajl-ruby>=1.4.3<1.5:devel/rubygem-yajl-ruby \ - rubygem-webauthn>=2.3<3:security/rubygem-webauthn \ + rubygem-webauthn>=3.0<4:security/rubygem-webauthn \ rubygem-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \ rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1 \ rubygem-ed25519>=1.3.0<1.4:security/rubygem-ed25519 \ rubygem-parser>=0:devel/rubygem-parser \ rubygem-cvss-suite>=3.0.1<3.1:security/rubygem-cvss-suite \ rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \ - rubygem-CFPropertyList>=0:devel/rubygem-CFPropertyList \ + rubygem-CFPropertyList>=3.0.0<3.1:devel/rubygem-CFPropertyList \ rubygem-app_store_connect>=0:net/rubygem-app_store_connect \ rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \ - rubygem-kubeclient>=4.9.3<4.10.0:www/rubygem-kubeclient + rubygem-net-protocol01>=0.1.3<0.2:net/rubygem-net-protocol01 \ + rubygem-duo_api>=1.3<2:security/rubygem-duo_api BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} @@ -289,7 +288,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= d6192c2ab77ab814b9bd66103663047556fd67e4 +GL_COMMIT= a2b7634113a2b2f3b9aad86b1a98c52c380e5e76 USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index da108b212cc5..c44bb3c48f16 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680514226 -SHA256 (gitlab-org-gitlab-foss-d6192c2ab77ab814b9bd66103663047556fd67e4_GL0.tar.gz) = 508f5aa774e5116d25dabd812dd7a083031628f0148711dbc1493ef8dd6d0fb4 -SIZE (gitlab-org-gitlab-foss-d6192c2ab77ab814b9bd66103663047556fd67e4_GL0.tar.gz) = 101383166 +TIMESTAMP = 1680516365 +SHA256 (gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0.tar.gz) = 0d1b33ffd7478861636d49d4a8f26ec08ff93d534ade6c472b36c1d13dec5cb5 +SIZE (gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0.tar.gz) = 101622772 diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile index 71455e83bcdb..153ef47eb908 100644 --- a/www/gitlab-pages/Makefile +++ b/www/gitlab-pages/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-pages -PORTVERSION= 15.9.4 +PORTVERSION= 15.10.1 DISTVERSIONPREFIX= v PORTREVISION= 2 CATEGORIES= www @@ -19,7 +19,7 @@ GO_MODULE= gitlab.com/gitlab-org/gitlab-pages USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitlab-pages/-/tags/ -GL_COMMIT= 7dc97d597fb95280b4f44cffd19128673e95defb +GL_COMMIT= a6f8992867871247a0b5486ecbff642a6d23ad1b GO_BUILDFLAGS= -ldflags="-X 'main.VERSION=${PORTVERSION}' -X 'main.REVISION=${GL_COMMIT}'" diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index d98e5fcd9ef2..eaba9ac25544 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1680514377 -SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-7dc97d597fb95280b4f44cffd19128673e95defb_GL0/go.mod) = 407883ba322b73d1526b585fb5a2570826c39759adf176965e8a37b1cf664f2d -SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-7dc97d597fb95280b4f44cffd19128673e95defb_GL0/go.mod) = 2938 -SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-7dc97d597fb95280b4f44cffd19128673e95defb_GL0/gitlab-org-gitlab-pages-7dc97d597fb95280b4f44cffd19128673e95defb_GL0.tar.gz) = b3a80363d8cc3dca252314ea81ef78483737802d9a7d8c6f1a123c97ee002458 -SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-7dc97d597fb95280b4f44cffd19128673e95defb_GL0/gitlab-org-gitlab-pages-7dc97d597fb95280b4f44cffd19128673e95defb_GL0.tar.gz) = 227627 +TIMESTAMP = 1681107198 +SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-a6f8992867871247a0b5486ecbff642a6d23ad1b_GL0/go.mod) = 46db8658c6f0351191e106a870b9570de4ab97b900b450daa66ea74ec805f1f5 +SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-a6f8992867871247a0b5486ecbff642a6d23ad1b_GL0/go.mod) = 3020 +SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-a6f8992867871247a0b5486ecbff642a6d23ad1b_GL0/gitlab-org-gitlab-pages-a6f8992867871247a0b5486ecbff642a6d23ad1b_GL0.tar.gz) = 88f11e7b5646dd199b7f2072d2b65290f7de6cb7425c7988d200c91a21ca118e +SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-a6f8992867871247a0b5486ecbff642a6d23ad1b_GL0/gitlab-org-gitlab-pages-a6f8992867871247a0b5486ecbff642a6d23ad1b_GL0.tar.gz) = 227626 diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index 03e9449892f0..3f793d2405e4 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-workhorse -PORTVERSION= 15.9.4 +PORTVERSION= 15.10.1 PORTREVISION= 0 DISTVERSIONPREFIX= v CATEGORIES= www @@ -25,7 +25,7 @@ USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT= d6192c2ab77ab814b9bd66103663047556fd67e4 +GL_COMMIT= a2b7634113a2b2f3b9aad86b1a98c52c380e5e76 # for go dependencies # Gitlab hosts there dependencies on their own platform and not on go-proxy diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 8151ecfde06f..df1f3b82d3f4 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1680514336 -SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-d6192c2ab77ab814b9bd66103663047556fd67e4_GL0/go.mod) = 165e946b71ad1f8ba80b2b2d5057345f3506ca29ecb92786555d740a6487c393 -SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-d6192c2ab77ab814b9bd66103663047556fd67e4_GL0/go.mod) = 6261 -SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-d6192c2ab77ab814b9bd66103663047556fd67e4_GL0/gitlab-org-gitlab-foss-d6192c2ab77ab814b9bd66103663047556fd67e4_GL0.tar.gz) = 508f5aa774e5116d25dabd812dd7a083031628f0148711dbc1493ef8dd6d0fb4 -SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-d6192c2ab77ab814b9bd66103663047556fd67e4_GL0/gitlab-org-gitlab-foss-d6192c2ab77ab814b9bd66103663047556fd67e4_GL0.tar.gz) = 101383166 +TIMESTAMP = 1680517474 +SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0/go.mod) = 9fdf8cb254d815b1e1887360684bc8b5969b03cdaacbc9a7c8628e2828622458 +SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0/go.mod) = 6201 +SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0/gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0.tar.gz) = 0d1b33ffd7478861636d49d4a8f26ec08ff93d534ade6c472b36c1d13dec5cb5 +SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0/gitlab-org-gitlab-foss-a2b7634113a2b2f3b9aad86b1a98c52c380e5e76_GL0.tar.gz) = 101622772