Skip to content

Commit 7723a02

Browse files
authored
Merge branch 'python:main' into pythongh-93376
2 parents dde80ce + bb0268f commit 7723a02

File tree

6 files changed

+432
-167
lines changed

6 files changed

+432
-167
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Upgrade to libexpat 2.7.0

Misc/sbom.spdx.json

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Modules/expat/expat.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
Copyright (c) 2000-2005 Fred L. Drake, Jr. <[email protected]>
1212
Copyright (c) 2001-2002 Greg Stein <[email protected]>
1313
Copyright (c) 2002-2016 Karl Waclawek <[email protected]>
14-
Copyright (c) 2016-2024 Sebastian Pipping <[email protected]>
14+
Copyright (c) 2016-2025 Sebastian Pipping <[email protected]>
1515
Copyright (c) 2016 Cristian Rodríguez <[email protected]>
1616
Copyright (c) 2016 Thomas Beutlich <[email protected]>
1717
Copyright (c) 2017 Rhodri James <[email protected]>
@@ -1067,8 +1067,8 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);
10671067
See https://semver.org
10681068
*/
10691069
#define XML_MAJOR_VERSION 2
1070-
#define XML_MINOR_VERSION 6
1071-
#define XML_MICRO_VERSION 4
1070+
#define XML_MINOR_VERSION 7
1071+
#define XML_MICRO_VERSION 0
10721072

10731073
#ifdef __cplusplus
10741074
}

Modules/expat/refresh.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ fi
1212

1313
# Update this when updating to a new version after verifying that the changes
1414
# the update brings in are good. These values are used for verifying the SBOM, too.
15-
expected_libexpat_tag="R_2_6_4"
16-
expected_libexpat_version="2.6.4"
17-
expected_libexpat_sha256="fd03b7172b3bd7427a3e7a812063f74754f24542429b634e0db6511b53fb2278"
15+
expected_libexpat_tag="R_2_7_0"
16+
expected_libexpat_version="2.7.0"
17+
expected_libexpat_sha256="362e89ca6b8a0d46fc5740a917eb2a8b4d6356edbe016eee09f49c0781215844"
1818

1919
expat_dir="$(realpath "$(dirname -- "${BASH_SOURCE[0]}")")"
2020
cd ${expat_dir}

0 commit comments

Comments
 (0)