git: 1c2885ba2525 - 2022Q3 - www/gitlab-ce: security update to 15.2.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 25 Aug 2022 13:21:16 UTC
The branch 2022Q3 has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1c2885ba252564c197c80052bba44890efea57c2
commit 1c2885ba252564c197c80052bba44890efea57c2
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2022-08-16 14:18:01 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2022-08-25 13:20:21 +0000
www/gitlab-ce: security update to 15.2.2
Changelog:
https://about.gitlab.com/releases/2022/07/28/security-release-gitlab-15-2-1-released/
https://about.gitlab.com/releases/2022/08/01/gitlab-15-2-2-released/
(cherry picked from commit 68cf6a1c0f8979bccf94f6cc56183f2b30855c4c)
---
devel/gitaly/Makefile | 4 ++--
devel/gitaly/distinfo | 10 +++++-----
www/gitlab-ce/Makefile | 6 +++---
www/gitlab-ce/distinfo | 6 +++---
www/gitlab-workhorse/Makefile | 4 ++--
www/gitlab-workhorse/distinfo | 10 +++++-----
6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index d45e5514ddc6..8b0a15662c04 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitaly
-DISTVERSION= 15.2.0
+DISTVERSION= 15.2.2
DISTVERSIONPREFIX= v
PORTREVISION= 0
CATEGORIES= devel
@@ -51,7 +51,7 @@ MAKE_ENV+= ${GO_ENV}
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT= 91f52100ffca75bb08e295d34da3a02a46c5df78
+GL_COMMIT= 94d5f4f16427baeee577f2d6162c44c1d54a1edd
# for go dependencies
# Gitlab hosts there dependencies on their own platform and not on go-proxy
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index bfbc5da7f6b0..62835e82781c 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1658817992
-SHA256 (go/devel_gitaly/gitlab-org-gitaly-91f52100ffca75bb08e295d34da3a02a46c5df78_GL0/go.mod) = dc003dfe788c03dfd145369d4d81321f1306df51dac7289a6491dc84e25b2bbc
-SIZE (go/devel_gitaly/gitlab-org-gitaly-91f52100ffca75bb08e295d34da3a02a46c5df78_GL0/go.mod) = 9144
-SHA256 (go/devel_gitaly/gitlab-org-gitaly-91f52100ffca75bb08e295d34da3a02a46c5df78_GL0/gitlab-org-gitaly-91f52100ffca75bb08e295d34da3a02a46c5df78_GL0.tar.gz) = f3be6247359252ccad7dbb67c18819213310488842c7370d84766d8e2e40783a
-SIZE (go/devel_gitaly/gitlab-org-gitaly-91f52100ffca75bb08e295d34da3a02a46c5df78_GL0/gitlab-org-gitaly-91f52100ffca75bb08e295d34da3a02a46c5df78_GL0.tar.gz) = 4001229
+TIMESTAMP = 1660635237
+SHA256 (go/devel_gitaly/gitlab-org-gitaly-94d5f4f16427baeee577f2d6162c44c1d54a1edd_GL0/go.mod) = dc003dfe788c03dfd145369d4d81321f1306df51dac7289a6491dc84e25b2bbc
+SIZE (go/devel_gitaly/gitlab-org-gitaly-94d5f4f16427baeee577f2d6162c44c1d54a1edd_GL0/go.mod) = 9144
+SHA256 (go/devel_gitaly/gitlab-org-gitaly-94d5f4f16427baeee577f2d6162c44c1d54a1edd_GL0/gitlab-org-gitaly-94d5f4f16427baeee577f2d6162c44c1d54a1edd_GL0.tar.gz) = bf31c72906d0770da32cf3a4db9ddd7affd869a44991a7d4c4b1659d5729eecf
+SIZE (go/devel_gitaly/gitlab-org-gitaly-94d5f4f16427baeee577f2d6162c44c1d54a1edd_GL0/gitlab-org-gitaly-94d5f4f16427baeee577f2d6162c44c1d54a1edd_GL0.tar.gz) = 4002561
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 3603e07033ad..7da2e417f20c 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-ce
-PORTVERSION= 15.2.0
+PORTVERSION= 15.2.2
PORTREVISION= 0
CATEGORIES= www devel
@@ -249,7 +249,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \
rubygem-json>=2.5.1<3:devel/rubygem-json \
rubygem-json_schemer>=0.2.18<0.3:devel/rubygem-json_schemer \
- rubygem-oj>=3.13.16<3.14:devel/rubygem-oj \
+ rubygem-oj>=3.13.19<3.14:devel/rubygem-oj \
rubygem-multi_json114>=1.14.1<1.15:devel/rubygem-multi_json114 \
rubygem-yajl-ruby>=1.4.1<1.5:devel/rubygem-yajl-ruby \
rubygem-webauthn>=2.3<3:security/rubygem-webauthn \
@@ -277,7 +277,7 @@ USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
GL_PROJECT= gitlab-foss
# Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
-GL_COMMIT= a876afc5fd85a4ccae6947941884f3913f472ab0
+GL_COMMIT= 4ecb014a9353d25d25249cceb268ee34eab0c96b
USERS= git
GROUPS= git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index d7b678883391..c7c8d52877c1 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1658815292
-SHA256 (gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0.tar.gz) = 281c61ce7279e5d8bd9afd2e28e1cdab944b7e2d3383b545e03b8480f9bdaf07
-SIZE (gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0.tar.gz) = 101269547
+TIMESTAMP = 1660638267
+SHA256 (gitlab-org-gitlab-foss-4ecb014a9353d25d25249cceb268ee34eab0c96b_GL0.tar.gz) = 2f1579ad2a5f7204fc20e086ca597bdf6278de80ea4fe134d011b594883c6cfc
+SIZE (gitlab-org-gitlab-foss-4ecb014a9353d25d25249cceb268ee34eab0c96b_GL0.tar.gz) = 101281744
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index e025d82f80c6..9bf7cc7bbb87 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,7 +1,7 @@
# Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
PORTNAME= gitlab-workhorse
-PORTVERSION= 15.2.0
+PORTVERSION= 15.2.2
DISTVERSIONPREFIX= v
PORTREVISION= 0
CATEGORIES= www
@@ -26,7 +26,7 @@ USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
GL_PROJECT= gitlab-foss
# Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
-GL_COMMIT= a876afc5fd85a4ccae6947941884f3913f472ab0
+GL_COMMIT= 4ecb014a9353d25d25249cceb268ee34eab0c96b
# for go dependencies
# Gitlab hosts there dependencies on their own platform and not on go-proxy
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index fc9b2a709bd8..79143aea7dea 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1658821522
-SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0/go.mod) = 3aad71b404db096347d2dc6f7a2d98a031d66ac70ed6626546f49bac91ddf380
-SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0/go.mod) = 5778
-SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0/gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0.tar.gz) = 281c61ce7279e5d8bd9afd2e28e1cdab944b7e2d3383b545e03b8480f9bdaf07
-SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0/gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0.tar.gz) = 101269547
+TIMESTAMP = 1660638161
+SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-4ecb014a9353d25d25249cceb268ee34eab0c96b_GL0/go.mod) = 3aad71b404db096347d2dc6f7a2d98a031d66ac70ed6626546f49bac91ddf380
+SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-4ecb014a9353d25d25249cceb268ee34eab0c96b_GL0/go.mod) = 5778
+SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-4ecb014a9353d25d25249cceb268ee34eab0c96b_GL0/gitlab-org-gitlab-foss-4ecb014a9353d25d25249cceb268ee34eab0c96b_GL0.tar.gz) = 2f1579ad2a5f7204fc20e086ca597bdf6278de80ea4fe134d011b594883c6cfc
+SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-4ecb014a9353d25d25249cceb268ee34eab0c96b_GL0/gitlab-org-gitlab-foss-4ecb014a9353d25d25249cceb268ee34eab0c96b_GL0.tar.gz) = 101281744