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

gh-126623: Update libexpat to 2.6.4, make future updates easier #126792

Merged
merged 1 commit into from
Nov 13, 2024

Conversation

sethmlarson
Copy link
Contributor

@sethmlarson sethmlarson commented Nov 13, 2024

This upgrades libexpat to 2.6.4 but also adds a refresh.sh script to make future updates easier. Used the refresh.sh script for HACL* as a reference. Willing to create the backport PRs myself as this diff won't apply cleanly to 3.11 and earlier.

cc @hartwork

@@ -40,6 +40,10 @@
#ifndef Expat_External_INCLUDED
#define Expat_External_INCLUDED 1

/* Namespace external symbols to allow multiple libexpat version to
co-exist. */
#include "pyexpatns.h"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Moved this so we have an easier anchor point for sed.

@gpshead gpshead added needs backport to 3.9 only security fixes needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes needs backport to 3.12 bug and security fixes needs backport to 3.13 bugs and security fixes labels Nov 13, 2024
@gpshead gpshead enabled auto-merge (squash) November 13, 2024 18:26
@gpshead gpshead merged commit 3c99969 into python:main Nov 13, 2024
61 checks passed
@miss-islington-app
Copy link

Thanks @sethmlarson for the PR, and @gpshead for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9, 3.10, 3.11, 3.12, 3.13.
🐍🍒⛏🤖

@sethmlarson sethmlarson deleted the libexpat-2.6.4 branch November 13, 2024 18:31
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 13, 2024
…pythonGH-126792)

Update libexpat to 2.6.4, make future updates easier.
(cherry picked from commit 3c99969)

Co-authored-by: Seth Michael Larson <seth@python.org>
@bedevere-app
Copy link

bedevere-app bot commented Nov 13, 2024

GH-126796 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Nov 13, 2024
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 13, 2024
…pythonGH-126792)

Update libexpat to 2.6.4, make future updates easier.
(cherry picked from commit 3c99969)

Co-authored-by: Seth Michael Larson <seth@python.org>
@bedevere-app
Copy link

bedevere-app bot commented Nov 13, 2024

GH-126797 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.12 bug and security fixes label Nov 13, 2024
@miss-islington-app
Copy link

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

cherry_picker 3c9996909402fadc98e6ca2a64e75a71a7427352 3.11

@miss-islington-app
Copy link

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

cherry_picker 3c9996909402fadc98e6ca2a64e75a71a7427352 3.10

@miss-islington-app
Copy link

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

cherry_picker 3c9996909402fadc98e6ca2a64e75a71a7427352 3.9

sethmlarson added a commit to sethmlarson/cpython that referenced this pull request Nov 13, 2024
… easier (pythonGH-126792)

Update libexpat to 2.6.4, make future updates easier.
(cherry picked from commit 3c99969)

Co-authored-by: Seth Michael Larson <seth@python.org>
@bedevere-app
Copy link

bedevere-app bot commented Nov 13, 2024

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

@bedevere-app bedevere-app bot removed the needs backport to 3.11 only security fixes label Nov 13, 2024
sethmlarson added a commit to sethmlarson/cpython that referenced this pull request Nov 13, 2024
… easier (pythonGH-126792)

Update libexpat to 2.6.4, make future updates easier.
(cherry picked from commit 3c99969)

Co-authored-by: Seth Michael Larson <seth@python.org>
@bedevere-app
Copy link

bedevere-app bot commented Nov 13, 2024

GH-126799 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 Nov 13, 2024
sethmlarson added a commit to sethmlarson/cpython that referenced this pull request Nov 13, 2024
…easier (pythonGH-126792)

Update libexpat to 2.6.4, make future updates easier.
(cherry picked from commit 3c99969)

Co-authored-by: Seth Michael Larson <seth@python.org>
@bedevere-app
Copy link

bedevere-app bot commented Nov 13, 2024

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

@bedevere-app bedevere-app bot removed the needs backport to 3.9 only security fixes label Nov 13, 2024
sethmlarson added a commit to sethmlarson/cpython that referenced this pull request Nov 13, 2024
…easier (pythonGH-126792)

Update libexpat to 2.6.4, make future updates easier.
(cherry picked from commit 3c99969)

Co-authored-by: Seth Michael Larson <seth@python.org>
gpshead pushed a commit that referenced this pull request Nov 13, 2024
GH-126792) (GH-126797)

gh-126623: Update libexpat to 2.6.4, make future updates easier (GH-126792)

Update libexpat to 2.6.4, make future updates easier.
(cherry picked from commit 3c99969)

Co-authored-by: Seth Michael Larson <seth@python.org>
gpshead pushed a commit that referenced this pull request Nov 13, 2024
GH-126792) (GH-126796)

gh-126623: Update libexpat to 2.6.4, make future updates easier (GH-126792)

Update libexpat to 2.6.4, make future updates easier.
(cherry picked from commit 3c99969)

Co-authored-by: Seth Michael Larson <seth@python.org>
ambv pushed a commit that referenced this pull request Dec 2, 2024
ambv pushed a commit that referenced this pull request Dec 2, 2024
ambv pushed a commit that referenced this pull request Dec 3, 2024
GH-126792) (GH-126798)

Update libexpat to 2.6.4, make future updates easier.
(cherry picked from commit 3c99969)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3.14 new features, bugs and security fixes type-security A security issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants