Skip to content

2.7: Switch to importpatches #17

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

Merged
merged 0 commits into from
Sep 30, 2020

Conversation

encukou
Copy link
Member

@encukou encukou commented Sep 29, 2020

I've edited a few commit messages to make work with importpatches.
And then backported a CVE.
Dist-git PR: https://src.fedoraproject.org/rpms/python2.7/pull-request/4

@encukou encukou requested a review from hroncok September 29, 2020 14:39
@stratakis
Copy link
Member

The last commit won't work with Python 2 (cve-2020-26116 fix). Better to backport the commit from the 3.5 branch which should be fine (haven't tested it yet myself). python#21946

@encukou
Copy link
Member Author

encukou commented Sep 29, 2020

Ah, that might be right. Limiting the scope to just the switch to importpatches.

@encukou encukou changed the title 2.7: Switch to importpatches & backport CVE-2020-26116 2.7: Switch to importpatches Sep 29, 2020
@hroncok
Copy link
Member

hroncok commented Sep 29, 2020

At this point, I don't really understand this as a PR (it is not mergeable anyway). The list of commits looks OK, I'll review it trough the src.fp.o PR. Where I can see the changes more easily.

@encukou
Copy link
Member Author

encukou commented Sep 29, 2020

It should be force-pushed to fedora-2.7, rather than rebased/squashed/merge-committed.
Review however best works for you; the branch is available here if you need it :)

@encukou encukou merged commit fcc4a58 into fedora-python:fedora-2.7 Sep 30, 2020
@encukou encukou deleted the fedora-2.7-git+cve branch September 30, 2020 12:01
@encukou
Copy link
Member Author

encukou commented Sep 30, 2020

Punched and tagged.

@hroncok
Copy link
Member

hroncok commented Sep 30, 2020

Punch it

@vstinner
Copy link

vstinner commented Oct 5, 2020

Oh nice, a 2.7 branch. Thanks @encukou!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants