-
-
Notifications
You must be signed in to change notification settings - Fork 30.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[3.13] gh-126623: Update libexpat to 2.6.4, make future updates easier (
GH-126792) (GH-126796) gh-126623: Update libexpat to 2.6.4, make future updates easier (GH-126792) Update libexpat to 2.6.4, make future updates easier. (cherry picked from commit 3c99969) Co-authored-by: Seth Michael Larson <seth@python.org>
- Loading branch information
1 parent
9162340
commit 1d6ba84
Showing
7 changed files
with
119 additions
and
22 deletions.
There are no files selected for viewing
1 change: 1 addition & 0 deletions
1
Misc/NEWS.d/next/Security/2024-11-13-11-09-12.gh-issue-126623.TO7NnR.rst
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Upgrade libexpat to 2.6.4 |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
#!/usr/bin/env bash | ||
# | ||
# Use this script to update libexpat | ||
|
||
set -e | ||
set -o pipefail | ||
|
||
if [[ "${BASH_VERSINFO[0]}" -lt 4 ]]; then | ||
echo "A bash version >= 4 required. Got: $BASH_VERSION" >&2 | ||
exit 1 | ||
fi | ||
|
||
# Update this when updating to a new version after verifying that the changes | ||
# the update brings in are good. These values are used for verifying the SBOM, too. | ||
expected_libexpat_tag="R_2_6_4" | ||
expected_libexpat_version="2.6.4" | ||
expected_libexpat_sha256="fd03b7172b3bd7427a3e7a812063f74754f24542429b634e0db6511b53fb2278" | ||
|
||
expat_dir="$(realpath "$(dirname -- "${BASH_SOURCE[0]}")")" | ||
cd ${expat_dir} | ||
|
||
# Step 1: download and copy files | ||
curl --location "https://github.com/libexpat/libexpat/releases/download/${expected_libexpat_tag}/expat-${expected_libexpat_version}.tar.gz" > libexpat.tar.gz | ||
echo "${expected_libexpat_sha256} libexpat.tar.gz" | sha256sum --check | ||
|
||
# Step 2: Pull files from the libexpat distribution | ||
declare -a lib_files | ||
lib_files=( | ||
ascii.h | ||
asciitab.h | ||
expat.h | ||
expat_external.h | ||
iasciitab.h | ||
internal.h | ||
latin1tab.h | ||
nametab.h | ||
siphash.h | ||
utf8tab.h | ||
winconfig.h | ||
xmlparse.c | ||
xmlrole.c | ||
xmlrole.h | ||
xmltok.c | ||
xmltok.h | ||
xmltok_impl.c | ||
xmltok_impl.h | ||
xmltok_ns.c | ||
) | ||
for f in "${lib_files[@]}"; do | ||
tar xzvf libexpat.tar.gz "expat-${expected_libexpat_version}/lib/${f}" --strip-components 2 | ||
done | ||
rm libexpat.tar.gz | ||
|
||
# Step 3: Add the namespacing include to expat_external.h | ||
sed -i 's/#define Expat_External_INCLUDED 1/&\n\n\/* Namespace external symbols to allow multiple libexpat version to\n co-exist. \*\/\n#include "pyexpatns.h"/' expat_external.h | ||
|
||
echo "Updated; verify all is okay using git diff and git status." |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters