From cc2643e1a282ad14cb0d6732ce670c997f02cbd2 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Fri, 24 Nov 2017 09:15:03 +0000
Subject: [PATCH] Add a patch to libxml2, to prevent segfaults in itstool when
 the python module is built with Python3

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@19528 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  4 ++--
 general/genlib/libxml2.xml         | 19 +++++++++++++------
 introduction/welcome/changelog.xml | 10 ++++++++++
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/general.ent b/general.ent
index 4dde74367c..b1a54973e6 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "22">                   <!-- Always 2 digits -->
+<!ENTITY day          "23">                   <!-- Always 2 digits -->
 <!ENTITY month        "11">                   <!-- Always 2 digits -->
 <!ENTITY year         "2017">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "November 22nd, &year;">
+<!ENTITY releasedate  "November 23rd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development -->
diff --git a/general/genlib/libxml2.xml b/general/genlib/libxml2.xml
index 2e6ff7bfaa..5a80a87689 100644
--- a/general/genlib/libxml2.xml
+++ b/general/genlib/libxml2.xml
@@ -81,13 +81,13 @@
           enables <command>make check</command> to do complete testing.
         </para>
       </listitem>
-<!-- All CVEs seem to have been applied in 2.9.4
+
       <listitem>
         <para>
-          Required patch:
-          <ulink url="&patch-root;/libxml2-&libxml2-version;-security_fixes-1.patch"/>
+          Recommended patch to prevent a segfault in itstool when using Python3:
+          <ulink url="&patch-root;/libxml2-&libxml2-version;-python3_hack-1.patch"/>
         </para>
-      </listitem>-->
+      </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">libxml2 Dependencies</bridgehead>
@@ -130,8 +130,15 @@
   <sect2 role="installation">
     <title>Installation of libxml2</title>
 
-   <para>
-      To ensure that the <application>Python3</application> module can be
+    <para>
+      First apply a patch, which prevents segfaults in the Python module, when
+      built by <xref linkend="python3"/>:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../libxml2-&libxml2-version;-python3_hack-1.patch</userinput></screen>
+
+    <para>
+      To ensure that the <application>Python</application> module can be
       built by <xref linkend="python3"/>, run:
     </para>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 921e0d62f4..5c87627d6e 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,16 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>November 23rd, 2017</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Patch libxml2, to prevent segfaults in itstool
+          in some cases.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>November 22nd, 2017</para>
       <itemizedlist>