Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1573046383126800"
MIME-Version: 1.0
Date: Wed, 6 Nov 2019 13:19:43 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/textproc/libxml2
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20191106131943.C2BD0FA93@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1573046383126800
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="UTF-8"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Wed Nov  6 13:19:43 UTC 2019

Modified Files:
	pkgsrc/textproc/libxml2: Makefile.common PLIST distinfo
	pkgsrc/textproc/libxml2/patches: patch-configure

Log Message:
libxml2: update to 2.9.10.

This is a relatively large release, Nick fixed a number of bugs
and improved the code in many areas, among other things removing
some recursive behaviour of the code in various places. Includes
various portability fixes, documentation updates and cleanups:

Documentation:
- Fix a few more typos ("fonction") (Nick Wellnhofer)
- Large batch of typo fixes (Jared Yanovich)
- Fix typos: tree: move{ -> s}, reconcil{i -> }ed, h{o -> e}ld by... (Jan Pokorný)
- Fix typo: xpath: simpli{ -> fi}ed (Jan Pokorný)
- Doc: do not mislead towards "infeasible" scenario wrt. xmlBufNodeDump (Jan Pokorný)
- Fix comments in test code (zhouzhongyuan)
- fix comment in testReader.c (zhouzhongyuan)

Portability:
- Fix some release issues on Fedora 30 (Daniel Veillard)
- Fix exponent digits when running tests under old MSVC (Daniel Richard G)
- Work around buggy ceil() function on AIX (Daniel Richard G)
- Don't call printf with NULL string in runtest.c (Daniel Richard G)
- Switched from unsigned long to ptrdiff_t in parser.c (Stephen Chenney)
- timsort.h: support older GCCs (Jérôme Duval)
- Make configure.ac work with older pkg-config (Nick Wellnhofer)
- Stop defining _REENTRANT on some Win32 platforms (Nick Wellnhofer)
- Fix nanohttp.c on MinGW (Nick Wellnhofer)
- Fix Windows compiler warning in testC14N.c (Nick Wellnhofer)
- Merge testThreadsWin32.c into testThreads.c (Nick Wellnhofer)
- Fix Python bindings under Windows (Nick Wellnhofer)

Bug Fixes:
- Another fix for conditional sections at end of document (Nick Wellnhofer)
- Fix for conditional sections at end of document (Nick Wellnhofer)
- Make sure that Python tests exit with error code (Nick Wellnhofer)
- Audit memory error handling in xpath.c (Nick Wellnhofer)
- Fix error code in xmlTextWriterStartDocument (Nick Wellnhofer)
- Fix integer overflow when counting written bytes (Nick Wellnhofer)
- Fix uninitialized memory access in HTML parser (Nick Wellnhofer)
- Fix memory leak in xmlSchemaValAtomicType (Nick Wellnhofer)
- Disallow conditional sections in internal subset (Nick Wellnhofer)
- Fix use-after-free in xmlTextReaderFreeNodeList (Nick Wellnhofer)
- Fix Regextests (Nick Wellnhofer)
- Fix empty branch in regex (Nick Wellnhofer)
- Fix integer overflow in entity recursion check (Nick Wellnhofer)
- Don't read external entities or XIncludes from stdin (Nick Wellnhofer)
- Fix Schema determinism check of ##other namespaces (Nick Wellnhofer)
- Fix potential null deref in xmlSchemaIDCFillNodeTables (zhouzhongyuan)
- Fix potential memory leak in xmlBufBackToBuffer (Nick Wellnhofer)
- Fix error message when processing XIncludes with fallbacks (Nick Wellnhofer)
- Fix memory leak in xmlRegEpxFromParse (zhouzhongyuan)
- 14:00 is a valid timezone for xs:dateTime (Nick Wellnhofer)
- Fix memory leak in xmlParseBalancedChunkMemoryRecover (Zhipeng Xie)
- Fix potential null deref in xmlRelaxNGParsePatterns (Nick Wellnhofer)
- Misleading error message with xs:{min|max}Inclusive (bettermanzzy)
- Fix memory leak in xmlXIncludeLoadTxt (Wang Kirin)
- Partial fix for comparison of xs:durations (Nick Wellnhofer)
- Fix null deref in xmlreader buffer (zhouzhongyuan)
- Fix unability to RelaxNG-validate grammar with choice-based name class (Jan Pokorný)
- Fix unability to validate ambiguously constructed interleave for RelaxNG (Jan Pokorný)
- Fix possible null dereference in xmlXPathIdFunction (zhouzhongyuan)
- fix memory leak in xmlAllocOutputBuffer (zhouzhongyuan)
- Fix unsigned int overflow (Jens Eggerstedt)
- dict.h: gcc 2.95 doesn't allow multiple storage classes (Nick Wellnhofer)
- Fix another code path in xmlParseQName (Nick Wellnhofer)
- Make sure that xmlParseQName returns NULL in error case (Nick Wellnhofer)
- Fix build without reader but with pattern (Nick Wellnhofer)
- Fix memory leak in xmlAllocOutputBufferInternal error path (Nick Wellnhofer)
- Fix unsigned integer overflow (Nick Wellnhofer)
- Fix return value of xmlOutputBufferWrite (Nick Wellnhofer)
- Fix parser termination from "Double hyphen within comment" error (David Warring)
- Fix call stack overflow in xmlFreePattern (Nick Wellnhofer)
- Fix null deref in previous commit (Nick Wellnhofer)
- Fix memory leaks in xmlXPathParseNameComplex error paths (Nick Wellnhofer)
- Check for integer overflow in xmlXPtrEvalChildSeq (Nick Wellnhofer)
- Fix xmllint dump of XPath namespace nodes (Nick Wellnhofer)
- Fix float casts in xmlXPathSubstringFunction (Nick Wellnhofer)
- Fix null deref in xmlregexp error path (Nick Wellnhofer)
- Fix null pointer dereference in xmlTextReaderReadOuterXml (Nick Wellnhofer)
- Fix memory leaks in xmlParseStartTag2 error paths (Nick Wellnhofer)
- Fix memory leak in xmlSAX2StartElement (Nick Wellnhofer)
- Fix commit "Memory leak in xmlFreeID (xmlreader.c)" (Nick Wellnhofer)
- Fix NULL pointer deref in xmlTextReaderValidateEntity (Nick Wellnhofer)
- Memory leak in xmlFreeTextReader (Nick Wellnhofer)
- Memory leak in xmlFreeID (xmlreader.c) (Nick Wellnhofer)

Improvements:
- Run XML conformance tests under CI (Nick Wellnhofer)
- Update GitLab CI config (Nick Wellnhofer)
- Propagate memory errors in valuePush (Nick Wellnhofer)
- Propagate memory errors in xmlXPathCompExprAdd (Nick Wellnhofer)
- Make xmlFreeDocElementContent non-recursive (Nick Wellnhofer)
- Enable continuous integration via GitLab CI (Nick Wellnhofer)
- Avoid ignored attribute warnings under GCC (Nick Wellnhofer)
- Make xmlDumpElementContent non-recursive (Nick Wellnhofer)
- Make apibuild.py ignore ATTRIBUTE_NO_SANITIZE (Nick Wellnhofer)
- Mark xmlExp* symbols as removed (Nick Wellnhofer)
- Make xmlParseConditionalSections non-recursive (Nick Wellnhofer)
- Adjust expected error in Python tests (Nick Wellnhofer)
- Make xmlTextReaderFreeNodeList non-recursive (Nick Wellnhofer)
- Make xmlFreeNodeList non-recursive (Nick Wellnhofer)
- Make xmlParseContent and xmlParseElement non-recursive (Nick Wellnhofer)
- Remove executable bit from non-executable files (Nick Wellnhofer)
- Fix expected output of test/schemas/any4 (Nick Wellnhofer)
- Optimize build instructions in README (zhouzhongyuan)
- xml2-config.in: Output CFLAGS and LIBS on the same line (Hugh McMaster)
- xml2-config: Add a --dynamic switch to print only shared libraries (Hugh McMaster)
- Annotate functions with __attribute__((no_sanitize)) (Nick Wellnhofer)
- Fix warnings when compiling without reader or push parser (Nick Wellnhofer)
- Remove unused member `doc` in xmlSaveCtxt (Nick Wellnhofer)
- Limit recursion depth in xmlXPathCompOpEvalPredicate (Nick Wellnhofer)
- Remove -Wno-array-bounds (Nick Wellnhofer)
- Remove unreachable code in xmlXPathCountFunction (Nick Wellnhofer)
- Improve XPath predicate and filter evaluation (Nick Wellnhofer)
- Limit recursion depth in xmlXPathOptimizeExpression (Nick Wellnhofer)
- Disable hash randomization when fuzzing (Nick Wellnhofer)
- Optional recursion limit when parsing XPath expressions (Nick Wellnhofer)
- Optional recursion limit when evaluating XPath expressions (Nick Wellnhofer)
- Use break statements in xmlXPathCompOpEval (Nick Wellnhofer)
- Optional XPath operation limit (Nick Wellnhofer)
- Fix compilation with --with-minimum (Nick Wellnhofer)
- Check XPath stack after calling functions (Nick Wellnhofer)
- Remove debug printf in xmlreader.c (Nick Wellnhofer)
- Always define LIBXML_THREAD_ENABLED when enabled (Michael Haubenwallner)
- Regenerate NEWS (Nick Wellnhofer)
- Change git repo URL (Nick Wellnhofer)
- Change bug tracker URL (Nick Wellnhofer)
- Remove outdated HTML file (Nick Wellnhofer)
- Fix unused function warning in testapi.c (Nick Wellnhofer)
- Add some generated test files to .gitignore (Nick Wellnhofer)
- Remove unneeded function pointer casts (Nick Wellnhofer)
- Fix -Wcast-function-type warnings (GCC 8) (Nick Wellnhofer)
- Fix -Wformat-truncation warnings (GCC 8) (Nick Wellnhofer)

