git: f777bbd1454a - 2024Q1 - www/gitlab-ce: security update to 16.8.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Fri, 23 Feb 2024 15:09:18 UTC
The branch 2024Q1 has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f777bbd1454a2aa4611f344f3f8e6363ef623b6c

commit f777bbd1454a2aa4611f344f3f8e6363ef623b6c
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2024-01-26 14:30:34 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2024-02-23 14:22:41 +0000

    www/gitlab-ce: security update to 16.8.1
    
    Changelog:
    https://about.gitlab.com/releases/2024/01/25/critical-security-release-gitlab-16-8-1-released/
    (cherry picked from commit ef7c64e7dc425dabd56c2db2fd71970e154e38a4)
---
 devel/gitaly/Makefile                             |  2 +-
 devel/gitaly/distinfo                             | 10 +++++-----
 devel/gitlab-shell/Makefile                       |  2 +-
 devel/gitlab-shell/distinfo                       | 10 +++++-----
 devel/gitlab-shell/files/patch-Makefile           | 16 ++++++++--------
 devel/gitlab-shell/files/patch-config.yml.example |  4 ++--
 www/gitlab-ce/Makefile                            |  8 ++++----
 www/gitlab-ce/distinfo                            |  6 +++---
 www/gitlab-ce/files/patch-Gemfile                 | 10 ++++++++--
 www/gitlab-pages/Makefile                         |  2 +-
 www/gitlab-pages/distinfo                         | 10 +++++-----
 www/gitlab-workhorse/Makefile                     |  2 +-
 www/gitlab-workhorse/distinfo                     | 10 +++++-----
 13 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index d0a38d763d39..643641b2141d 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitaly
-DISTVERSION=	16.8.0
+DISTVERSION=	16.8.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 1f446374abc8..4e4059bd3bf2 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1705827282
-SHA256 (go/devel_gitaly/gitaly-v16.8.0/go.mod) = 114e8afe5f7e9000677d449a0d55972d9845f8c237cfc3eb98d673cf886006a7
-SIZE (go/devel_gitaly/gitaly-v16.8.0/go.mod) = 10585
-SHA256 (go/devel_gitaly/gitaly-v16.8.0/gitaly-v16.8.0.tar.bz2) = b8f0009b58afb95984fa280bcab8eafd98e6a0d740478735a8df44f93ccee40c
-SIZE (go/devel_gitaly/gitaly-v16.8.0/gitaly-v16.8.0.tar.bz2) = 2554011
+TIMESTAMP = 1706270509
+SHA256 (go/devel_gitaly/gitaly-v16.8.1/go.mod) = 114e8afe5f7e9000677d449a0d55972d9845f8c237cfc3eb98d673cf886006a7
+SIZE (go/devel_gitaly/gitaly-v16.8.1/go.mod) = 10585
+SHA256 (go/devel_gitaly/gitaly-v16.8.1/gitaly-v16.8.1.tar.bz2) = 4cd56356c5303ea9173c0f7eb5123ebbf164c53a929cf24d378a3442b4fe427a
+SIZE (go/devel_gitaly/gitaly-v16.8.1/gitaly-v16.8.1.tar.bz2) = 2554018
diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index ea0f0b06970a..862ff34899c5 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-shell
-PORTVERSION=	14.32.0
+PORTVERSION=	14.33.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo
index 857d29994681..d222ab3c46bc 100644
--- a/devel/gitlab-shell/distinfo
+++ b/devel/gitlab-shell/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1703589928
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.32.0/go.mod) = 10b662f9fd5aab451647fe6fd2bd71dc5e9e3d7215ac0ebe7ce77cb9e3c297af
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.32.0/go.mod) = 4862
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.32.0/gitlab-shell-v14.32.0.tar.bz2) = 10e3ede7672da0a648d4d83b13bfcd0da0737248b80e6e786a2928504ceb7e0d
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.32.0/gitlab-shell-v14.32.0.tar.bz2) = 142573
+TIMESTAMP = 1706270707
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.33.0/go.mod) = f64c325f61d8e8de8e172499a0a49635100f60545f20de5841612a72ed44c8ae
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.33.0/go.mod) = 4835
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.33.0/gitlab-shell-v14.33.0.tar.bz2) = e94a51c6cc8c4818920cf887c315e5eb26dfac1867cbcfea845277a6b6cae34f
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.33.0/gitlab-shell-v14.33.0.tar.bz2) = 143072
diff --git a/devel/gitlab-shell/files/patch-Makefile b/devel/gitlab-shell/files/patch-Makefile
index 9a7419bc1dda..57ba48e14e50 100644
--- a/devel/gitlab-shell/files/patch-Makefile
+++ b/devel/gitlab-shell/files/patch-Makefile
@@ -1,11 +1,11 @@
---- Makefile.orig	2023-11-20 05:28:27 UTC
+--- Makefile.orig	2024-01-26 13:37:36 UTC
 +++ Makefile
