[pkgsrc/pkgsrc-2012Q1]: pkgsrc/textproc/libxml2 Pullup ticket #3795 - request...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/67b7796ade3b
branches:  pkgsrc-2012Q1
changeset: 602117:67b7796ade3b
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon May 21 15:13:36 2012 +0000

description:
Pullup ticket #3795 - requested by taca
textproc/libxml2: security patch

Revisions pulled up:
- textproc/libxml2/Makefile                                     1.116
- textproc/libxml2/distinfo                                     1.91-1.92
- textproc/libxml2/patches/patch-threads.c                      1.2
- textproc/libxml2/patches/patch-xpointer.c                     1.2

---
   Module Name: pkgsrc
   Committed By:        mishka
   Date:                Fri Apr 27 15:05:02 UTC 2012

   Modified Files:
        pkgsrc/textproc/libxml2: distinfo
        pkgsrc/textproc/libxml2/patches: patch-threads.c

   Log Message:
   FreeBSD 6 and earlier misses the pthread_equal() stub as well.
   While here, improve comments a little bit.

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Mon May 21 12:22:54 UTC 2012

   Modified Files:
        pkgsrc/textproc/libxml2: Makefile distinfo
        pkgsrc/textproc/libxml2/patches: patch-xpointer.c

   Log Message:
   Add fix for http://secunia.com/advisories/49177/ from repository.

   Bump PKGREVISION.

diffstat:

 textproc/libxml2/Makefile                 |   4 +-
 textproc/libxml2/distinfo                 |   6 ++--
 textproc/libxml2/patches/patch-threads.c  |  10 ++++----
 textproc/libxml2/patches/patch-xpointer.c |  33 +++++++++++++++++++++++++++++-
 4 files changed, 41 insertions(+), 12 deletions(-)

diffs (100 lines):

diff -r 0be349651666 -r 67b7796ade3b textproc/libxml2/Makefile
--- a/textproc/libxml2/Makefile Mon May 21 15:02:38 2012 +0000
+++ b/textproc/libxml2/Makefile Mon May 21 15:13:36 2012 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.115 2012/04/03 09:08:33 obache Exp $
+# $NetBSD: Makefile,v 1.115.2.1 2012/05/21 15:13:36 tron Exp $
 
 DISTNAME=      libxml2-2.7.8
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    textproc
 MASTER_SITES=  ftp://xmlsoft.org/libxml2/ \
                http://xmlsoft.org/sources/
diff -r 0be349651666 -r 67b7796ade3b textproc/libxml2/distinfo
--- a/textproc/libxml2/distinfo Mon May 21 15:02:38 2012 +0000
+++ b/textproc/libxml2/distinfo Mon May 21 15:13:36 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.90 2012/04/03 09:08:33 obache Exp $
+$NetBSD: distinfo,v 1.90.2.1 2012/05/21 15:13:36 tron Exp $
 
 SHA1 (libxml2-2.7.8.tar.gz) = 859dd535edbb851cc15b64740ee06551a7a17d40
 RMD160 (libxml2-2.7.8.tar.gz) = 30709622cfe3e2175e73d6701b7e19a25ab5ac47
@@ -18,5 +18,5 @@
 SHA1 (patch-am) = ae7ab69b7bba2271d2d996161cc8b9956d0b06fa
 SHA1 (patch-include_libxml_xpath.h) = 3fc74551a7843668cf9ffee19b1f20ccb674e153
 SHA1 (patch-testapi.c) = 63a0a34c8ca98d9214c4d3391e97d9a9ca4569f8
-SHA1 (patch-threads.c) = f686b5b3af1d09da8edb95b311780ae69071bcb2
-SHA1 (patch-xpointer.c) = fa720fd515bab3f99bb11bf56320b3ad8e5fb211
+SHA1 (patch-threads.c) = 38bf7d702c21057795eec88d4e239b5df598382d
+SHA1 (patch-xpointer.c) = 720ed5e012759cee6551b71c352ba31e19d39406
diff -r 0be349651666 -r 67b7796ade3b textproc/libxml2/patches/patch-threads.c
--- a/textproc/libxml2/patches/patch-threads.c  Mon May 21 15:02:38 2012 +0000
+++ b/textproc/libxml2/patches/patch-threads.c  Mon May 21 15:13:36 2012 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-threads.c,v 1.1 2012/04/03 09:08:33 obache Exp $
+$NetBSD: patch-threads.c,v 1.1.2.1 2012/05/21 15:13:36 tron Exp $
 
-* Treat OpenBSD and MirBSD sam as Linux to avoid linked with libpthreead.
-* NetBSD<4.99.36 lack of pthread_equal() stub function in libc.
+* Treat OpenBSD and MirBSD same as Linux to avoid linking with libpthread.
+* NetBSD<4.99.36 and FreeBSD<7.0 lack pthread_equal() stub function in libc.
 
 --- threads.c.orig     2010-10-15 17:28:30.000000000 +0000
 +++ threads.c
@@ -28,10 +28,10 @@
  #endif
  #endif /* linux */
  #endif /* __GNUC__ */
-+#if defined(__NetBSD__) && __NetBSD_Version__ < 499003600
++#if (defined(__NetBSD__) && __NetBSD_Version__ < 499003600) || (defined(__FreeBSD__) && __FreeBSD_version < 700000)
 +extern int pthread_equal ()
 +         __attribute((weak));
-+#endif /* NetBSD-4 */
++#endif /* NetBSD-4, FreeBSD-6 */
  #endif /* HAVE_PTHREAD_H */
  
  /*
diff -r 0be349651666 -r 67b7796ade3b textproc/libxml2/patches/patch-xpointer.c
--- a/textproc/libxml2/patches/patch-xpointer.c Mon May 21 15:02:38 2012 +0000
+++ b/textproc/libxml2/patches/patch-xpointer.c Mon May 21 15:13:36 2012 +0000
@@ -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.1.6.1 2012/05/21 15:13:36 tron 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;