GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — [3.11] Upgrade bundled libexpat to 2.6.0 (GH-115399) by sethmlarson · Pull Request #115468 · python/cpython

Conversation

@sethmlarson

@sethmlarson sethmlarson commented Feb 14, 2024 •
edited by bedevere-app Bot
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Contributor

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

  • Issue: Please upgrade bundled Expat to 2.6.0 (e.g. for the fix to CVE-2023-52425) #115399

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@sethmlarson
[3.11] Upgrade bundled libexpat to 2.6.0
242c378
@bedevere-app bedevere-app Bot added awaiting review type-bug An unexpected behavior, bug, or error labels Feb 14, 2024
@bedevere-app bedevere-app Bot mentioned this pull request Feb 14, 2024
Please upgrade bundled Expat to 2.6.0 (e.g. for the fix to CVE-2023-52425) #115399
Closed
@sethmlarson sethmlarson added needs backport to 3.8 labels Feb 14, 2024
@sethmlarson sethmlarson mentioned this pull request Feb 14, 2024
gh-115399: Upgrade bundled libexpat to 2.6.0 #115431
Merged
hartwork
hartwork approved these changes Feb 14, 2024
View reviewed changes

@hartwork hartwork left a comment

Copy link
Copy Markdown
Contributor

There was a problem hiding this 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.'

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@bedevere-app bedevere-app Bot added awaiting core review and removed awaiting review labels Feb 14, 2024
@ambv
ambv merged commit e071b0d into python:3.11 Feb 14, 2024
@miss-islington-app

miss-islington-app Bot commented Feb 14, 2024

Copy link
Copy Markdown

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.
🐍🍒⛏🤖

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@bedevere-app bedevere-app Bot removed the awaiting core review label Feb 14, 2024
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 14, 2024
@sethmlarson @miss-islington
[3.11] Upgrade bundled libexpat to 2.6.0 (pythonGH-115399) (pythonGH-…
e711c8e
…115468)

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

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

miss-islington-app Bot commented Feb 14, 2024

Copy link
Copy Markdown

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
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@bedevere-app

bedevere-app Bot commented Feb 14, 2024

Copy link
Copy Markdown

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

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@miss-islington-app miss-islington-app Bot assigned ambv Feb 14, 2024
@bedevere-app bedevere-app Bot removed the needs backport to 3.10 label Feb 14, 2024
@miss-islington-app

miss-islington-app Bot commented Feb 14, 2024

Copy link
Copy Markdown

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
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@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
@sethmlarson
[3.9] [3.11] Upgrade bundled libexpat to 2.6.0 (pythonGH-115399) (pyt…
2740bfa
…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
@sethmlarson
[3.8] [3.11] Upgrade bundled libexpat to 2.6.0 (pythonGH-115399) (pyt…
10de572
…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
@sethmlarson
[3.9] Upgrade bundled libexpat to 2.6.0 (pythonGH-115399) (pythonGH-1…
b5762ec
…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
@sethmlarson
[3.8] Upgrade bundled libexpat to 2.6.0 (pythonGH-115399) (pythonGH-1…
68dd471
…15468)

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

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

sethmlarson commented Feb 14, 2024

Copy link
Copy Markdown
Contributor Author

@ambv 3.9 and 3.8 backports are available:

  • [3.9] Upgrade bundled libexpat to 2.6.0 (GH-115399) #115474
  • [3.8] Upgrade bundled libexpat to 2.6.0 (GH-115399) #115475
hartwork reacted with thumbs up emoji
All reactions
  • 👍 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@bedevere-app

bedevere-app Bot commented Feb 14, 2024

Copy link
Copy Markdown

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

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

sethmlarson added a commit to miss-islington/cpython that referenced this pull request Feb 19, 2024
@sethmlarson
[3.10] Upgrade bundled libexpat to 2.6.0 (pythonGH-115399) (pythonGH-…
58f4f54
…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
@miss-islington @sethmlarson
[3.10] Upgrade bundled libexpat to 2.6.0 (GH-115399) (GH-115468) (#11…
d0524ca
…5473)

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

Co-authored-by: Seth Michael Larson <[email protected]>
@hugovk hugovk removed the needs backport to 3.9 label Feb 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@hartwork hartwork hartwork approved these changes
Reviewers whose approvals may not affect merge requirements

Uh oh!

There was an error while loading. Please reload this page.

Assignees

@ambv ambv

Labels

type-bug An unexpected behavior, bug, or error

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

4 participants

@sethmlarson @hartwork @ambv @hugovk
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.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.