[3.11] Upgrade bundled libexpat to 2.6.0 (GH-115399)#115468
Merged
ambv merged 1 commit intopython:3.11from Feb 14, 2024
Merged
Conversation
hartwork
approved these changes
Feb 14, 2024
Contributor
hartwork
left a comment
There was a problem hiding this comment.
Verified using this Dockerfile, based on earlier version #98742 (review):
# Copyright (c) 2022-2024 Sebastian Pipping <sebastian@pipping.org>
# Licensed under the Apache License version 2.0
FROM alpine
RUN apk add --update \
diffutils \
git \
sed \
&& \
git clone --depth 1 --branch 3.11 https://github.com/python/cpython cpython-3-11 \
&& \
( cd cpython-3-11 && git rev-parse HEAD ) \
&& \
git clone --depth 1 --branch libexpat-2.6.0-3.11 https://github.com/sethmlarson/cpython cpython-pr \
&& \
( cd cpython-pr && git rev-parse HEAD ) \
&& \
git config --global advice.detachedHead false \
&& \
git clone --depth 1 --branch R_2_5_0 https://github.com/libexpat/libexpat libexpat_2_5_0 \
&& \
git clone --depth 1 --branch R_2_6_0 https://github.com/libexpat/libexpat libexpat_2_6_0 \
&& \
diff -r -u libexpat_2_5_0/expat/lib/ cpython-3-11/Modules/expat/ | tee 2-5-0.diff \
&& \
diff -r -u libexpat_2_6_0/expat/lib/ cpython-pr/Modules/expat/ | tee 2-6-0.diff \
&& \
sed -e '/^Only in /d' -e '/^\(+++\|---\) /d' -e '/^diff /d' -i 2-5-0.diff 2-6-0.diff \
&& \
diff -u 2-5-0.diff 2-6-0.diff \
&& \
echo 'Diff is good.'|
Thanks @sethmlarson for the PR, and @ambv for merging it 🌮🎉.. I'm working now to backport this PR to: 3.8, 3.9, 3.10. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Feb 14, 2024
|
Sorry, @sethmlarson and @ambv, I could not cleanly backport this to |
|
GH-115473 is a backport of this pull request to the 3.10 branch. |
|
Sorry, @sethmlarson and @ambv, I could not cleanly backport this to |
sethmlarson
added a commit
to sethmlarson/cpython
that referenced
this pull request
Feb 14, 2024
…honGH-115468) Manual backport due to code differences. (cherry picked from commit e071b0d) Co-authored-by: Seth Michael Larson <seth@python.org>
sethmlarson
added a commit
to sethmlarson/cpython
that referenced
this pull request
Feb 14, 2024
…honGH-115468) Manual backport due to code differences. (cherry picked from commit e071b0d) Co-authored-by: Seth Michael Larson <seth@python.org>
Contributor
Author
|
@ambv 3.9 and 3.8 backports are available: |
|
GH-115473 is a backport of this pull request to the 3.10 branch. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #115431 to 3.11 and prior (without changes to SBOM)