-@@ -5,7 +5,7 @@ OS := $(shell uname | tr A-Z a-z)
- GO_SOURCES := $(shell git ls-files \*.go)
- VERSION_STRING := $(shell git describe --match v* 2>/dev/null || awk '$$0="v"$$0' VERSION 2>/dev/null || echo unknown)
- BUILD_TIME := $(shell date -u +%Y%m%d.%H%M%S)
--BUILD_TAGS := tracer_static tracer_static_jaeger continuous_profiler_stackdriver gssapi
-+BUILD_TAGS := tracer_static tracer_static_jaeger continuous_profiler_stackdriver
+@@ -34,7 +34,7 @@ ifeq (${FIPS_MODE}, 1)
+ endif
  
- ARCH ?= $(shell uname -m | sed -e 's/x86_64/amd64/' | sed -e 's/aarch64/arm64/')
+ ifneq (${CGO_ENABLED}, 0)
+-	GO_TAGS += gssapi
++#	GO_TAGS += gssapi
+ endif
  
+ ifeq (${OS}, darwin) # Mac OS
diff --git a/devel/gitlab-shell/files/patch-config.yml.example b/devel/gitlab-shell/files/patch-config.yml.example
index 4e7a60a26aef..eaf2bf2a1f16 100644
--- a/devel/gitlab-shell/files/patch-config.yml.example
+++ b/devel/gitlab-shell/files/patch-config.yml.example
@@ -1,4 +1,4 @@
---- config.yml.example.orig	2021-02-05 17:09:18 UTC
+--- config.yml.example.orig	2024-01-19 10:36:34 UTC
 +++ config.yml.example
 @@ -13,7 +13,7 @@ user: git
  # only listen on a Unix domain socket. For Unix domain sockets use
@@ -10,7 +10,7 @@
  # When a http+unix:// is used in gitlab_url, this is the relative URL root to GitLab.
  # Not used if gitlab_url is http:// or https://.
 @@ -29,7 +29,7 @@ http_settings:
-   self_signed_cert: false
+ #
  
  # File used as authorized_keys for gitlab user
 -auth_file: "/home/git/.ssh/authorized_keys"
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index a93600a2d77b..f212812c887a 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-ce
-PORTVERSION=	16.8.0
+PORTVERSION=	16.8.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www devel
 
@@ -27,7 +27,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	gitlab-elasticsearch-indexer>=4.6.0:textproc/gitlab-elasticsearch-indexer \
 	gitlab-agent>=16.8.0:net/gitlab-agent \
 	gitlab-pages>=${PORTVERSION}:www/gitlab-pages \
-	gitlab-shell>=14.32.0:devel/gitlab-shell \
+	gitlab-shell>=14.33.0:devel/gitlab-shell \
 	gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \
 	redis>=6.2.11:databases/redis \
 	yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \
@@ -146,7 +146,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-rouge>=4.2.0<4.3:textproc/rubygem-rouge \
 	rubygem-truncato>=0.7.12<0.8.0:textproc/rubygem-truncato \
 	rubygem-nokogiri>=1.16<2:textproc/rubygem-nokogiri \
-	rubygem-gitlab-glfm-markdown>=0.0.10<0.1:textproc/rubygem-gitlab-glfm-markdown \
+	rubygem-gitlab-glfm-markdown>=0.0.11<0.1:textproc/rubygem-gitlab-glfm-markdown \
 	rubygem-icalendar>=0:devel/rubygem-icalendar \
 	rubygem-diffy>=3.4<4:textproc/rubygem-diffy \
 	rubygem-rack22>=2.2.8,3<2.3,3:www/rubygem-rack22 \
@@ -233,7 +233,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-net-ntp>0:net/rubygem-net-ntp \
 	rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \
 	rubygem-spamcheck>=1.3.0<1.4:net/rubygem-spamcheck \
