Date: Tue, 28 Oct 2014 16:06:14 +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: <20141028160614.GD1206@hub.FreeBSD.org> In-Reply-To: <20141023185343.GA8981@hub.FreeBSD.org> References: <C73ECBFD-AAA9-421A-9FAB-799F57591604@yahoo.com> <20141023051037.GB1237@hub.FreeBSD.org> <20141023051531.GC1237@hub.FreeBSD.org> <5449485A.6000709@FreeBSD.org> <20141023185343.GA8981@hub.FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--OROCMA9jn6tkzFBc Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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=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=3D72a46a519ce7326d9a00f= 0b6a7f2a8e958cd1675 > >=20 >=20 > I can confirm that this does resolve the issue. >=20 > I have attached the patch to the port used to confirm. >=20 > Glen >=20 > Index: textproc/libxml2/files/patch-parser.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- 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 =3D=3D 0) && > ++ if (((ent->checked =3D=3D 0) || > ++ ((ent->children =3D=3D NULL) && (ctxt->options & XML_PARSE_NOE= NT))) && > + ((ent->etype !=3D XML_EXTERNAL_GENERAL_PARSED_ENTITY) || > + (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) { > + unsigned long oldnbent =3D ctxt->nbentities; > @@ -14830,9 +14830,6 @@ xmlInitParser(void) { > #ifdef LIBXML_XPATH_ENABLED > xmlXPathInit(); Can someone from gnome@ please commit this? Glen --OROCMA9jn6tkzFBc Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJUT772AAoJEAMUWKVHj+KTmQ4P/iSkh8hvqx4CFa6mFspj+ev1 g9TEjP4Os6wZjYdhAv16kmisYQfmbqXTk9yMPhLKQhOcO8DguETu5yhikVpxV2/l 83NdyUiPVwpdI6u/GmXaVT8hu9zfXPficUPxUgN8yM5GGDwanq4YkVV6j7GTziLB ybDBUhOYxPxPk9diPU8XHjxz4zLn2Kilf4ZE0FDOR+m/6fDQVEPBsImxNrlwUm5J swEvuP4+pP9vNFxS1BNcK9wcmRYu+35tumOANEWeFf0ohMx7X4nHR2t9V1a9UVYh jPjigxLB2VWdNUxiJ7MiCN3sPo9A7EHS3yq635/Dh/NV0h46SO6+5vz9D80ygttw GTC8WjqjzN3nXHPuYw+juMtxXgCRpgV6tbC5aiu//uH7gStbDUuZ4/O6l1tRcVJn BPC9KE5d/tkUVuX4jIOeaGNzvaaTr9+BpBtBwMPJ/Zz/zd1k+jW1CvDFfgZ/xvNF KbOlwGxcBL+OKwZpUB1FcIjAoiKQK987Lcuf9Pvj5QNgBdKF2WzTQsEHBpWyXq31 6jnG8Q7pHCllzWk9cEHqR5HJYrTcVUuynI4+Gt0q/qdXWKAXRPXmEWGCxlnjbZjh 8lUqa/CIYK8dxXvKNdKlkDZrTAVx3r2mti7ZUWTz6wegSIbGgA6hZTxDa1A70eMk OpmTbNkVyiAr8vzmoSSo =oL32 -----END PGP SIGNATURE----- --OROCMA9jn6tkzFBc--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20141028160614.GD1206>