Skip to content

Commit ec04065

Browse files
RoyShravanikalroydependabot[bot]
authored
Upgrade actionmailer to 7.0.8.5 to address CVE-2024-47889 in oc-id (#4001)
* Updating Ruby version build to 20250115070248 Signed-off-by: Kallol Roy <kallol.roy@progress.com> * Updating Ruby version build to 20250307064402 Signed-off-by: Kallol Roy <kallol.roy@progress.com> * Bump actionmailer from 7.0.8.1 to 7.0.8.5 in /src/oc-id Bumps [actionmailer](https://github.com/rails/rails) from 7.0.8.1 to 7.0.8.5. - [Release notes](https://github.com/rails/rails/releases) - [Changelog](https://github.com/rails/rails/blob/v7.2.1.1/actionmailer/CHANGELOG.md) - [Commits](rails/rails@v7.0.8.1...v7.0.8.5) --- updated-dependencies: - dependency-name: actionmailer dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * testing with net-imap Signed-off-by: RoyShravani <shravani.roy@progress.com> * testing with net-imap Signed-off-by: RoyShravani <shravani.roy@progress.com> * require logger for concurrent-ruby Signed-off-by: RoyShravani <shravani.roy@progress.com> * adding exceptions to license scouts Signed-off-by: RoyShravani <shravani.roy@progress.com> * license scout xceptions Signed-off-by: RoyShravani <shravani.roy@progress.com> --------- Signed-off-by: Kallol Roy <kallol.roy@progress.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: RoyShravani <shravani.roy@progress.com> Co-authored-by: Kallol Roy <kallol.roy@progress.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 18808e1 commit ec04065

6 files changed

Lines changed: 85 additions & 72 deletions

File tree

‎.license_scout.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,4 +215,15 @@ exceptions:
215215
reason: Exception made by Chef Legal
216216
- name: core/xz
217217
reason: Exception made by Chef Legal
218+
- name: core/libiconv
219+
reason: Exception made by Chef Legal
220+
- name: core/libidn2
221+
reason: Exception made by Chef Legal
222+
- name: core/libunistring
223+
reason: Exception made by Chef Legal
224+
- name: core/libmpc
225+
reason: Exception made by Chef Legal
226+
- name: core/mpfr
227+
reason: Exception made by Chef Legal
228+
218229

‎src/chef-server-ctl/habitat/plan.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pkg_deps=(
66
core/coreutils
77
core/curl
88
core/jq-static
9-
core/ruby31/3.1.6/20240912144513
9+
core/ruby31/3.1.6/20250307064402
1010
core/libffi
1111
core/postgresql-client
1212
core/gcc-libs

‎src/oc-id/Gemfile.lock‎

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (7.0.8.1)
5-
actionpack (= 7.0.8.1)
6-
activesupport (= 7.0.8.1)
4+
actioncable (7.0.8.5)
5+
actionpack (= 7.0.8.5)
6+
activesupport (= 7.0.8.5)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
9-
actionmailbox (7.0.8.1)
10-
actionpack (= 7.0.8.1)
11-
activejob (= 7.0.8.1)
12-
activerecord (= 7.0.8.1)
13-
activestorage (= 7.0.8.1)
14-
activesupport (= 7.0.8.1)
9+
actionmailbox (7.0.8.5)
10+
actionpack (= 7.0.8.5)
11+
activejob (= 7.0.8.5)
12+
activerecord (= 7.0.8.5)
13+
activestorage (= 7.0.8.5)
14+
activesupport (= 7.0.8.5)
1515
mail (>= 2.7.1)
1616
net-imap
1717
net-pop
1818
net-smtp
19-
actionmailer (7.0.8.1)
20-
actionpack (= 7.0.8.1)
21-
actionview (= 7.0.8.1)
22-
activejob (= 7.0.8.1)
23-
activesupport (= 7.0.8.1)
19+
actionmailer (7.0.8.5)
20+
actionpack (= 7.0.8.5)
21+
actionview (= 7.0.8.5)
22+
activejob (= 7.0.8.5)
23+
activesupport (= 7.0.8.5)
2424
mail (~> 2.5, >= 2.5.4)
2525
net-imap
2626
net-pop
2727
net-smtp
2828
rails-dom-testing (~> 2.0)
29-
actionpack (7.0.8.1)
30-
actionview (= 7.0.8.1)
31-
activesupport (= 7.0.8.1)
29+
actionpack (7.0.8.5)
30+
actionview (= 7.0.8.5)
31+
activesupport (= 7.0.8.5)
3232
rack (~> 2.0, >= 2.2.4)
3333
rack-test (>= 0.6.3)
3434
rails-dom-testing (~> 2.0)
3535
rails-html-sanitizer (~> 1.0, >= 1.2.0)
36-
actiontext (7.0.8.1)
37-
actionpack (= 7.0.8.1)
38-
activerecord (= 7.0.8.1)
39-
activestorage (= 7.0.8.1)
40-
activesupport (= 7.0.8.1)
36+
actiontext (7.0.8.5)
37+
actionpack (= 7.0.8.5)
38+
activerecord (= 7.0.8.5)
39+
activestorage (= 7.0.8.5)
40+
activesupport (= 7.0.8.5)
4141
globalid (>= 0.6.0)
4242
nokogiri (>= 1.8.5)
43-
actionview (7.0.8.1)
44-
activesupport (= 7.0.8.1)
43+
actionview (7.0.8.5)
44+
activesupport (= 7.0.8.5)
4545
builder (~> 3.1)
4646
erubi (~> 1.4)
4747
rails-dom-testing (~> 2.0)
4848
rails-html-sanitizer (~> 1.1, >= 1.2.0)
49-
activejob (7.0.8.1)
50-
activesupport (= 7.0.8.1)
49+
activejob (7.0.8.5)
50+
activesupport (= 7.0.8.5)
5151
globalid (>= 0.3.6)
52-
activemodel (7.0.8.1)
53-
activesupport (= 7.0.8.1)
54-
activerecord (7.0.8.1)
55-
activemodel (= 7.0.8.1)
56-
activesupport (= 7.0.8.1)
57-
activestorage (7.0.8.1)
58-
actionpack (= 7.0.8.1)
59-
activejob (= 7.0.8.1)
60-
activerecord (= 7.0.8.1)
61-
activesupport (= 7.0.8.1)
52+
activemodel (7.0.8.5)
53+
activesupport (= 7.0.8.5)
54+
activerecord (7.0.8.5)
55+
activemodel (= 7.0.8.5)
56+
activesupport (= 7.0.8.5)
57+
activestorage (7.0.8.5)
58+
actionpack (= 7.0.8.5)
59+
activejob (= 7.0.8.5)
60+
activerecord (= 7.0.8.5)
61+
activesupport (= 7.0.8.5)
6262
marcel (~> 1.0)
6363
mini_mime (>= 1.1.0)
64-
activesupport (7.0.8.1)
64+
activesupport (7.0.8.5)
6565
concurrent-ruby (~> 1.0, >= 1.0.2)
6666
i18n (>= 1.6, < 2)
6767
minitest (>= 5.1)
@@ -165,15 +165,15 @@ GEM
165165
coffee-script-source
166166
execjs
167167
coffee-script-source (1.12.2)
168-
concurrent-ruby (1.3.3)
168+
concurrent-ruby (1.3.5)
169169
config (4.1.0)
170170
deep_merge (~> 1.2, >= 1.2.1)
171171
dry-validation (~> 1.0, >= 1.0.0)
172172
corefoundation (0.3.13)
173173
ffi (>= 1.15.0)
174174
crass (1.0.6)
175175
daemons (1.4.1)
176-
date (3.3.3)
176+
date (3.4.1)
177177
debug_inspector (1.1.0)
178178
deep_merge (1.2.2)
179179
diff-lcs (1.5.0)
@@ -211,7 +211,7 @@ GEM
211211
dry-initializer (~> 3.0)
212212
dry-schema (>= 1.12, < 2)
213213
zeitwerk (~> 2.6)
214-
erubi (1.13.0)
214+
erubi (1.13.1)
215215
erubis (2.7.0)
216216
eventmachine (1.2.7)
217217
execjs (2.8.1)
@@ -231,8 +231,8 @@ GEM
231231
ffi-yajl (2.4.0)
232232
libyajl2 (>= 1.2)
233233
fuzzyurl (0.9.0)
234-
globalid (1.1.0)
235-
activesupport (>= 5.0)
234+
globalid (1.2.1)
235+
activesupport (>= 6.1)
236236
gssapi (1.3.1)
237237
ffi (>= 1.0.1)
238238
gyoku (1.4.0)
@@ -244,7 +244,7 @@ GEM
244244
tilt
245245
hashie (4.1.0)
246246
httpclient (2.8.3)
247-
i18n (1.14.5)
247+
i18n (1.14.7)
248248
concurrent-ruby (~> 1.0)
249249
iniparse (1.5.0)
250250
inspec-core (4.24.32)
@@ -291,7 +291,7 @@ GEM
291291
logging (2.3.1)
292292
little-plugger (~> 1.1)
293293
multi_json (~> 1.14)
294-
loofah (2.22.0)
294+
loofah (2.24.0)
295295
crass (~> 1.0.2)
296296
nokogiri (>= 1.12.0)
297297
mail (2.8.1)
@@ -313,8 +313,8 @@ GEM
313313
matrix (0.4.2)
314314
method_source (1.0.0)
315315
mini_mime (1.1.5)
316-
mini_portile2 (2.8.7)
317-
minitest (5.24.1)
316+
mini_portile2 (2.8.8)
317+
minitest (5.25.5)
318318
mixlib-archive (1.1.7)
319319
mixlib-log
320320
mixlib-authentication (3.0.10)
@@ -328,18 +328,18 @@ GEM
328328
multipart-post (2.3.0)
329329
mustermann (3.0.0)
330330
ruby2_keywords (~> 0.0.1)
331-
net-imap (0.3.4)
331+
net-imap (0.5.6)
332332
date
333333
net-protocol
334334
net-pop (0.1.2)
335335
net-protocol
336-
net-protocol (0.2.1)
336+
net-protocol (0.2.2)
337337
timeout
338338
net-scp (4.0.0)
339339
net-ssh (>= 2.6.5, < 8.0.0)
340340
net-sftp (3.0.0)
341341
net-ssh (>= 5.0.0, < 7.0.0)
342-
net-smtp (0.3.3)
342+
net-smtp (0.5.1)
343343
net-protocol
344344
net-ssh (6.1.0)
345345
nio4r (2.5.9)
@@ -385,25 +385,25 @@ GEM
385385
stringio
386386
public_suffix (5.0.3)
387387
racc (1.8.1)
388-
rack (2.2.9)
388+
rack (2.2.13)
389389
rack-protection (3.0.6)
390390
rack
391-
rack-test (2.1.0)
391+
rack-test (2.2.0)
392392
rack (>= 1.3)
393-
rails (7.0.8.1)
394-
actioncable (= 7.0.8.1)
395-
actionmailbox (= 7.0.8.1)
396-
actionmailer (= 7.0.8.1)
397-
actionpack (= 7.0.8.1)
398-
actiontext (= 7.0.8.1)
399-
actionview (= 7.0.8.1)
400-
activejob (= 7.0.8.1)
401-
activemodel (= 7.0.8.1)
402-
activerecord (= 7.0.8.1)
403-
activestorage (= 7.0.8.1)
404-
activesupport (= 7.0.8.1)
393+
rails (7.0.8.5)
394+
actioncable (= 7.0.8.5)
395+
actionmailbox (= 7.0.8.5)
396+
actionmailer (= 7.0.8.5)
397+
actionpack (= 7.0.8.5)
398+
actiontext (= 7.0.8.5)
399+
actionview (= 7.0.8.5)
400+
activejob (= 7.0.8.5)
401+
activemodel (= 7.0.8.5)
402+
activerecord (= 7.0.8.5)
403+
activestorage (= 7.0.8.5)
404+
activesupport (= 7.0.8.5)
405405
bundler (>= 1.15.0)
406-
railties (= 7.0.8.1)
406+
railties (= 7.0.8.5)
407407
rails-controller-testing (1.0.5)
408408
actionpack (>= 5.0.1.rc1)
409409
actionview (>= 5.0.1.rc1)
@@ -415,9 +415,9 @@ GEM
415415
rails-html-sanitizer (1.6.0)
416416
loofah (~> 2.21)
417417
nokogiri (~> 1.14)
418-
railties (7.0.8.1)
419-
actionpack (= 7.0.8.1)
420-
activesupport (= 7.0.8.1)
418+
railties (7.0.8.5)
419+
actionpack (= 7.0.8.5)
420+
activesupport (= 7.0.8.5)
421421
method_source
422422
rake (>= 12.2)
423423
thor (~> 1.0)
@@ -513,7 +513,7 @@ GEM
513513
thor (1.2.1)
514514
tilt (2.1.0)
515515
timecop (0.9.6)
516-
timeout (0.3.2)
516+
timeout (0.4.3)
517517
tomlrb (1.3.0)
518518
train-core (3.10.7)
519519
addressable (~> 2.5)
@@ -638,4 +638,4 @@ DEPENDENCIES
638638
veil (~> 0.3.11)
639639

640640
BUNDLED WITH
641-
2.3.7
641+
2.3.7

‎src/oc-id/config/boot.rb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
33

44
require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
5+
require "logger" # Fix concurrent-ruby removing logger dependency which Rails itself does not have
6+

‎src/oc-id/habitat/plan.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pkg_deps=(
66
core/sqitch_pg
77
core/curl
88
core/node14
9-
core/ruby31/3.1.6/20240912144513
9+
core/ruby31/3.1.6/20250307064402
1010
core/rsync
1111
core/sed
1212
core/libffi

‎src/oc_erchef/habitat/plan.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pkg_deps=(
99
core/curl
1010
core/openssl
1111
core/gcc-libs
12-
core/ruby31/3.1.6/20240912144513
12+
core/ruby31/3.1.6/20250307064402
1313
core/sqitch_pg
1414
core/gecode
1515
core/libffi

0 commit comments

Comments
 (0)