From 533f23ba1e579248f841888cc422d30104a7534f Mon Sep 17 00:00:00 2001 From: Adub17030MS <110563293+Adub17030MS@users.noreply.github.com> Date: Mon, 1 Apr 2024 13:42:42 -0700 Subject: [PATCH] Update expat changelog (#8601) Co-authored-by: Pawel Winogrodzki --- SPECS/expat/expat.spec | 9 ++++----- .../resources/manifests/package/pkggen_core_aarch64.txt | 6 +++--- .../resources/manifests/package/pkggen_core_x86_64.txt | 6 +++--- .../resources/manifests/package/toolchain_aarch64.txt | 8 ++++---- toolkit/resources/manifests/package/toolchain_x86_64.txt | 8 ++++---- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/SPECS/expat/expat.spec b/SPECS/expat/expat.spec index 13546efa53..c730739161 100644 --- a/SPECS/expat/expat.spec +++ b/SPECS/expat/expat.spec @@ -2,7 +2,7 @@ Summary: An XML parser library Name: expat Version: 2.6.2 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Mariner @@ -67,12 +67,11 @@ rm -rf %{buildroot}/%{_docdir}/%{name} %{_libdir}/libexpat.so.1* %changelog +* Thu Mar 28 2024 Aditya Dubey - 2.6.2-2 +- Removed unnecessary "-p2" argument in "%%autosetup". + * Thu Mar 21 2024 Aditya Dubey - 2.6.2-1 - Upgrading to 2.6.2 to fix CVE-2023-52425 and CVE-2023-28757 -- No longer need Patch CVE-2023-52426 since 2.6.2 fixes it - -* Thu Mar 07 2024 Saul Paredes - 2.5.0-2 -- Patch CVE-2023-52426 * Wed Oct 26 2022 CBL-Mariner Servicing Account - 2.5.0-1 - Upgrade to 2.5.0 diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 7e79faef0c..1a5f73f4ac 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -95,9 +95,9 @@ elfutils-libelf-0.186-2.cm2.aarch64.rpm elfutils-libelf-devel-0.186-2.cm2.aarch64.rpm elfutils-libelf-devel-static-0.186-2.cm2.aarch64.rpm elfutils-libelf-lang-0.186-2.cm2.aarch64.rpm -expat-2.6.2-1.cm2.aarch64.rpm -expat-devel-2.6.2-1.cm2.aarch64.rpm -expat-libs-2.6.2-1.cm2.aarch64.rpm +expat-2.6.2-2.cm2.aarch64.rpm +expat-devel-2.6.2-2.cm2.aarch64.rpm +expat-libs-2.6.2-2.cm2.aarch64.rpm libpipeline-1.5.5-3.cm2.aarch64.rpm libpipeline-devel-1.5.5-3.cm2.aarch64.rpm gdbm-1.21-1.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 49e5790523..706862e168 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -95,9 +95,9 @@ elfutils-libelf-0.186-2.cm2.x86_64.rpm elfutils-libelf-devel-0.186-2.cm2.x86_64.rpm elfutils-libelf-devel-static-0.186-2.cm2.x86_64.rpm elfutils-libelf-lang-0.186-2.cm2.x86_64.rpm -expat-2.6.2-1.cm2.x86_64.rpm -expat-devel-2.6.2-1.cm2.x86_64.rpm -expat-libs-2.6.2-1.cm2.x86_64.rpm +expat-2.6.2-2.cm2.x86_64.rpm +expat-devel-2.6.2-2.cm2.x86_64.rpm +expat-libs-2.6.2-2.cm2.x86_64.rpm libpipeline-1.5.5-3.cm2.x86_64.rpm libpipeline-devel-1.5.5-3.cm2.x86_64.rpm gdbm-1.21-1.cm2.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index a59cc1cd22..7847ebcbee 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -73,10 +73,10 @@ elfutils-libelf-0.186-2.cm2.aarch64.rpm elfutils-libelf-devel-0.186-2.cm2.aarch64.rpm elfutils-libelf-devel-static-0.186-2.cm2.aarch64.rpm elfutils-libelf-lang-0.186-2.cm2.aarch64.rpm -expat-2.6.2-1.cm2.aarch64.rpm -expat-debuginfo-2.6.2-1.cm2.aarch64.rpm -expat-devel-2.6.2-1.cm2.aarch64.rpm -expat-libs-2.6.2-1.cm2.aarch64.rpm +expat-2.6.2-2.cm2.aarch64.rpm +expat-debuginfo-2.6.2-2.cm2.aarch64.rpm +expat-devel-2.6.2-2.cm2.aarch64.rpm +expat-libs-2.6.2-2.cm2.aarch64.rpm file-5.40-2.cm2.aarch64.rpm file-debuginfo-5.40-2.cm2.aarch64.rpm file-devel-5.40-2.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index d23881a9b1..891050c69b 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -76,10 +76,10 @@ elfutils-libelf-0.186-2.cm2.x86_64.rpm elfutils-libelf-devel-0.186-2.cm2.x86_64.rpm elfutils-libelf-devel-static-0.186-2.cm2.x86_64.rpm elfutils-libelf-lang-0.186-2.cm2.x86_64.rpm -expat-2.6.2-1.cm2.x86_64.rpm -expat-debuginfo-2.6.2-1.cm2.x86_64.rpm -expat-devel-2.6.2-1.cm2.x86_64.rpm -expat-libs-2.6.2-1.cm2.x86_64.rpm +expat-2.6.2-2.cm2.x86_64.rpm +expat-debuginfo-2.6.2-2.cm2.x86_64.rpm +expat-devel-2.6.2-2.cm2.x86_64.rpm +expat-libs-2.6.2-2.cm2.x86_64.rpm file-5.40-2.cm2.x86_64.rpm file-debuginfo-5.40-2.cm2.x86_64.rpm file-devel-5.40-2.cm2.x86_64.rpm