From owner-freebsd-gnome@FreeBSD.ORG Wed Oct 29 17:12:38 2014 Return-Path: Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4C8AF70F; Wed, 29 Oct 2014 17:12:38 +0000 (UTC) Received: from fep12.mx.upcmail.net (fep12.mx.upcmail.net [62.179.121.32]) by mx1.freebsd.org (Postfix) with ESMTP id ED6B08F6; Wed, 29 Oct 2014 17:12:36 +0000 (UTC) Received: from edge03.upcmail.net ([192.168.13.238]) by viefep26-int.chello.at (InterMail vM.8.01.05.13 201-2260-151-135-20130320) with ESMTP id <20141029170927.NYQD663.viefep26-int.chello.at@edge03.upcmail.net>; Wed, 29 Oct 2014 18:09:27 +0100 Received: from [192.168.0.23] ([178.84.134.112]) by edge03.upcmail.net with edge id 95BT1p00e2Rg3Ey015BT3W; Wed, 29 Oct 2014 18:11:28 +0100 X-SourceIP: 178.84.134.112 Message-ID: <54511FC0.4070707@rainbow-runner.nl> Date: Wed, 29 Oct 2014 18:11:28 +0100 From: Koop Mast User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Glen Barber , Jung-uk Kim Subject: Re: FreeBSD Home Page References: <20141023051037.GB1237@hub.FreeBSD.org> <20141023051531.GC1237@hub.FreeBSD.org> <5449485A.6000709@FreeBSD.org> <20141023185343.GA8981@hub.FreeBSD.org> <20141028160614.GD1206@hub.FreeBSD.org> In-Reply-To: <20141028160614.GD1206@hub.FreeBSD.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Cc: FreeBSD Documentation Engineering Team , freebsd-doc@FreeBSD.org, FreeBSD Gnome X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Oct 2014 17:12:38 -0000 On 28-10-2014 17:06, Glen Barber wrote: > 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@.] >>>> >>>> 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 > Done