Index: head/textproc/raptor2/Makefile =================================================================== --- head/textproc/raptor2/Makefile (revision 554670) +++ head/textproc/raptor2/Makefile (revision 554671) @@ -1,36 +1,36 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= raptor2 PORTVERSION= 2.0.15 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= textproc MASTER_SITES= http://download.librdf.org/source/ \ SF/librdf/${PORTNAME}/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= RDF Parser Toolkit for Redland # Even though GPLv3 is not explicitly mentioned in the port's LICENSE.html, one # of its licenses is "GPLv2 or newer", which includes GPLv3. LICENSE= APACHE20 GPLv2 GPLv3 LGPL21 LICENSE_COMB= dual LIB_DEPENDS= libcurl.so:ftp/curl \ libicuuc.so:devel/icu \ libyajl.so:devel/yajl CONFLICTS= raptor-1.4.1[0-9]* raptor-1.4.21 USE_GNOME= libxml2 libxslt USES= gnome libtool:keepla pathfix pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-xml2-config=${LOCALBASE}/bin/xml2-config \ --with-curl-config=${LOCALBASE}/bin/curl-config \ --with-icu-config=${LOCALBASE}/bin/icu-config \ --with-www=curl INSTALL_TARGET= install-strip USE_LDCONFIG= yes .include Index: head/textproc/raptor2/files/patch-CVE-2017-18926 =================================================================== --- head/textproc/raptor2/files/patch-CVE-2017-18926 (nonexistent) +++ head/textproc/raptor2/files/patch-CVE-2017-18926 (revision 554671) @@ -0,0 +1,40 @@ +From 590681e546cd9aa18d57dc2ea1858cb734a3863f Mon Sep 17 00:00:00 2001 +From: Dave Beckett +Date: Sun, 16 Apr 2017 23:15:12 +0100 +Subject: [PATCH] Calcualte max nspace declarations correctly for XML writer + +(raptor_xml_writer_start_element_common): Calculate max including for +each attribute a potential name and value. + +Fixes Issues #0000617 http://bugs.librdf.org/mantis/view.php?id=617 +and #0000618 http://bugs.librdf.org/mantis/view.php?id=618 +--- + src/raptor_xml_writer.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git src/raptor_xml_writer.c.orig src/raptor_xml_writer.c +index 693b9468..0d3a36a5 100644 +--- src/raptor_xml_writer.c.orig ++++ src/raptor_xml_writer.c +@@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + size_t nspace_declarations_count = 0; + unsigned int i; + +- /* max is 1 per element and 1 for each attribute + size of declared */ + if(nstack) { +- int nspace_max_count = element->attribute_count+1; ++ int nspace_max_count = element->attribute_count * 2; /* attr and value */ ++ if(element->name->nspace) ++ nspace_max_count++; + if(element->declared_nspaces) + nspace_max_count += raptor_sequence_size(element->declared_nspaces); + if(element->xml_language) +@@ -237,7 +238,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + } + } + +- /* Add the attribute + value */ ++ /* Add the attribute's value */ + nspace_declarations[nspace_declarations_count].declaration= + raptor_qname_format_as_xml(element->attributes[i], + &nspace_declarations[nspace_declarations_count].length); Property changes on: head/textproc/raptor2/files/patch-CVE-2017-18926 ___________________________________________________________________ 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