Author: ken
Date: Fri Nov 20 22:49:54 2020
New Revision: 23921

Log:
Patch libxml2 and libexif.

Comment libexif as a possible ImageMagick dependency.

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/genlib/libxml2.xml
   trunk/BOOK/general/genutils/imagemagick.xml
   trunk/BOOK/general/graphlib/libexif.xml
   trunk/BOOK/introduction/welcome/changelog.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Fri Nov 20 14:35:18 2020        (r23920)
+++ trunk/BOOK/general.ent      Fri Nov 20 22:49:54 2020        (r23921)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "20">                   <!-- Always 2 digits -->
+<!ENTITY day          "21">                   <!-- Always 2 digits -->
 <!ENTITY month        "11">                   <!-- Always 2 digits -->
 <!ENTITY year         "2020">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "November 20th, &year;">
+<!ENTITY releasedate  "November 21st, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development -->

Modified: trunk/BOOK/general/genlib/libxml2.xml
==============================================================================
--- trunk/BOOK/general/genlib/libxml2.xml       Fri Nov 20 14:35:18 2020        
(r23920)
+++ trunk/BOOK/general/genlib/libxml2.xml       Fri Nov 20 22:49:54 2020        
(r23921)
@@ -76,6 +76,12 @@
     <itemizedlist spacing="compact">
       <listitem>
         <para>
+          Required patch:
+          <ulink 
url="&patch-root;/libxml2-&libxml2-version;-security_fixes-1.patch"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           Optional Testsuite:
           <ulink 
url="http://www.w3.org/XML/Test/xmlts&testsuite-version;.tar.gz"/> - This
           enables <command>make check</command> to do complete testing.
@@ -124,6 +130,12 @@
     <title>Installation of libxml2</title>
 
     <para>
+      Apply a patch to fix various errors:
+    </para>
+
+<screen><userinput remap="pre">patch -p1 -i 
../libxml2-&libxml2-version;-security_fixes-1.patch</userinput></screen>
+
+<!--<para>
       First fix a problem generating the Python3 module with Python-3.9.0 and 
later:
     </para>
 
@@ -134,11 +146,11 @@
       built by <xref linkend="python3"/>, run:
     </para>
 
-<screen><userinput>sed -i '/_PyVerify_fd/,+1d' 
python/types.c</userinput></screen>
+<screen><userinput>sed -i '/_PyVerify_fd/,+1d' 
python/types.c</userinput></screen>-->
 
     <para>
-      If you are going to run the tests, disable one test that prevents the
-      tests from completing:
+      If you are going to run the tests, disable one test that causes the 
Python
+      tests to terminate early with an error:
     </para>
 
 <screen><userinput>sed -i 's/test.test/#&amp;/' 
python/tests/tstLastError.py</userinput></screen>

Modified: trunk/BOOK/general/genutils/imagemagick.xml
==============================================================================
--- trunk/BOOK/general/genutils/imagemagick.xml Fri Nov 20 14:35:18 2020        
(r23920)
+++ trunk/BOOK/general/genutils/imagemagick.xml Fri Nov 20 22:49:54 2020        
(r23921)
@@ -162,7 +162,9 @@
       <xref linkend="jasper"/>,
       <xref role="nodep" linkend="lcms"/> or
       <xref linkend="lcms2"/>,
-      <xref linkend="libexif"/>,
+      <!-- although libexif may have been used in the past, I can find no
+          evidence that it has been used in imagemagick-7.  ken
+      <xref linkend="libexif"/>,-->
       <xref linkend="libgxps"/>,
       <xref linkend="libjpeg"/>,
       <xref linkend="libpng"/>,

Modified: trunk/BOOK/general/graphlib/libexif.xml
==============================================================================
--- trunk/BOOK/general/graphlib/libexif.xml     Fri Nov 20 14:35:18 2020        
(r23920)
+++ trunk/BOOK/general/graphlib/libexif.xml     Fri Nov 20 22:49:54 2020        
(r23921)
@@ -78,17 +78,15 @@
       </listitem>
     </itemizedlist>
 
-<!-- Applied in 0.6.22
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>
           Required patch:
-          <ulink 
url="&patch-root;/libexif-&libexif-version;-security_fix-1.patch"/>
+          <ulink 
url="&patch-root;/libexif-&libexif-version;-security_fixes-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
--->
 
     <bridgehead renderas="sect3">libexif Dependencies</bridgehead>
 
@@ -106,13 +104,14 @@
   <sect2 role="installation">
     <title>Installation of libexif</title>
 
-<!--
+
     <para>
-      First, apply a patch to fix a security issue (integer overflow):
+      First, apply a patch to fix a security issue (integer overflow leading to
+      Out Of Buffer write):
     </para>
 
-<screen><userinput remap="pre">patch -Np1 -i 
../libexif-&libexif-version;-security_fix-1.patch</userinput></screen>
--->
+<screen><userinput remap="pre">patch -Np1 -i 
../libexif-&libexif-version;-security_fixes-1.patch</userinput></screen>
+
 
     <para>
       Install <application>libexif</application> by running the following

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Fri Nov 20 14:35:18 
2020        (r23920)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Fri Nov 20 22:49:54 
2020        (r23921)
@@ -42,6 +42,20 @@
     </listitem>
     -->
     <listitem>
+      <para>November 21st, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Patch libexif for security fixes. Fixes
+          <ulink url="&blfs-ticket-root;14272">#14272</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Patch libxml2 for security fixes. Fixes
+          <ulink url="&blfs-ticket-root;14271">#14271</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 20th, 2020</para>
       <itemizedlist>
         <listitem>
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to