Index: branches/2016Q3/textproc/libxml2/Makefile =================================================================== --- branches/2016Q3/textproc/libxml2/Makefile (revision 421042) +++ branches/2016Q3/textproc/libxml2/Makefile (revision 421043) @@ -1,71 +1,74 @@ # Created by: Yukihiro Nakai # $FreeBSD$ PORTNAME= libxml2 -PORTVERSION= 2.9.3 +PORTVERSION= 2.9.4 PORTREVISION?= 0 CATEGORIES?= textproc gnome MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ http://xmlsoft.org/sources/ \ ftp://gd.tuwien.ac.at/pub/libxml/ DIST_SUBDIR= gnome2 MAINTAINER?= gnome@FreeBSD.org COMMENT?= XML parser library for GNOME + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING .if !defined(REFERENCE_PORT) GNU_CONFIGURE= yes USES+= cpe gmake iconv libtool pathfix pkgconfig shebangfix CPE_VENDOR= xmlsoft USE_LDCONFIG= yes CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \ --with-html-dir=${PREFIX}/share/doc \ --with-html-subdir=${PORTNAME} \ --without-icu \ --with-lzma=/usr \ --without-python INSTALL_TARGET= install-strip SHEBANG_FILES= *.py */*.py */*/*.py PLIST_SUB+= LIBVERSION=${PORTVERSION} .if !defined(MASTERDIR) OPTIONS_DEFINE= SCHEMA VALID THREADS MEM_DEBUG XMLLINT_HIST THREAD_ALLOC OPTIONS_DEFAULT=SCHEMA VALID THREADS SCHEMA_DESC= XML schema support SCHEMA_CONFIGURE_WITH= schemas VALID_DESC= Validation support VALID_CONFIGURE_OFF= --without-valid THREADS_DESC= Threads support THREADS_CONFIGURE_WITH= threads MEM_DEBUG_DESC= Memory debugging (DEVELOPERS ONLY!) MEM_DEBUG_CONFIGURE_WITH= mem-debug XMLLINT_HIST_DESC= History for xmllint XMLLINT_HIST_CONFIGURE_WITH= history THREAD_ALLOC_DESC= Per-thread memory (DEVELOPERS ONLY!) THREAD_ALLOC_CONFIGURE_WITH= thread-alloc .endif # !defined(MASTERDIR) post-patch: .for d in . doc doc/devhelp doc/examples @${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' \ ${WRKSRC}/${d}/Makefile.in .endfor .for f in catalog.c xmlcatalog.c xmllint.c doc/xmllint.1 @${REINPLACE_CMD} -e \ 's|/etc/xml/catalog|${LOCALBASE}/share/xml/catalog|g; \ s|/etc/sgml/catalog|${LOCALBASE}/share/sgml/catalog|g' \ ${WRKSRC}/${f} .endfor .if !defined(MASTERDIR) post-install: @${RM} -rf ${STAGEDIR}${PREFIX}/share/gtk-doc .endif .include .endif Index: branches/2016Q3/textproc/libxml2/distinfo =================================================================== --- branches/2016Q3/textproc/libxml2/distinfo (revision 421042) +++ branches/2016Q3/textproc/libxml2/distinfo (revision 421043) @@ -1,2 +1,3 @@ -SHA256 (gnome2/libxml2-2.9.3.tar.gz) = 4de9e31f46b44d34871c22f54bfc54398ef124d6f7cafb1f4a5958fbcd3ba12d -SIZE (gnome2/libxml2-2.9.3.tar.gz) = 5477112 +TIMESTAMP = 1472161994 +SHA256 (gnome2/libxml2-2.9.4.tar.gz) = ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c +SIZE (gnome2/libxml2-2.9.4.tar.gz) = 5374830 Index: branches/2016Q3/textproc/libxml2/files/patch-d8083bf =================================================================== --- branches/2016Q3/textproc/libxml2/files/patch-d8083bf (nonexistent) +++ branches/2016Q3/textproc/libxml2/files/patch-d8083bf (revision 421043) @@ -0,0 +1,57 @@ +From d8083bf77955b7879c1290f0c0a24ab8cc70f7fb Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Sat, 25 Jun 2016 12:35:50 +0200 +Subject: Fix NULL pointer deref in XPointer range-to + +- Check for errors after evaluating first operand. +- Add sanity check for empty stack. + +Found with afl-fuzz. +--- + result/XPath/xptr/viderror | 4 ++++ + test/XPath/xptr/viderror | 1 + + xpath.c | 7 ++++++- + 3 files changed, 11 insertions(+), 1 deletion(-) + create mode 100644 result/XPath/xptr/viderror + create mode 100644 test/XPath/xptr/viderror + +diff --git a/result/XPath/xptr/viderror b/result/XPath/xptr/viderror +new file mode 100644 +index 0000000..d589882 +--- /dev/null ++++ result/XPath/xptr/viderror +@@ -0,0 +1,4 @@ ++ ++======================== ++Expression: xpointer(non-existing-fn()/range-to(id('chapter2'))) ++Object is empty (NULL) +diff --git a/test/XPath/xptr/viderror b/test/XPath/xptr/viderror +new file mode 100644 +index 0000000..da8c53b +--- /dev/null ++++ test/XPath/xptr/viderror +@@ -0,0 +1 @@ ++xpointer(non-existing-fn()/range-to(id('chapter2'))) +diff --git a/xpath.c b/xpath.c +index 113bce6..751665b 100644 +--- xpath.c ++++ xpath.c +@@ -14005,9 +14005,14 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + xmlNodeSetPtr oldset; + int i, j; + +- if (op->ch1 != -1) ++ if (op->ch1 != -1) { + total += + xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); ++ CHECK_ERROR0; ++ } ++ if (ctxt->value == NULL) { ++ XP_ERROR0(XPATH_INVALID_OPERAND); ++ } + if (op->ch2 == -1) + return (total); + +-- +cgit v0.12 + Property changes on: branches/2016Q3/textproc/libxml2/files/patch-d8083bf ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q3/textproc/py-libxml2/Makefile =================================================================== --- branches/2016Q3/textproc/py-libxml2/Makefile (revision 421042) +++ branches/2016Q3/textproc/py-libxml2/Makefile (revision 421043) @@ -1,34 +1,34 @@ # Created by: Alexander Nedotsukov # $FreeBSD$ PORTREVISION= 0 CATEGORIES= textproc gnome python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= gnome@FreeBSD.org COMMENT= Python interface for XML parser library for GNOME MASTERDIR= ${.CURDIR}/../libxml2 BUILD_WRKSRC= ${WRKSRC}/python INSTALL_WRKSRC= ${BUILD_WRKSRC} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist USE_GNOME+= libxml2 -USES+= python:2 +USES+= python:2 gettext-runtime USE_PYTHON= autoplist distutils CPPFLAGS+= `${PYTHON_VERSION}-config --cflags` LDFLAGS+= -L${LOCALBASE}/lib `${PYTHON_VERSION}-config --libs` CONFIGURE_ARGS= --with-iconv=${ICONV_PREFIX} \ --with-html-dir=${PREFIX}/share/doc \ --with-html-subdir=${PORTNAME} \ --with-python=${PYTHON_CMD} DOCSDIR= ${PREFIX}/share/doc/py-libxml2 EXAMPLESDIR= ${PREFIX}/share/examples/py-libxml2 post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so .include "${MASTERDIR}/Makefile" Index: branches/2016Q3/textproc/py3-libxml2/Makefile =================================================================== --- branches/2016Q3/textproc/py3-libxml2/Makefile (revision 421042) +++ branches/2016Q3/textproc/py3-libxml2/Makefile (revision 421043) @@ -1,34 +1,34 @@ # Created by: Alexander Nedotsukov # $FreeBSD$ PORTREVISION= 0 CATEGORIES= textproc gnome python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= gnome@FreeBSD.org COMMENT= Python interface for XML parser library for GNOME MASTERDIR= ${.CURDIR}/../libxml2 BUILD_WRKSRC= ${WRKSRC}/python INSTALL_WRKSRC= ${BUILD_WRKSRC} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist USE_GNOME+= libxml2 -USES= python:3 +USES= python:3 gettext-runtime USE_PYTHON= autoplist distutils CPPFLAGS+= `${PYTHON_VERSION}-config --cflags` LDFLAGS+= -L${LOCALBASE}/lib `${PYTHON_VERSION}-config --libs` CONFIGURE_ARGS= --with-iconv=${ICONV_PREFIX} \ --with-html-dir=${PREFIX}/share/doc \ --with-html-subdir=${PORTNAME} \ --with-python=${PYTHON_CMD} DOCSDIR= ${PREFIX}/share/doc/py-libxml2 EXAMPLESDIR= ${PREFIX}/share/examples/py-libxml2 post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so .include "${MASTERDIR}/Makefile" Index: branches/2016Q3 =================================================================== --- branches/2016Q3 (revision 421042) +++ branches/2016Q3 (revision 421043) Property changes on: branches/2016Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r421031