Skip to content

Commit 776bbab

Browse files
author
GitLab Release Tools Bot
committed
Merge remote-tracking branch 'dev/master'
2 parents 59b298f + 6b640c0 commit 776bbab

File tree

3 files changed

+27
-1
lines changed

3 files changed

+27
-1
lines changed

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
The latest version of this file can be found at the master branch of the
44
omnibus-gitlab repository.
55

6+
## 16.5.1 (2023-10-30)
7+
8+
No changes.
9+
610
## 16.5.0 (2023-10-20)
711

812
### Added (3 changes)
@@ -53,6 +57,13 @@ omnibus-gitlab repository.
5357

5458
- [Update Mattermost to 9.0.0](gitlab-org/omnibus-gitlab@fddabad069dad759b6f0937d66e88295530c28b0) by @akis.maziotis ([merge request](gitlab-org/omnibus-gitlab!7168))
5559

60+
## 16.4.2 (2023-10-30)
61+
62+
### Security (2 changes)
63+
64+
- [Apply CVE-2023-44487 patch to NGINX](gitlab-org/security/omnibus-gitlab@f8c6d5b4f79d13c4db87925ad5f476a43fb56464) ([merge request](gitlab-org/security/omnibus-gitlab!381))
65+
- [Update curl to v8.4.0](gitlab-org/security/omnibus-gitlab@56b7cf4f033315e31a5dc765dcbefa46322f04c7) ([merge request](gitlab-org/security/omnibus-gitlab!383))
66+
5667
## 16.4.1 (2023-09-28)
5768

5869
### Security (3 changes)
@@ -104,6 +115,13 @@ omnibus-gitlab repository.
104115

105116
- [Enable dual namespace polling for sidekiq probe in gitlab-exporter](gitlab-org/omnibus-gitlab@6ddfb82c93158bdc25e3546625688e99cb400584) ([merge request](gitlab-org/omnibus-gitlab!7141))
106117

118+
## 16.3.6 (2023-10-30)
119+
120+
### Security (2 changes)
121+
122+
- [Apply CVE-2023-44487 patch to NGINX](gitlab-org/security/omnibus-gitlab@5ee0faf8f90ecb15a9c4bb2dc6392eb96ce03631) ([merge request](gitlab-org/security/omnibus-gitlab!382))
123+
- [Update curl to v8.4.0](gitlab-org/security/omnibus-gitlab@4857a2153b226e77749c8e3b3182a247ceaef64c) ([merge request](gitlab-org/security/omnibus-gitlab!384))
124+
107125
## 16.3.5 (2023-09-28)
108126

109127
### Security (3 changes)

config/software/pcre2.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
name 'pcre2'
1818

19-
version = Gitlab::Version.new('pcre2', 'pcre2-10.40')
19+
version = Gitlab::Version.new('pcre2', 'pcre2-10.42')
2020
default_version version.print(false)
2121
display_version version.print(false).delete_prefix('pcre2-')
2222

deps.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,14 @@ dependencies:
220220
tag_filter:
221221
matching: 'curl-(\d+)_(\d+)_(\d+)'
222222
sort_as: '$1.$2.$3'
223+
# pcre2
224+
https://github.com/PCRE2Project/pcre2.git:
225+
replace_in_files:
226+
- filename: config/software/pcre2.rb
227+
pattern: "Gitlab::Version.new\\('pcre2', '(\\S+)'\\)"
228+
tag_filter:
229+
matching: 'pcre2-(\d+).(\d+)'
230+
sort_as: '$1.$2.0'
223231
# deps that need updated filtering to work https://github.com/dropseed/deps-git/issues/2
224232
# krb5
225233
# https://github.com/krb5/krb5.git:

0 commit comments

Comments
 (0)