aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Fechner <mfechner@FreeBSD.org>2024-09-17 07:00:46 +0000
committerMatthias Fechner <mfechner@FreeBSD.org>2024-09-17 07:03:59 +0000
commit3a237ca5993ccce53735cd242c227aff2ba4ff1d (patch)
tree23c20332bdf8a164c4b635802cbcfd7199ee2416
parentbecf5003ee719da90b27e02f06be71bbfcf538b1 (diff)
downloadports-3a237ca5993ccce53735cd242c227aff2ba4ff1d.tar.gz
ports-3a237ca5993ccce53735cd242c227aff2ba4ff1d.zip
www/gitlab: update to 17.3.3
Added a unique PORTREVISION tag to be in sync with all gitlab related ports. Please increase in www/gitlab/Makefile.common GITLAB_PORTREVISION if required.
-rw-r--r--devel/gitaly/Makefile1
-rw-r--r--devel/gitaly/distinfo14
-rw-r--r--net/gitlab-agent/Makefile1
-rw-r--r--net/gitlab-agent/distinfo10
-rw-r--r--net/rubygem-gitaly/Makefile2
-rw-r--r--net/rubygem-gitaly/distinfo6
-rw-r--r--www/gitlab-pages/Makefile1
-rw-r--r--www/gitlab-pages/distinfo10
-rw-r--r--www/gitlab-workhorse/Makefile1
-rw-r--r--www/gitlab-workhorse/distinfo10
-rw-r--r--www/gitlab/Makefile5
-rw-r--r--www/gitlab/Makefile.common3
-rw-r--r--www/gitlab/distinfo12
-rw-r--r--www/gitlab/files/patch-Gemfile11
14 files changed, 51 insertions, 36 deletions
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index b1a32e32adf7..30c75fbcf240 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,6 +1,7 @@
PORTNAME= gitaly
DISTVERSIONPREFIX= v
DISTVERSION= ${GITLAB_VERSION}
+PORTREVISION= ${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common
CATEGORIES= devel
MAINTAINER= mfechner@FreeBSD.org
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 18687b65c747..9b22d5c87039 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1726157589
-SHA256 (go/devel_gitaly/gitaly-v17.3.2/go.mod) = 27f37cc992540a2c53a90a47c503860a012051134ac616859cc2e662ee9c0d54
-SIZE (go/devel_gitaly/gitaly-v17.3.2/go.mod) = 12846
-SHA256 (go/devel_gitaly/gitaly-v17.3.2/gitaly-v17.3.2.tar.bz2) = dff11d9cb3b65dc96acdd021c5aedbc83e80a07df403492956a0224ef4fc3550
-SIZE (go/devel_gitaly/gitaly-v17.3.2/gitaly-v17.3.2.tar.bz2) = 2914660
-SHA256 (go/devel_gitaly/gitaly-v17.3.2/git-v2.45.2.tar.bz2) = da929efd422d9e7e030ccbfac4c51acd56f63e96f67f2714fe906bf7f033604e
-SIZE (go/devel_gitaly/gitaly-v17.3.2/git-v2.45.2.tar.bz2) = 8710568
+TIMESTAMP = 1726548395
+SHA256 (go/devel_gitaly/gitaly-v17.3.3/go.mod) = 27f37cc992540a2c53a90a47c503860a012051134ac616859cc2e662ee9c0d54
+SIZE (go/devel_gitaly/gitaly-v17.3.3/go.mod) = 12846
+SHA256 (go/devel_gitaly/gitaly-v17.3.3/gitaly-v17.3.3.tar.bz2) = 8938fe7abe57eb0ddbda77f142106be836e8daff6674c529ae123aa43160113c
+SIZE (go/devel_gitaly/gitaly-v17.3.3/gitaly-v17.3.3.tar.bz2) = 2914874
+SHA256 (go/devel_gitaly/gitaly-v17.3.3/git-v2.45.2.tar.bz2) = da929efd422d9e7e030ccbfac4c51acd56f63e96f67f2714fe906bf7f033604e
+SIZE (go/devel_gitaly/gitaly-v17.3.3/git-v2.45.2.tar.bz2) = 8710568
diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile
index 4c388df6842c..98083f8f61cd 100644
--- a/net/gitlab-agent/Makefile
+++ b/net/gitlab-agent/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gitlab-agent
PORTVERSION= ${GITLAB_VERSION}
+PORTREVISION= ${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common
DISTVERSIONPREFIX= v
CATEGORIES= net
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index 8795e20b1a20..53d207a4cc11 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1726157592
-SHA256 (go/net_gitlab-agent/gitlab-agent-v17.3.2/v17.3.2.mod) = 394483a3087d074c2fbbf29414d34c1f75d176f33d2fb530275ad5ea8361ebb0
-SIZE (go/net_gitlab-agent/gitlab-agent-v17.3.2/v17.3.2.mod) = 8581
-SHA256 (go/net_gitlab-agent/gitlab-agent-v17.3.2/v17.3.2.zip) = 59296b4f43dff5e149552f2d219a59f8925983d6d885f44977309cf125b913c9
-SIZE (go/net_gitlab-agent/gitlab-agent-v17.3.2/v17.3.2.zip) = 1334025
+TIMESTAMP = 1726548398
+SHA256 (go/net_gitlab-agent/gitlab-agent-v17.3.3/v17.3.3.mod) = 394483a3087d074c2fbbf29414d34c1f75d176f33d2fb530275ad5ea8361ebb0
+SIZE (go/net_gitlab-agent/gitlab-agent-v17.3.3/v17.3.3.mod) = 8581
+SHA256 (go/net_gitlab-agent/gitlab-agent-v17.3.3/v17.3.3.zip) = 592964449a83999f0ef74e1cb1dcebad5ec958f2aff98c54c10fbe0802c8fe7b
+SIZE (go/net_gitlab-agent/gitlab-agent-v17.3.3/v17.3.3.zip) = 1334033
diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile
index 259a8f465138..7291424238d2 100644
--- a/net/rubygem-gitaly/Makefile
+++ b/net/rubygem-gitaly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitaly
-PORTVERSION= 17.2.4
+PORTVERSION= 17.3.3
CATEGORIES= net rubygems
MASTER_SITES= RG
diff --git a/net/rubygem-gitaly/distinfo b/net/rubygem-gitaly/distinfo
index c2fd1852c0e0..69367b01d226 100644
--- a/net/rubygem-gitaly/distinfo
+++ b/net/rubygem-gitaly/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1724589837
-SHA256 (rubygem/gitaly-17.2.4.gem) = 44bf9dd279b4f50d121b3c87771879c11963aa5a4669cda078208a479a4a5735
-SIZE (rubygem/gitaly-17.2.4.gem) = 48128
+TIMESTAMP = 1726548374
+SHA256 (rubygem/gitaly-17.3.3.gem) = b12c08e33f8384027d2967049e3db9f16a2451cf3c8046359795004e870a48c0
+SIZE (rubygem/gitaly-17.3.3.gem) = 48640
diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
index 3ae22f35ad07..a0035c529057 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gitlab-pages
PORTVERSION= ${GITLAB_VERSION}
+PORTREVISION= ${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common
DISTVERSIONPREFIX= v
CATEGORIES= www
MASTER_SITES+= https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index cdc1c35b8c1b..17641214f769 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1726157595
-SHA256 (go/www_gitlab-pages/gitlab-pages-v17.3.2/go.mod) = 93577d318362d9d4259b4ccfeda9e91e8af7ab256befb41845e5ccd4e37d55b5
-SIZE (go/www_gitlab-pages/gitlab-pages-v17.3.2/go.mod) = 3327
-SHA256 (go/www_gitlab-pages/gitlab-pages-v17.3.2/gitlab-pages-v17.3.2.tar.bz2) = db1e2ee7390484d5561a1800f4929627c70555fce331e486afdeff13aeb31fa1
-SIZE (go/www_gitlab-pages/gitlab-pages-v17.3.2/gitlab-pages-v17.3.2.tar.bz2) = 229438
+TIMESTAMP = 1726548401
+SHA256 (go/www_gitlab-pages/gitlab-pages-v17.3.3/go.mod) = 93577d318362d9d4259b4ccfeda9e91e8af7ab256befb41845e5ccd4e37d55b5
+SIZE (go/www_gitlab-pages/gitlab-pages-v17.3.3/go.mod) = 3327
+SHA256 (go/www_gitlab-pages/gitlab-pages-v17.3.3/gitlab-pages-v17.3.3.tar.bz2) = ac3aeb08027f184ba7fb897892a7a03124ab4a7a8c8d9662717e55fba01cd88c
+SIZE (go/www_gitlab-pages/gitlab-pages-v17.3.3/gitlab-pages-v17.3.3.tar.bz2) = 229380
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index b3153a9a08b6..484f3882fcbc 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gitlab-workhorse
PORTVERSION= ${GITLAB_VERSION}
+PORTREVISION= ${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common
DISTVERSIONPREFIX= v
CATEGORIES= www
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 312550ea9978..8cf64d9bd735 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1726157661
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.3.2/go.mod) = 34bb920b000d41f8dc9da500411a9212a56d06b5e94e380b366c25ce5157bd68
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.3.2/go.mod) = 7141
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.3.2/gitlab-foss-v17.3.2.tar.bz2) = 260054a8e99ebd6f0b308df39032d7a8932f7f88d38a9621386ea71c9abb4e7e
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.3.2/gitlab-foss-v17.3.2.tar.bz2) = 104071488
+TIMESTAMP = 1726548452
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.3.3/go.mod) = 34bb920b000d41f8dc9da500411a9212a56d06b5e94e380b366c25ce5157bd68
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.3.3/go.mod) = 7141
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.3.3/gitlab-foss-v17.3.3.tar.bz2) = 21500f9a9e3f6c90111b28a373bbcc9f5c7d34741c9ff235f3ddf1b7713040b1
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.3.3/gitlab-foss-v17.3.3.tar.bz2) = 104073735
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index c6b9f1526a2a..3c2a74b728d8 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gitlab-${FLAVOR:Uce}
PORTVERSION= ${GITLAB_VERSION}
+PORTREVISION= ${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common
DISTVERSIONPREFIX= v
.if ${FLAVOR:U} == ee
DISTVERSIONSUFFIX= -ee
@@ -63,7 +64,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-doorkeeper-openid_connect>=1.8.7<2:security/rubygem-doorkeeper-openid_connect \
rubygem-doorkeeper-device_authorization_grant>=1.0.0<1.1:security/rubygem-doorkeeper-device_authorization_grant \
rubygem-rexml>=3.3.2<3.4:textproc/rubygem-rexml \
- rubygem-ruby-saml115>=1.15.0<1.16:security/rubygem-ruby-saml115 \
+ rubygem-ruby-saml>=1.17.0<1.18:security/rubygem-ruby-saml \
rubygem-omniauth>=2.1.0<3:security/rubygem-omniauth \
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 \
@@ -71,7 +72,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-omniauth-github>=2.0.1<2.1:net/rubygem-omniauth-github \
rubygem-omniauth-google-oauth2>=1.1<2:net/rubygem-omniauth-google-oauth2 \
rubygem-omniauth-oauth2-generic>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic \
- rubygem-omniauth-saml>=2.1.0<3:security/rubygem-omniauth-saml \
+ rubygem-omniauth-saml>=2.2.1<3:security/rubygem-omniauth-saml \
rubygem-omniauth-shibboleth-redux>=2.0<3:security/rubygem-omniauth-shibboleth-redux \
rubygem-omniauth_openid_connect>=0.8.0<0.9:net/rubygem-omniauth_openid_connect \
rubygem-openid_connect>=2.3.0<2.4:net/rubygem-openid_connect \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index b3599db8820e..aa72eadbd103 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,4 +1,5 @@
-GITLAB_VERSION= 17.3.2
+GITLAB_VERSION= 17.3.3
+GITLAB_PORTREVISION= 0
# Git version gitaly should use (from gitlab mirror)
# Find current tag from Makefile and .gitlab-ci.yaml
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index cb4387b0ff2a..75aeee05151f 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1726157527
-SHA256 (gitlab-foss-v17.3.2.tar.bz2) = 260054a8e99ebd6f0b308df39032d7a8932f7f88d38a9621386ea71c9abb4e7e
-SIZE (gitlab-foss-v17.3.2.tar.bz2) = 104071488
-TIMESTAMP = 1726157580
-SHA256 (gitlab-v17.3.2-ee.tar.bz2) = 57b72af24b0bddd42698f9df38b7d3cc693720a1c106831e803bf1dab47b76a0
-SIZE (gitlab-v17.3.2-ee.tar.bz2) = 113003231
+TIMESTAMP = 1726548333
+SHA256 (gitlab-foss-v17.3.3.tar.bz2) = 21500f9a9e3f6c90111b28a373bbcc9f5c7d34741c9ff235f3ddf1b7713040b1
+SIZE (gitlab-foss-v17.3.3.tar.bz2) = 104073735
+TIMESTAMP = 1726548386
+SHA256 (gitlab-v17.3.3-ee.tar.bz2) = 167fae13955da30ac1a7873afcaa43abde108da04274be03954973c0c2004b60
+SIZE (gitlab-v17.3.3-ee.tar.bz2) = 113001807
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 6c38a9e1aee7..0da807cab28d 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig 2024-08-20 19:36:17 UTC
+--- Gemfile.orig 2024-09-16 16:10:31 UTC
+++ Gemfile
@@ -156,7 +156,6 @@ gem 'graphql', '~> 2.3.5', feature_category: :api
@@ -189,6 +189,15 @@
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
+@@ -623,7 +507,7 @@ gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/Mis
+ gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
+
+ # Gitaly GRPC protocol definitions
+-gem 'gitaly', '~> 17.2.0', feature_category: :gitaly
++gem 'gitaly', '~> 17.3.3', feature_category: :gitaly
+
+ # KAS GRPC protocol definitions
+ gem 'kas-grpc', '~> 0.6.0', feature_category: :deployment_management
@@ -632,7 +516,7 @@ gem 'kas-grpc', '~> 0.6.0', feature_category: :deploym
# https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939
# Or we can upgrade to a more recent version as long as we can confirm