summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorMatthias Fechner <mfechner@FreeBSD.org>2024-07-02 11:40:18 +0300
committerMatthias Fechner <mfechner@FreeBSD.org>2024-07-03 10:42:25 +0300
commitac5743b99bf625636b3e2353160c124e81c4915b (patch)
tree5f62d13cb801cfe698135ff806bdae6c12ad649d /www
parentdevel/gitlab-runner: update to 17.1.0 (diff)
www/gitlab: security and patch update to 17.1.1
Changes: https://about.gitlab.com/releases/2024/06/26/patch-release-gitlab-17-1-1-released/ Security: 589de937-343f-11ef-8a7b-001b217b3468
Diffstat (limited to 'www')
-rw-r--r--www/gitlab-pages/Makefile2
-rw-r--r--www/gitlab-pages/distinfo10
-rw-r--r--www/gitlab-workhorse/Makefile2
-rw-r--r--www/gitlab-workhorse/distinfo10
-rw-r--r--www/gitlab/Makefile2
-rw-r--r--www/gitlab/distinfo12
-rw-r--r--www/gitlab/files/patch-Gemfile11
7 files changed, 29 insertions, 20 deletions
diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
index a3ae3b4b4813..1d2c04cbfd49 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-pages
-PORTVERSION= 17.1.0
+PORTVERSION= 17.1.1
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 4464503182bb..b90ffc22796f 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1718793262
-SHA256 (go/www_gitlab-pages/gitlab-pages-v17.1.0/go.mod) = dc647bef3c9a1eb596f949dd6bdaee81bc6a791f8a4ad6f34e5e09b13c0e0350
-SIZE (go/www_gitlab-pages/gitlab-pages-v17.1.0/go.mod) = 3269
-SHA256 (go/www_gitlab-pages/gitlab-pages-v17.1.0/gitlab-pages-v17.1.0.tar.bz2) = 55a09929ec5659267396cc9dbe413720739fe1554f018f77dbc60ddb246c7cf5
-SIZE (go/www_gitlab-pages/gitlab-pages-v17.1.0/gitlab-pages-v17.1.0.tar.bz2) = 218472
+TIMESTAMP = 1719895468
+SHA256 (go/www_gitlab-pages/gitlab-pages-v17.1.1/go.mod) = dc647bef3c9a1eb596f949dd6bdaee81bc6a791f8a4ad6f34e5e09b13c0e0350
+SIZE (go/www_gitlab-pages/gitlab-pages-v17.1.1/go.mod) = 3269
+SHA256 (go/www_gitlab-pages/gitlab-pages-v17.1.1/gitlab-pages-v17.1.1.tar.bz2) = 9a7c948510c558ec550fb8152d279ea7e22d267814dc30e4c9f27fe4ae324823
+SIZE (go/www_gitlab-pages/gitlab-pages-v17.1.1/gitlab-pages-v17.1.1.tar.bz2) = 218570
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 984b34ba3e0d..3486a12984e2 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-workhorse
-PORTVERSION= 17.1.0
+PORTVERSION= 17.1.1
DISTVERSIONPREFIX= v
CATEGORIES= www
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index fea57c4c61e0..d9d96806723c 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1718793205
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.1.0/go.mod) = eb2321aa5993d64f24051d87d4ffd701d2054c1084e55af4ec654a289e2dba95
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.1.0/go.mod) = 6994
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.1.0/gitlab-foss-v17.1.0.tar.bz2) = 3f85ff78b83d2bed3fd7bcf205e13b5361d5979fc9c805c579a5eb06471614b5
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.1.0/gitlab-foss-v17.1.0.tar.bz2) = 106374768
+TIMESTAMP = 1719895296
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.1.1/go.mod) = eb2321aa5993d64f24051d87d4ffd701d2054c1084e55af4ec654a289e2dba95
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.1.1/go.mod) = 6994
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.1.1/gitlab-foss-v17.1.1.tar.bz2) = 2eedeea18a1042fbaa96c397ec0d26372141e46a4f067496e60c54d893b1de09
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.1.1/gitlab-foss-v17.1.1.tar.bz2) = 106395522
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index e6d6b884c14e..f0510bdfac37 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-${FLAVOR:Uce}
-PORTVERSION= 17.1.0
+PORTVERSION= 17.1.1
DISTVERSIONPREFIX= v
.if ${FLAVOR:U} == ee
DISTVERSIONSUFFIX= -ee
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index f783044c5bd5..ecca1b3fe0d6 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1718791024
-SHA256 (gitlab-foss-v17.1.0.tar.bz2) = 3f85ff78b83d2bed3fd7bcf205e13b5361d5979fc9c805c579a5eb06471614b5
-SIZE (gitlab-foss-v17.1.0.tar.bz2) = 106374768
-TIMESTAMP = 1718791076
-SHA256 (gitlab-v17.1.0-ee.tar.bz2) = e3eec07dc8a9277b45ba193d3a3711adb4cca8b376b356e0028dd7f6ab2d57aa
-SIZE (gitlab-v17.1.0-ee.tar.bz2) = 114925370
+TIMESTAMP = 1719895321
+SHA256 (gitlab-foss-v17.1.1.tar.bz2) = 2eedeea18a1042fbaa96c397ec0d26372141e46a4f067496e60c54d893b1de09
+SIZE (gitlab-foss-v17.1.1.tar.bz2) = 106395522
+TIMESTAMP = 1719895431
+SHA256 (gitlab-v17.1.1-ee.tar.bz2) = 1a4df4d3a02929dd3e8245cdff485fbb2136e9afd2647599f6720c6dabd4ab1d
+SIZE (gitlab-v17.1.1-ee.tar.bz2) = 114926450
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 22b05c6010b3..dd9d6e0337c8 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig 2024-06-19 08:46:16 UTC
+--- Gemfile.orig 2024-06-25 20:33:28 UTC
+++ Gemfile
@@ -58,7 +58,7 @@ gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingF
@@ -215,6 +215,15 @@
gem 'octokit', '~> 8.1', feature_category: :importers
gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared
+@@ -594,7 +478,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.0.1', feature_category: :gitaly
++gem 'gitaly', '~> 17.1', feature_category: :gitaly
+
+ # KAS GRPC protocol definitions
+ gem 'kas-grpc', '~> 0.5.0', feature_category: :deployment_management
@@ -620,7 +504,7 @@ gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfil
gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory