From 2c0d94e4f7070db095bce43d594bc55f90777edd Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@eng.windriver.com>
Date: Mon, 4 Mar 2024 15:20:30 +0800
Subject: expat: upgrdae 2.6.0 -> 2.6.1

ChangeLog:
(https://github.com/libexpat/libexpat/blob/R_2_6_1/expat/Changes)

Bug fixes:
  #817  Make tests independent of CPU speed, and thus more robust
  #828 #836  Expose billion laughs API with XML_DTD defined and
             XML_GE undefined, regression from 2.6.0

Other changes:
  #829  Hide test-only code behind new internal macro
  #833  Autotools: Reject expat_config.h.in defining SIZEOF_VOID_P
  #819  Address compiler warnings
  #832 #834  Version info bumped from 10:0:9 (libexpat*.so.1.9.0)
             to 10:1:9 (libexpat*.so.1.9.1); see https://verbump.de/
             for what these numbers do

Infrastructure:
  #818  CI: Adapt to breaking changes in clang-format

(From OE-Core rev: 1808a9e60d587c705218a3328716cd24a5228dc6)

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-core/expat/expat_2.6.0.bb | 33 ---------------------------------
 meta/recipes-core/expat/expat_2.6.1.bb | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 33 deletions(-)
 delete mode 100644 meta/recipes-core/expat/expat_2.6.0.bb
 create mode 100644 meta/recipes-core/expat/expat_2.6.1.bb

(limited to 'meta/recipes-core/expat')

diff --git a/meta/recipes-core/expat/expat_2.6.0.bb b/meta/recipes-core/expat/expat_2.6.0.bb
deleted file mode 100644
index 1f9f7b269a..0000000000
--- a/meta/recipes-core/expat/expat_2.6.0.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY = "A stream-oriented XML parser library"
-DESCRIPTION = "Expat is an XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags)"
-HOMEPAGE = "https://github.com/libexpat/libexpat"
-SECTION = "libs"
-LICENSE = "MIT"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=7b3b078238d0901d3b339289117cb7fb"
-
-VERSION_TAG = "${@d.getVar('PV').replace('.', '_')}"
-
-SRC_URI = "${GITHUB_BASE_URI}/download/R_${VERSION_TAG}/expat-${PV}.tar.bz2  \
-           file://run-ptest \
-           "
-
-GITHUB_BASE_URI = "https://github.com/libexpat/libexpat/releases/"
-UPSTREAM_CHECK_REGEX = "releases/tag/R_(?P<pver>.+)"
-
-SRC_URI[sha256sum] = "ff60e6a6b6ce570ae012dc7b73169c7fdf4b6bf08c12ed0ec6f55736b78d85ba"
-
-EXTRA_OECMAKE:class-native += "-DEXPAT_BUILD_DOCS=OFF"
-
-RDEPENDS:${PN}-ptest += "bash"
-
-inherit cmake lib_package ptest github-releases
-
-do_install_ptest:class-target() {
-	install -m 755 ${B}/tests/runtests* ${D}${PTEST_PATH}
-	install -m 755 ${B}/tests/benchmark/benchmark ${D}${PTEST_PATH}
-}
-
-BBCLASSEXTEND += "native nativesdk"
-
-CVE_PRODUCT = "expat libexpat"
diff --git a/meta/recipes-core/expat/expat_2.6.1.bb b/meta/recipes-core/expat/expat_2.6.1.bb
new file mode 100644
index 0000000000..9bdc3b6206
--- /dev/null
+++ b/meta/recipes-core/expat/expat_2.6.1.bb
@@ -0,0 +1,33 @@
+SUMMARY = "A stream-oriented XML parser library"
+DESCRIPTION = "Expat is an XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags)"
+HOMEPAGE = "https://github.com/libexpat/libexpat"
+SECTION = "libs"
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=7b3b078238d0901d3b339289117cb7fb"
+
+VERSION_TAG = "${@d.getVar('PV').replace('.', '_')}"
+
+SRC_URI = "${GITHUB_BASE_URI}/download/R_${VERSION_TAG}/expat-${PV}.tar.bz2  \
+           file://run-ptest \
+           "
+
+GITHUB_BASE_URI = "https://github.com/libexpat/libexpat/releases/"
+UPSTREAM_CHECK_REGEX = "releases/tag/R_(?P<pver>.+)"
+
+SRC_URI[sha256sum] = "4677d957c0c6cb2a3321101944574c24113b637c7ab1cf0659a27c5babc201fd"
+
+EXTRA_OECMAKE:class-native += "-DEXPAT_BUILD_DOCS=OFF"
+
+RDEPENDS:${PN}-ptest += "bash"
+
+inherit cmake lib_package ptest github-releases
+
+do_install_ptest:class-target() {
+	install -m 755 ${B}/tests/runtests* ${D}${PTEST_PATH}
+	install -m 755 ${B}/tests/benchmark/benchmark ${D}${PTEST_PATH}
+}
+
+BBCLASSEXTEND += "native nativesdk"
+
+CVE_PRODUCT = "expat libexpat"
-- 
cgit v1.2.3-54-g00ecf