diff --git a/general/genlib/libxml2.xml b/general/genlib/libxml2.xml index 09bd594861..ea326838ca 100644 --- a/general/genlib/libxml2.xml +++ b/general/genlib/libxml2.xml @@ -7,10 +7,10 @@ - + - - + + ]> @@ -102,15 +102,6 @@ - The old Python2 module can be built after libxml2.so has been installed, @@ -126,33 +117,6 @@ Installation of libxml2 - - Apply a patch to fix various errors: - - -patch -p1 -i ../libxml2-&libxml2-version;-security_fixes-1.patch - - - Fix a problem generating the Python3 module with Python-3.9.0 and - later: - - -sed -i '/if Py/{s/Py/(Py/;s/)/))/}' python/{types.c,libxml.c} - - - If you are going to run the tests, disable one test that causes the Python - tests to terminate early with an error: - - -sed -i 's/test.test/#&/' python/tests/tstLastError.py - - - If, and only if, you are using , fix a - build breakage caused by that version by running the following command: - - -sed -i 's/ TRUE/ true/' encoding.c - Install libxml2 by running the following commands: @@ -174,7 +138,7 @@ make To test the results, issue: make check > check.log. A summary of the results can be obtained with grep -E '^Total|expected' check.log. If is - installed and you want to check memory leaks, replace + installed and you want to check for memory leaks, replace check with check-valgrind. diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index f98b5e400f..a65095fc95 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -45,6 +45,10 @@ May 16th, 2021 + + [bdubbs] - Update to libxml2-2.9.12. Fixes + #15039. + [renodr] - Restore the ICU-69 patch in node.js. diff --git a/packages.ent b/packages.ent index 2a6990ffab..2e824424bf 100644 --- a/packages.ent +++ b/packages.ent @@ -173,7 +173,7 @@ - +