Changeset c121596

Timestamp:

10/23/2014 03:17:07 PM (9 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

6571737b

Parents:

f22356bf

Message:

Reinstate libxml2 2.9.2 after upstream fix. Figures taken from Fernando initial
update.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@14711 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/genlib/libxml2.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

general/genlib/libxml2.xml

@@ -7 +7 @@
   <!ENTITY libxml2-download-http "http://xmlsoft.org/sources/libxml2-&libxml2-version;.tar.gz">
   <!ENTITY libxml2-download-ftp  "ftp://xmlsoft.org/libxml2/libxml2-&libxml2-version;.tar.gz">
-  <!ENTITY libxml2-md5sum        "9c0cfef285d5c4a5c80d00904ddab380">
-  <!ENTITY libxml2-size          "5.0 MB">
-  <!ENTITY libxml2-buildsize     "100 MB">
-  <!ENTITY libxml2-time          "0.6 SBU">
+  <!ENTITY libxml2-md5sum        "9e6a9aca9d155737868b3dc5fd82f788">
+  <!ENTITY libxml2-size          "5.2 MB">
+  <!ENTITY libxml2-buildsize     "77 MB (additional 18 MB for tests)">
+  <!ENTITY libxml2-time          "0.5 SBU (additional 0.2 SBU for tests)">
   <!ENTITY testsuite-version     "20130923">
 ]>
@@ -109 +109 @@
   <sect2 role="installation">
     <title>Installation of libxml2</title>
+
+    <para>
+       Apply two upstream fixes, which correct bugs in
+       <command>xmlcatalog</command> and in the entity substitution
+       mechanism:
+    </para>
+
+<screen><userinput>sed \
+  -e /xmlInitializeCatalog/d \
+  -e 's/((ent->checked =.*&amp;&amp;/(((ent->checked == 0) ||\
+          ((ent->children == NULL) \&amp;\&amp; (ctxt->options \&amp; XML_PARSE_NOENT))) \&amp;\&amp;/' \
+  -i parser.c</userinput></screen>
 
     <para>

introduction/welcome/changelog.xml

@@ -49 +49 @@
       <itemizedlist>
         <listitem>
+          <para>[pierre] - Reinstate libxml2-2.9.2, with upstream fixes.
+          Fixes again <ulink url="&blfs-ticket-root;5697">#5697</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[fernando] - Some fixes to usbutils-008.</para>
         </listitem>

packages.ent

@@ -131 +131 @@
 <!ENTITY libusb-version               "1.0.19">
 <!ENTITY libusb-compat-version        "0.1.5">
-<!ENTITY libxml2-version              "2.9.1">
+<!ENTITY libxml2-version              "2.9.2">
 <!ENTITY libxslt-version              "1.1.28">
 <!ENTITY libzeitgeist-version         "0.3.18">