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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7edda97726cf
branches:  trunk
changeset: 371187:7edda97726cf
user:      prlw1 <prlw1%pkgsrc.org@localhost>
date:      Mon Nov 06 16:16:53 2017 +0000

description:
libxml2: Update to 2.9.7

- Portability:
  Change preprocessor OS tests to __linux__ (Nick Wellnhofer)

- Bug Fixes:
  Fix XPath stack frame logic (Nick Wellnhofer),
  Report undefined XPath variable error message (Nick Wellnhofer),
  Fix regression with librsvg (Nick Wellnhofer),
  Handle more invalid entity values in recovery mode (Nick Wellnhofer),
  Fix structured validation errors (Nick Wellnhofer),
  Fix memory leak in LZMA decompressor (Nick Wellnhofer),
  Set memory limit for LZMA decompression (Nick Wellnhofer),
  Handle illegal entity values in recovery mode (Nick Wellnhofer),
  Fix debug dump of streaming XPath expressions (Nick Wellnhofer),
  Fix memory leak in nanoftp (Nick Wellnhofer),
  Fix memory leaks in SAX1 parser (Nick Wellnhofer)

diffstat:

 textproc/libxml2/Makefile.common  |   4 ++--
 textproc/libxml2/distinfo         |  12 ++++++------
 textproc/libxml2/patches/patch-ab |  24 ++++++++++++------------
 textproc/py-libxml2/Makefile      |   3 +--
 4 files changed, 21 insertions(+), 22 deletions(-)

diffs (131 lines):

diff -r 76ffcac5c4bd -r 7edda97726cf textproc/libxml2/Makefile.common
--- a/textproc/libxml2/Makefile.common  Mon Nov 06 16:12:11 2017 +0000
+++ b/textproc/libxml2/Makefile.common  Mon Nov 06 16:16:53 2017 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.9 2017/10/31 13:15:44 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.10 2017/11/06 16:16:53 prlw1 Exp $
 #
 # used by textproc/libxml2/Makefile
 # used by textproc/py-libxml2/Makefile
 
-DISTNAME=      libxml2-2.9.6
+DISTNAME=      libxml2-2.9.7
 CATEGORIES=    textproc
 MASTER_SITES=  ftp://xmlsoft.org/libxml2/
 MASTER_SITES+= http://xmlsoft.org/sources/
diff -r 76ffcac5c4bd -r 7edda97726cf textproc/libxml2/distinfo
--- a/textproc/libxml2/distinfo Mon Nov 06 16:12:11 2017 +0000
+++ b/textproc/libxml2/distinfo Mon Nov 06 16:16:53 2017 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.121 2017/11/06 16:12:11 prlw1 Exp $
+$NetBSD: distinfo,v 1.122 2017/11/06 16:16:53 prlw1 Exp $
 
-SHA1 (libxml2-2.9.6.tar.gz) = 4ab4605fce0f82a004c3b2aeb368efc8f356e020
-RMD160 (libxml2-2.9.6.tar.gz) = 99616c77b5991a00e83abca708338cfa09beef29
-SHA512 (libxml2-2.9.6.tar.gz) = 5ef80f895374bd5dd3bcd5f00c715795f026bf45d998f8f762c0cdb739b8755e01de40cf853d98a3826eacef95c4adebe4777db11020e8d98d0bda921f55a0ed
-Size (libxml2-2.9.6.tar.gz) = 5469624 bytes
+SHA1 (libxml2-2.9.7.tar.gz) = ab3325e6cdda50ab2382fdfe0bdb6f7d1b9224a6
+RMD160 (libxml2-2.9.7.tar.gz) = f596599cbcac6d3175482177c3320a56e68b49a2
+SHA512 (libxml2-2.9.7.tar.gz) = da06cb7c5032ef4b7c8e902fabb9d2c74634c42c161be07a7c66a00d53a68029f89b0d4de32a6b9d4ff338c2d1d9c4e53aefb9cf50cb1c2d6c6b06b442ef42d5
+Size (libxml2-2.9.7.tar.gz) = 5467389 bytes
 SHA1 (patch-aa) = e687eaa9805b855b0c8a944ec5c597bd34954472
-SHA1 (patch-ab) = d6d6e9a91307da0c7f334b5b9ad432878babd1ac
+SHA1 (patch-ab) = a0df60b1a8609c185ed7d45a015eafdbfb6d6b41
 SHA1 (patch-ac) = 34afe787f6012b460a85be993048e133907a1621
 SHA1 (patch-ad) = d65b7e3be9694147e96ce4bb70a1739e2279ba81
 SHA1 (patch-ae) = 4eede9719724f94402e850ee6d6043a74aaf62b2
diff -r 76ffcac5c4bd -r 7edda97726cf textproc/libxml2/patches/patch-ab
--- a/textproc/libxml2/patches/patch-ab Mon Nov 06 16:12:11 2017 +0000
+++ b/textproc/libxml2/patches/patch-ab Mon Nov 06 16:16:53 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.30 2016/05/25 07:16:36 he Exp $
+$NetBSD: patch-ab,v 1.31 2017/11/06 16:16:53 prlw1 Exp $
 
 Various configure fixes:
  * Add run-path to XML_LIBDIR
@@ -7,9 +7,9 @@
  * Fix test for SAX
    Submitted as https://bugzilla.gnome.org/show_bug.cgi?id=766859
 
---- configure.orig     2014-10-16 07:35:12.000000000 +0000
+--- configure.orig     2017-11-02 20:16:48.000000000 +0000
 +++ configure
-@@ -14349,7 +14349,7 @@ fi
+@@ -15084,7 +15084,7 @@ fi
  fi
  
  
@@ -18,7 +18,7 @@
  XML_INCLUDEDIR='-I${includedir}/libxml2'
  
  XML_CFLAGS=""
-@@ -14822,13 +14822,13 @@ else
+@@ -15557,13 +15557,13 @@ else
          if test "$with_threads" = "pthread" || test "$with_threads" = "" || test "$with_threads" = "yes" ; then
              ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
  if test "x$ac_cv_header_pthread_h" = xyes; then :
@@ -35,7 +35,7 @@
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -14860,7 +14860,7 @@ fi
+@@ -15595,7 +15595,7 @@ fi
  $as_echo "$ac_cv_lib_pthread_pthread_join" >&6; }
  if test "x$ac_cv_lib_pthread_pthread_join" = xyes; then :
  
@@ -44,7 +44,7 @@
  
  $as_echo "#define HAVE_LIBPTHREAD /**/" >>confdefs.h
  
-@@ -14882,12 +14882,12 @@ fi
+@@ -15617,12 +15617,12 @@ fi
         *beos*) WITH_THREADS="1"
           THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS"
         ;;
@@ -59,7 +59,7 @@
                   if expr ${GCC_MEDIUM} \> 2 \& ${GCC_MAJOR} = 3 > /dev/null
                   then
                       THREAD_LIBS=""
-@@ -14904,6 +14904,10 @@ fi
+@@ -15639,6 +15639,10 @@ fi
               fi
           fi
         ;;
@@ -70,7 +70,7 @@
      esac
      if test "$WITH_THREADS" = "1" ; then
        THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT"
-@@ -15174,7 +15178,7 @@ else
+@@ -15909,7 +15913,7 @@ else
      TEST_SAX=SAXtests
  fi
  
@@ -79,10 +79,10 @@
    WITH_SAX1_SOURCES_TRUE=
    WITH_SAX1_SOURCES_FALSE='#'
  else
-@@ -15605,10 +15609,6 @@ case "$host" in
- 
- $as_echo "#define _WINSOCKAPI_ 1" >>confdefs.h
- 
+@@ -16493,10 +16497,6 @@ case "$host" in
+  CPPFLAGS="$CPPFLAGS -DWIN32"
+  WIN32_EXTRA_LIBADD="-lws2_32"
+  WIN32_EXTRA_LDFLAGS="-no-undefined"
 - if test "${PYTHON}" != ""
 - then
 -   WIN32_EXTRA_PYTHON_LIBADD="-L${pythondir}/../../libs -lpython$(echo ${PYTHON_VERSION} | tr -d .)"
diff -r 76ffcac5c4bd -r 7edda97726cf textproc/py-libxml2/Makefile
--- a/textproc/py-libxml2/Makefile      Mon Nov 06 16:12:11 2017 +0000
+++ b/textproc/py-libxml2/Makefile      Mon Nov 06 16:16:53 2017 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2017/11/06 16:02:00 prlw1 Exp $
+# $NetBSD: Makefile,v 1.59 2017/11/06 16:16:53 prlw1 Exp $
 
 .include "../../textproc/libxml2/Makefile.common"
 
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
 
 COMMENT=       Python wrapper for libxml2
 LICENSE=       modified-bsd