os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

PR: www/153524

Browse source 
PR:     www/142437

Patch the website so that "Errata Notices" are available the same way as "Security Advisories":
- RSS feed
- Link from the frontpage
- Own subpage
- Available via navigation menu

Initially suggested by: Jason Helfman (jhelfman ett e-e dott com)
Patch provided by:      John Baldwin (jhb@)
This commit is contained in:
Johann Kois 2011-01-04 20:14:37 +00:00
parent 2f48f5e975
commit 7ad337a2f8
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/www/; revision=36769
6 changed files with 27 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
en/index.xsl
View file

@ -4,7 +4,7 @@
<!ENTITY title "The FreeBSD Project">
]>
<!-- $FreeBSD: www/en/index.xsl,v 1.168 2009/06/02 19:16:33 rene Exp $ -->
<!-- $FreeBSD: www/en/index.xsl,v 1.169 2009/06/02 21:11:59 gabor Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
@ -334,7 +334,7 @@
<div>
<ul class="newseventslist">
<li class="first-child">
<a href="&base;/security/" title="More Errata Notices">More</a>
<a href="&base;/security/notices.html" title="More Errata Notices">More</a>
</li>
<li class="last-child">
<a href="&base;/security/errata.xml" title="Errata Notices RSS Feed"><img class="rssimage" src="&base;/layout/images/ico_rss.png" width="27" height="12" alt="Errata Notices RSS Feed" /></a>

15
en/security/Makefile
View file

@ -1,4 +1,4 @@
# $FreeBSD: www/en/security/Makefile,v 1.16 2008/03/01 01:55:27 simon Exp $
# $FreeBSD: www/en/security/Makefile,v 1.17 2008/06/20 20:03:28 danger Exp $
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@ -11,21 +11,30 @@ DATA= so_public_key.asc
DOCS= charter.sgml
DOCS+= security.sgml
DOCS+= advisories.sgml
DOCS+= notices.sgml
advisories.sgml: advisories.html.inc
INDEXLINK= security.html
notices.sgml: notices.html.inc
security.html: advisories.html.inc advisories.rdf
INDEXLINK= security.html
DEPENDSET.DEFAULT= advisories
DEPENDSET.errata-rss= notices
DEPENDSET.notices= notices
XML.DEFAULT= ${XML_ADVISORIES}
XMLDOCS= advisories:mkindex.xsl::advisories.html.inc
PARAMS.advisories= --param type "'advisory'"
NO_DATA.advisories= yes
NO_TIDY.advisories= yes
XMLDOCS+= notices:mkindex.xsl::notices.html.inc
PARAMS.notices= --param advisories.xml "'${XML_NOTICES}'"
PARAMS.notices+= --param type "'notice'"
NO_DATA.notices= yes
NO_TIDY.notices= yes
XMLDOCS+= advisories-rdf:security-rdf.xsl::advisories.rdf
XMLDOCS+= advisories-rss:security-rss.xsl::rss.xml
XMLDOCS+= errata-rss:errata-rss.xsl::errata.xml

3
en/security/mkindex.xsl
View file

@ -5,7 +5,7 @@
<!ENTITY title "">
]>
<!-- $FreeBSD: www/en/security/mkindex.xsl,v 1.5 2006/08/19 21:20:52 hrs Exp $ -->
<!-- $FreeBSD: www/en/security/mkindex.xsl,v 1.6 2008/03/01 01:55:27 simon Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
@ -16,6 +16,7 @@
<xsl:template match="/">
<xsl:call-template name="html-list-advisories">
<xsl:with-param name="advisories.xml" select="$advisories.xml" />
<xsl:with-param name="type" select="$type" />
</xsl:call-template>
</xsl:template>
</xsl:stylesheet>

6
en/security/security.sgml
View file

