From 4aa53df947064f4eb959e42a5fd73d20a4dc5f07 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 14 Mar 2024 20:23:02 +0100 Subject: [PATCH] [expat] Update to 2.6.2 (#37426) --- ports/expat/portfile.cmake | 10 +--------- ports/expat/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/expat.json | 5 +++++ 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/ports/expat/portfile.cmake b/ports/expat/portfile.cmake index 5678e0b1c9..7af4a7c384 100644 --- a/ports/expat/portfile.cmake +++ b/ports/expat/portfile.cmake @@ -1,19 +1,11 @@ string(REPLACE "." "_" REF "R_${VERSION}") -vcpkg_download_distfile(CVE-2024-28757 - URLS "https://github.com/libexpat/libexpat/commit/5026213864ba1a11ef03ba2e8111af8654e9404d.diff?full_index=1" - FILENAME libexpat-CVE-2024-28757.patch - SHA512 0d697b26116c89dd72d946ad04eb8f02ace970a435bbd67ba31841a13309d6a43e2cfa2dea8f6e7d53b478a508f7642dd9ff8c8f367d0d0205e982041f62f849 -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libexpat/libexpat REF "${REF}" - SHA512 cf6c64fc0ca55dd172ca8a6ca10d1fb2c915d0f941b0068f42cb90488022dea73e04119c49a1bd4ab9a5d425ddc132ae5f22260ff6d2e25204637a1169e7bd4f + SHA512 49b6be12bd6284106920abc61d86d441cba126615fc4019744fc56dc5e7c5efc72b02c09e5c7b491882a633c1c45dc4a03e92a96372ab62bcd70755f6878c6b6 HEAD_REF master - PATCHES - ${CVE-2024-28757} ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" EXPAT_LINKAGE) diff --git a/ports/expat/vcpkg.json b/ports/expat/vcpkg.json index 6895e3ccb3..11a072065a 100644 --- a/ports/expat/vcpkg.json +++ b/ports/expat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "expat", - "version": "2.6.1", + "version": "2.6.2", "description": "XML parser library written in C", "homepage": "https://github.com/libexpat/libexpat", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index dc2e539677..ce541a13be 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2537,7 +2537,7 @@ "port-version": 1 }, "expat": { - "baseline": "2.6.1", + "baseline": "2.6.2", "port-version": 0 }, "expected-lite": { diff --git a/versions/e-/expat.json b/versions/e-/expat.json index 18b88e5e27..f98c8810f2 100644 --- a/versions/e-/expat.json +++ b/versions/e-/expat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e75ed0e0697a3049343ccfb52fd11eea6cebc30a", + "version": "2.6.2", + "port-version": 0 + }, { "git-tree": "8deb84860eca4c337d83da3051340336d01dc57f", "version": "2.6.1",