git: d2a9f9016c2f - main - www/gitlab: security and patch update to 17.4.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Thu, 26 Sep 2024 12:15:09 UTC
The branch main has been updated by mfechner:

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

commit d2a9f9016c2fc5fe9fe4c21cdfd28d2366d7b7eb
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2024-09-26 12:04:02 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2024-09-26 12:15:01 +0000

    www/gitlab: security and patch update to 17.4.1
    
    Changes:        https://about.gitlab.com/releases/2024/09/25/patch-release-gitlab-17-4-1-released/
    
    Security:       4b7ed61f-7bbf-11ef-9369-2cf05da270f3
---
 devel/gitaly/distinfo                | 14 +++++++-------
 net/gitlab-agent/distinfo            | 10 +++++-----
 net/rubygem-gitlab-kas-grpc/Makefile |  4 +++-
 net/rubygem-gitlab-kas-grpc/distinfo |  6 +++---
 www/gitlab-pages/distinfo            | 10 +++++-----
 www/gitlab-workhorse/distinfo        | 10 +++++-----
 www/gitlab/Makefile                  |  4 ++--
 www/gitlab/Makefile.common           |  2 +-
 www/gitlab/distinfo                  | 12 ++++++------
 9 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 55267b4e6a2d..0fb9a865a1b0 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1726723188
-SHA256 (go/devel_gitaly/gitaly-v17.4.0/go.mod) = 6879310f467381a3ed45a19473b4c79a9e6351773df42e07c555a05c302bcbf4
-SIZE (go/devel_gitaly/gitaly-v17.4.0/go.mod) = 12862
-SHA256 (go/devel_gitaly/gitaly-v17.4.0/gitaly-v17.4.0.tar.bz2) = 7e9b5a2a7ade58f83ac694799c1ce2ccca12b606ce287afa747254854c95cfd8
-SIZE (go/devel_gitaly/gitaly-v17.4.0/gitaly-v17.4.0.tar.bz2) = 2954774
-SHA256 (go/devel_gitaly/gitaly-v17.4.0/git-v2.46.1.tar.bz2) = af8c4087aa193259c93bcc753156247c881b5790dfa184a3c84f2efe75cae783
-SIZE (go/devel_gitaly/gitaly-v17.4.0/git-v2.46.1.tar.bz2) = 8821150
+TIMESTAMP = 1727325489
+SHA256 (go/devel_gitaly/gitaly-v17.4.1/go.mod) = 6879310f467381a3ed45a19473b4c79a9e6351773df42e07c555a05c302bcbf4
+SIZE (go/devel_gitaly/gitaly-v17.4.1/go.mod) = 12862
+SHA256 (go/devel_gitaly/gitaly-v17.4.1/gitaly-v17.4.1.tar.bz2) = fa74d4dfbead2cfd1b18ee29f9cfb766655cb2d691d37509364b7668cee90d35
+SIZE (go/devel_gitaly/gitaly-v17.4.1/gitaly-v17.4.1.tar.bz2) = 2955272
+SHA256 (go/devel_gitaly/gitaly-v17.4.1/git-v2.46.1.tar.bz2) = af8c4087aa193259c93bcc753156247c881b5790dfa184a3c84f2efe75cae783
+SIZE (go/devel_gitaly/gitaly-v17.4.1/git-v2.46.1.tar.bz2) = 8821150
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index 4db9d781b892..e5f1cedfdfc9 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1726722995
-SHA256 (go/net_gitlab-agent/gitlab-agent-v17.4.0/v17.4.0.mod) = b97d1a40937e17a403f19c17005a4a696c7b7a78a9f710548301f478a00a35fa
-SIZE (go/net_gitlab-agent/gitlab-agent-v17.4.0/v17.4.0.mod) = 8669
-SHA256 (go/net_gitlab-agent/gitlab-agent-v17.4.0/v17.4.0.zip) = 55bec24138c91dc68944cfc01725da108f9d29e904897c35ff76c494b2029b3d
-SIZE (go/net_gitlab-agent/gitlab-agent-v17.4.0/v17.4.0.zip) = 1364257
+TIMESTAMP = 1727325492
+SHA256 (go/net_gitlab-agent/gitlab-agent-v17.4.1/v17.4.1.mod) = b97d1a40937e17a403f19c17005a4a696c7b7a78a9f710548301f478a00a35fa
+SIZE (go/net_gitlab-agent/gitlab-agent-v17.4.1/v17.4.1.mod) = 8669
+SHA256 (go/net_gitlab-agent/gitlab-agent-v17.4.1/v17.4.1.zip) = 9ae387d2aecd77240eabbb7d6eee2f51fc8d6c427edb31d8ee13f9cf5daf00e5
+SIZE (go/net_gitlab-agent/gitlab-agent-v17.4.1/v17.4.1.zip) = 1364266
diff --git a/net/rubygem-gitlab-kas-grpc/Makefile b/net/rubygem-gitlab-kas-grpc/Makefile
index ffd5fbf2b97b..f73e632ccda3 100644
--- a/net/rubygem-gitlab-kas-grpc/Makefile
+++ b/net/rubygem-gitlab-kas-grpc/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gitlab-kas-grpc
-PORTVERSION=	17.4.0
+PORTVERSION=	${GITLAB_VERSION}
+PORTREVISION=	${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
@@ -15,4 +16,5 @@ USES=		gem
 
 NO_ARCH=	yes
 
+.include "${.CURDIR}/../../www/gitlab/Makefile.common"
 .include <bsd.port.mk>
diff --git a/net/rubygem-gitlab-kas-grpc/distinfo b/net/rubygem-gitlab-kas-grpc/distinfo
index 63c219b97cd2..06c999c190e7 100644
--- a/net/rubygem-gitlab-kas-grpc/distinfo
+++ b/net/rubygem-gitlab-kas-grpc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1726721137
-SHA256 (rubygem/gitlab-kas-grpc-17.4.0.gem) = 472a7ef469a71602f6b2f25ccc25997d0dce7c4b3995f11aac667443ea836b8c
-SIZE (rubygem/gitlab-kas-grpc-17.4.0.gem) = 8704
+TIMESTAMP = 1727325550
+SHA256 (rubygem/gitlab-kas-grpc-17.4.1.gem) = 1674fe95e49a84f840c6bbb1654b32519cd6e56d0efd63f84330b99ccb32e0a0
+SIZE (rubygem/gitlab-kas-grpc-17.4.1.gem) = 8704
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index 9df2f4ae3e0a..b72d761d7a4e 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1726723027
-SHA256 (go/www_gitlab-pages/gitlab-pages-v17.4.0/go.mod) = 6ff49ea30f45d00e03846a8707a3a57725b3a020985ea35b78d52e983b4cbc86
-SIZE (go/www_gitlab-pages/gitlab-pages-v17.4.0/go.mod) = 3456
-SHA256 (go/www_gitlab-pages/gitlab-pages-v17.4.0/gitlab-pages-v17.4.0.tar.bz2) = 8423f1b895d0d13d1e0a25f2bce38a03e3c2967d55b6d03a6e8ca986f0fd1865
-SIZE (go/www_gitlab-pages/gitlab-pages-v17.4.0/gitlab-pages-v17.4.0.tar.bz2) = 230569
+TIMESTAMP = 1727325495
+SHA256 (go/www_gitlab-pages/gitlab-pages-v17.4.1/go.mod) = 6ff49ea30f45d00e03846a8707a3a57725b3a020985ea35b78d52e983b4cbc86
+SIZE (go/www_gitlab-pages/gitlab-pages-v17.4.1/go.mod) = 3456
+SHA256 (go/www_gitlab-pages/gitlab-pages-v17.4.1/gitlab-pages-v17.4.1.tar.bz2) = a1f7017f2032f00085b50c006943935891d5250ed60f67c1ed6190cc829dbd27
+SIZE (go/www_gitlab-pages/gitlab-pages-v17.4.1/gitlab-pages-v17.4.1.tar.bz2) = 230668
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index fb85dd90bf3a..1eb5dac64134 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1726723250
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.4.0/go.mod) = 2b446f8b88ec69df0276676f9ef0e63e750d690b31f8b1944264c0b988dd2704
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.4.0/go.mod) = 8244
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.4.0/gitlab-foss-v17.4.0.tar.bz2) = 371ff1e904489e80e5fe94ca32bc19078d449541ab55704a596f404bb2166a6e
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.4.0/gitlab-foss-v17.4.0.tar.bz2) = 105612137
+TIMESTAMP = 1727325543
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.4.1/go.mod) = 2b446f8b88ec69df0276676f9ef0e63e750d690b31f8b1944264c0b988dd2704
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.4.1/go.mod) = 8244
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.4.1/gitlab-foss-v17.4.1.tar.bz2) = 5b5106841f3a7e4407f6e2d3106b83617b90332cd9147672ccc91c4dff0e2a52
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.4.1/gitlab-foss-v17.4.1.tar.bz2) = 105613155
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index f7ba241239c9..00b022cb8eb7 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -5,7 +5,6 @@ DISTVERSIONPREFIX=	v
 .if ${FLAVOR:U} == ee
 DISTVERSIONSUFFIX=	-ee
 .endif
-PORTREVISION=	1
 CATEGORIES=	www devel
 
 # include patch to fix database migration
@@ -271,7 +270,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \
 	rubygem-spamcheck>=1.3.0<1.4:net/rubygem-spamcheck \
 	rubygem-gitaly>=17.4.0:net/rubygem-gitaly \
-	rubygem-gitlab-kas-grpc>=17.4.0<17.5:net/rubygem-gitlab-kas-grpc \
+	rubygem-gitlab-kas-grpc>=${GITLAB_VERSION}:net/rubygem-gitlab-kas-grpc \
 	rubygem-grpc>=1.63.0<2:net/rubygem-grpc \
 	rubygem-google-protobuf3>=3.25.3<4:devel/rubygem-google-protobuf3 \
 	rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \
@@ -540,6 +539,7 @@ makesum:
 	(cd ../../net/gitlab-agent && ${MAKE} makesum)
 	(cd ../../www/gitlab-pages && ${MAKE} makesum)
 	(cd ../../www/gitlab-workhorse && ${MAKE} makesum)
+	(cd ../../net/rubygem-gitlab-kas-grpc && ${MAKE} makesum)
 
 .endif
 
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 067972f3ba0b..ff030f9decfb 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,4 +1,4 @@
-GITLAB_VERSION=		17.4.0
+GITLAB_VERSION=		17.4.1
 GITLAB_PORTREVISION=	0
 
 # Git version gitaly should use (from gitlab mirror)
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index 5d8b40819daf..f0d8a313abc7 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1726722599
-SHA256 (gitlab-foss-v17.4.0.tar.bz2) = 371ff1e904489e80e5fe94ca32bc19078d449541ab55704a596f404bb2166a6e
-SIZE (gitlab-foss-v17.4.0.tar.bz2) = 105612137
-TIMESTAMP = 1726722650
-SHA256 (gitlab-v17.4.0-ee.tar.bz2) = 05b6d0c049f91c5e57d77a045b4ad44d2c98ce2a70c286a20e73b86eed7fce53
-SIZE (gitlab-v17.4.0-ee.tar.bz2) = 114597333
+TIMESTAMP = 1727325429
+SHA256 (gitlab-foss-v17.4.1.tar.bz2) = 5b5106841f3a7e4407f6e2d3106b83617b90332cd9147672ccc91c4dff0e2a52
+SIZE (gitlab-foss-v17.4.1.tar.bz2) = 105613155
+TIMESTAMP = 1727325481
+SHA256 (gitlab-v17.4.1-ee.tar.bz2) = 02fe98d0fd1f5fe3a7aaa339ba38aafc3e857eb5e4ec8c7853509ea95a6b17d5
+SIZE (gitlab-v17.4.1-ee.tar.bz2) = 114599341