git: ac5743b99bf6 - main - www/gitlab: security and patch update to 17.1.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Wed, 03 Jul 2024 07:43:05 UTC
The branch main has been updated by mfechner:

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

commit ac5743b99bf625636b3e2353160c124e81c4915b
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2024-07-02 08:40:18 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2024-07-03 07:42:25 +0000

    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
---
 devel/gitaly/Makefile          |  2 +-
 devel/gitaly/distinfo          | 10 +++++-----
 net/gitlab-agent/Makefile      |  2 +-
 net/gitlab-agent/distinfo      | 10 +++++-----
 net/rubygem-gitaly/Makefile    |  6 +++---
 net/rubygem-gitaly/distinfo    |  6 +++---
 www/gitlab-pages/Makefile      |  2 +-
 www/gitlab-pages/distinfo      | 10 +++++-----
 www/gitlab-workhorse/Makefile  |  2 +-
 www/gitlab-workhorse/distinfo  | 10 +++++-----
 www/gitlab/Makefile            |  2 +-
 www/gitlab/distinfo            | 12 ++++++------
 www/gitlab/files/patch-Gemfile | 11 ++++++++++-
 13 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 7150b41d40bc..c8e850dd200b 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gitaly
 DISTVERSIONPREFIX=	v
-DISTVERSION=	17.1.0
+DISTVERSION=	17.1.1
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 848b0a92d68f..649f82944126 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1718793266
-SHA256 (go/devel_gitaly/gitaly-v17.1.0/go.mod) = 46321e96184062643db930c26d8033bdb94f79cd766b3768b96cf2feced18b8b
-SIZE (go/devel_gitaly/gitaly-v17.1.0/go.mod) = 11095
-SHA256 (go/devel_gitaly/gitaly-v17.1.0/gitaly-v17.1.0.tar.bz2) = 74265df39beaa54734256747def4ee5b13d09c99af2f5bd7fa93a745034b6eee
-SIZE (go/devel_gitaly/gitaly-v17.1.0/gitaly-v17.1.0.tar.bz2) = 2630746
+TIMESTAMP = 1719895488
+SHA256 (go/devel_gitaly/gitaly-v17.1.1/go.mod) = 46321e96184062643db930c26d8033bdb94f79cd766b3768b96cf2feced18b8b
+SIZE (go/devel_gitaly/gitaly-v17.1.1/go.mod) = 11095
+SHA256 (go/devel_gitaly/gitaly-v17.1.1/gitaly-v17.1.1.tar.bz2) = 05c5c06e4c8994e97a11ab92635a9563aafa843728303099941bc790c306bd4b
+SIZE (go/devel_gitaly/gitaly-v17.1.1/gitaly-v17.1.1.tar.bz2) = 2631148
diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile
index 6a1732a597fc..9ac2dd992916 100644
--- a/net/gitlab-agent/Makefile
+++ b/net/gitlab-agent/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-agent
-PORTVERSION=	17.1.0
+PORTVERSION=	17.1.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index 74523d575f25..34cf38d0b7b4 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1718868566
-SHA256 (go/net_gitlab-agent/gitlab-agent-v17.1.0/v17.1.0.mod) = 7ab7b64f4dbcbf2f73c13ae82253a7f4d9a05c7a1b16c90bf11b4bd084a41704
-SIZE (go/net_gitlab-agent/gitlab-agent-v17.1.0/v17.1.0.mod) = 7042
-SHA256 (go/net_gitlab-agent/gitlab-agent-v17.1.0/v17.1.0.zip) = ba255129d6d85a5cb01d61f241580facf2f4ec278f391c0bbaf64a51feaa899f
-SIZE (go/net_gitlab-agent/gitlab-agent-v17.1.0/v17.1.0.zip) = 1237638
+TIMESTAMP = 1719915838
+SHA256 (go/net_gitlab-agent/gitlab-agent-v17.1.1/v17.1.1.mod) = 7ab7b64f4dbcbf2f73c13ae82253a7f4d9a05c7a1b16c90bf11b4bd084a41704
+SIZE (go/net_gitlab-agent/gitlab-agent-v17.1.1/v17.1.1.mod) = 7042
+SHA256 (go/net_gitlab-agent/gitlab-agent-v17.1.1/v17.1.1.zip) = 58cdc48ace366eb3cfffddd66b4d788bcb7476f3e2fa02b9a4dbd6adb4910f9b
+SIZE (go/net_gitlab-agent/gitlab-agent-v17.1.1/v17.1.1.zip) = 1237691
diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile
index 8d9dfc30c1fd..6a7ffe1c8f90 100644
--- a/net/rubygem-gitaly/Makefile
+++ b/net/rubygem-gitaly/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitaly
-PORTVERSION=	17.0.3
+PORTVERSION=	17.1.1
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
@@ -13,8 +13,8 @@ RUN_DEPENDS=	rubygem-grpc>=1.0<2.0:net/rubygem-grpc
 
 USES=		cpe gem
 
-NO_ARCH=	yes
-
 CPE_VENDOR=	gitlab
 
+NO_ARCH=	yes
+
 .include <bsd.port.mk>
diff --git a/net/rubygem-gitaly/distinfo b/net/rubygem-gitaly/distinfo
index 2d5fa2146e56..5f218d06fda9 100644
--- a/net/rubygem-gitaly/distinfo
+++ b/net/rubygem-gitaly/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1719465327
-SHA256 (rubygem/gitaly-17.0.3.gem) = c385d4919419efc0ee1108c49ffe039a13c6965bd4333868341db8b65e9c522c
-SIZE (rubygem/gitaly-17.0.3.gem) = 47616
+TIMESTAMP = 1719895512
+SHA256 (rubygem/gitaly-17.1.1.gem) = b396bbc6e1621ff0b793131977fefaa34723f91e3f04abf2759779750285665e
+SIZE (rubygem/gitaly-17.1.1.gem) = 47616
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