Skip to content

Commit 6b640c0

Browse files
GitLab Release Tools BotClemens Beck
andcommitted
Merge branch 'security-update-pcre2' into 'master'
Update pcre2 from 10.40 to 10.42 See merge request https://gitlab.com/gitlab-org/security/omnibus-gitlab/-/merge_requests/377 Merged-by: GitLab Release Tools Bot <[email protected]> Approved-by: Kevin Morrison <[email protected]> Approved-by: Balasankar 'Balu' C <[email protected]> Co-authored-by: Clemens Beck <[email protected]>
2 parents f0d422d + 6641fe8 commit 6b640c0

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

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)