Merge remote-tracking branch 'dev/15-10-stable' into 15-10-stable

CHANGELOG.md

@@ -3,6 +3,14 @@
 The latest version of this file can be found at the master branch of the
 omnibus-gitlab repository.
+## 15.10.1 (2023-03-30)
+
+### Security (3 changes)
+
+- [Mattermost March 2023 security updates](gitlab-org/security/omnibus-gitlab@4f4f5b3fddbc1223c58b7fe8781b132aa89d327c) ([merge request](gitlab-org/security/omnibus-gitlab!315))
+- [Update redis to 6.2.11](gitlab-org/security/omnibus-gitlab@0764196fef0778dc64fc5ca5f05437c81fd9fd40) ([merge request](gitlab-org/security/omnibus-gitlab!314))
+- [Update curl to 8.0.1 to resolve February CVEs](gitlab-org/security/omnibus-gitlab@d58c934f28aacfc63388584b7e03fe63177957f5) ([merge request](gitlab-org/security/omnibus-gitlab!321))
+
 ## 15.10.0 (2023-03-21)
 ### Added (4 changes)

GITALY_SERVER_VERSION

-15.10.0
\ No newline at end of file
+15.10.1
\ No newline at end of file

GITLAB_PAGES_VERSION

-15.10.0
\ No newline at end of file
+15.10.1
\ No newline at end of file

VERSION

-15.10.0-ee
\ No newline at end of file
+15.10.1-ee
\ No newline at end of file

config/software/curl.rb

@@ -16,7 +16,7 @@
 name 'curl'
-version = Gitlab::Version.new('curl', 'curl-7_87_0')
+version = Gitlab::Version.new('curl', 'curl-8_0_1')
 default_version version.print(false)
 display_version version.print(false).delete_prefix('curl-').tr('_', '.')

config/software/mattermost.rb

@@ -17,10 +17,10 @@
 #
 name 'mattermost'
-default_version '7.8.1'
+default_version '7.8.2'
 source url: "https://releases.mattermost.com/#{version}/mattermost-team-#{version}-linux-amd64.tar.gz",
-       sha256: '79e0a0f1819ff59165b61cb1aeb4da0104b5cdbe7b32bd88c2a6b44cbd1c8039'
+       sha256: '9e53a3e30eed2c36b2b6b0dccd1bc18a59cb265385c7ee7974252239fc8c89ff'
 relative_path 'mattermost'
 license_name = 'GITLAB-MATTERMOST-COMPILED-LICENSE.txt'

config/software/redis.rb

@@ -25,7 +25,7 @@ skip_transitive_dependency_licensing true
 dependency 'config_guess'
 dependency 'openssl' unless Build::Check.use_system_ssl?
-version = Gitlab::Version.new('redis', '6.2.8')
+version = Gitlab::Version.new('redis', '6.2.11')
 default_version version.print(false)
 source git: version.remote