Skip to content

Conversation

@vstinner
Copy link
Member

New file: Modules/expat/siphash.h.
(cherry picked from commit 5ff7132)

New file: Modules/expat/siphash.h.
(cherry picked from commit 5ff7132)
@vstinner
Copy link
Member Author

I tested manually the change on Linux, test_pyexpat pass:

git clean -fdx  # remove all untracked files
./configure -C --with-pydebug CFLAGS=-O0 --enable-unicode=ucs4 && make && ./python -m test -v test_pyexpat 

@vstinner
Copy link
Member Author

Oh, the compilation of expat 2.2.1 on Windows using Visual Studio 2008 fails because of missing stdint.h header :-(

c:\projects\cpython\modules\expat\siphash.h(79): fatal error C1083: Cannot open include file: 'stdint.h': No such file or directory [C:\projects\cpython\PCbuild\_elementtree.vcxproj]

https://ci.appveyor.com/project/python/cpython/build/2.7.13+.3582

@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept your contribution by verifying you have signed the PSF contributor agreement (CLA).

Unfortunately we couldn't find an account corresponding to your GitHub username on bugs.python.org (b.p.o) to verify you have signed the CLA (this might be simply due to a missing "GitHub Name" entry in your b.p.o account settings). This is necessary for legal reasons before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

Thanks again to your contribution and we look forward to looking at it!

@vstinner
Copy link
Member Author

Oh, the compilation of expat 2.2.1 on Windows using Visual Studio 2008 fails because of missing stdint.h header :-(

So, I wrote a patch, and added it for my PR. Then I wanted to send it upstream, but... upstream, they already fixed the issue in master! libexpat/libexpat@c74d380

New try: I cherry-picked this commit on top of expat 2.2.1.

@vstinner
Copy link
Member Author

I tested the latest version of this PR on Windows with VS 2008 on a fresh Git repository (I ran "git clean -fdx" to remove all untracked files): the compilation succeed and test_pyexpat pass!

(cherry picked from libexpat commit c74d380b8f0b5215153d840d2af9455d9c53b960)
@vstinner
Copy link
Member Author

@the-knights-who-say-ni: "Unfortunately we couldn't find an account corresponding to your GitHub username on bugs.python.org (b.p.o) to verify you have signed the CLA (...)"

Oh, I kept the original author of the commit in my cherry-pick: "Sebastian Pipping [email protected]", but as expected, this libexpat contributor isn't related to Python :-/ I took the ownership of this commit, sorry Sebastian! Anyway, I already replaced the Git ownership of all files in Modules/expat/ :-)

@vstinner vstinner merged commit 2ada64d into python:2.7 Jun 21, 2017
@vstinner vstinner deleted the expat211_27 branch June 21, 2017 15:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type-security A security issue

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants