diff options
Diffstat (limited to 'www/gitlab')
| -rw-r--r-- | www/gitlab/Makefile | 5 | ||||
| -rw-r--r-- | www/gitlab/Makefile.common | 3 | ||||
| -rw-r--r-- | www/gitlab/distinfo | 12 | ||||
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 11 |
4 files changed, 21 insertions, 10 deletions
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 |