Skip to content

Conversation

@sethmlarson
Copy link
Contributor

@sethmlarson sethmlarson commented Feb 14, 2024

Backport of #115431 to 3.11 and prior (without changes to SBOM)

Copy link
Contributor

@hartwork hartwork left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified using this Dockerfile, based on earlier version #98742 (review):

# Copyright (c) 2022-2024 Sebastian Pipping <[email protected]>
# 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.'

@ambv ambv merged commit e071b0d into python:3.11 Feb 14, 2024
@miss-islington-app
Copy link

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
…115468)

Manual backport due to code differences.
(cherry picked from commit e071b0d)

Co-authored-by: Seth Michael Larson <[email protected]>
@miss-islington-app
Copy link

Sorry, @sethmlarson and @ambv, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker e071b0d558b2f5cddd5a9fc6afadb4ba109ec77e 3.9

@bedevere-app
Copy link

bedevere-app bot commented Feb 14, 2024

GH-115473 is a backport of this pull request to the 3.10 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.10 only security fixes label Feb 14, 2024
@miss-islington-app
Copy link

Sorry, @sethmlarson and @ambv, I could not cleanly backport this to 3.8 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker e071b0d558b2f5cddd5a9fc6afadb4ba109ec77e 3.8

@sethmlarson sethmlarson deleted the libexpat-2.6.0-3.11 branch February 14, 2024 17:30
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 <[email protected]>
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 <[email protected]>
sethmlarson added a commit to sethmlarson/cpython that referenced this pull request Feb 14, 2024
…15468)

Manual backport due to code differences.
(cherry picked from commit e071b0d)

Co-authored-by: Seth Michael Larson <[email protected]>
sethmlarson added a commit to sethmlarson/cpython that referenced this pull request Feb 14, 2024
…15468)

Manual backport due to code differences.
(cherry picked from commit e071b0d)

Co-authored-by: Seth Michael Larson <[email protected]>
@sethmlarson
Copy link
Contributor Author

@ambv 3.9 and 3.8 backports are available:

@bedevere-app
Copy link

bedevere-app bot commented Feb 14, 2024

GH-115473 is a backport of this pull request to the 3.10 branch.

sethmlarson added a commit to miss-islington/cpython that referenced this pull request Feb 19, 2024
…115468)

Manual backport due to code differences.
(cherry picked from commit e071b0d)

Co-authored-by: Seth Michael Larson <[email protected]>
pablogsal pushed a commit that referenced this pull request Feb 19, 2024
…5473)

Manual backport due to code differences.
(cherry picked from commit e071b0d)

Co-authored-by: Seth Michael Larson <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type-bug An unexpected behavior, bug, or error

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants