Changeset 31b81050 for general/genlib/libxml2.xml

Timestamp:

10/27/2014 04:38:11 PM (10 years ago)

Author:

Christopher Gregory <cjg@…>

Branches:

systemd-13485

Children:

bb522c6

Parents:

070fcd8

Message:

Merge more updates from trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@14764 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• general/genlib/libxml2.xml (modified) (2 diffs)

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">
 ]>
@@ -113 +113 @@
 
 <screen><userinput>tar xf ../xmlts&testsuite-version;.tar.gz</userinput></screen>
+
+    <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>