◐ Shell
reader mode source ↗
Skip to content

bpo-30694: Upgrade Modules/expat/ to libexpat 2.2.1#2300

Merged
vstinner merged 1 commit into
python:masterfrom
vstinner:expat211
Jun 21, 2017
Merged

bpo-30694: Upgrade Modules/expat/ to libexpat 2.2.1#2300
vstinner merged 1 commit into
python:masterfrom
vstinner:expat211

Conversation

@vstinner

Copy link
Copy Markdown
Member

New file: Modules/expat/siphash.h.

New file: Modules/expat/siphash.h.
@vstinner

Copy link
Copy Markdown
Member Author

@marco-buttu: Modules/expat/ is a copy of the 2.2.1 branch of the http://github.com/libexpat/libexpat project. Please report your issues to the project directly :-)

@vstinner vstinner requested a review from gpshead June 20, 2017 22:07
@vstinner

Copy link
Copy Markdown
Member Author

I generated this PR using the rebuild_expat_dir.sh script attached to http://bugs.python.org/issue30694

I only reverted a single change, to get the #include "pyexpatns.h" line.

My main contribution was the Misc/NEWS entry :-)

@vstinner vstinner merged commit 5ff7132 into python:master Jun 21, 2017
@vstinner vstinner deleted the expat211 branch June 21, 2017 12:39
@vstinner

Copy link
Copy Markdown
Member Author

I would have prefer to wait for a review before merging, but IMHO we have too many open security issues, so I would like to move fast. For this specific PR, I just copied code from libexpat 2.2.1, I only wrote the Misc/NEWS entry. So it's not like I can do a lot of mistakes :-)

@bedevere-bot

Copy link
Copy Markdown

GH-2312 is a backport of this pull request to the 2.7 branch.

@bedevere-bot

Copy link
Copy Markdown

GH-2313 is a backport of this pull request to the 3.6 branch.

@bedevere-bot

Copy link
Copy Markdown

GH-2314 is a backport of this pull request to the 3.5 branch.

vstinner added a commit that referenced this pull request Jun 21, 2017
New file: Modules/expat/siphash.h.
(cherry picked from commit 5ff7132)
vstinner added a commit that referenced this pull request Jun 21, 2017
New file: Modules/expat/siphash.h.
(cherry picked from commit 5ff7132)
@gpshead

gpshead commented Jun 21, 2017

Copy link
Copy Markdown
Member

looks good to me.

@marco-buttu

Copy link
Copy Markdown
Contributor

ned-deily pushed a commit to ned-deily/cpython that referenced this pull request Jul 7, 2017
…thon#2313)

New file: Modules/expat/siphash.h.
(cherry picked from commit 5ff7132)
(cherry picked from commit 4a66524)
larryhastings pushed a commit that referenced this pull request Jul 12, 2017
…2164) (#2203)

* bpo-29591: Upgrade Modules/expat to libexpat 2.2 (#2164)

* bpo-29591: Upgrade Modules/expat to libexpat 2.2

* bpo-29591: Restore Python changes on expat

* bpo-29591: Remove expat config of unsupported platforms

Remove the configuration (Modules/expat/*config.h) of unsupported
platforms:

* Amiga
* MacOS Classic on PPC32
* Open Watcom

* bpo-29591: Remove useless XML_HAS_SET_HASH_SALT

The XML_HAS_SET_HASH_SALT define of Modules/expat/expat.h became
useless since our local expat copy was upgrade to expat 2.1 (it's now
expat 2.2.0).

(cherry picked from commit 23ec4b5)

* bpo-30694: Upgrade Modules/expat/ to libexpat 2.2.1 (#2300)

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

* bpo-30726: PCbuild _elementtree: remove duplicate defines (#2348)

bpo-30726, bpo-29591: libexpat 2.2.1 of Modules/expat/ now uses
a winconfig.h configuration file which already defines:

* XML_NS
* XML_DTD
* BYTEORDER=1234
* XML_CONTEXT_BYTES=1024
* HAVE_MEMMOVE

Remove these defines from PCbuild/_elementtree.vcxproj to prevent
compiler warnings.

Co-Authored-By: Jeremy Kloth <jeremy.kloth@gmail.com>
(cherry picked from commit c8fb58b)

* bpo-30726: Fix elementtree warnings on Windows due to expat upgrade (#2319)

* bpo-30726: Fix elementtree warnings on Windows

Caused by usage of `getenv` which should be safe. And a few integer
truncations which should also be ok.

* bpo-30726: Don't ignore libexpat warnings which haypo intends to fix upstream

(cherry picked from commit 87c6555)
ned-deily pushed a commit that referenced this pull request Jul 16, 2017
…2164) (#2204)

* bpo-29591: Upgrade Modules/expat to libexpat 2.2 (#2164)

* bpo-29591: Upgrade Modules/expat to libexpat 2.2

* bpo-29591: Restore Python changes on expat

* bpo-29591: Remove expat config of unsupported platforms

Remove the configuration (Modules/expat/*config.h) of unsupported
platforms:

* Amiga
* MacOS Classic on PPC32
* Open Watcom

* bpo-29591: Remove useless XML_HAS_SET_HASH_SALT

The XML_HAS_SET_HASH_SALT define of Modules/expat/expat.h became
useless since our local expat copy was upgrade to expat 2.1 (it's now
expat 2.2.0).

(cherry picked from commit 23ec4b5)

* bpo-30694: Upgrade Modules/expat/ to libexpat 2.2.1 (#2300)

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

* bpo-30726: PCbuild _elementtree: remove duplicate defines (#2348)

bpo-30726, bpo-29591: libexpat 2.2.1 of Modules/expat/ now uses
a winconfig.h configuration file which already defines:

* XML_NS
* XML_DTD
* BYTEORDER=1234
* XML_CONTEXT_BYTES=1024
* HAVE_MEMMOVE

Remove these defines from PCbuild/_elementtree.vcxproj to prevent
compiler warnings.

Co-Authored-By: Jeremy Kloth <jeremy.kloth@gmail.com>
(cherry picked from commit c8fb58b)

* bpo-30726: Fix elementtree warnings on Windows due to expat upgrade (#2319)

* bpo-30726: Fix elementtree warnings on Windows

Caused by usage of `getenv` which should be safe. And a few integer
truncations which should also be ok.

* bpo-30726: Don't ignore libexpat warnings which haypo intends to fix upstream

(cherry picked from commit 87c6555)
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.

5 participants