diff options
| author | taca <taca> | 2012-05-21 12:22:53 +0000 |
|---|---|---|
| committer | taca <taca> | 2012-05-21 12:22:53 +0000 |
| commit | 62efafd0e6ae0a31a917e5b1369e74abe5dce83b (patch) | |
| tree | a26b9cf19c6e9cd9e9380e32b31ba70597697992 /textproc | |
| parent | c1a546c8773aeaf73b94099521d114aa99f25339 (diff) | |
| download | pkgsrc-62efafd0e6ae0a31a917e5b1369e74abe5dce83b.tar.gz | |
Add fix for http://secunia.com/advisories/49177/ from repository.
Bump PKGREVISION.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/libxml2/Makefile | 4 | ||||
| -rw-r--r-- | textproc/libxml2/distinfo | 4 | ||||
| -rw-r--r-- | textproc/libxml2/patches/patch-xpointer.c | 33 |
3 files changed, 35 insertions, 6 deletions
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index da3bcfe36fa..126d22e2ca5 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.115 2012/04/03 09:08:33 obache Exp $ +# $NetBSD: Makefile,v 1.116 2012/05/21 12:22:53 taca Exp $ DISTNAME= libxml2-2.7.8 -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= textproc MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ http://xmlsoft.org/sources/ diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo index a9def88f85d..94af4278f88 100644 --- a/textproc/libxml2/distinfo +++ b/textproc/libxml2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.91 2012/04/27 15:05:02 mishka Exp $ +$NetBSD: distinfo,v 1.92 2012/05/21 12:22:53 taca Exp $ SHA1 (libxml2-2.7.8.tar.gz) = 859dd535edbb851cc15b64740ee06551a7a17d40 RMD160 (libxml2-2.7.8.tar.gz) = 30709622cfe3e2175e73d6701b7e19a25ab5ac47 @@ -19,4 +19,4 @@ SHA1 (patch-am) = ae7ab69b7bba2271d2d996161cc8b9956d0b06fa SHA1 (patch-include_libxml_xpath.h) = 3fc74551a7843668cf9ffee19b1f20ccb674e153 SHA1 (patch-testapi.c) = 63a0a34c8ca98d9214c4d3391e97d9a9ca4569f8 SHA1 (patch-threads.c) = 38bf7d702c21057795eec88d4e239b5df598382d -SHA1 (patch-xpointer.c) = fa720fd515bab3f99bb11bf56320b3ad8e5fb211 +SHA1 (patch-xpointer.c) = 720ed5e012759cee6551b71c352ba31e19d39406 diff --git a/textproc/libxml2/patches/patch-xpointer.c b/textproc/libxml2/patches/patch-xpointer.c index 83ac46edf56..bc709f8660f 100644 --- a/textproc/libxml2/patches/patch-xpointer.c +++ b/textproc/libxml2/patches/patch-xpointer.c @@ -1,8 +1,37 @@ -$NetBSD: patch-xpointer.c,v 1.1 2011/11/01 19:21:06 spz Exp $ +$NetBSD: patch-xpointer.c,v 1.2 2012/05/21 12:22:54 taca Exp $ + +patches for these security problems: + http://secunia.com/advisories/46632/ + http://secunia.com/advisories/49177/ --- xpointer.c.orig 2010-10-12 06:25:33.000000000 +0000 +++ xpointer.c -@@ -1269,6 +1269,7 @@ xmlXPtrEvalXPointer(xmlXPathParserContex +@@ -1007,21 +1007,14 @@ xmlXPtrEvalXPtrPart(xmlXPathParserContex + NEXT; + break; + } +- *cur++ = CUR; + } else if (CUR == '(') { + level++; +- *cur++ = CUR; + } else if (CUR == '^') { +- NEXT; +- if ((CUR == ')') || (CUR == '(') || (CUR == '^')) { +- *cur++ = CUR; +- } else { +- *cur++ = '^'; +- *cur++ = CUR; ++ if ((NXT(1) == ')') || (NXT(1) == '(') || (NXT(1) == '^')) { ++ NEXT; + } +- } else { +- *cur++ = CUR; + } ++ *cur++ = CUR; + NEXT; + } + *cur = 0; +@@ -1269,6 +1262,7 @@ xmlXPtrEvalXPointer(xmlXPathParserContex ctxt->valueNr = 0; ctxt->valueMax = 10; ctxt->value = NULL; |