FreeBSD Home Page

[Glen Barber]

On Thu, Oct 23, 2014 at 06:53:43PM +0000, Glen Barber wrote:
> On Thu, Oct 23, 2014 at 02:26:34PM -0400, Jung-uk Kim wrote:
> > On 2014-10-23 01:15:31 -0400, Glen Barber wrote:
> > > [Move hackers@ to BCC to prevent further noise there, added 
> > > doceng at .]
> > > 
> > > On Thu, Oct 23, 2014 at 05:10:37AM +0000, Glen Barber wrote:
> > >> On Thu, Oct 23, 2014 at 12:41:59PM +0800, by via freebsd-hackers 
> > >> wrote:
> > >>> freebsd.org home page seems strange with "Production" and 
> > >>> "Upcoming".
> > >> 
> > >> Copying the proper list.
> > >> 
> > > 
> > > This is related to one of the recent textproc/libxml2 updates, 
> > > confirmed locally.  Either ports r371120 or r371269 is suspect 
> > > here.
> > 
> > It seems the problem was fixed with the following upstream commit.
> > 
> > https://git.gnome.org/browse/libxml2/commit/?id=72a46a519ce7326d9a00f0b6a7f2a8e958cd1675
> > 
> 
> I can confirm that this does resolve the issue.
> 
> I have attached the patch to the port used to confirm.
> 
> Glen
> 

> Index: textproc/libxml2/files/patch-parser.c
> ===================================================================
> --- textproc/libxml2/files/patch-parser.c	(revision 371400)
> +++ textproc/libxml2/files/patch-parser.c	(working copy)
> @@ -16,6 +16,16 @@ diff --git a/parser.c b/parser.c
>  index 1d93967..67c9dfd 100644
>  --- parser.c
>  +++ parser.c
> +@@ -7235,7 +7235,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
> +      * 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 +14830,6 @@ xmlInitParser(void) {
>   #ifdef LIBXML_XPATH_ENABLED
>   	xmlXPathInit();

Can someone from gnome@ please commit this?

Glen

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-doc/attachments/20141028/ee99f930/attachment.sig>