head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.8 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.6 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.4 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.2 pkgsrc-2011Q2-base:1.6 pkgsrc-2010Q1:1.5.0.4 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.2 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.3.0.2 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.2.0.22 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.20 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.18 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.16 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.14 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.12 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.10 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.8 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.6 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.4 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.2 pkgsrc-2006Q2-base:1.2; locks; strict; comment @# @; 1.6 date 2010.04.13.16.04.09; author drochner; state dead; branches; next 1.5; 1.5 date 2009.10.25.17.19.44; author sno; state Exp; branches; next 1.4; 1.4 date 2009.02.21.13.58.49; author wiz; state dead; branches; next 1.3; 1.3 date 2008.11.24.13.59.16; author tron; state Exp; branches; next 1.2; 1.2 date 2006.06.09.21.16.39; author drochner; state dead; branches 1.2.22.1; next 1.1; 1.1 date 2006.05.05.10.02.18; author drochner; state Exp; branches; next ; 1.2.22.1 date 2008.11.26.11.12.10; author rtr; state Exp; branches; next ; desc @@ 1.6 log @update to 2.7.7 changes: -Adding a --xpath option to xmllint -Make HTML parser non-recursive -misc portability improvements and bugfixes @ text @$NetBSD: patch-ah,v 1.5 2009/10/25 17:19:44 sno Exp $ Fixes compiler error "operands have incompatible types" --- relaxng.c.orig 2009-10-25 19:02:59.621179988 +0100 +++ relaxng.c 2009-10-25 19:03:31.920058072 +0100 @@@@ -5369,7 +5369,7 @@@@ } else { xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT, "expecting name, anyName, nsName or choice : got %s\n", - (node == NULL ? "nothing" : node->name), NULL); + (node == NULL ? (const xmlChar *)"nothing" : node->name), NULL); return (NULL); } if (ret != def) { @@@@ -9459,7 +9459,7 @@@@ ctxt->states = NULL; if (found == 0) { if (cur == NULL) { - VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname"); + VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, (const xmlChar *)"noname"); } else { VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name); } @ 1.5 log @Add patch to fix compiler error 'operands have incompatible types' @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @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). @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.3 2008/11/24 13:59:16 tron Exp $ d3 22 a24 26 --- 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 /* for memset() only ! */ - +#include #ifdef HAVE_CTYPE_H #include #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; @ 1.3 log @Add fixes for security vulnerabilities reported in CVE-2008-4225 and CVE-2008-4226 from "libxml2" SVN repository. Bump package revision. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @update to 2.6.26 changes: fixes for bugs and memory leaks, minor optimizations @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.1 2006/05/05 10:02:18 drochner Exp $ d3 26 a28 11 --- relaxng.c.orig 2006-05-05 11:39:00.000000000 +0200 +++ relaxng.c @@@@ -7394,7 +7394,7 @@@@ xmlRelaxNGParse(xmlRelaxNGParserCtxtPtr if (root == NULL) { xmlRngPErr(ctxt, (xmlNodePtr) doc, XML_RNGP_EMPTY, "xmlRelaxNGParse: %s is empty\n", - (ctxt->URL ? ctxt->URL : "schemas"), NULL); + (ctxt->URL ? ctxt->URL : (unsigned char *)"schemas"), NULL); xmlFreeDoc(ctxt->document); ctxt->document = NULL; @ 1.2.22.1 log @pullup ticket #2596 - requested by tron libxml2: update and patch package for security fixes revisions pulled up: pkgsrc/textproc/libxml2/Makefile 1.97,1.98,1.99 pkgsrc/textproc/libxml2/distinfo 1.69,1.70 pkgsrc/textproc/libxml2/patches/patch-af r0,1.3 pkgsrc/textproc/libxml2/patches/patch-ag r0,1.5 pkgsrc/textproc/libxml2/patches/patch-ah 1.3 Module Name: pkgsrc Committed By: drochner Date: Thu Oct 16 13:31:57 UTC 2008 Modified Files: pkgsrc/textproc/libxml2: Makefile distinfo Removed Files: pkgsrc/textproc/libxml2/patches: patch-af patch-ag Log Message: update to 2.7.2 changes: -Portability fix: fix solaris compilation problem, fix compilation if XPath is not configured in -Bug fixes: nasty entity bug introduced in 2.7.0, restore old behaviour when saving an HTML doc with an xml dump function, HTML UTF-8 parsing bug, fix reader custom error handlers -Improvement: xmlSave options for more flexibility to save as XML/HTML/XHTML, handle leading BOM in HTML documents ------------------------------------------------------------------------ Module Name: pkgsrc Committed By: drochner Date: Fri Oct 17 16:06:04 UTC 2008 Modified Files: pkgsrc/textproc/libxml2: Makefile Log Message: restore the without-threads config arg which I accidentally commented out in the last update, bump PKGREVISION fixes PR pkg/39755 by David A. Holland ------------------------------------------------------------------------ Module Name: pkgsrc Committed By: tron Date: Mon Nov 24 13:59:16 UTC 2008 Modified Files: pkgsrc/textproc/libxml2: Makefile distinfo Added Files: pkgsrc/textproc/libxml2/patches: patch-af patch-ag patch-ah Log Message: Add fixes for security vulnerabilities reported in CVE-2008-4225 and CVE-2008-4226 from "libxml2" SVN repository. Bump package revision. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.3 2008/11/24 13:59:16 tron Exp $ d3 11 a13 26 --- 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 /* for memset() only ! */ - +#include #ifdef HAVE_CTYPE_H #include #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; @ 1.1 log @add a cast to fix build on Solaris 10/Sun Studio CC, patch provided by Jake Kupersmith per PR pkg/33425 @ text @d1 1 a1 1 $NetBSD$ @