Skip to content

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

Merged
corona10 merged 2 commits into
python:mainfrom
corona10:gh-97005
Sep 22, 2022
Merged

gh-97005: Update libexpat from 2.4.7 to 2.4.9#97006
corona10 merged 2 commits into
python:mainfrom
corona10:gh-97005

Conversation

@corona10

@corona10corona10 commented Sep 22, 2022

Copy link
Copy Markdown
Member

@corona10

Copy link
Copy Markdown
MemberAuthor

For verification

# Copyright (c) 2022 Sebastian Pipping <sebastian@pipping.org># Licensed under the Apache License version 2.0FROM 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

Copy link
Copy Markdown
MemberAuthor

cc @hartwork

@gpsheadgpshead added the type-security A security issue label Sep 22, 2022

@gpsheadgpshead left a comment

Copy link
Copy Markdown
Member

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/

@miss-islington

Copy link
Copy Markdown
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-botbedevere-bot removed the needs backport to 3.11 only security fixes label Sep 22, 2022
@bedevere-bot

Copy link
Copy Markdown

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
Co-authored-by: Gregory P. Smith [Google] <greg@krypto.org>
(cherry picked from commit 10e3d39)
Co-authored-by: Dong-hee Na <donghee.na@python.org>
@bedevere-bot

Copy link
Copy Markdown

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

@bedevere-botbedevere-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
Co-authored-by: Gregory P. Smith [Google] <greg@krypto.org>
(cherry picked from commit 10e3d39)
Co-authored-by: Dong-hee Na <donghee.na@python.org>
@bedevere-bot

Copy link
Copy Markdown

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
Co-authored-by: Gregory P. Smith [Google] <greg@krypto.org>
(cherry picked from commit 10e3d39)
Co-authored-by: Dong-hee Na <donghee.na@python.org>
@bedevere-bot

Copy link
Copy Markdown

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
Co-authored-by: Gregory P. Smith [Google] <greg@krypto.org>
(cherry picked from commit 10e3d39)
Co-authored-by: Dong-hee Na <donghee.na@python.org>
@bedevere-bot

Copy link
Copy Markdown

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
Co-authored-by: Gregory P. Smith [Google] <greg@krypto.org>
(cherry picked from commit 10e3d39)
Co-authored-by: Dong-hee Na <donghee.na@python.org>
miss-islington added a commit that referenced this pull request Sep 22, 2022
Co-authored-by: Gregory P. Smith [Google] <greg@krypto.org>
(cherry picked from commit 10e3d39)
Co-authored-by: Dong-hee Na <donghee.na@python.org>
miss-islington added a commit that referenced this pull request Sep 22, 2022
Co-authored-by: Gregory P. Smith [Google] <greg@krypto.org>
(cherry picked from commit 10e3d39)
Co-authored-by: Dong-hee Na <donghee.na@python.org>
@hartworkhartwork mentioned this pull request Sep 22, 2022
27 tasks
ambv pushed a commit that referenced this pull request Oct 4, 2022
)
gh-97005: Update libexpat from 2.4.7 to 2.4.9 (gh-97006)
Co-authored-by: Gregory P. Smith [Google] <greg@krypto.org>
(cherry picked from commit 10e3d39)
Co-authored-by: Dong-hee Na <donghee.na@python.org>
Co-authored-by: Ned Deily <nad@python.org>
ambv pushed a commit that referenced this pull request Oct 4, 2022
)
gh-97005: Update libexpat from 2.4.7 to 2.4.9 (gh-97006)
Co-authored-by: Gregory P. Smith [Google] <greg@krypto.org>
(cherry picked from commit 10e3d39)
Co-authored-by: Dong-hee Na <donghee.na@python.org>
ambv pushed a commit that referenced this pull request Oct 5, 2022
Co-authored-by: Gregory P. Smith [Google] <greg@krypto.org>
(cherry picked from commit 10e3d39)
Co-authored-by: Dong-hee Na <donghee.na@python.org>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type-securityA security issue

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@corona10@miss-islington@bedevere-bot@gpshead