Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bpo-46932: Update bundled libexpat to 2.4.7 #31736

Merged
merged 2 commits into from Mar 7, 2022
Merged

Conversation

zooba
Copy link
Member

@zooba zooba commented Mar 7, 2022

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.

The pyexpatns.h part should probably not be dropped, please see the comment below.

The PR is likely good once it passes this Dockerfile of mine (and it does not, yet):

# Copyright (c) 2022 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 https://github.com/python/cpython cpython-main \
        && \
    ( cd cpython-main && git rev-parse HEAD ) \
        && \
    git clone --depth 1 --branch bpo-46932 https://github.com/zooba/cpython zooba-bpo-46932 \
        && \
    ( cd zooba-bpo-46932 && git rev-parse HEAD ) \
        && \
    git config --global advice.detachedHead false \
        && \
    git clone --depth 1 --branch R_2_4_6 https://github.com/libexpat/libexpat libexpat_2_4_6 \
        && \
    git clone --depth 1 --branch R_2_4_7 https://github.com/libexpat/libexpat libexpat_2_4_7 \
        && \
    diff -r -u libexpat_2_4_6/expat/lib/ cpython-main/Modules/expat/ | tee 2-4-6.diff \
        && \
    diff -r -u libexpat_2_4_7/expat/lib/ zooba-bpo-46932/Modules/expat/ | tee 2-4-7.diff \
        && \
    sed -e '/^Only in /d' -e '/^\(+++\|---\) /d' -e '/^diff /d' -i 2-4-6.diff 2-4-7.diff \
        && \
    diff -u 2-4-6.diff 2-4-7.diff \
        && \
    echo 'Diff is good.'

Modules/expat/expat_external.h Outdated Show resolved Hide resolved
@zooba zooba merged commit 176835c into python:main Mar 7, 2022
@miss-islington
Copy link
Contributor

Thanks @zooba for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7, 3.8, 3.9, 3.10.
🐍🍒⛏🤖

@bedevere-bot
Copy link

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

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Mar 7, 2022
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 7, 2022
(cherry picked from commit 176835c)

Co-authored-by: Steve Dower <steve.dower@python.org>
@bedevere-bot
Copy link

GH-31739 is a backport of this pull request to the 3.9 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Mar 7, 2022
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 7, 2022
(cherry picked from commit 176835c)

Co-authored-by: Steve Dower <steve.dower@python.org>
@bedevere-bot bedevere-bot removed the needs backport to 3.8 only security fixes label Mar 7, 2022
@bedevere-bot
Copy link

GH-31740 is a backport of this pull request to the 3.8 branch.

@bedevere-bot
Copy link

GH-31741 is a backport of this pull request to the 3.7 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 7, 2022
(cherry picked from commit 176835c)

Co-authored-by: Steve Dower <steve.dower@python.org>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 7, 2022
(cherry picked from commit 176835c)

Co-authored-by: Steve Dower <steve.dower@python.org>
@zooba zooba deleted the bpo-46932 branch March 7, 2022 21:49
miss-islington added a commit that referenced this pull request Mar 7, 2022
(cherry picked from commit 176835c)

Co-authored-by: Steve Dower <steve.dower@python.org>
miss-islington added a commit that referenced this pull request Mar 7, 2022
(cherry picked from commit 176835c)

Co-authored-by: Steve Dower <steve.dower@python.org>
ned-deily pushed a commit that referenced this pull request Mar 7, 2022
(cherry picked from commit 176835c)

Co-authored-by: Steve Dower <steve.dower@python.org>
ambv pushed a commit that referenced this pull request Mar 8, 2022
(cherry picked from commit 176835c)

Co-authored-by: Steve Dower <steve.dower@python.org>
hello-adam pushed a commit to hello-adam/cpython that referenced this pull request Jun 2, 2022
(cherry picked from commit 176835c)

Co-authored-by: Steve Dower <steve.dower@python.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type-security A security issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants