From nobody Sun May 14 17:27:04 2023 X-Original-To: dev-commits-ports-main@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 4QK8ZJ1vBHz4BvtN; Sun, 14 May 2023 17:27:04 +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 4QK8ZJ1bj2z3FyM; Sun, 14 May 2023 17:27:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684085224; 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=dGt0HBMepaTswbsvCuHJqq8aSzfilhc5xYZObyVXdTM=; b=hkcqhXO12FLPfaFBNhSV3VujE6jB976McnutZUdyREevAcThIKklsrvY+Kzes4EhDxbgkb /UbjfenYKVgll/fDu2K5tz0lq+k5hoiC7JJCWCwS6rqVXzMfLagnoS+c+DI+UCaxQKnOQQ Sgdm0zhUOvVbyUE+iDi5OFFM1FqpBdYG6O7ahYiRjNQTGTArvQLHm55d7eDMYVyw46AU7v Oim9fayTLQLOUIRMSLWgaOElKNVDtl2fk3U12EmNQ0KKvvBrX81cwFVP/pgXxn6bXzNzMn o1LWPNZInzjdohiHRzG74RI6Cy5YpciU2X95UnO6O986MxXqOIKMOcZ8WDn73w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684085224; 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=dGt0HBMepaTswbsvCuHJqq8aSzfilhc5xYZObyVXdTM=; b=ZLsEgCrguZdzzo8OicxiWkBymo5n32u/FYPJbdInYnvxyLwuopAOdmrVZweInWquqxBY2U /F0UH45/Zv8L7AnMTWuyXgvZdwcgkZdLozO2b9mJ+8IwMwUHedFwcz8quqZFbvCN0tm1o7 BMopQZ5f765+DVnphpBV0/p6kID09aP8A/J3nDQNGeCiqaRnev4/WgJTNfHnAkKRQjjbr/ HC1oE++G34MwDJnO00D60U0jQbGoUMqkTF1/QOglyVAaInPxcNmOMuThG61JB55BhcUQIR kd6gkXqXI5cntkW4P78r5CTxbo9e62kdGx0u6+m1E3mGF1JRjibnTfG1xFYQSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684085224; a=rsa-sha256; cv=none; b=D0J07mIVS4QHuYjCRLRM0FOHtUT81C7a6YaaqYQ+ExA0THU+LY9rwpnHVvDrPd+drKuFeR u3sfWX0uoNphM5QENU7QYcO+iD/Og622/aQNkwNGVm9+E8QaeGYPrWa3lYMJSICeNI0R8k GYQ5zKu5b2P90FpjsHPEKsIcwMSzhcxnbpB0oAp679BZ1AKk/FDE6uVCETqVo1APM7Fby4 Gv+BuVc/kP1Ju6kCeqSVsv7r1ipGNTWB8g+w3d9jmmROZF5T4H78RKqqjlVTXcMsGpO6ik BRROQUbKgaw3iTvYrPO3TjI4TgzF2rNnq6JOU7Dm3k6iDJtMjgT35xEAvuAN8Q== 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 4QK8ZJ0Tp7z16tb; Sun, 14 May 2023 17:27:04 +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 34EHR4NF067616; Sun, 14 May 2023 17:27:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34EHR4Gg067615; Sun, 14 May 2023 17:27:04 GMT (envelope-from git) Date: Sun, 14 May 2023 17:27:04 GMT Message-Id: <202305141727.34EHR4Gg067615@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 10a220d880a7 - main - www/gitlab-ce: major update to 15.11.3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10a220d880a7019c719d98343d1ad478b3526e29 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=10a220d880a7019c719d98343d1ad478b3526e29 commit 10a220d880a7019c719d98343d1ad478b3526e29 Author: Matthias Fechner AuthorDate: 2023-05-14 17:23:54 +0000 Commit: Matthias Fechner CommitDate: 2023-05-14 17:25:57 +0000 www/gitlab-ce: major update to 15.11.3 Changelog: https://about.gitlab.com/releases/2023/04/22/gitlab-15-11-released/ --- devel/gitaly/Makefile | 6 +- devel/gitaly/distinfo | 10 +-- devel/gitaly/files/patch-Makefile | 14 +--- devel/gitaly/files/patch-config.toml.example | 20 ++---- net/gitlab-agent/Makefile | 2 +- net/gitlab-agent/distinfo | 10 +-- textproc/gitlab-elasticsearch-indexer/Makefile | 5 +- textproc/gitlab-elasticsearch-indexer/distinfo | 10 +-- www/gitlab-ce/Makefile | 62 +++++++++-------- www/gitlab-ce/distinfo | 6 +- www/gitlab-ce/files/patch-Gemfile | 94 +++++++++++++------------- www/gitlab-ce/pkg-message | 4 +- www/gitlab-pages/Makefile | 4 +- www/gitlab-pages/distinfo | 10 +-- www/gitlab-workhorse/Makefile | 4 +- www/gitlab-workhorse/distinfo | 10 +-- 16 files changed, 129 insertions(+), 142 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index ab1ee3a73f70..8aea0c6644d4 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -DISTVERSION= 15.10.7 +DISTVERSION= 15.11.3 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -26,7 +26,7 @@ MY_DEPENDS= git>=2.40.1: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.22.2<3.23:devel/rubygem-google-protobuf \ + rubygem-google-protobuf>=3.22.3<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 @@ -48,7 +48,7 @@ MAKE_ENV+= ${GO_ENV} USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= 6f72a217aaed46958d0afcd2d6d97e5501f0e59c +GL_COMMIT= 62b051c35c2bcccd5ad7c707ff4f1fd67f641717 # 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 e1abbe7de0c5..e4c60e166e4a 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1683958011 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-6f72a217aaed46958d0afcd2d6d97e5501f0e59c_GL0/go.mod) = f9e62b5491c17780d343f8de6921e04e1012858cd7ad6de24a77d38e6d941235 -SIZE (go/devel_gitaly/gitlab-org-gitaly-6f72a217aaed46958d0afcd2d6d97e5501f0e59c_GL0/go.mod) = 10320 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-6f72a217aaed46958d0afcd2d6d97e5501f0e59c_GL0/gitlab-org-gitaly-6f72a217aaed46958d0afcd2d6d97e5501f0e59c_GL0.tar.gz) = fa934b7bd6ffb3a2b650aba44edc717d0de381b6b046803953e98cc71aba47dc -SIZE (go/devel_gitaly/gitlab-org-gitaly-6f72a217aaed46958d0afcd2d6d97e5501f0e59c_GL0/gitlab-org-gitaly-6f72a217aaed46958d0afcd2d6d97e5501f0e59c_GL0.tar.gz) = 3096694 +TIMESTAMP = 1683982203 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-62b051c35c2bcccd5ad7c707ff4f1fd67f641717_GL0/go.mod) = 4937565cfcb003930a583d7adb41f6dce0acb6b5cc496c2c03242dbd4eb36a18 +SIZE (go/devel_gitaly/gitlab-org-gitaly-62b051c35c2bcccd5ad7c707ff4f1fd67f641717_GL0/go.mod) = 10423 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-62b051c35c2bcccd5ad7c707ff4f1fd67f641717_GL0/gitlab-org-gitaly-62b051c35c2bcccd5ad7c707ff4f1fd67f641717_GL0.tar.gz) = 9730eb06bfe1add7e4a84e16c28a04ff79084bc118693835e5f41a0996e7c7d4 +SIZE (go/devel_gitaly/gitlab-org-gitaly-62b051c35c2bcccd5ad7c707ff4f1fd67f641717_GL0/gitlab-org-gitaly-62b051c35c2bcccd5ad7c707ff4f1fd67f641717_GL0.tar.gz) = 3458575 diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile index 326cc55a9afd..68da5f620614 100644 --- a/devel/gitaly/files/patch-Makefile +++ b/devel/gitaly/files/patch-Makefile @@ -1,14 +1,6 @@ ---- Makefile.orig 2023-03-30 13:24:44 UTC +--- Makefile.orig 2023-04-21 08:04:56 UTC +++ Makefile -@@ -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 -- ${Q}cd ${GITALY_RUBY_DIR} && bundle install - ${Q}touch $@ - - ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE -@@ -604,7 +603,7 @@ ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BU +@@ -573,7 +573,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 +9,7 @@ if test "${OS}" = "Linux"; then \ go run "${SOURCE_DIR}"/tools/replace-buildid \ -input "$<" -input-build-id "${TEMPORARY_BUILD_ID}" \ -@@ -630,7 +629,6 @@ ${BUILD_DIR}/intermediate/gitaly: GO_BUILD_ +@@ -599,7 +599,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-config.toml.example b/devel/gitaly/files/patch-config.toml.example index 7e6e96a77994..7df2f61fefe4 100644 --- a/devel/gitaly/files/patch-config.toml.example +++ b/devel/gitaly/files/patch-config.toml.example @@ -1,4 +1,4 @@ ---- config.toml.example.orig 2022-06-21 10:12:22 UTC +--- config.toml.example.orig 2023-04-21 08:04:56 UTC +++ config.toml.example @@ -2,10 +2,10 @@ # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and @@ -44,25 +44,19 @@ # # You can optionally configure more storages for this Gitaly instance to serve up # -@@ -63,7 +63,7 @@ path = "/home/git/repositories" +@@ -61,9 +61,9 @@ path = "/home/git/repositories" + # + # # You can optionally configure Gitaly to output JSON-formatted log messages to stdout - # [logging] +-# [logging] ++[logging] # # The directory where Gitaly stores extra log files -dir = "/home/git/gitlab/log" +dir = "%%PREFIX%%/www/gitlab-ce/log" # 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 -@@ -81,7 +81,7 @@ dir = "/home/git/gitlab/log" - - [gitaly-ruby] - # The directory where gitaly-ruby is installed --dir = "/home/git/gitaly/ruby" -+dir = "%%PREFIX%%/share/gitaly/ruby" - - # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes) - # max_rss = 200000000 -@@ -101,14 +101,14 @@ dir = "/home/git/gitaly/ruby" +@@ -79,14 +79,14 @@ dir = "/home/git/gitlab/log" [gitlab-shell] # The directory where gitlab-shell is installed diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile index cca7f73142e4..4e8e2a9ab18e 100644 --- a/net/gitlab-agent/Makefile +++ b/net/gitlab-agent/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-agent -PORTVERSION= 15.10.0 +PORTVERSION= 15.11.0 DISTVERSIONPREFIX= v CATEGORIES= net diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index e70e95cf07cf..36e720bf2ac7 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -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 +TIMESTAMP = 1682145775 +SHA256 (go/net_gitlab-agent/gitlab-agent-v15.11.0/v15.11.0.mod) = 6aaae783c3e97fcd41a5a05ff0d20e05867d7bbb77ce13ba8d2fda6e0c907d58 +SIZE (go/net_gitlab-agent/gitlab-agent-v15.11.0/v15.11.0.mod) = 10767 +SHA256 (go/net_gitlab-agent/gitlab-agent-v15.11.0/v15.11.0.zip) = 5b0db2a41e117b4b6c028fcd5dc16d4a5160b000afd29443163872474e04cbb2 +SIZE (go/net_gitlab-agent/gitlab-agent-v15.11.0/v15.11.0.zip) = 984432 diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile index 66faf3ef9cd6..e8e1c85bde6a 100644 --- a/textproc/gitlab-elasticsearch-indexer/Makefile +++ b/textproc/gitlab-elasticsearch-indexer/Makefile @@ -1,7 +1,6 @@ PORTNAME= gitlab-elasticsearch-indexer -PORTVERSION= 4.1.0 +PORTVERSION= 4.3.0 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= mfechner@FreeBSD.org @@ -21,7 +20,7 @@ USES= gmake go:modules,no_targets pkgconfig USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer/-/tags -GL_COMMIT= c33cd08b6239fb9e3bc86302f27037d00c647049 +GL_COMMIT= c0a71075f58bcce5fa55e3e0cf2a2106230858a4 MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" # make sure to pass go build options into make process diff --git a/textproc/gitlab-elasticsearch-indexer/distinfo b/textproc/gitlab-elasticsearch-indexer/distinfo index 7e31ea88da9c..f208c286fdbc 100644 --- a/textproc/gitlab-elasticsearch-indexer/distinfo +++ b/textproc/gitlab-elasticsearch-indexer/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1676992088 -SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-org-gitlab-elasticsearch-indexer-c33cd08b6239fb9e3bc86302f27037d00c647049_GL0/go.mod) = c456b10b1ea442ca1d9a9cdb1f7e21dc11f67c659ba43930dcae78fd5e7ec439 -SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-org-gitlab-elasticsearch-indexer-c33cd08b6239fb9e3bc86302f27037d00c647049_GL0/go.mod) = 2318 -SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-org-gitlab-elasticsearch-indexer-c33cd08b6239fb9e3bc86302f27037d00c647049_GL0/gitlab-org-gitlab-elasticsearch-indexer-c33cd08b6239fb9e3bc86302f27037d00c647049_GL0.tar.gz) = be6d6c7663e4be0705c9936e18c802a72a4e1ecbfd6a5519f93285dfbdfd60ea -SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-org-gitlab-elasticsearch-indexer-c33cd08b6239fb9e3bc86302f27037d00c647049_GL0/gitlab-org-gitlab-elasticsearch-indexer-c33cd08b6239fb9e3bc86302f27037d00c647049_GL0.tar.gz) = 87541 +TIMESTAMP = 1682145471 +SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-org-gitlab-elasticsearch-indexer-c0a71075f58bcce5fa55e3e0cf2a2106230858a4_GL0/go.mod) = 129e0b5346dcc05c8938268396ed12455ca904e6b8b07ff1305d316583389a65 +SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-org-gitlab-elasticsearch-indexer-c0a71075f58bcce5fa55e3e0cf2a2106230858a4_GL0/go.mod) = 2181 +SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-org-gitlab-elasticsearch-indexer-c0a71075f58bcce5fa55e3e0cf2a2106230858a4_GL0/gitlab-org-gitlab-elasticsearch-indexer-c0a71075f58bcce5fa55e3e0cf2a2106230858a4_GL0.tar.gz) = 6095842b9163ee9096af1e30c0bd3f861eac121fd6cbd86618b7ba8d911c55c0 +SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-org-gitlab-elasticsearch-indexer-c0a71075f58bcce5fa55e3e0cf2a2106230858a4_GL0/gitlab-org-gitlab-elasticsearch-indexer-c0a71075f58bcce5fa55e3e0cf2a2106230858a4_GL0.tar.gz) = 90095 diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 28463e57344c..acd7d6d9c4ad 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-ce -PORTVERSION= 15.10.7 +PORTVERSION= 15.11.3 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -18,8 +18,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # mail/rubygem-net-pop is required as ruby 3.1 removed it 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.10.0:net/gitlab-agent \ + gitlab-elasticsearch-indexer>=4.3.0:textproc/gitlab-elasticsearch-indexer \ + gitlab-agent>=15.11.0:net/gitlab-agent \ gitlab-metrics-exporter>0:devel/gitlab-metrics-exporter \ gitlab-pages>=${PORTVERSION}:www/gitlab-pages \ gitlab-shell>=14.18.0:devel/gitlab-shell \ @@ -34,24 +34,24 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-rails61>=6.1.7.2<6.1.8:www/rubygem-rails61 \ rubygem-bootsnap>=1.16.0<1.17:devel/rubygem-bootsnap \ rubygem-openssl2>=2.2.2<2.3:security/rubygem-openssl2 \ - rubygem-ipaddr122>=1.2.2<1.2.3:net/rubygem-ipaddr122 \ + rubygem-ipaddr>=1.2.5<1.3:net/rubygem-ipaddr \ 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-pg14>=1.4.5<1.5:databases/rubygem-pg14 \ rubygem-rugged>=1.5<2:devel/rubygem-rugged \ rubygem-grape-path-helpers>=1.7.1<1.8:devel/rubygem-grape-path-helpers \ - rubygem-faraday1>=1.10.0<2:www/rubygem-faraday1 \ + rubygem-faraday1>=1.10.0<3:www/rubygem-faraday1 \ rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \ rubygem-declarative_policy>=1.1.0<1.2:security/rubygem-declarative_policy \ rubygem-devise-rails61>=4.8.1<4.9:devel/rubygem-devise-rails61 \ rubygem-bcrypt>=3.1.14<3.2:security/rubygem-bcrypt \ - rubygem-doorkeeper562>=5.5.4<5.6.3:security/rubygem-doorkeeper562 \ - rubygem-doorkeeper-openid_connect>=1.8.3<2:security/rubygem-doorkeeper-openid_connect \ + rubygem-doorkeeper>=5.6.6<6:security/rubygem-doorkeeper \ + rubygem-doorkeeper-openid_connect>=1.8.5<2:security/rubygem-doorkeeper-openid_connect \ rubygem-rexml>=3.2.5<3.3:textproc/rubygem-rexml \ rubygem-ruby-saml>=1.13.0<1.14:security/rubygem-ruby-saml \ rubygem-omniauth>=2.1.0<3:security/rubygem-omniauth \ - rubygem-omniauth-auth0>=3.0.0<3.1.0:net/rubygem-omniauth-auth0 \ + rubygem-omniauth-auth0>=3.1.0<3.2.0:net/rubygem-omniauth-auth0 \ rubygem-omniauth-azure-activedirectory-v2>=2.0<3:net/rubygem-omniauth-azure-activedirectory-v2 \ rubygem-omniauth-cas3-oauth2>=1.1.4<1.2.0:security/rubygem-omniauth-cas3-oauth2 \ rubygem-omniauth-dingtalk-oauth2>=1.0.1<2:security/rubygem-omniauth-dingtalk-oauth2 \ @@ -63,10 +63,10 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-omniauth-saml>=2.0.0<3:security/rubygem-omniauth-saml \ rubygem-omniauth-twitter>=1.4<2.0:net/rubygem-omniauth-twitter \ rubygem-omniauth_openid_connect>=0.6.1<0.7.0:net/rubygem-omniauth_openid_connect \ - rubygem-openid_connect>=1.3.0<1.3.1:net/rubygem-openid_connect \ + rubygem-openid_connect>=1.3.1<1.3.2:net/rubygem-openid_connect \ rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \ rubygem-rack-oauth21>=1.21.3<1.22.0:security/rubygem-rack-oauth21 \ - rubygem-jwt25>=2.5.0<2.6:www/rubygem-jwt25 \ + rubygem-jwt>=2.5<3:www/rubygem-jwt \ rubygem-gssapi>=1.3.1<1.4:security/rubygem-gssapi \ rubygem-recaptcha>=5.12<6.0:devel/rubygem-recaptcha \ rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \ @@ -78,7 +78,7 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-rubyzip>=2.3.2<2.4:archivers/rubygem-rubyzip \ rubygem-acme-client>=2.0.9<3:security/rubygem-acme-client \ rubygem-browser>=5.3.1<5.4:www/rubygem-browser \ - rubygem-ohai>=16.10<17:sysutils/rubygem-ohai \ + rubygem-ohai>=17.9<18:sysutils/rubygem-ohai \ rubygem-gpgme>=2.0.22<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 \ @@ -113,14 +113,15 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-google-apis-iam_v1>=0.36.0<0.37:devel/rubygem-google-apis-iam_v1 \ rubygem-google-apis-serviceusage_v1>=0.28.0<0.29:devel/rubygem-google-apis-serviceusage_v1 \ rubygem-google-apis-sqladmin_v1beta4_041>=0.41.0<0.42:devel/rubygem-google-apis-sqladmin_v1beta4_041 \ + rubygem-google-apis-androidpublisher_v3034>=0.34.0<0.35:devel/rubygem-google-apis-androidpublisher_v3034 \ rubygem-unf>=0.1.4<0.2.0:textproc/rubygem-unf \ rubygem-seed-fu>=2.3.7<2.4.0:databases/rubygem-seed-fu \ 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-core3170>=3.170.0<3.171:devel/rubygem-aws-sdk-core3170 \ + rubygem-aws-sdk-core>=3.171.0<3.172:devel/rubygem-aws-sdk-core \ rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \ - rubygem-aws-sdk-s31119>=1.119.1<1.120:devel/rubygem-aws-sdk-s31119 \ + rubygem-aws-sdk-s31121>=1.121.0<1.122:devel/rubygem-aws-sdk-s31121 \ 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 \ @@ -139,11 +140,11 @@ MY_DEPENDS= git>=2.39.2:devel/git \ 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.2<1.15:textproc/rubygem-nokogiri \ + rubygem-nokogiri>=1.14.3<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 \ - rubygem-rack22>=2.2.6.2<2.3,3:www/rubygem-rack22 \ + rubygem-rack22>=2.2.6.4<2.3,3:www/rubygem-rack22 \ rubygem-rack-timeout>=0.6.3<0.7:www/rubygem-rack-timeout \ rubygem-puma>=5.6.5<5.7:www/rubygem-puma \ rubygem-puma_worker_killer>=0.3.1:www/rubygem-puma_worker_killer \ @@ -153,13 +154,13 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-sidekiq6>=6.5.7<6.6:devel/rubygem-sidekiq6 \ rubygem-sidekiq-cron18>=1.8.0<1.9:devel/rubygem-sidekiq-cron18 \ rubygem-redis-namespace19>=1.9.0<1.10.0:databases/rubygem-redis-namespace19 \ - rubygem-gitlab-sidekiq-fetcher>=0.9.0<0.10:devel/rubygem-gitlab-sidekiq-fetcher \ rubygem-fugit>=1.8.1<1.9:devel/rubygem-fugit \ rubygem-httparty020>=0.20.0<0.21:www/rubygem-httparty020 \ rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \ rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \ rubygem-settingslogic>=2.0.9<2.1.0:devel/rubygem-settingslogic \ rubygem-re2>=1.6.0<1.7.0:devel/rubygem-re2 \ + rubygem-semver_dialects>=1.2.1<1.3:textproc/rubygem-semver_dialects \ rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \ rubygem-js_regex>=3.8<4.0:textproc/rubygem-js_regex \ rubygem-device_detector>=0:devel/rubygem-device_detector \ @@ -171,12 +172,13 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-atlassian-jwt>=0.2.0<0.3.0:www/rubygem-atlassian-jwt \ rubygem-slack-messenger>=2.3.4<2.4.0:devel/rubygem-slack-messenger \ rubygem-hangouts-chat>=0.0.5<0.1.0:net/rubygem-hangouts-chat \ - rubygem-asana0>=0.10.13<0.11:www/rubygem-asana0 \ + rubygem-asana1>=0.10.13<3:www/rubygem-asana1 \ 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-ruby-openai>=3.7<4:devel/rubygem-ruby-openai \ rubygem-sanitize>=6.0<7:textproc/rubygem-sanitize \ rubygem-babosa>=1.0.4<1.1.0:textproc/rubygem-babosa \ - rubygem-loofah219>=2.19.1<2.20:textproc/rubygem-loofah219 \ + rubygem-loofah>=2.20.0<2.21: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.6<1:devel/rubygem-ruby-magic \ @@ -195,14 +197,14 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-gitlab-license>=2.2.1<2.3:devel/rubygem-gitlab-license \ rubygem-rack-attack>=6.6.1<6.7:www/rubygem-rack-attack \ rubygem-sentry-raven>=3.1<4.0:devel/rubygem-sentry-raven \ - rubygem-sentry-ruby>=5.1.1<5.2:devel/rubygem-sentry-ruby \ - rubygem-sentry-rails>=5.1.1<5.2:devel/rubygem-sentry-rails \ - rubygem-sentry-sidekiq>=5.1.1<5.2:devel/rubygem-sentry-sidekiq \ + rubygem-sentry-ruby>=5.8.0<5.9:devel/rubygem-sentry-ruby \ + rubygem-sentry-rails>=5.8.0<5.9:devel/rubygem-sentry-rails \ + rubygem-sentry-sidekiq>=5.8.0<5.9: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.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-ruby_parser>=3.20<4.0:devel/rubygem-ruby_parser \ rubygem-rails-i18n-rails61>=7.0<8:devel/rubygem-rails-i18n-rails61 \ rubygem-gettext_i18n_rails18>=1.8.0<1.9.0:devel/rubygem-gettext_i18n_rails18 \ rubygem-gettext_i18n_rails_js-rails61>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails61 \ @@ -210,13 +212,13 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-batch-loader>=2.0.1<2.1:devel/rubygem-batch-loader \ 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-webrick>=1.8.1<1.9:www/rubygem-webrick \ 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.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-gitlab-dangerfiles>=3.9.0<3.10:devel/rubygem-gitlab-dangerfiles \ + rubygem-octokit>=4.20<6.0:net/rubygem-octokit \ + rubygem-gitlab-mail_room>=0.0.23<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.23<0.3:devel/rubygem-stackprof \ @@ -230,11 +232,11 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-sys-filesystem>=1.4.3<1.5:sysutils/rubygem-sys-filesystem \ rubygem-net-ntp>0:net/rubygem-net-ntp \ rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \ - rubygem-spamcheck>=1.0.0<1.1:net/rubygem-spamcheck \ + rubygem-spamcheck>=1.3.0<1.4:net/rubygem-spamcheck \ 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-grpc>=1.42.0<2:net/rubygem-grpc \ - rubygem-google-protobuf>=3.22.2<4:devel/rubygem-google-protobuf \ + rubygem-google-protobuf>=3.22.3<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 \ @@ -243,7 +245,7 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-gitlab-experiment>=0.7.0<0.8:devel/rubygem-gitlab-experiment \ rubygem-lograge-rails61>=0.11.2<1.0:www/rubygem-lograge-rails61 \ rubygem-grape_logging>=1.8<2.0:devel/rubygem-grape_logging \ - rubygem-gitlab-net-dns>=0.9.1<0.10:dns/rubygem-gitlab-net-dns \ + rubygem-gitlab-net-dns>=0.9.2<0.10:dns/rubygem-gitlab-net-dns \ 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 \ @@ -288,7 +290,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= 472365a5cdb28f4e89ca07cbd79051c51870fe31 +GL_COMMIT= 332cca52b7eceafe5626d2f7ac0e3c58bfa528e1 USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index ed5a37bd4280..080cb83ddb7f 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1683957785 -SHA256 (gitlab-org-gitlab-foss-472365a5cdb28f4e89ca07cbd79051c51870fe31_GL0.tar.gz) = 4022b48daf9628ad9617576f2cd5efd90fc92f0729c02caec881378ad51a6632 -SIZE (gitlab-org-gitlab-foss-472365a5cdb28f4e89ca07cbd79051c51870fe31_GL0.tar.gz) = 101631013 +TIMESTAMP = 1683982072 +SHA256 (gitlab-org-gitlab-foss-332cca52b7eceafe5626d2f7ac0e3c58bfa528e1_GL0.tar.gz) = 951cbc5b3edbf42975c3355902f3d348c3faafe405266b9c1c1ca49989d127f7 +SIZE (gitlab-org-gitlab-foss-332cca52b7eceafe5626d2f7ac0e3c58bfa528e1_GL0.tar.gz) = 102158349 diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 82a63d5ff625..f2e5f409a3d3 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2023-04-05 16:11:51 UTC +--- Gemfile.orig 2023-05-10 10:38:54 UTC +++ Gemfile @@ -19,7 +19,7 @@ gem 'bootsnap', '~> 1.16.0', require: false @@ -6,23 +6,19 @@ # See https://stdgems.org/openssl/#gem-version. -gem 'openssl', '2.2.2' +gem 'openssl', '~> 2.2.2' - # This gem was originally bundled with Ruby 2.7, but is unbundled as of Ruby 3. - # Since the latest version caused problems with GitLab, we pin this to an older - # version for now. -@@ -49,23 +49,23 @@ gem 'declarative_policy', '~> 1.1.0' - gem 'devise', '~> 4.8.1' - gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' - gem 'bcrypt', '~> 3.1', '>= 3.1.14' --gem 'doorkeeper', '~> 5.5' -+gem 'doorkeeper', '= 5.6.2' - gem 'doorkeeper-openid_connect', '~> 1.8' - gem 'rexml', '~> 3.2.5' - gem 'ruby-saml', '~> 1.13.0' - gem 'omniauth', '~> 2.1.0' --gem 'omniauth-auth0', '~> 2.0.0' -+gem 'omniauth-auth0', '>= 2.0.0' - gem 'omniauth-azure-activedirectory-v2', '~> 2.0' - gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md + gem 'ipaddr', '~> 1.2.5' + + # Responders respond_to and respond_with +@@ -35,7 +35,7 @@ gem 'pg', '~> 1.4.6' + gem 'rugged', '~> 1.5' + gem 'grape-path-helpers', '~> 1.7.1' + +-gem 'faraday', '~> 1.0' ++gem 'faraday', '>= 1.0' + gem 'marginalia', '~> 1.11.1' + + # Authorization +@@ -56,18 +56,18 @@ gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor gem 'omniauth-cas3', '~> 1.1.4', path: 'vendor/gems/omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md gem 'omniauth-dingtalk-oauth2', '~> 1.0' gem 'omniauth-alicloud', '~> 2.0.1' @@ -38,16 +34,14 @@ gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md gem 'omniauth_openid_connect', '~> 0.6.1' -@@ -75,7 +75,7 @@ gem 'openid_connect', '= 1.3.0' + # Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem. + # See https://docs.gitlab.com/ee/development/emails.html#rationale. +-gem 'openid_connect', '= 1.3.0' ++gem 'openid_connect', '= 1.3.1' gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md gem 'omniauth-atlassian-oauth2', '~> 0.2.0' gem 'rack-oauth2', '~> 1.21.3' --gem 'jwt', '~> 2.1.0' -+gem 'jwt', '~> 2.5.0' - - # Kerberos authentication. EE-only - gem 'gssapi', '~> 1.3.1', group: :kerberos -@@ -157,7 +157,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.7.0', require: 'fog/a +@@ -153,7 +153,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.7.0', require: 'fog/a # for Google storage gem 'google-cloud-storage', '~> 1.44.0' @@ -56,18 +50,21 @@ gem 'google-apis-compute_v1', '~> 0.57.0' gem 'google-apis-container_v1', '~> 0.43.0' gem 'google-apis-container_v1beta1', '~> 0.43.0' -@@ -365,117 +365,20 @@ gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/ - gem 'snowplow-tracker', '~> 0.8.0' +@@ -279,7 +279,7 @@ gem 'slack-messenger', '~> 2.3.4' + gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat' - # Metrics --gem 'webrick', '~> 1.6.1', require: false -+gem 'webrick', '~> 1.7.0', require: false - gem 'prometheus-client-mmap', '~> 0.19', require: 'prometheus/client' + # Asana integration +-gem 'asana', '~> 0.10.13' ++gem 'asana', '>= 0.10.13' + + # FogBugz integration + gem 'ruby-fogbugz', '~> 0.3.0' +@@ -371,114 +371,17 @@ gem 'prometheus-client-mmap', '~> 0.19', require: 'pro gem 'warning', '~> 1.3.0' -group :development do -- gem 'lefthook', '~> 1.3.3', require: false +- gem 'lefthook', '~> 1.3.10', require: false - gem 'rubocop' - gem 'solargraph', '~> 0.47.2', require: false - @@ -130,7 +127,7 @@ -end - group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.8.0', require: false + gem 'gitlab-dangerfiles', '~> 3.9.0', require: false end -group :development, :test, :coverage do @@ -147,23 +144,24 @@ -group :test do - gem 'fuubar', '~> 2.2.0' -- gem 'rspec-retry', '~> 0.6.1' +- gem 'rspec-retry', '~> 0.6.2' - gem 'rspec_profiling', '~> 0.0.6' - gem 'rspec-benchmark', '~> 0.6.0' - gem 'rspec-parameterized', '~> 1.0', require: false -- -- gem 'capybara', '~> 3.35.3' -- gem 'capybara-screenshot', '~> 1.0.22' -- gem 'selenium-webdriver', '~> 3.142' ++gem 'octokit', '>= 4.15' + +- gem 'capybara', '~> 3.39' +- gem 'capybara-screenshot', '~> 1.0.26' +- gem 'selenium-webdriver', '~> 3.142', '>= 3.142.7' - - gem 'graphlyte', '~> 1.0.0' - - gem 'shoulda-matchers', '~> 5.1.0', require: false - gem 'email_spec', '~> 2.2.0' -- gem 'webmock', '~> 3.9.1' +- gem 'webmock', '~> 3.18.1' - gem 'rails-controller-testing' - gem 'concurrent-ruby', '~> 1.1' -- gem 'test-prof', '~> 1.0.7' +- gem 'test-prof', '~> 1.2.1' - gem 'rspec_junit_formatter' - gem 'guard-rspec' - gem 'axe-core-rspec' @@ -172,17 +170,19 @@ - gem 'derailed_benchmarks', require: false -end - - gem 'octokit', '~> 4.15' +-gem 'octokit', '~> 4.15' +- + gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room' - # Updating this gem version here is deprecated. See: -@@ -515,14 +418,14 @@ gem 'gitaly', '~> 15.9.0-rc3' + gem 'email_reply_trimmer', '~> 0.1' +@@ -514,14 +417,14 @@ gem 'gitaly', '~> 15.9.0-rc3' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' -gem 'grpc', '~> 1.42.0' +gem 'grpc', '~> 1.42' - gem 'google-protobuf', '~> 3.22', '>= 3.22.2' + gem 'google-protobuf', '~> 3.22', '>= 3.22.3' gem 'toml-rb', '~> 2.2.0' @@ -192,8 +192,8 @@ gem 'flipper-active_record', '~> 0.25.0' gem 'flipper-active_support_cache_store', '~> 0.25.0' gem 'unleash', '~> 3.2.2' -@@ -536,7 +439,7 @@ gem 'grape_logging', '~> 1.8' - gem 'gitlab-net-dns', '~> 0.9.1' +@@ -535,7 +438,7 @@ gem 'grape_logging', '~> 1.8' + gem 'gitlab-net-dns', '~> 0.9.2' # Countries list -gem 'countries', '~> 4.0.0' @@ -201,7 +201,7 @@ gem 'retriable', '~> 3.1.2' -@@ -579,6 +482,11 @@ gem 'ed25519', '~> 1.3.0' +@@ -582,6 +485,11 @@ gem 'ed25519', '~> 1.3.0' # Error Tracking OpenAPI client # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature gem 'error_tracking_open_api', path: 'vendor/gems/error_tracking_open_api' diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message index 5dd4469ccd53..7d85411ee6e5 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/15.10-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/15.11-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/15.9-15.10-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/15.10-15.11-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 2d83164adc3f..5a9a39bbe0e7 100644 --- a/www/gitlab-pages/Makefile +++ b/www/gitlab-pages/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-pages -PORTVERSION= 15.10.7 +PORTVERSION= 15.11.3 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES+= https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/ @@ -18,7 +18,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= 8462094aa5668c1937ccdc69b88aad9483d7ca61 +GL_COMMIT= 1574ac87597710194ec31a2a5e0126c4eb3634d0 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 0545c5b55207..80127b526b4f 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1683958378 -SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-8462094aa5668c1937ccdc69b88aad9483d7ca61_GL0/go.mod) = 46db8658c6f0351191e106a870b9570de4ab97b900b450daa66ea74ec805f1f5 -SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-8462094aa5668c1937ccdc69b88aad9483d7ca61_GL0/go.mod) = 3020 -SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-8462094aa5668c1937ccdc69b88aad9483d7ca61_GL0/gitlab-org-gitlab-pages-8462094aa5668c1937ccdc69b88aad9483d7ca61_GL0.tar.gz) = bd72931a3309d6b5327faebdab5e430f1d86916e74a3fb79e120cfcf19d09b28 -SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-8462094aa5668c1937ccdc69b88aad9483d7ca61_GL0/gitlab-org-gitlab-pages-8462094aa5668c1937ccdc69b88aad9483d7ca61_GL0.tar.gz) = 227696 +TIMESTAMP = 1683982203 +SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-1574ac87597710194ec31a2a5e0126c4eb3634d0_GL0/go.mod) = 46db8658c6f0351191e106a870b9570de4ab97b900b450daa66ea74ec805f1f5 +SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-1574ac87597710194ec31a2a5e0126c4eb3634d0_GL0/go.mod) = 3020 +SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-1574ac87597710194ec31a2a5e0126c4eb3634d0_GL0/gitlab-org-gitlab-pages-1574ac87597710194ec31a2a5e0126c4eb3634d0_GL0.tar.gz) = 51b7d67c88607084d3000f53b201631ecae31070fd59a1a059d43f45cb3c39b4 +SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-1574ac87597710194ec31a2a5e0126c4eb3634d0_GL0/gitlab-org-gitlab-pages-1574ac87597710194ec31a2a5e0126c4eb3634d0_GL0.tar.gz) = 229385 diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index 8d9d52931db3..cba56d9ad196 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-workhorse -PORTVERSION= 15.10.7 +PORTVERSION= 15.11.3 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= 472365a5cdb28f4e89ca07cbd79051c51870fe31 +GL_COMMIT= 332cca52b7eceafe5626d2f7ac0e3c58bfa528e1 # 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 1676f8e0f57e..409b8b94821a 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1683957657 -SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-472365a5cdb28f4e89ca07cbd79051c51870fe31_GL0/go.mod) = 9fdf8cb254d815b1e1887360684bc8b5969b03cdaacbc9a7c8628e2828622458 -SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-472365a5cdb28f4e89ca07cbd79051c51870fe31_GL0/go.mod) = 6201 -SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-472365a5cdb28f4e89ca07cbd79051c51870fe31_GL0/gitlab-org-gitlab-foss-472365a5cdb28f4e89ca07cbd79051c51870fe31_GL0.tar.gz) = 4022b48daf9628ad9617576f2cd5efd90fc92f0729c02caec881378ad51a6632 -SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-472365a5cdb28f4e89ca07cbd79051c51870fe31_GL0/gitlab-org-gitlab-foss-472365a5cdb28f4e89ca07cbd79051c51870fe31_GL0.tar.gz) = 101631013 +TIMESTAMP = 1683981983 +SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-332cca52b7eceafe5626d2f7ac0e3c58bfa528e1_GL0/go.mod) = a8e53c4a34094e2dcb0cf4d16483efc9a8e4a469b34af0b27333a6fbd76cf4de +SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-332cca52b7eceafe5626d2f7ac0e3c58bfa528e1_GL0/go.mod) = 6202 +SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-332cca52b7eceafe5626d2f7ac0e3c58bfa528e1_GL0/gitlab-org-gitlab-foss-332cca52b7eceafe5626d2f7ac0e3c58bfa528e1_GL0.tar.gz) = 951cbc5b3edbf42975c3355902f3d348c3faafe405266b9c1c1ca49989d127f7 +SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-332cca52b7eceafe5626d2f7ac0e3c58bfa528e1_GL0/gitlab-org-gitlab-foss-332cca52b7eceafe5626d2f7ac0e3c58bfa528e1_GL0.tar.gz) = 102158349