Cleanups:
- Rebuild docs (Nick Wellnhofer)
- Disable xmlExp regex code (Nick Wellnhofer)
- Remove redundant code in xmlRelaxNGValidateState (Nick Wellnhofer)
- Remove redundant code in xmlXPathCompRelationalExpr (Nick Wellnhofer)

  Thanks Nick and all who helped contribute to this release!


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/libxml2/Makefile.common
cvs rdiff -u -r1.45 -r1.46 pkgsrc/textproc/libxml2/PLIST
cvs rdiff -u -r1.130 -r1.131 pkgsrc/textproc/libxml2/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/libxml2/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1573046383126800
Content-Disposition: inline
Content-Length: 5851
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/textproc/libxml2/Makefile.common
diff -u pkgsrc/textproc/libxml2/Makefile.common:1.12 pkgsrc/textproc/libxml2/Makefile.common:1.13
--- pkgsrc/textproc/libxml2/Makefile.common:1.12	Wed Jan  9 19:09:02 2019
+++ pkgsrc/textproc/libxml2/Makefile.common	Wed Nov  6 13:19:43 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.12 2019/01/09 19:09:02 adam Exp $
+# $NetBSD: Makefile.common,v 1.13 2019/11/06 13:19:43 wiz Exp $
 #
 # used by textproc/libxml2/Makefile
 # used by textproc/py-libxml2/Makefile
 
-DISTNAME=	libxml2-2.9.9
+DISTNAME=	libxml2-2.9.10
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://xmlsoft.org/libxml2/
 MASTER_SITES+=	http://xmlsoft.org/sources/

Index: pkgsrc/textproc/libxml2/PLIST
diff -u pkgsrc/textproc/libxml2/PLIST:1.45 pkgsrc/textproc/libxml2/PLIST:1.46
--- pkgsrc/textproc/libxml2/PLIST:1.45	Fri Oct 17 15:46:47 2014
+++ pkgsrc/textproc/libxml2/PLIST	Wed Nov  6 13:19:43 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.45 2014/10/17 15:46:47 drochner Exp $
+@comment $NetBSD: PLIST,v 1.46 2019/11/06 13:19:43 wiz Exp $
 bin/xml2-config
 bin/xmlcatalog
 bin/xmllint
@@ -118,7 +118,6 @@ share/doc/libxml2/html/libxml-xmlwriter.
 share/doc/libxml2/html/libxml-xpath.html
 share/doc/libxml2/html/libxml-xpathInternals.html
 share/doc/libxml2/html/libxml-xpointer.html
-share/doc/libxml2/html/libxml-xzlib.html
 share/doc/libxml2/html/right.png
 share/doc/libxml2/html/up.png
 share/doc/libxml2/io1.c

Index: pkgsrc/textproc/libxml2/distinfo
diff -u pkgsrc/textproc/libxml2/distinfo:1.130 pkgsrc/textproc/libxml2/distinfo:1.131
--- pkgsrc/textproc/libxml2/distinfo:1.130	Wed Jan  9 19:09:02 2019
+++ pkgsrc/textproc/libxml2/distinfo	Wed Nov  6 13:19:43 2019
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.130 2019/01/09 19:09:02 adam Exp $
+$NetBSD: distinfo,v 1.131 2019/11/06 13:19:43 wiz Exp $
 
-SHA1 (libxml2-2.9.9.tar.gz) = 96686d1dd9fddf3b35a28b1e2e4bbacac889add3
-RMD160 (libxml2-2.9.9.tar.gz) = a7d5f9ca4a24db329108f4bfb6bd4eed0f61ab21
-SHA512 (libxml2-2.9.9.tar.gz) = cb7784ba4e72e942614e12e4f83f4ceb275f3d738b30e3b5c1f25edf8e9fa6789e854685974eed95b362049dbf6c8e7357e0327d64c681ed390534ac154e6810
-Size (libxml2-2.9.9.tar.gz) = 5476717 bytes
+SHA1 (libxml2-2.9.10.tar.gz) = db6592ec9ca9708c4e71bf6bfd907bbb5cd40644
+RMD160 (libxml2-2.9.10.tar.gz) = 455f81e1f121c63dac96802de7f83ce4483f1afe
+SHA512 (libxml2-2.9.10.tar.gz) = 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed
+Size (libxml2-2.9.10.tar.gz) = 5624761 bytes
 SHA1 (patch-Makefile.in) = e687eaa9805b855b0c8a944ec5c597bd34954472
 SHA1 (patch-catalog.c) = 34afe787f6012b460a85be993048e133907a1621
-SHA1 (patch-configure) = a0df60b1a8609c185ed7d45a015eafdbfb6d6b41
+SHA1 (patch-configure) = f6e9f08377a537657df08deee17a5cc66c60b808
 SHA1 (patch-doc_examples_Makefile.in) = 4eede9719724f94402e850ee6d6043a74aaf62b2
 SHA1 (patch-encoding.c) = 6cf0a7d421828b9f40a4079ee85adb791c54d096
 SHA1 (patch-python_libxml.c) = cfa07b4f3dfddb501c2ba210bb32b8ee14e3df9d

Index: pkgsrc/textproc/libxml2/patches/patch-configure
diff -u pkgsrc/textproc/libxml2/patches/patch-configure:1.1 pkgsrc/textproc/libxml2/patches/patch-configure:1.2
--- pkgsrc/textproc/libxml2/patches/patch-configure:1.1	Wed Jan  9 19:09:03 2019
+++ pkgsrc/textproc/libxml2/patches/patch-configure	Wed Nov  6 13:19:43 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.1 2019/01/09 19:09:03 adam Exp $
+$NetBSD: patch-configure,v 1.2 2019/11/06 13:19:43 wiz Exp $
 
 Various configure fixes:
  * Add run-path to XML_LIBDIR
@@ -7,9 +7,9 @@ Various configure fixes:
  * Fix test for SAX
    Submitted as https://bugzilla.gnome.org/show_bug.cgi?id=766859
 
---- configure.orig	2017-11-02 20:16:48.000000000 +0000
+--- configure.orig	2019-10-30 19:14:22.000000000 +0000
 +++ configure
-@@ -15084,7 +15084,7 @@ fi
+@@ -14970,7 +14970,7 @@ fi
  fi
  
  
@@ -18,7 +18,7 @@ Various configure fixes:
  XML_INCLUDEDIR='-I${includedir}/libxml2'
  
  XML_CFLAGS=""
-@@ -15557,13 +15557,13 @@ else
+@@ -15443,13 +15443,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 @@ Various configure fixes:
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -15595,7 +15595,7 @@ fi
+@@ -15481,7 +15481,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 @@ Various configure fixes:
  
  $as_echo "#define HAVE_LIBPTHREAD /**/" >>confdefs.h
  
-@@ -15617,12 +15617,12 @@ fi
+@@ -15503,12 +15503,12 @@ fi
         *beos*) WITH_THREADS="1"
  	   THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS"
         ;;
@@ -59,7 +59,7 @@ Various configure fixes:
  	           if expr ${GCC_MEDIUM} \> 2 \& ${GCC_MAJOR} = 3 > /dev/null
  		   then
  		       THREAD_LIBS=""
-@@ -15639,6 +15639,10 @@ fi
+@@ -15525,6 +15525,10 @@ fi
  	       fi
  	   fi
         ;;
@@ -70,7 +70,7 @@ Various configure fixes:
      esac
      if test "$WITH_THREADS" = "1" ; then
  	THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT"
-@@ -15909,7 +15913,7 @@ else
+@@ -15795,7 +15799,7 @@ else
      TEST_SAX=SAXtests
  fi
  
@@ -79,14 +79,3 @@ Various configure fixes:
    WITH_SAX1_SOURCES_TRUE=
    WITH_SAX1_SOURCES_FALSE='#'
  else
-@@ -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 .)"
-- fi
-  ;;
-  *-*-cygwin*)
-  CYGWIN_EXTRA_LDFLAGS="-no-undefined"


--_----------=_1573046383126800--