Date: Thu, 23 Oct 2014 18:53:43 +0000 From: Glen Barber <gjb@FreeBSD.org> To: Jung-uk Kim <jkim@FreeBSD.org> Cc: FreeBSD Documentation Engineering Team <doceng@FreeBSD.org>, freebsd-doc@FreeBSD.org, FreeBSD Gnome <freebsd-gnome@freebsd.org> Subject: Re: FreeBSD Home Page Message-ID: <20141023185343.GA8981@hub.FreeBSD.org> In-Reply-To: <5449485A.6000709@FreeBSD.org> References: <C73ECBFD-AAA9-421A-9FAB-799F57591604@yahoo.com> <20141023051037.GB1237@hub.FreeBSD.org> <20141023051531.GC1237@hub.FreeBSD.org> <5449485A.6000709@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--mxv5cy4qt+RJ9ypb Content-Type: multipart/mixed; boundary="wRRV7LY7NUeQGEoC" Content-Disposition: inline --wRRV7LY7NUeQGEoC Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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=20 > > doceng@.] > >=20 > > 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=20 > >> wrote: > >>> freebsd.org home page seems strange with "Production" and=20 > >>> "Upcoming". > >>=20 > >> Copying the proper list. > >>=20 > >=20 > > This is related to one of the recent textproc/libxml2 updates,=20 > > confirmed locally. Either ports r371120 or r371269 is suspect=20 > > here. >=20 > It seems the problem was fixed with the following upstream commit. >=20 > https://git.gnome.org/browse/libxml2/commit/?id=3D72a46a519ce7326d9a00f0b= 6a7f2a8e958cd1675 >=20 I can confirm that this does resolve the issue. I have attached the patch to the port used to confirm. Glen --wRRV7LY7NUeQGEoC Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="libxml2.diff.txt" 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(); --wRRV7LY7NUeQGEoC-- --mxv5cy4qt+RJ9ypb Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJUSU63AAoJEAMUWKVHj+KTAsAP/jBY54acs0Q+ZIe342hiSVZ+ ZaAs/Ota0PXxnSB+St60AX8qHcNG5sT5rw+bF/IXh25K/xfrcak1LrFBvRguD3/f ljwA2WAgl3ZwIfjqvi31isAaM966ERRPs3FguyQChqQyvJG18UODBm/DmNW9BTA6 YN7b/J1OTenjp/5e21c3xS1CqsYrPVq2OMFj2fP7v1/MGRLJRgE4YhCPFwgHfbyY XFF2Xi8jRtgiOXQAnkzzXq4C9rmTJL81awb0KUHWPXtlokIz9ZO21P/24H2zZCKD XbTVDoUxcja+XqtyLfbEOgOiY/2nQUXs+XFlOzZ/6i3hTCF5tAAlF7xY7RhwG9Kv /HRl8SDMnH6MEmojajiE+0UEh5F3oAIys0cIht3R5+znvp697Mv6lkm+4OiqZWtq qcYWIaflpHsLPQsyF5qAL8AXqd6XqaRmPUHkgDWV0pEMvqh8CrHlN/CpU/9SdLKf uqx02DeHceQx2BLTmpTBS/vL1UnuQYdulqP3zQC58zW3faAGZoYHvIlD2oTQ3un2 reL1ECDO5aJ4w28N/HmW4IQSexFcXG2fsa/X3vjLkjYaPzWgChxhVvUm1H1SQtCK OI1a2ytpdCVVh6LAPFnjuCON/LEs0ChcYc4dUrAxdxiSDUb464XvZQSiBHlBB33H wtx1vA5HvN9oEWILx6ap =5BQi -----END PGP SIGNATURE----- --mxv5cy4qt+RJ9ypb--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20141023185343.GA8981>