Date: Mon, 20 Oct 2003 23:31:09 +0900 (JST) From: Hiroki Sato <hrs@eos.ocn.ne.jp> To: andy@freebsd.org Cc: www@freebsd.org Subject: Re: FreeBSD web build failed on freefall.freebsd.org Message-ID: <20031020.233109.89039796.hrs@eos.ocn.ne.jp> In-Reply-To: <20031020135933.GC3708@submonkey.net> References: <200310201252.h9KCqK9T063702@freefall.freebsd.org> <20031020135933.GC3708@submonkey.net>
next in thread | previous in thread | raw e-mail | index | archive | help
----Security_Multipart0(Mon_Oct_20_23:31:09_2003_882)-- Content-Type: Multipart/Mixed; boundary="--Next_Part(Mon_Oct_20_23:31:09_2003_336)--" Content-Transfer-Encoding: 7bit ----Next_Part(Mon_Oct_20_23:31:09_2003_336)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Ceri Davies <ceri@freebsd.org> wrote in <20031020135933.GC3708@submonkey.net>: ceri> Wow, this is ugly, but it fixes the build. No, the cause is that index.xsl still uses security/advisories.xml. The attached patch should fix the build. BTW, I think I will move advisories.xml to www/share, a language independent place. Sorry for confusing, but please check carefully if www/ tree can be built. -- | Hiroki SATO ----Next_Part(Mon_Oct_20_23:31:09_2003_336)-- Content-Type: Text/Plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline; filename="www.ru.diff" Index: index.xsl =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 RCS file: /home/ncvs/www/ru/index.xsl,v retrieving revision 1.7 diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\= $ -I\$hrs:.*\$ -r1.7 index.xsl --- index.xsl 14 Oct 2003 08:48:06 -0000 1.7 +++ index.xsl 20 Oct 2003 14:19:13 -0000 @@ -483,16 +483,16 @@ <font size=3D"-1"> =F0=CF=D3=CC=C5=C4=CE=C5=C5 =CF=C2=CE=CF=D7= =CC=C5=CE=C9=C5: <xsl:value-of - select=3D"document('security/advisories= .xml')/descendant::month[position() =3D 1]/name"/> + select=3D"document('../en/security/advi= sories.xml')/descendant::month[position() =3D 1]/name"/> <xsl:text> </xsl:text> <xsl:value-of - select=3D"document('security/advisories= .xml')/descendant::day[position() =3D 1]/name"/> + select=3D"document('../en/security/advi= sories.xml')/descendant::day[position() =3D 1]/name"/> <xsl:text>, </xsl:text> <xsl:value-of - select=3D"document('security/advisories= .xml')/descendant::year[position() =3D 1]/name"/> + select=3D"document('../en/security/advi= sories.xml')/descendant::year[position() =3D 1]/name"/> <br/> <!-- Pull in the 10 most recent security = advisories --> - <xsl:for-each select=3D"document('securit= y/advisories.xml')/descendant::advisory[position() < 10]"> + <xsl:for-each select=3D"document('../en/s= ecurity/advisories.xml')/descendant::advisory[position() < 10]"> · <a> <xsl:attribute name=3D"href">ftp://ft= p.freebsd.org/pub/FreeBSD/CERT/advisories/<xsl:value-of select=3D"name"= />.asc</xsl:attribute> <xsl:value-of select=3D"name"/> Index: Makefile =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 RCS file: /home/ncvs/www/ru/Makefile,v retrieving revision 1.25 diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\= $ -I\$hrs:.*\$ -r1.25 Makefile --- Makefile 16 Oct 2003 17:57:44 -0000 1.25 +++ Makefile 20 Oct 2003 14:19:37 -0000 @@ -87,7 +87,7 @@ DATA+=3D index.html CLEANFILES+=3D index.html = -index.html: index.xsl news/news.xml news/press.xml includes.xsl news/i= ncludes.xsl security/advisories.xml +index.html: index.xsl news/news.xml news/press.xml includes.xsl news/i= ncludes.xsl ../en/security/advisories.xml ${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \ ${.CURDIR}/index.xsl ${.CURDIR}/news/news.xml .if !defined(NO_TIDY) ----Next_Part(Mon_Oct_20_23:31:09_2003_336)---- ----Security_Multipart0(Mon_Oct_20_23:31:09_2003_882)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.2 (FreeBSD) iD8DBQA/k/GtTyzT2CeTzy0RAq6lAJ99d+lDUQOIRxJmx0asHRGvKZIuVwCfRAsl K23tuQnTwwcFXoygazAbNig= =huCv -----END PGP SIGNATURE----- ----Security_Multipart0(Mon_Oct_20_23:31:09_2003_882)----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031020.233109.89039796.hrs>