[pkgsrc/trunk]: pkgsrc/textproc/libxml2 Update to 2.7.3:

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2e9ec4aeefb8
branches:  trunk
changeset: 554825:2e9ec4aeefb8
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Feb 21 13:58:49 2009 +0000

description:
Update to 2.7.3:

2.7.3: Jan 18 2009

    * Build fix: fix build when HTML support is not included.
    * Bug fixes: avoid memory overflow in gigantic text nodes,
    indentation problem on the writed (Rob Richards), xmlAddChildList
    pointer problem (Rob Richards and Kevin Milburn), xmlAddChild
    problem with attribute (Rob Richards and Kris Breuker), avoid
    a memory leak in an edge case (Daniel Zimmermann), deallocate
    some pthread data (Alex Ott).
    * Improvements: configure option to avoid rebuilding docs
    (Adrian Bunk), limit text nodes to 10MB max by default, add
    element traversal APIs, add a parser option to enable pre 2.7
    SAX behavior (Rob Richards), add gcc malloc checking (Marcus
    Meissner), add gcc printf like functions parameters checking
    (Marcus Meissner).

diffstat:

 textproc/libxml2/Makefile         |   5 +--
 textproc/libxml2/distinfo         |  11 +++------
 textproc/libxml2/patches/patch-af |  40 ---------------------------------------
 textproc/libxml2/patches/patch-ag |  24 -----------------------
 textproc/libxml2/patches/patch-ah |  28 ---------------------------
 5 files changed, 6 insertions(+), 102 deletions(-)

diffs (138 lines):

diff -r 631a09d69211 -r 2e9ec4aeefb8 textproc/libxml2/Makefile
--- a/textproc/libxml2/Makefile Sat Feb 21 13:52:48 2009 +0000
+++ b/textproc/libxml2/Makefile Sat Feb 21 13:58:49 2009 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.99 2008/11/24 13:59:16 tron Exp $
+# $NetBSD: Makefile,v 1.100 2009/02/21 13:58:49 wiz Exp $
 
-DISTNAME=      libxml2-2.7.2
-PKGREVISION=   2
+DISTNAME=      libxml2-2.7.3
 CATEGORIES=    textproc
 MASTER_SITES=  ftp://xmlsoft.org/libxml2/ \
                http://xmlsoft.org/sources/
diff -r 631a09d69211 -r 2e9ec4aeefb8 textproc/libxml2/distinfo
--- a/textproc/libxml2/distinfo Sat Feb 21 13:52:48 2009 +0000
+++ b/textproc/libxml2/distinfo Sat Feb 21 13:58:49 2009 +0000
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.70 2008/11/24 13:59:16 tron Exp $
+$NetBSD: distinfo,v 1.71 2009/02/21 13:58:49 wiz Exp $
 
-SHA1 (libxml2-2.7.2.tar.gz) = 750b2bcd4ee3bf8595baf97e1881f1a57b1ef363
-RMD160 (libxml2-2.7.2.tar.gz) = 2b14531007a705679c7814618dc15baed62bc574
-Size (libxml2-2.7.2.tar.gz) = 4790639 bytes
+SHA1 (libxml2-2.7.3.tar.gz) = fd4e427fb55c977876bc74c0e552ef7d3d794a07
+RMD160 (libxml2-2.7.3.tar.gz) = 14018347531fd135366cee9fd9d760a1988546e2
+Size (libxml2-2.7.3.tar.gz) = 4789450 bytes
 SHA1 (patch-aa) = bf7db00ddf8a36394521baf656cf83d99bd9cbd3
 SHA1 (patch-ab) = a8dc745539528db69bf1ccb8977a69c24fa818e3
 SHA1 (patch-ac) = 264c75cf9fff5319105b971c122cdf5fc103c04e
 SHA1 (patch-ad) = cd45da492b02cce9983c46762839f68b8b1e0177
 SHA1 (patch-ae) = b9176919edbf3582cb24aff53f7c4f291e2b78c8
-SHA1 (patch-af) = 7d748c002fc8c7c2a80c28790c2ae719ab05aa5e
-SHA1 (patch-ag) = 91b8fb441d997fc6a0ecf622e96eb3690f2d27fb
-SHA1 (patch-ah) = 33996d6f8e9eeffa8d0b813ffc7721436c46eb21
diff -r 631a09d69211 -r 2e9ec4aeefb8 textproc/libxml2/patches/patch-af
--- a/textproc/libxml2/patches/patch-af Sat Feb 21 13:52:48 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-$NetBSD: patch-af,v 1.3 2008/11/24 13:59:16 tron Exp $
-
---- SAX2.c.orig        2008-08-25 10:02:32.000000000 +0100
-+++ SAX2.c     2008-11-24 13:25:21.000000000 +0000
-@@ -11,6 +11,7 @@
- #include "libxml.h"
- #include <stdlib.h>
- #include <string.h>
-+#include <limits.h>
- #include <libxml/xmlmemory.h>
- #include <libxml/tree.h>
- #include <libxml/parser.h>
-@@ -26,6 +27,11 @@
- #include <libxml/HTMLtree.h>
- #include <libxml/globals.h>
- 
-+/* Define SIZE_T_MAX unless defined through <limits.h>. */
-+#ifndef SIZE_T_MAX
-+# define SIZE_T_MAX     ((size_t)-1)
-+#endif /* !SIZE_T_MAX */
-+
- /* #define DEBUG_SAX2 */
- /* #define DEBUG_SAX2_TREE */
- 
-@@ -2455,9 +2461,14 @@
-                      (xmlDictOwns(ctxt->dict, lastChild->content))) {
-               lastChild->content = xmlStrdup(lastChild->content);
-           }
-+          if ((size_t)ctxt->nodelen > SIZE_T_MAX - (size_t)len || 
-+              (size_t)ctxt->nodemem + (size_t)len > SIZE_T_MAX / 2) {
-+                  xmlSAX2ErrMemory(ctxt, "xmlSAX2Characters overflow prevented");
-+                  return;
-+          }
-           if (ctxt->nodelen + len >= ctxt->nodemem) {
-               xmlChar *newbuf;
--              int size;
-+              size_t size;
- 
-               size = ctxt->nodemem + len;
-               size *= 2;
diff -r 631a09d69211 -r 2e9ec4aeefb8 textproc/libxml2/patches/patch-ag
--- a/textproc/libxml2/patches/patch-ag Sat Feb 21 13:52:48 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2008/11/24 13:59:16 tron Exp $
-
---- parser.c.orig      2008-10-03 08:40:37.000000000 +0100
-+++ parser.c   2008-11-24 13:26:17.000000000 +0000
-@@ -4142,6 +4142,9 @@
-                     line = ctxt->input->line;
-                     col = ctxt->input->col;
-               }
-+                /* something really bad happened in the SAX callback */
-+                if (ctxt->instate != XML_PARSER_CONTENT)
-+                    return;
-           }
-           ctxt->input->cur = in;
-           if (*in == 0xD) {
-@@ -4222,6 +4225,9 @@
-               }
-           }
-           nbchar = 0;
-+            /* something really bad happened in the SAX callback */
-+            if (ctxt->instate != XML_PARSER_CONTENT)
-+                return;
-       }
-       count++;
-       if (count > 50) {
diff -r 631a09d69211 -r 2e9ec4aeefb8 textproc/libxml2/patches/patch-ah
--- a/textproc/libxml2/patches/patch-ah Sat Feb 21 13:52:48 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2008/11/24 13:59:16 tron Exp $
-
---- tree.c.orig        2008-09-01 08:17:20.000000000 +0100
-+++ tree.c     2008-11-24 13:27:08.000000000 +0000
-@@ -14,7 +14,7 @@
- #include "libxml.h"
- 
- #include <string.h> /* for memset() only ! */
--
-+#include <limits.h>
- #ifdef HAVE_CTYPE_H
- #include <ctype.h>
- #endif
-@@ -6996,7 +6996,13 @@
-       case XML_BUFFER_ALLOC_DOUBLEIT:
-           /*take care of empty case*/
-           newSize = (buf->size ? buf->size*2 : size + 10);
--          while (size > newSize) newSize *= 2;
-+          while (size > newSize) {
-+              if (newSize > UINT_MAX / 2) {
-+                  xmlTreeErrMemory("growing buffer");
-+                  return 0;
-+              }
-+              newSize *= 2;
-+          }
-           break;
-       case XML_BUFFER_ALLOC_EXACT:
-           newSize = size+10;