From 1d290b7f2ddcad1e9f68cee1ce7c2db16dfc7acc Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 1 Nov 2022 11:48:08 +0300
Subject: Upgrade to 2.5.0

This in particular fixes CVE-2022-43680.
---
 README-DEV                     | 8 ++++----
 libexpat/build/bootstrap.build | 4 ++--
 libexpat/manifest              | 2 +-
 upstream                       | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README-DEV b/README-DEV
index dc48a3c..5cbc248 100644
--- a/README-DEV
+++ b/README-DEV
@@ -28,11 +28,11 @@ Debian and Fedora distributions. The configuration options defining these sets
 are specified in the Debian's rules and Fedora's RPM .spec files. These files
 can be obtained as follows:
 
-$ wget http://deb.debian.org/debian/pool/main/e/expat/expat_2.4.9-1.debian.tar.xz
-$ tar xf expat_2.4.9-1.debian.tar.xz debian/rules
+$ wget http://deb.debian.org/debian/pool/main/e/expat/expat_2.5.0-1.debian.tar.xz
+$ tar xf expat_2.5.0-1.debian.tar.xz debian/rules
 
-$ wget https://kojipkgs.fedoraproject.org//packages/expat/2.4.9/1.fc38/src/expat-2.4.9-1.fc38.src.rpm
-$ rpm2cpio expat-2.4.9-1.fc38.src.rpm | cpio -civ '*.spec'
+$ wget https://kojipkgs.fedoraproject.org/packages/expat/2.5.0/1.fc38/src/expat-2.5.0-1.fc38.src.rpm
+$ rpm2cpio expat-2.5.0-1.fc38.src.rpm | cpio -civ '*.spec'
 
 As a side note, on Debian and Fedora the source, libraries, and headers are
 packaged as follows:
diff --git a/libexpat/build/bootstrap.build b/libexpat/build/bootstrap.build
index 71ba29a..5e414ed 100644
--- a/libexpat/build/bootstrap.build
+++ b/libexpat/build/bootstrap.build
@@ -18,10 +18,10 @@ using install
 # from the comment in expat/configure.ac, the major version (current - age) is
 # incremented for backwards-incompatible ABI changes.
 #
-if ($version.major == 2 && $version.minor == 4 && $version.patch == 9)
+if ($version.major == 2 && $version.minor == 5 && $version.patch == 0)
 {
   abi_version_major = 1
-  abi_version = "$abi_version_major.8.9" # <current - age>.<age>.<revision>
+  abi_version = "$abi_version_major.8.10" # <current - age>.<age>.<revision>
 }
 else
   fail 'increment the ABI version?'
diff --git a/libexpat/manifest b/libexpat/manifest
index 0ef3e66..ab70452 100644
--- a/libexpat/manifest
+++ b/libexpat/manifest
@@ -1,6 +1,6 @@
 : 1
 name: libexpat
-version: 2.4.9
+version: 2.5.0-a.0.z
 project: expat
 priority: security
 summary: Stream-oriented XML parsing C library
diff --git a/upstream b/upstream
index d77291a..654d2de 160000
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-Subproject commit d77291a4824d78e697c5dc2b8024fd65ab31e209
+Subproject commit 654d2de0da85662fcc7644a7acd7c2dd2cfb21f0
-- 
cgit v1.1