Fix CVE-2018-14647:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-14647
https://bugs.python.org/issue34623

Taken from upstream:
https://github.com/python/cpython/commit/f7666e828cc3d5873136473ea36ba2013d624fa1

diff --git Include/pyexpat.h Include/pyexpat.h
index 44259bf6d7..07020b5dc9 100644
--- Include/pyexpat.h
+++ Include/pyexpat.h
@@ -3,7 +3,7 @@
 
 /* note: you must import expat.h before importing this module! */
 
-#define PyExpat_CAPI_MAGIC  "pyexpat.expat_CAPI 1.0"
+#define PyExpat_CAPI_MAGIC  "pyexpat.expat_CAPI 1.1"
 #define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI"
 
 struct PyExpat_CAPI
@@ -48,6 +48,8 @@ struct PyExpat_CAPI
     enum XML_Status (*SetEncoding)(XML_Parser parser, const XML_Char *encoding);
     int (*DefaultUnknownEncodingHandler)(
         void *encodingHandlerData, const XML_Char *name, XML_Encoding *info);
+    /* might be none for expat < 2.1.0 */
+    int (*SetHashSalt)(XML_Parser parser, unsigned long hash_salt);
     /* always add new stuff to the end! */
 };
 
diff --git Modules/_elementtree.c Modules/_elementtree.c
index 707ab2912b..53f05f937f 100644
--- Modules/_elementtree.c
+++ Modules/_elementtree.c
@@ -3261,6 +3261,11 @@ _elementtree_XMLParser___init___impl(XMLParserObject *self, PyObject *html,
         PyErr_NoMemory();
         return -1;
     }
+    /* expat < 2.1.0 has no XML_SetHashSalt() */
+    if (EXPAT(SetHashSalt) != NULL) {
+        EXPAT(SetHashSalt)(self->parser,
+                           (unsigned long)_Py_HashSecret.expat.hashsalt);
+    }
 
     if (target) {
         Py_INCREF(target);
diff --git Modules/pyexpat.c Modules/pyexpat.c
index 47c3e86c20..aa21d93c11 100644
--- Modules/pyexpat.c
+++ Modules/pyexpat.c
@@ -1887,6 +1887,11 @@ MODULE_INITFUNC(void)
     capi.SetStartDoctypeDeclHandler = XML_SetStartDoctypeDeclHandler;
     capi.SetEncoding = XML_SetEncoding;
     capi.DefaultUnknownEncodingHandler = PyUnknownEncodingHandler;
+#if XML_COMBINED_VERSION >= 20100
+    capi.SetHashSalt = XML_SetHashSalt;
+#else
+    capi.SetHashSalt = NULL;
+#endif
 
     /* export using capsule */
     capi_object = PyCapsule_New(&capi, PyExpat_CAPSULE_NAME, NULL);
mit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=30e06c2cee92fa9a9b9e86bb8bf9c3e8d458ef9b'>root</a>/<a href='/guix/log/gnu?id=30e06c2cee92fa9a9b9e86bb8bf9c3e8d458ef9b'>gnu</a>/<a href='/guix/log/gnu/packages?id=30e06c2cee92fa9a9b9e86bb8bf9c3e8d458ef9b'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=30e06c2cee92fa9a9b9e86bb8bf9c3e8d458ef9b'>patches</a>/<a href='/guix/log/gnu/packages/patches/python-2.7-adjust-tests.patch?id=30e06c2cee92fa9a9b9e86bb8bf9c3e8d458ef9b'>python-2.7-adjust-tests.patch</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/patches/python-2.7-adjust-tests.patch?id=30e06c2cee92fa9a9b9e86bb8bf9c3e8d458ef9b&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-10-19 00:16:49 +0200'>2017-10-19</span></td><td><a href='/guix/commit/gnu/packages/patches/python-2.7-adjust-tests.patch?id=603a64920f13a28a5b62cb8aedf1f460f08e15f0'>gnu: python@2: Update to 2.7.14.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/python.scm (python-2.7): Update to 2.7.14.
[source]: Add patch to skip two new tests.  Delete upstreamed patch.
* gnu/packages/patches/python-2.7-adjust-tests.patch: New file.
* gnu/packages/patches/python-2.7-getentropy-on-old-kernels.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
</span></span></td><td>Marius Bakke</td></tr>