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.

Sign up for GitHub

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

Jump to bottom

gh-97005: Update libexpat from 2.4.7 to 2.4.9 #97006

Merged
merged 2 commits into from
Sep 22, 2022
Merged

gh-97005: Update libexpat from 2.4.7 to 2.4.9 #97006

merged 2 commits into from
Sep 22, 2022

Conversation

corona10
Copy link
Member

@corona10 corona10 commented Sep 22, 2022 •
edited by bedevere-bot
Loading

@corona10
Copy link
Member Author

For verification

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

@corona10 corona10 requested a review from gpshead September 22, 2022 05:45
@corona10
Copy link
Member Author

cc @hartwork

@gpshead gpshead added the type-security A security issue label Sep 22, 2022
gpshead
gpshead approved these changes Sep 22, 2022
View reviewed changes
Copy link
Member

@gpshead gpshead left a comment

Choose a reason for hiding this comment

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

I verified the update by diffing Modules/expat/ against https://github.com/libexpat/libexpat/tree/R_2_4_9 expat/

@corona10 corona10 merged commit 10e3d39 into python:main Sep 22, 2022
@miss-islington
Copy link
Contributor

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

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Sep 22, 2022
@bedevere-bot
Copy link

GH-97010 is a backport of this pull request to the 3.11 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 22, 2022
@corona10 @miss-islington
pythongh-97005: Update libexpat from 2.4.7 to 2.4.9 (pythongh-97006)
450a77d 
Co-authored-by: Gregory P. Smith [Google] <[email protected]>
(cherry picked from commit 10e3d39)

Co-authored-by: Dong-hee Na <[email protected]>
@bedevere-bot
Copy link

GH-97011 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 Sep 22, 2022
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 22, 2022
@corona10 @miss-islington
pythongh-97005: Update libexpat from 2.4.7 to 2.4.9 (pythongh-97006)
7916bed 
Co-authored-by: Gregory P. Smith [Google] <[email protected]>
(cherry picked from commit 10e3d39)

Co-authored-by: Dong-hee Na <[email protected]>
@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Sep 22, 2022
@bedevere-bot
Copy link

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 22, 2022
@corona10 @miss-islington
pythongh-97005: Update libexpat from 2.4.7 to 2.4.9 (pythongh-97006)
71bc5cd 
Co-authored-by: Gregory P. Smith [Google] <[email protected]>
(cherry picked from commit 10e3d39)

Co-authored-by: Dong-hee Na <[email protected]>
@bedevere-bot
Copy link

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 22, 2022
@corona10 @miss-islington
pythongh-97005: Update libexpat from 2.4.7 to 2.4.9 (pythongh-97006)
b6a9c32 
Co-authored-by: Gregory P. Smith [Google] <[email protected]>
(cherry picked from commit 10e3d39)

Co-authored-by: Dong-hee Na <[email protected]>
@bedevere-bot
Copy link

GH-97014 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 Sep 22, 2022
@corona10 @miss-islington
pythongh-97005: Update libexpat from 2.4.7 to 2.4.9 (pythongh-97006)
ed737af 
Co-authored-by: Gregory P. Smith [Google] <[email protected]>
(cherry picked from commit 10e3d39)

Co-authored-by: Dong-hee Na <[email protected]>
miss-islington added a commit that referenced this pull request Sep 22, 2022
@miss-islington @corona10
gh-97005: Update libexpat from 2.4.7 to 2.4.9 (gh-97006)
6d9905f 
Co-authored-by: Gregory P. Smith [Google] <[email protected]>
(cherry picked from commit 10e3d39)

Co-authored-by: Dong-hee Na <[email protected]>
miss-islington added a commit that referenced this pull request Sep 22, 2022
@miss-islington @corona10
gh-97005: Update libexpat from 2.4.7 to 2.4.9 (gh-97006)
c967049 
Co-authored-by: Gregory P. Smith [Google] <[email protected]>
(cherry picked from commit 10e3d39)

Co-authored-by: Dong-hee Na <[email protected]>
@hartwork hartwork mentioned this pull request Sep 22, 2022
Closed
27 tasks
ambv pushed a commit that referenced this pull request Oct 4, 2022
@miss-islington @corona10 @ned-deily
[3.9] gh-97005: Update libexpat from 2.4.7 to 2.4.9 (gh-97006) (gh-97012
9b409e4 
)

gh-97005: Update libexpat from 2.4.7 to 2.4.9 (gh-97006)

Co-authored-by: Gregory P. Smith [Google] <[email protected]>
(cherry picked from commit 10e3d39)

Co-authored-by: Dong-hee Na <[email protected]>
Co-authored-by: Ned Deily <[email protected]>
ambv pushed a commit that referenced this pull request Oct 4, 2022
@miss-islington @corona10
[3.8] gh-97005: Update libexpat from 2.4.7 to 2.4.9 (gh-97006) (gh-97013
069b718 
)

gh-97005: Update libexpat from 2.4.7 to 2.4.9 (gh-97006)

Co-authored-by: Gregory P. Smith [Google] <[email protected]>
(cherry picked from commit 10e3d39)

Co-authored-by: Dong-hee Na <[email protected]>
ambv pushed a commit that referenced this pull request Oct 5, 2022
@miss-islington @corona10
[3.7] gh-97005: Update libexpat from 2.4.7 to 2.4.9 (gh-97006) (#97014)
46796ed 
Co-authored-by: Gregory P. Smith [Google] <[email protected]>
(cherry picked from commit 10e3d39)

Co-authored-by: Dong-hee Na <[email protected]>
@scdub scdub mentioned this pull request Oct 26, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gpshead gpshead gpshead approved these changes

Assignees
No one assigned
Labels
type-security A security issue
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@corona10 @miss-islington @bedevere-bot @gpshead