git: c724de40a954 - 2025Q1 - www/gitlab: security and bugfix update to 17.9.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Thu, 13 Mar 2025 07:23:07 UTC
The branch 2025Q1 has been updated by mfechner:

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

commit c724de40a9542b8fc28357fe63c8123f91fe34c2
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2025-03-13 07:06:51 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2025-03-13 07:13:16 +0000

    www/gitlab: security and bugfix update to 17.9.2
    
    Changes:        https://about.gitlab.com/releases/2025/03/12/patch-release-gitlab-17-9-2-released/
    Security:       a435609c-ffd5-11ef-b4e4-2cf05da270f3
    (cherry picked from commit fd8d065bf288e0d18a8572aa5ea8dd4de9f48f35)
---
 devel/gitaly/distinfo                      | 14 +++++++-------
 net/gitlab-agent/distinfo                  | 10 +++++-----
 net/rubygem-gitlab-kas-grpc/distinfo       |  6 +++---
 security/rubygem-ruby-saml-gitlab/Makefile |  3 +--
 security/rubygem-ruby-saml-gitlab/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 ++++++------
 www/gitlab/files/patch-Gemfile             |  8 +++++---
 11 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 24fb5731a76b..dad610ec0830 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1740727804
-SHA256 (go/devel_gitaly/gitaly-v17.9.1/go.mod) = 8681bf4d8150ee800eae8c39a76f47d2eeccb9f891456339c6989669f07910ce
-SIZE (go/devel_gitaly/gitaly-v17.9.1/go.mod) = 12317
-SHA256 (go/devel_gitaly/gitaly-v17.9.1/gitaly-v17.9.1.tar.bz2) = a926d97871311fd9c753c4898eb4398c8ccb9f1a53979e601389f29f79116d51
-SIZE (go/devel_gitaly/gitaly-v17.9.1/gitaly-v17.9.1.tar.bz2) = 4410707
-SHA256 (go/devel_gitaly/gitaly-v17.9.1/git-v2.47.2.tar.bz2) = 061297b19daa4adcf9700a01acadbc5ca8722c9c26e2d2a2fe002edff537545f
-SIZE (go/devel_gitaly/gitaly-v17.9.1/git-v2.47.2.tar.bz2) = 8892868
+TIMESTAMP = 1741805285
+SHA256 (go/devel_gitaly/gitaly-v17.9.2/go.mod) = 8681bf4d8150ee800eae8c39a76f47d2eeccb9f891456339c6989669f07910ce
+SIZE (go/devel_gitaly/gitaly-v17.9.2/go.mod) = 12317
+SHA256 (go/devel_gitaly/gitaly-v17.9.2/gitaly-v17.9.2.tar.bz2) = 95934908a1e9f38cddca7a893753277235f349b6255c7e050c220934bcc3a3ac
+SIZE (go/devel_gitaly/gitaly-v17.9.2/gitaly-v17.9.2.tar.bz2) = 4410689
+SHA256 (go/devel_gitaly/gitaly-v17.9.2/git-v2.47.2.tar.bz2) = 061297b19daa4adcf9700a01acadbc5ca8722c9c26e2d2a2fe002edff537545f
+SIZE (go/devel_gitaly/gitaly-v17.9.2/git-v2.47.2.tar.bz2) = 8892868
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index c640f28a9eb7..adee3793829c 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1740727807
-SHA256 (go/net_gitlab-agent/gitlab-agent-v17.9.1/v17.9.1.mod) = a2652235ef0a6e36f95f2e721cc1168145d1022ac9498a5bed465803cd8f6ef9
-SIZE (go/net_gitlab-agent/gitlab-agent-v17.9.1/v17.9.1.mod) = 9329
-SHA256 (go/net_gitlab-agent/gitlab-agent-v17.9.1/v17.9.1.zip) = e36e7c91aa0d1b7a8cba21166c945899b108f324a070bf9d6b86d14226bd7ca1
-SIZE (go/net_gitlab-agent/gitlab-agent-v17.9.1/v17.9.1.zip) = 1564873
+TIMESTAMP = 1741805287
+SHA256 (go/net_gitlab-agent/gitlab-agent-v17.9.2/v17.9.2.mod) = a2652235ef0a6e36f95f2e721cc1168145d1022ac9498a5bed465803cd8f6ef9
+SIZE (go/net_gitlab-agent/gitlab-agent-v17.9.2/v17.9.2.mod) = 9329
+SHA256 (go/net_gitlab-agent/gitlab-agent-v17.9.2/v17.9.2.zip) = ad33a6822cfa1cbf04ea2677e8f7de5d6a4a5bdbcb80d24d626b19589bb62030
+SIZE (go/net_gitlab-agent/gitlab-agent-v17.9.2/v17.9.2.zip) = 1564878
diff --git a/net/rubygem-gitlab-kas-grpc/distinfo b/net/rubygem-gitlab-kas-grpc/distinfo
index c081d7c878e4..078306b805b1 100644
--- a/net/rubygem-gitlab-kas-grpc/distinfo
+++ b/net/rubygem-gitlab-kas-grpc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740727859
-SHA256 (rubygem/gitlab-kas-grpc-17.9.1.gem) = fd480c1669c741ceab8d5f86b7e5e32b71f4f25af8b523725382dae425aaa958
-SIZE (rubygem/gitlab-kas-grpc-17.9.1.gem) = 10752
+TIMESTAMP = 1741805340
+SHA256 (rubygem/gitlab-kas-grpc-17.9.2.gem) = d1844f73d5b9754dd71824af953db980da5dfc703044bb0ac35af8ba7ff54e91
+SIZE (rubygem/gitlab-kas-grpc-17.9.2.gem) = 10752
diff --git a/security/rubygem-ruby-saml-gitlab/Makefile b/security/rubygem-ruby-saml-gitlab/Makefile
index cd044f2c2d9e..c5b015f3c564 100644
--- a/security/rubygem-ruby-saml-gitlab/Makefile
+++ b/security/rubygem-ruby-saml-gitlab/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	ruby-saml
-PORTVERSION=	1.17.0
-PORTREVISION=	1
+PORTVERSION=	1.18.0
 CATEGORIES=	security rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-gitlab
diff --git a/security/rubygem-ruby-saml-gitlab/distinfo b/security/rubygem-ruby-saml-gitlab/distinfo
index b4adc796086c..051d76fc3243 100644
--- a/security/rubygem-ruby-saml-gitlab/distinfo
+++ b/security/rubygem-ruby-saml-gitlab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1726081909
-SHA256 (rubygem/ruby-saml-1.17.0.gem) = 0419839ba3312d255e35fe3cc7ae155e4a241fd468796caebcf61164aa01b8a9
-SIZE (rubygem/ruby-saml-1.17.0.gem) = 76800
+TIMESTAMP = 1741805035
+SHA256 (rubygem/ruby-saml-1.18.0.gem) = de342a55925fd5ce6114d0802651c324428c0fec26e7fe52bf3a7cfa54dbfa6d
+SIZE (rubygem/ruby-saml-1.18.0.gem) = 78848
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index ecc6436f3965..3ab0fa297da5 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1740727810
-SHA256 (go/www_gitlab-pages/gitlab-pages-v17.9.1/go.mod) = 0a2270c8237f0d394ca6409539d1e8639d5effb0ab9000cd13549aa0a53c7996
-SIZE (go/www_gitlab-pages/gitlab-pages-v17.9.1/go.mod) = 3464
-SHA256 (go/www_gitlab-pages/gitlab-pages-v17.9.1/gitlab-pages-v17.9.1.tar.bz2) = d74105a6e56fa293bd65e82de14a73490853fc6a9da6eb26724f8df26cd5ee35
-SIZE (go/www_gitlab-pages/gitlab-pages-v17.9.1/gitlab-pages-v17.9.1.tar.bz2) = 232484
+TIMESTAMP = 1741805290
+SHA256 (go/www_gitlab-pages/gitlab-pages-v17.9.2/go.mod) = 0a2270c8237f0d394ca6409539d1e8639d5effb0ab9000cd13549aa0a53c7996
+SIZE (go/www_gitlab-pages/gitlab-pages-v17.9.2/go.mod) = 3464
+SHA256 (go/www_gitlab-pages/gitlab-pages-v17.9.2/gitlab-pages-v17.9.2.tar.bz2) = f109146fc03eda264b5019288073d5b0266c90ae4c5b6348cd2580162aead987
+SIZE (go/www_gitlab-pages/gitlab-pages-v17.9.2/gitlab-pages-v17.9.2.tar.bz2) = 232413
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index cecee287ea25..a5f6935835b5 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1740727859
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.9.1/go.mod) = 981ed1f4b3ca120ca4234c32a11114e8efa3acec171ff8265b91a00bc1707a54
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.9.1/go.mod) = 8008
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.9.1/gitlab-foss-v17.9.1.tar.bz2) = 6514bc799614c929777ed681f51a765b2325d2d9d073ad9e9269713cc000fffb
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.9.1/gitlab-foss-v17.9.1.tar.bz2) = 113765748
+TIMESTAMP = 1741805339
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.9.2/go.mod) = 981ed1f4b3ca120ca4234c32a11114e8efa3acec171ff8265b91a00bc1707a54
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.9.2/go.mod) = 8008
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.9.2/gitlab-foss-v17.9.2.tar.bz2) = c28a4c55b91402f608ba13a11d62f1e1ce6ced97c72b28c921aad85ec42fba65
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.9.2/gitlab-foss-v17.9.2.tar.bz2) = 115724401
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index c5983a414660..36c04d3649bb 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -66,7 +66,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-doorkeeper-openid_connect>=1.8.11<2:security/rubygem-doorkeeper-openid_connect \
 	rubygem-doorkeeper-device_authorization_grant>=1.0.0<1.1:security/rubygem-doorkeeper-device_authorization_grant \
 	rubygem-rexml>=3.4.1<3.5:textproc/rubygem-rexml \
-	rubygem-ruby-saml-gitlab>=1.17.0<1.18:security/rubygem-ruby-saml-gitlab \
+	rubygem-ruby-saml-gitlab>=1.18.0<1.19:security/rubygem-ruby-saml-gitlab \
 	rubygem-omniauth>=2.1.2<3:security/rubygem-omniauth \
 	rubygem-omniauth-auth0-gitlab>=3.1.1<3.2.0:net/rubygem-omniauth-auth0-gitlab \
 	rubygem-omniauth-azure-activedirectory-v2>=2.0<3:net/rubygem-omniauth-azure-activedirectory-v2 \
@@ -101,7 +101,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-grape-swagger-entity>=0.5.1<0.6:devel/rubygem-grape-swagger-entity \
 	rubygem-grape-path-helpers>=2.0.1<2.1:devel/rubygem-grape-path-helpers \
 	rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \
-	rubygem-graphql>=2.4.8<2.5:devel/rubygem-graphql \
+	rubygem-graphql>=2.4.11<2.5:devel/rubygem-graphql \
 	rubygem-apollo_upload_server>=2.1.6<2.2:net/rubygem-apollo_upload_server \
 	rubygem-graphlient>=0.8.0<0.9:devel/rubygem-graphlient \
 	rubygem-ffaker>=2.24.0<3:devel/rubygem-ffaker \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index eaf62fe1499d..a397183d7be9 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,4 +1,4 @@
-GITLAB_VERSION=		17.9.1
+GITLAB_VERSION=		17.9.2
 GITLAB_PORTREVISION=	0
 
 # Git version gitaly should use (from gitlab mirror)
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index 8bbae53f9f35..6fb2ddaea600 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1740727743
-SHA256 (gitlab-foss-v17.9.1.tar.bz2) = 6514bc799614c929777ed681f51a765b2325d2d9d073ad9e9269713cc000fffb
-SIZE (gitlab-foss-v17.9.1.tar.bz2) = 113765748
-TIMESTAMP = 1740727796
-SHA256 (gitlab-v17.9.1-ee.tar.bz2) = cbb7dcdec29b937653bd27eb30b3549f9bad0221e9c7065083fe4270a1aa24f0
-SIZE (gitlab-v17.9.1-ee.tar.bz2) = 124819261
+TIMESTAMP = 1741805223
+SHA256 (gitlab-foss-v17.9.2.tar.bz2) = c28a4c55b91402f608ba13a11d62f1e1ce6ced97c72b28c921aad85ec42fba65
+SIZE (gitlab-foss-v17.9.2.tar.bz2) = 115724401
+TIMESTAMP = 1741805276
+SHA256 (gitlab-v17.9.2-ee.tar.bz2) = 246a9bf8bb3864661febc31b42a04cc7dbde1f5c7ecadab8f541381aa4b64f80
+SIZE (gitlab-v17.9.2-ee.tar.bz2) = 126792361
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 9e1f07d87311..90d16ba77666 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,10 +1,12 @@
---- Gemfile.orig	2025-02-19 06:08:46 UTC
+--- Gemfile.orig	2025-03-11 19:30:16 UTC
 +++ Gemfile
-@@ -165,7 +165,7 @@ gem 'graphql', '~> 2.4.1', feature_category: :api
+@@ -164,8 +164,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea
+ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared
  
  # GraphQL API
- gem 'graphql', '~> 2.4.1', feature_category: :api
+-gem 'graphql', '2.4.11', path: 'vendor/gems/graphql', feature_category: :api
 -gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api
++gem 'graphql', '~> 2.4.11', path: 'vendor/gems/graphql', feature_category: :api
 +#gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api
  gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
  gem 'graphlient', '~> 0.8.0', feature_category: :importers # Used by BulkImport feature (group::import)