Index: branches/2014Q4/textproc/libxml2/Makefile
===================================================================
--- branches/2014Q4/textproc/libxml2/Makefile	(revision 372036)
+++ branches/2014Q4/textproc/libxml2/Makefile	(revision 372037)
@@ -1,68 +1,68 @@
 # Created by: Yukihiro Nakai <Nakai@technologist.com>
 # $FreeBSD$
 #    $MCom: ports/trunk/textproc/libxml2/Makefile 19578 2014-04-25 21:50:30Z kwm $
 
 PORTNAME=	libxml2
 PORTVERSION=	2.9.2
-PORTREVISION?=	1
+PORTREVISION?=	2
 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
 
 .if !defined(REFERENCE_PORT)
 
 GNU_CONFIGURE=	yes
 USES+=		gmake iconv libtool pathfix pkgconfig shebangfix
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \
 		--with-html-dir=${PREFIX}/share/doc \
 		--with-html-subdir=${PORTNAME} \
 		--with-lzma=/usr \
 		--without-python
 INSTALL_TARGET=	install-strip
 SHEBANG_FILES=	*.py */*.py */*/*.py
 
 PLIST_SUB+=	LIBVERSION=${PORTVERSION}
 
 .if !defined(MASTERDIR)
 
 OPTIONS_DEFINE= SCHEMA THREADS MEM_DEBUG XMLLINT_HIST THREAD_ALLOC
 OPTIONS_DEFAULT=SCHEMA THREADS
 SCHEMA_DESC=	XML schema support
 SCHEMA_CONFIGURE_WITH=	schemas
 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 <bsd.port.mk>
 
 .endif
Index: branches/2014Q4/textproc/libxml2/files/patch-parser.c
===================================================================
--- branches/2014Q4/textproc/libxml2/files/patch-parser.c	(revision 372036)
+++ branches/2014Q4/textproc/libxml2/files/patch-parser.c	(revision 372037)
@@ -1,31 +1,45 @@
+From 72a46a519ce7326d9a00f0b6a7f2a8e958cd1675 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Thu, 23 Oct 2014 11:35:36 +0800
+Subject: Fix missing entities after CVE-2014-3660 fix
+
+For https://bugzilla.gnome.org/show_bug.cgi?id=738805
+
+The fix for CVE-2014-3660 introduced a regression in some case
+where entity substitution is required and the entity is used
+first in anotther entity referenced from an attribute value
+
+---
+
 From 0e6659ec960734b0b01aad196d4bdb4a3800b493 Mon Sep 17 00:00:00 2001
 From: Lubomir Rintel <lkundrak@v3.sk>
 Date: Thu, 16 Oct 2014 19:10:59 +0200
 Subject: [PATCH] Revert "Missing initialization for the catalog module"
 
 It's not correct to always load the default catalog.
 https://bugzilla.redhat.com/show_bug.cgi?id=1153753
 
 This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7.
 
----
- parser.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/parser.c b/parser.c
-index 1d93967..67c9dfd 100644
---- parser.c
-+++ parser.c
-@@ -14830,9 +14830,6 @@ xmlInitParser(void) {
+--- parser.c.orig	2014-10-29 14:28:43.755327730 +0100
++++ parser.c	2014-10-29 14:28:55.287325756 +0100
+@@ -7235,7 +7235,8 @@
+      * far more secure as the parser will only process data coming from
+      * the document entity by default.
+      */
+-    if ((ent->checked == 0) &&
++    if (((ent->checked == 0) ||
++         ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) &&
+         ((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) ||
+          (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) {
+ 	unsigned long oldnbent = ctxt->nbentities;
+@@ -14830,9 +14831,6 @@
  #ifdef LIBXML_XPATH_ENABLED
  	xmlXPathInit();
  #endif
 -#ifdef LIBXML_CATALOG_ENABLED
 -        xmlInitializeCatalog();
 -#endif
  	xmlParserInitialized = 1;
  #ifdef LIBXML_THREAD_ENABLED
      }
--- 
-1.9.3
-
Index: branches/2014Q4
===================================================================
--- branches/2014Q4	(revision 372036)
+++ branches/2014Q4	(revision 372037)

Property changes on: branches/2014Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r371693