@ -1,12 +1,11 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
<!ENTITY base CDATA "..">
<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.215 2010/11/30 20:48:03 cperciva Exp $">
<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.216 2010/12/01 00:00:14 cperciva Exp $">
<!ENTITY title "FreeBSD Security Information">
<!ENTITY % navinclude.support "INCLUDE">
<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
<!ENTITY advisories.html.inc SYSTEM "advisories.html.inc">
]>
<!-- $FreeBSD: www/en/security/security.sgml,v 1.215 2010/11/30 20:48:03 cperciva Exp $ -->
<!-- $FreeBSD: www/en/security/security.sgml,v 1.216 2010/12/01 00:00:14 cperciva Exp $ -->
<html>
&header;
@ -32,6 +31,7 @@
<ul>
<li><a href="charter.html">Charter for the Security Officer and Team</a></li>
<li><a href="advisories.html">List of FreeBSD Security Advisories</a></li>
<li><a href="notices.html">List of FreeBSD Errata Notices</a></li>
<li><a href="&base;/doc/en_US.ISO8859-1/books/handbook/security-advisories.html">
Reading FreeBSD Security Advisories</a></li>
</ul>

27
share/sgml/libcommon.xsl
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
<!-- $FreeBSD: www/share/sgml/libcommon.xsl,v 1.30 2010/03/05 00:17:57 danger Exp $ -->
<!-- $FreeBSD: www/share/sgml/libcommon.xsl,v 1.31 2010/04/09 10:09:05 jkois Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0"
@ -760,32 +760,16 @@
<xsl:when test="$type = 'advisory'">
<xsl:call-template name="html-list-advisories-putitems">
<xsl:with-param name="items" select="document($advisories.xml)//advisory" />
<xsl:with-param name="itemtype" select="'Advisory'" />
<xsl:with-param name="prefix" select="'&ftpbase;'" />
<xsl:with-param name="prefixold" select="'&ftpbaseold;'" />
</xsl:call-template>
</xsl:when>
<xsl:when test="$type = 'notice'">
<xsl:for-each select="document($advisories.xml)
/descendant::release">
<xsl:variable name="relname" select="string(name)" />
<xsl:call-template name="html-list-advisories-putitems">
<xsl:with-param name="items" select="document($advisories.xml)
//notice[$relname = string(following::release/name[1])]" />
<xsl:with-param name="prefix" select="'&ftpbaseerrata;'" />
<xsl:with-param name="prefixold" select="'&ftpbaseerrata;'" />
</xsl:call-template>
<xsl:call-template name="html-list-advisories-release-label">
<xsl:with-param name="relname" select="name" />
</xsl:call-template>
</xsl:for-each>
<xsl:call-template name="html-list-advisories-putitems">
<xsl:with-param name="items" select="document($advisories.xml)
//notice[not(following::release/name[1])]" />
<xsl:with-param name="items" select="document($advisories.xml)//notice" />
<xsl:with-param name="itemtype" select="'Errata Notice'" />
<xsl:with-param name="prefix" select="'&ftpbaseerrata;'" />
<xsl:with-param name="prefixold" select="'&ftpbaseerrata;'" />
</xsl:call-template>
@ -798,12 +782,13 @@
<xsl:template name="html-list-advisories-putitems">
<xsl:param name="items" select="''" />
<xsl:param name="itemtype" select="''" />
<xsl:param name="prefix" select="''" />
<xsl:param name="prefixold" select="''" />
<xsl:if test="$items">
<table>
<tr><th>Date</th><th>Advisory name</th></tr>
<tr><th>Date</th><th><xsl:value-of select='$itemtype' /> name</th></tr>
<xsl:for-each select="$items">
<xsl:variable name="year" select="../../../name" />
<xsl:variable name="month" select="../../name" />

3
share/sgml/navibar.ent
View file

@ -1,4 +1,4 @@
<!-- $FreeBSD: www/share/sgml/navibar.ent,v 1.30 2010/05/10 19:33:23 kwm Exp $ -->
<!-- $FreeBSD: www/share/sgml/navibar.ent,v 1.31 2010/11/21 00:03:21 kwm Exp $ -->
<!ENTITY % navinclude.about "IGNORE">
<![ %navinclude.about; [
@ -179,6 +179,7 @@
<li><a href="&base;/security/index.html">Security Information</a>
<ul>
<li><a href="&base;/security/advisories.html">Advisories</a></li>
<li><a href="&base;/security/notices.html">Errata Notices</a></li>
</ul></li>
<li><a href="&base;/support/bugreports.html">Bug Reports</a>
<ul>