-	rubygem-gitaly>=16.7.0.rc1<16.8.0:net/rubygem-gitaly \
+	rubygem-gitaly>=16.7.0.rc1<16.9.0:net/rubygem-gitaly \
 	rubygem-kas-grpc>=0.3.0,1<0.4.0,1:net/rubygem-kas-grpc \
 	rubygem-grpc>=1.58.0<2:net/rubygem-grpc \
 	rubygem-google-protobuf>=3.25.2<4:devel/rubygem-google-protobuf \
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index 9ec1dab8197e..11b0b2a09762 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1705828549
-SHA256 (gitlab-foss-v16.8.0.tar.bz2) = 6d90540e97b73f6e6953ef2aa9aa6ce846837efd2879dc2fbaf7640ca942f52d
-SIZE (gitlab-foss-v16.8.0.tar.bz2) = 100003151
+TIMESTAMP = 1706270415
+SHA256 (gitlab-foss-v16.8.1.tar.bz2) = a329cc61285fd516ee1d16fa5a655996b9c25afa2f7623144af19a93ce8541e0
+SIZE (gitlab-foss-v16.8.1.tar.bz2) = 100007780
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index e22528190161..db38faea6542 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2024-01-17 10:09:09 UTC
+--- Gemfile.orig	2024-01-24 16:26:54 UTC
 +++ Gemfile
 @@ -58,7 +58,7 @@ gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/Miss
  
@@ -176,7 +176,13 @@
  gem 'octokit', '~> 6.0' # rubocop:todo Gemfile/MissingFeatureCategory
  
  gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared
-@@ -557,7 +438,7 @@ gem 'gitaly', '~> 16.7.0-rc1', feature_category: :gita
+@@ -552,12 +433,12 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/Missin
+ gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
+ 
+ # Gitaly GRPC protocol definitions
+-gem 'gitaly', '~> 16.7.0-rc1', feature_category: :gitaly
++gem 'gitaly', '~> 16.7', feature_category: :gitaly
+ 
  # KAS GRPC protocol definitions
  gem 'kas-grpc', '~> 0.3.0', feature_category: :deployment_management
  
diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
index 0623edddb045..6146745103a0 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-pages
-PORTVERSION=	16.8.0
+PORTVERSION=	16.8.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 556264216867..5c587ec0b184 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1705828540
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.8.0/go.mod) = a921362a600558c9a7399ca1f3bfe7763d81dd49dd66f8a010c4a1810ff26a8c
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.8.0/go.mod) = 3295
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.8.0/gitlab-pages-v16.8.0.tar.bz2) = 08a93bc0624832bea5c84a96f27854b875de5a0c9dcc0626862be6cef0684e73
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.8.0/gitlab-pages-v16.8.0.tar.bz2) = 211369
+TIMESTAMP = 1706270469
+SHA256 (go/www_gitlab-pages/gitlab-pages-v16.8.1/go.mod) = a921362a600558c9a7399ca1f3bfe7763d81dd49dd66f8a010c4a1810ff26a8c
+SIZE (go/www_gitlab-pages/gitlab-pages-v16.8.1/go.mod) = 3295
+SHA256 (go/www_gitlab-pages/gitlab-pages-v16.8.1/gitlab-pages-v16.8.1.tar.bz2) = 535b0dd00701917a1619d31411d21aa7e0a463911ef88d10c546b8a029887439
+SIZE (go/www_gitlab-pages/gitlab-pages-v16.8.1/gitlab-pages-v16.8.1.tar.bz2) = 211392
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index a1323ba20ce5..e88e3119b909 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-workhorse
-PORTVERSION=	16.8.0
+PORTVERSION=	16.8.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 810533d1445c..eff09ca491b2 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1705827469
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.8.0/go.mod) = 4ef98c9480dc69d9ac8f0438a9964432a977593dd48d6006f2b7363fcb7f1c74
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.8.0/go.mod) = 6610
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.8.0/gitlab-foss-v16.8.0.tar.bz2) = 6d90540e97b73f6e6953ef2aa9aa6ce846837efd2879dc2fbaf7640ca942f52d
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.8.0/gitlab-foss-v16.8.0.tar.bz2) = 100003151
+TIMESTAMP = 1706270449
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.8.1/go.mod) = 4ef98c9480dc69d9ac8f0438a9964432a977593dd48d6006f2b7363fcb7f1c74
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.8.1/go.mod) = 6610
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.8.1/gitlab-foss-v16.8.1.tar.bz2) = a329cc61285fd516ee1d16fa5a655996b9c25afa2f7623144af19a93ce8541e0
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.8.1/gitlab-foss-v16.8.1.tar.bz2) = 100007780