git: 487036c6007f - main - www/gitlab: fix problems related to aws-sdk* package upgrades
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 10 Oct 2024 05:44:00 UTC
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=487036c6007f3f7393a3737b20c3ece45042e7a4
commit 487036c6007f3f7393a3737b20c3ece45042e7a4
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2024-10-10 05:18:21 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2024-10-10 05:28:03 +0000
www/gitlab: fix problems related to aws-sdk* package upgrades
Gitlab uses now dedicated packages it requires with the specific version.
PR: 281980
---
devel/Makefile | 4 ++++
.../rubygem-aws-sdk-cloudformation-gitlab/Makefile | 20 +++++++++++++++++++
.../rubygem-aws-sdk-cloudformation-gitlab/distinfo | 3 +++
.../pkg-descr | 1 +
devel/rubygem-aws-sdk-core-gitlab/Makefile | 23 ++++++++++++++++++++++
devel/rubygem-aws-sdk-core-gitlab/distinfo | 3 +++
devel/rubygem-aws-sdk-core-gitlab/pkg-descr | 2 ++
devel/rubygem-aws-sdk-kms-gitlab/Makefile | 21 ++++++++++++++++++++
devel/rubygem-aws-sdk-kms-gitlab/distinfo | 3 +++
devel/rubygem-aws-sdk-kms-gitlab/pkg-descr | 1 +
devel/rubygem-aws-sdk-s3-gitlab/Makefile | 22 +++++++++++++++++++++
devel/rubygem-aws-sdk-s3-gitlab/distinfo | 3 +++
devel/rubygem-aws-sdk-s3-gitlab/pkg-descr | 1 +
www/gitlab/Makefile | 8 ++++----
www/gitlab/files/patch-Gemfile | 14 +------------
15 files changed, 112 insertions(+), 17 deletions(-)
diff --git a/devel/Makefile b/devel/Makefile
index a5607a0e5ee1..ba22607c3bfa 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -6460,6 +6460,7 @@
SUBDIR += rubygem-aws-sdk-cloudcontrolapi
SUBDIR += rubygem-aws-sdk-clouddirectory
SUBDIR += rubygem-aws-sdk-cloudformation
+ SUBDIR += rubygem-aws-sdk-cloudformation-gitlab
SUBDIR += rubygem-aws-sdk-cloudfront
SUBDIR += rubygem-aws-sdk-cloudfrontkeyvaluestore
SUBDIR += rubygem-aws-sdk-cloudhsm
@@ -6502,6 +6503,7 @@
SUBDIR += rubygem-aws-sdk-controlcatalog
SUBDIR += rubygem-aws-sdk-controltower
SUBDIR += rubygem-aws-sdk-core
+ SUBDIR += rubygem-aws-sdk-core-gitlab
SUBDIR += rubygem-aws-sdk-core2
SUBDIR += rubygem-aws-sdk-costandusagereportservice
SUBDIR += rubygem-aws-sdk-costexplorer
@@ -6612,6 +6614,7 @@
SUBDIR += rubygem-aws-sdk-kinesisvideosignalingchannels
SUBDIR += rubygem-aws-sdk-kinesisvideowebrtcstorage
SUBDIR += rubygem-aws-sdk-kms
+ SUBDIR += rubygem-aws-sdk-kms-gitlab
SUBDIR += rubygem-aws-sdk-lakeformation
SUBDIR += rubygem-aws-sdk-lambda
SUBDIR += rubygem-aws-sdk-lambdapreview
@@ -6729,6 +6732,7 @@
SUBDIR += rubygem-aws-sdk-route53recoveryreadiness
SUBDIR += rubygem-aws-sdk-route53resolver
SUBDIR += rubygem-aws-sdk-s3
+ SUBDIR += rubygem-aws-sdk-s3-gitlab
SUBDIR += rubygem-aws-sdk-s3control
SUBDIR += rubygem-aws-sdk-s3outposts
SUBDIR += rubygem-aws-sdk-sagemaker
diff --git a/devel/rubygem-aws-sdk-cloudformation-gitlab/Makefile b/devel/rubygem-aws-sdk-cloudformation-gitlab/Makefile
new file mode 100644
index 000000000000..b8dc652e5178
--- /dev/null
+++ b/devel/rubygem-aws-sdk-cloudformation-gitlab/Makefile
@@ -0,0 +1,20 @@
+PORTNAME= aws-sdk-cloudformation
+PORTVERSION= 1.41.0
+CATEGORIES= devel rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Official AWS Ruby gem for AWS CloudFormation
+WWW= https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sdk-cloudformation
+
+LICENSE= APACHE20
+
+RUN_DEPENDS= rubygem-aws-sdk-core-gitlab>=3.99.0<4:devel/rubygem-aws-sdk-core-gitlab \
+ rubygem-aws-sigv4>=1.1<2:devel/rubygem-aws-sigv4
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-aws-sdk-cloudformation-gitlab/distinfo b/devel/rubygem-aws-sdk-cloudformation-gitlab/distinfo
new file mode 100644
index 000000000000..e33d2419fd5a
--- /dev/null
+++ b/devel/rubygem-aws-sdk-cloudformation-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1728535574
+SHA256 (rubygem/aws-sdk-cloudformation-1.41.0.gem) = 31e47539719734413671edf9b1a31f8673fbf9688549f50c41affabbcb1c6b26
+SIZE (rubygem/aws-sdk-cloudformation-1.41.0.gem) = 120320
diff --git a/devel/rubygem-aws-sdk-cloudformation-gitlab/pkg-descr b/devel/rubygem-aws-sdk-cloudformation-gitlab/pkg-descr
new file mode 100644
index 000000000000..6a062fdb145a
--- /dev/null
+++ b/devel/rubygem-aws-sdk-cloudformation-gitlab/pkg-descr
@@ -0,0 +1 @@
+Official AWS Ruby gem for AWS CloudFormation.
diff --git a/devel/rubygem-aws-sdk-core-gitlab/Makefile b/devel/rubygem-aws-sdk-core-gitlab/Makefile
new file mode 100644
index 000000000000..bcf43bcc9826
--- /dev/null
+++ b/devel/rubygem-aws-sdk-core-gitlab/Makefile
@@ -0,0 +1,23 @@
+PORTNAME= aws-sdk-core
+PORTVERSION= 3.202.2
+CATEGORIES= devel rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= AWS SDK for Ruby - Core
+WWW= https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sdk-core
+
+LICENSE= APACHE20
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS= rubygem-aws-eventstream>=1.3.0<2:devel/rubygem-aws-eventstream \
+ rubygem-aws-partitions>=1.651.0<2:devel/rubygem-aws-partitions \
+ rubygem-aws-sigv4>=1.9<2:devel/rubygem-aws-sigv4 \
+ rubygem-jmespath>=1.6.1<2:devel/rubygem-jmespath
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-aws-sdk-core-gitlab/distinfo b/devel/rubygem-aws-sdk-core-gitlab/distinfo
new file mode 100644
index 000000000000..011c3d42670e
--- /dev/null
+++ b/devel/rubygem-aws-sdk-core-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1728535040
+SHA256 (rubygem/aws-sdk-core-3.202.2.gem) = 732a51d71938db90aab5dcb6fe9c86f023c0b431b350b324ecff16efcc667092
+SIZE (rubygem/aws-sdk-core-3.202.2.gem) = 374784
diff --git a/devel/rubygem-aws-sdk-core-gitlab/pkg-descr b/devel/rubygem-aws-sdk-core-gitlab/pkg-descr
new file mode 100644
index 000000000000..99ad2101b8c4
--- /dev/null
+++ b/devel/rubygem-aws-sdk-core-gitlab/pkg-descr
@@ -0,0 +1,2 @@
+Provides API clients for AWS. This gem is part of the official AWS SDK for
+Ruby.
diff --git a/devel/rubygem-aws-sdk-kms-gitlab/Makefile b/devel/rubygem-aws-sdk-kms-gitlab/Makefile
new file mode 100644
index 000000000000..a0ab248c3774
--- /dev/null
+++ b/devel/rubygem-aws-sdk-kms-gitlab/Makefile
@@ -0,0 +1,21 @@
+PORTNAME= aws-sdk-kms
+PORTVERSION= 1.76.0
+CATEGORIES= devel rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Official AWS Ruby gem for AWS Key Management Service (KMS)
+WWW= https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sdk-kms
+
+LICENSE= APACHE20
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS= rubygem-aws-sdk-core-gitlab>=3.188.0<4:devel/rubygem-aws-sdk-core-gitlab \
+ rubygem-aws-sigv4>=1.1<2:devel/rubygem-aws-sigv4
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-aws-sdk-kms-gitlab/distinfo b/devel/rubygem-aws-sdk-kms-gitlab/distinfo
new file mode 100644
index 000000000000..56fe370e634c
--- /dev/null
+++ b/devel/rubygem-aws-sdk-kms-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1728536719
+SHA256 (rubygem/aws-sdk-kms-1.76.0.gem) = e7f75013cba9ba357144f66bbc600631c192e2cda9dd572794be239654e2cf49
+SIZE (rubygem/aws-sdk-kms-1.76.0.gem) = 143872
diff --git a/devel/rubygem-aws-sdk-kms-gitlab/pkg-descr b/devel/rubygem-aws-sdk-kms-gitlab/pkg-descr
new file mode 100644
index 000000000000..3a1bbca30bc0
--- /dev/null
+++ b/devel/rubygem-aws-sdk-kms-gitlab/pkg-descr
@@ -0,0 +1 @@
+Official AWS Ruby gem for AWS Key Management Service (KMS).
diff --git a/devel/rubygem-aws-sdk-s3-gitlab/Makefile b/devel/rubygem-aws-sdk-s3-gitlab/Makefile
new file mode 100644
index 000000000000..07ef0c16ba68
--- /dev/null
+++ b/devel/rubygem-aws-sdk-s3-gitlab/Makefile
@@ -0,0 +1,22 @@
+PORTNAME= aws-sdk-s3
+PORTVERSION= 1.159.0
+CATEGORIES= devel rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Official AWS Ruby gem for Amazon Simple Storage Service (Amazon S3)
+WWW= https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sdk-s3
+
+LICENSE= APACHE20
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS= rubygem-aws-sdk-core-gitlab>=3.201.0<4:devel/rubygem-aws-sdk-core-gitlab \
+ rubygem-aws-sdk-kms-gitlab>=1<2:devel/rubygem-aws-sdk-kms-gitlab \
+ rubygem-aws-sigv4>=1.5<2:devel/rubygem-aws-sigv4
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-aws-sdk-s3-gitlab/distinfo b/devel/rubygem-aws-sdk-s3-gitlab/distinfo
new file mode 100644
index 000000000000..c7d4375bce97
--- /dev/null
+++ b/devel/rubygem-aws-sdk-s3-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1728535249
+SHA256 (rubygem/aws-sdk-s3-1.159.0.gem) = 406ba75c68890938350aa573df1c3f878dd7781a59ba1ddc0953968a70725e98
+SIZE (rubygem/aws-sdk-s3-1.159.0.gem) = 456192
diff --git a/devel/rubygem-aws-sdk-s3-gitlab/pkg-descr b/devel/rubygem-aws-sdk-s3-gitlab/pkg-descr
new file mode 100644
index 000000000000..0507ee9034ed
--- /dev/null
+++ b/devel/rubygem-aws-sdk-s3-gitlab/pkg-descr
@@ -0,0 +1 @@
+Official AWS Ruby gem for Amazon Simple Storage Service (Amazon S3).
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index c60824c2bf33..caf7d8a3e220 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -5,7 +5,7 @@ DISTVERSIONPREFIX= v
.if ${FLAVOR:U} == ee
DISTVERSIONSUFFIX= -ee
.endif
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www devel
# include patch to fix database migration
@@ -135,9 +135,9 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-elasticsearch-model713>=7.2<8:textproc/rubygem-elasticsearch-model713 \
rubygem-elasticsearch-rails7>=7.2<8:textproc/rubygem-elasticsearch-rails7 \
rubygem-elasticsearch-api7>=7.17.11<7.18:textproc/rubygem-elasticsearch-api7 \
- rubygem-aws-sdk-core>=3.202.0<4:devel/rubygem-aws-sdk-core \
- rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \
- rubygem-aws-sdk-s3>=1.159.0<2:devel/rubygem-aws-sdk-s3 \
+ rubygem-aws-sdk-core-gitlab>=3.202.0<3.203:devel/rubygem-aws-sdk-core-gitlab \
+ rubygem-aws-sdk-cloudformation-gitlab>=1<2:devel/rubygem-aws-sdk-cloudformation-gitlab \
+ rubygem-aws-sdk-s3-gitlab>=1.159.0<1.160:devel/rubygem-aws-sdk-s3-gitlab \
rubygem-faraday-typhoeus>=1.1<2:www/rubygem-faraday-typhoeus \
rubygem-faraday_middleware-aws-sigv4>=1.0.1<1.1:devel/rubygem-faraday_middleware-aws-sigv4 \
rubygem-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 7f956cb65376..bb189590edaa 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig 2024-09-18 10:07:13 UTC
+--- Gemfile.orig 2024-10-09 10:29:44 UTC
+++ Gemfile
@@ -156,7 +156,7 @@ gem 'graphql', '~> 2.3.14', feature_category: :api
@@ -27,18 +27,6 @@
gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared
gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared
-@@ -231,9 +231,9 @@ gem 'elasticsearch-api', '7.17.11', feature_category:
- gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search
- gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search
- gem 'elasticsearch-api', '7.17.11', feature_category: :global_search
--gem 'aws-sdk-core', '~> 3.202.0' # rubocop:todo Gemfile/MissingFeatureCategory
-+gem 'aws-sdk-core', '~> 3.202' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory
--gem 'aws-sdk-s3', '~> 1.159.0' # rubocop:todo Gemfile/MissingFeatureCategory
-+gem 'aws-sdk-s3', '~> 1.159' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search
- gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search
- # Used with Elasticsearch to support http keep-alive connections
@@ -271,7 +271,7 @@ group :puma do
gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory