◐ Shell
reader mode source ↗
Skip to content

bpo-30947: Update libexpat from 2.2.1 to 2.2.3#3106

Merged
vstinner merged 7 commits into
python:masterfrom
vstinner:expat223
Aug 18, 2017
Merged

bpo-30947: Update libexpat from 2.2.1 to 2.2.3#3106
vstinner merged 7 commits into
python:masterfrom
vstinner:expat223

Conversation

@vstinner

@vstinner vstinner commented Aug 16, 2017 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

@vstinner vstinner requested review from gpshead and tiran August 16, 2017 14:52
@vstinner

vstinner commented Aug 16, 2017

Copy link
Copy Markdown
Member Author

The CI checks failed because of patchcheck: see https://bugs.python.org/issue31221

gpshead
gpshead approved these changes Aug 16, 2017
View reviewed changes

@gpshead gpshead left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hide comment

seems sane. i'm not reviewing the changed to expat itself, just that it appears to be a rational update. you might also consider checking in your cpython_rebuild_expat_dir.sh script that you've attached to the bpo issue.

@vstinner

vstinner commented Aug 17, 2017

Copy link
Copy Markdown
Member Author

@gpshead: "you might also consider checking in your cpython_rebuild_expat_dir.sh script that you've attached to the bpo issue."

My script is crappy: the version is hardcoded and uses the libexpat tag format, it requires a libexpat repository with an hardcoded path on my disk, etc. :-) I'm not interested to include it right now.

cc @serhiy-storchaka

@vstinner

vstinner commented Aug 17, 2017 •
edited
Loading

Copy link
Copy Markdown
Member Author

Oh, compilation fails on Travis CI at:


#if !defined(HAVE_GETRANDOM) && !defined(HAVE_SYSCALL_GETRANDOM) \
    && !defined(HAVE_ARC4RANDOM_BUF) && !defined(HAVE_ARC4RANDOM) \
    && !defined(XML_DEV_URANDOM) \
    && !defined(_WIN32) \
    && !defined(XML_POOR_ENTROPY)
# error  \
    You do not have support for any sources of high quality entropy \
    enabled.  For end user security, that is probably not what you want. \
    \
    Your options include: \
      * Linux + glibc >=2.25 (getrandom): HAVE_GETRANDOM, \
      * Linux + glibc <2.25 (syscall SYS_getrandom): HAVE_SYSCALL_GETRANDOM, \
      * BSD / macOS >=10.7 (arc4random_buf): HAVE_ARC4RANDOM_BUF, \
      * BSD / macOS <10.7 (arc4random): HAVE_ARC4RANDOM, \
      * libbsd (arc4random_buf): HAVE_ARC4RANDOM_BUF + HAVE_LIBBSD, \
      * libbsd (arc4random): HAVE_ARC4RANDOM + HAVE_LIBBSD, \
      * Linux / BSD / macOS (/dev/urandom): XML_DEV_URANDOM \
      * Windows (RtlGenRandom): _WIN32. \
    \
    If insist on not using any of these, bypass this error by defining \
    XML_POOR_ENTROPY; you have been warned. \
    \
    For CMake, one way to pass the define is: \
        cmake -DCMAKE_C_FLAGS="-pipe -O2 -DHAVE_SYSCALL_GETRANDOM" . \
    \
    If you have reasons to patch this detection code away or need changes \
    to the build system, please open a bug.  Thank you!
#endif

@vstinner vstinner merged commit 93d0cb5 into python:master Aug 18, 2017
@vstinner vstinner deleted the expat223 branch August 18, 2017 21:43
vstinner added a commit that referenced this pull request Aug 18, 2017
@vstinner
bpo-30947: Update libexpat from 2.2.1 to 2.2.3 (#3106) (#3143) …
83e37e1 
* bpo-30947: Update libexpat from 2.2.1 to 2.2.3

* Add NEWS entry

* Add new loadlibrary.c

* expat_external.h: restore include "pyexpatns.h"

* PCbuild: add expat/loadlibrary.c

* Define XML_POOR_ENTROPY to compile expat

(cherry picked from commit 93d0cb5)
vstinner added a commit that referenced this pull request Aug 18, 2017
@vstinner
bpo-30947: Update libexpat from 2.2.1 to 2.2.3 (#3106) (#3145) …
ec4ab09 
* bpo-30947: Update libexpat from 2.2.1 to 2.2.3

* Add NEWS entry

* Add new loadlibrary.c

* expat_external.h: restore include "pyexpatns.h"

* PCbuild: add expat/loadlibrary.c

* Define XML_POOR_ENTROPY to compile expat

Python 2.7 backport: add expat/loadlibrary.c to PC/VS9.0/ project
files (_elementtree and pyexpat).

(cherry picked from commit 93d0cb5)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gpshead gpshead

@tiran tiran

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@vstinner @gpshead @Mariatta @the-knights-who-say-ni @bedevere-bot