www/gitlab-ce: fixed regression cause by upgrade of devel/rubygem-aws…

…-sdk-core
freebsd · Jul 20, 2023 · 9fc7fdd · 9fc7fdd
1 parent cbfab12
commit 9fc7fdd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
@@ -1,5 +1,7 @@
 PORTNAME=	gitlab-ce
 PORTVERSION=	16.1.2
+DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -119,7 +121,7 @@ MY_DEPENDS=	git>=2.39.2:devel/git \
 	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-core3175>=3.175.0<3.176:devel/rubygem-aws-sdk-core3175 \
+	rubygem-aws-sdk-core>=3.175.0<4.176:devel/rubygem-aws-sdk-core \
 	rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \
 	rubygem-aws-sdk-s31126>=1.126.0<1.127:devel/rubygem-aws-sdk-s31126 \
 	rubygem-faraday_middleware-aws-sigv403>=0.3.0<0.4:devel/rubygem-faraday_middleware-aws-sigv403 \
@@ -291,8 +293,6 @@ USE_RC_SUBR=	gitlab
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GL_PROJECT=	gitlab-foss
-# Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
-GL_TAGNAME=	e60fc11f2d3d2a3d4fe6e1c9001e29091bd4ccd5
 
 USERS=	git
 GROUPS=	git

diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688637835
-SHA256 (gitlab-org-gitlab-foss-e60fc11f2d3d2a3d4fe6e1c9001e29091bd4ccd5_GL0.tar.gz) = 67e7b5425a22b5f5cd9824fb0501e04b33afd409389e2448bd6669965f1871c4
-SIZE (gitlab-org-gitlab-foss-e60fc11f2d3d2a3d4fe6e1c9001e29091bd4ccd5_GL0.tar.gz) = 101886134
+TIMESTAMP = 1689569487
+SHA256 (gitlab-foss-v16.1.2.tar.bz2) = 6b8482a4a295470c3f100fc7c56ba71f4f324713a710e9d0cc9aa4da464464e9
+SIZE (gitlab-foss-v16.1.2.tar.bz2) = 89390241
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2023-06-21 08:07:20 UTC
+--- Gemfile.orig	2023-07-04 20:45:49 UTC
 +++ Gemfile
 @@ -35,7 +35,7 @@ gem 'neighbor', '~> 0.2.3'
  gem 'rugged', '~> 1.5'
@@ -38,6 +38,15 @@
  gem 'google-apis-compute_v1', '~> 0.57.0'
  gem 'google-apis-container_v1', '~> 0.43.0'
  gem 'google-apis-container_v1beta1', '~> 0.43.0'
+@@ -173,7 +173,7 @@ gem 'seed-fu', '~> 2.3.7'
+ gem 'elasticsearch-model', '~> 7.2'
+ gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation'
+ gem 'elasticsearch-api',   '7.13.3'
+-gem 'aws-sdk-core', '~> 3.175.0'
++gem 'aws-sdk-core', '~> 3.175'
+ gem 'aws-sdk-cloudformation', '~> 1'
+ gem 'aws-sdk-s3', '~> 1.126.0'
+ gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
 @@ -274,7 +274,7 @@ gem 'slack-messenger', '~> 2.3.4'
  gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat'