Skip to content

Commit 4e0396f

Browse files
Address the Check Manifests error
1 parent af4867f commit 4e0396f

File tree

6 files changed

+11
-7
lines changed

6 files changed

+11
-7
lines changed

SPECS/cmake/CVE-2025-5916.patch

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ From: dj_palli <v-dpalli@microsoft.com>
33
Date: Thu, 19 Jun 2025 12:55:15 +0000
44
Subject: [PATCH] Address CVE-2025-5916
55

6+
Upstream patch reference:https://github.com/libarchive/libarchive/pull/2568
7+
68
---
79
.../libarchive/archive_read_support_format_warc.c | 7 +++++--
810
1 file changed, 5 insertions(+), 2 deletions(-)

SPECS/cmake/CVE-2025-5917.patch

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ From: dj_palli <v-dpalli@microsoft.com>
33
Date: Thu, 19 Jun 2025 13:36:28 +0000
44
Subject: [PATCH] Address CVE-2025-5917
55

6+
Upstream patch reference:https://github.com/libarchive/libarchive/pull/2588
7+
68
---
79
.../cmlibarchive/libarchive/archive_write_set_format_pax.c | 4 ++--
810
1 file changed, 2 insertions(+), 2 deletions(-)

SPECS/cmake/CVE-2025-5918.patch

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ From: dj_palli <v-dpalli@microsoft.com>
33
Date: Thu, 19 Jun 2025 19:51:08 +0000
44
Subject: [PATCH] Address CVE-2025-5918
55

6+
Upstream patch reference:https://github.com/libarchive/libarchive/pull/2584
7+
68
---
79
.../libarchive/archive_read_open_fd.c | 12 +++++--
810
.../libarchive/archive_read_open_file.c | 33 ++++++++++++++-----

SPECS/cmake/cmake.spec

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,7 @@ bin/ctest --force-new-ctest-process --rerun-failed --output-on-failure
106106

107107
%changelog
108108
* Fri Jun 20 2025 Durga Jagadeesh Palli <v-dpalli@microsoft.com> - 3.21.4-19
109-
- Add patch for CVE-2025-5916.patch
110-
- Add patch for CVE-2025-5917.patch
111-
- Add patch for CVE-2025-5918.patch
109+
- Patch CVE-2025-5916, CVE-2025-5917 & CVE-2025-5918
112110

113111
* Mon May 12 2025 Archana Shettigar <v-shettigara@microsoft.com> - 3.21.4-18
114112
- Fix CVE-2024-8096 by backporting

toolkit/resources/manifests/package/toolchain_aarch64.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ check-debuginfo-0.15.2-1.cm2.aarch64.rpm
3030
chkconfig-1.20-4.cm2.aarch64.rpm
3131
chkconfig-debuginfo-1.20-4.cm2.aarch64.rpm
3232
chkconfig-lang-1.20-4.cm2.aarch64.rpm
33-
cmake-3.21.4-18.cm2.aarch64.rpm
34-
cmake-debuginfo-3.21.4-18.cm2.aarch64.rpm
33+
cmake-3.21.4-19.cm2.aarch64.rpm
34+
cmake-debuginfo-3.21.4-19.cm2.aarch64.rpm
3535
coreutils-8.32-7.cm2.aarch64.rpm
3636
coreutils-debuginfo-8.32-7.cm2.aarch64.rpm
3737
coreutils-lang-8.32-7.cm2.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ check-debuginfo-0.15.2-1.cm2.x86_64.rpm
3131
chkconfig-1.20-4.cm2.x86_64.rpm
3232
chkconfig-debuginfo-1.20-4.cm2.x86_64.rpm
3333
chkconfig-lang-1.20-4.cm2.x86_64.rpm
34-
cmake-3.21.4-18.cm2.x86_64.rpm
35-
cmake-debuginfo-3.21.4-18.cm2.x86_64.rpm
34+
cmake-3.21.4-19.cm2.x86_64.rpm
35+
cmake-debuginfo-3.21.4-19.cm2.x86_64.rpm
3636
coreutils-8.32-7.cm2.x86_64.rpm
3737
coreutils-debuginfo-8.32-7.cm2.x86_64.rpm
3838
coreutils-lang-8.32-7.cm2.x86_64.rpm

0 commit comments

Comments
 (0)