Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Feb 2015 16:28:19 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r278267 - in stable/10/release/doc: en_US.ISO8859-1/errata en_US.ISO8859-1/relnotes share/xml
Message-ID:  <201502051628.t15GSJUi009808@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gjb
Date: Thu Feb  5 16:28:18 2015
New Revision: 278267
URL: https://svnweb.freebsd.org/changeset/base/278267

Log:
  Apply r278265 from head:
  
  Security Advisory information is included on several
  pages in the release notes.  Rather than duplicating
  the information between various files, add two new
  files to include in all pages that currently display
  the information.
  
  Sponsored by:	The FreeBSD Foundation

Added:
  stable/10/release/doc/share/xml/errata.xml
     - copied, changed from r278265, head/release/doc/share/xml/errata.xml
  stable/10/release/doc/share/xml/security.xml
     - copied, changed from r278265, head/release/doc/share/xml/security.xml
Modified:
  stable/10/release/doc/en_US.ISO8859-1/errata/article.xml
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/errata/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/errata/article.xml	Thu Feb  5 16:00:34 2015	(r278266)
+++ stable/10/release/doc/en_US.ISO8859-1/errata/article.xml	Thu Feb  5 16:28:18 2015	(r278267)
@@ -4,6 +4,8 @@
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"
   "http://www.FreeBSD.org/release/XML/release.ent">;
 %release;
+<!ENTITY security SYSTEM "../../share/xml/security.xml">
+<!ENTITY errata SYSTEM "../../share/xml/errata.xml">
 ]>
 
 <article xmlns="http://docbook.org/ns/docbook"
@@ -76,48 +78,13 @@
   <sect1 xml:id="security">
     <title>Security Advisories</title>
 
-    <informaltable frame="none" pgwide="0">
-      <tgroup cols="3">
-	<colspec colwidth="1*" />
-	<colspec colwidth="1*" />
-	<colspec colwidth="3*" />
-	<thead>
-	  <row>
-	    <entry>Advisory</entry>
-	    <entry>Date</entry>
-	    <entry>Topic</entry>
-	  </row>
-	</thead>
-
-	<tbody>
-	  <row>
-	    <entry><link xlink:href="http://www.freebsd.org/security/advisories/FreeBSD-SA-14:27.stdio.asc">SA-14:27.stdio</link></entry>;
-	    <entry>10&nbsp;December&nbsp;2014</entry>
-	    <entry><para>Buffer overflow in stdio</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><link xlink:href="http://www.freebsd.org/security/advisories/FreeBSD-SA-14:28.file.asc">SA-14:28.file</link></entry>;
-	    <entry>10&nbsp;December&nbsp;2014</entry>
-	    <entry><para>Multiple vulnerabilities in &man.file.1; and
-		&man.libmagic.3;</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><link xlink:href="http://www.freebsd.org/security/advisories/FreeBSD-SA-14:30.unbound.asc">SA-14:30.unbound</link></entry>;
-	    <entry>17&nbsp;December&nbsp;2014</entry>
-	    <entry><para>Remote denial of service
-		vulnerability</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><link xlink:href="http://www.freebsd.org/security/advisories/FreeBSD-SA-14:31.ntp.asc">SA-14:31.ntp</link></entry>;
-	    <entry>23&nbsp;December&nbsp;2014</entry>
-	    <entry><para>Multiple vulnerabilities</para></entry>
-	  </row>
-	</tbody>
-      </tgroup>
-    </informaltable>
+    &security;
+  </sect1>
+
+  <sect1 xml:id="errata">
+    <title>Errata Notices</title>
+
+    &errata;
   </sect1>
 
   <sect1 xml:id="open-issues">

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Feb  5 16:00:34 2015	(r278266)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Feb  5 16:28:18 2015	(r278267)
@@ -7,6 +7,8 @@
  %sponsor;
 <!ENTITY % vendor PUBLIC "-//FreeBSD//ENTITIES Vendor Specification//EN" "vendor.ent">
  %vendor;
+<!ENTITY security SYSTEM "../../share/xml/security.xml">
+<!ENTITY errata SYSTEM "../../share/xml/errata.xml">
 ]>
 <article xmlns="http://docbook.org/ns/docbook"
   xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
@@ -138,106 +140,13 @@
     <sect2 xml:id="security">
       <title>Security Advisories</title>
 
-      <informaltable frame="none" pgwide="1">
-	<tgroup cols="3">
-	  <colspec colwidth="40%"/>
-	  <colspec colwidth="30%"/>
-	  <colspec colwidth="30%"/>
-	  <thead>
-	    <row>
-	      <entry>Advisory</entry>
-	      <entry>Date</entry>
-	      <entry>Topic</entry>
-	    </row>
-	  </thead>
-
-	  <tbody>
-	    <row>
-	      <entry><link
-		  xlink:href="&security.url;/FreeBSD-SA-14:27.stdio.asc">FreeBSD-SA-14:27.stdio</link></entry>
-	      <entry>10&nbsp;December&nbsp;2014</entry>
-	      <entry><para>Buffer overflow in stdio</para></entry>
-	    </row>
-
-	    <row>
-	      <entry><link
-		  xlink:href="&security.url;/FreeBSD-SA-14:28.file.asc">FreeBSD-SA-14:28.file</link></entry>
-	      <entry>10&nbsp;December&nbsp;2014</entry>
-	      <entry><para>Multiple vulnerabilities in &man.file.1;
-		and &man.libmagic.3;</para></entry>
-	    </row>
-
-	    <row>
-	      <entry><link
-		  xlink:href="&security.url;/FreeBSD-SA-14:30.unbound.asc">FreeBSD-SA-14:30.unbound</link></entry>
-	      <entry>17&nbsp;December&nbsp;2014</entry>
-	      <entry><para>Remote denial of service
-		vulnerability</para></entry>
-	    </row>
-
-	    <row>
-	      <entry><link
-		  xlink:href="&security.url;/FreeBSD-SA-14:31.ntp.asc">FreeBSD-SA-14:31.ntp</link></entry>
-	      <entry>23&nbsp;December&nbsp;2014</entry>
-	      <entry><para>Multiple vulnerabilities in NTP
-		suite</para></entry>
-	    </row>
-
-	    <row>
-	      <entry><link
-		  xlink:href="&security.url;/FreeBSD-SA-15:01.openssl.asc">FreeBSD-SA-15:01.openssl</link></entry>
-	      <entry>14&nbsp;January&nbsp;2015</entry>
-	      <entry><para>Multiple vulnerabilities in
-		OpenSSL</para></entry>
-	    </row>
-
-	    <row>
-	      <entry><link
-		  xlink:href="&security.url;/FreeBSD-SA-15:02.kmem.asc">FreeBSD-SA-15:02.kmem</link></entry>
-	      <entry>27&nbsp;January&nbsp;2015</entry>
-	      <entry><para>SCTP kernel memory corruption and
-		disclosure vulnerability</para></entry>
-	    </row>
-
-	    <row>
-	      <entry><link
-		  xlink:href="&security.url;/FreeBSD-SA-15:03.sctp.asc">FreeBSD-SA-15:03.sctp</link></entry>
-	      <entry>27&nbsp;January&nbsp;2015</entry>
-	      <entry><para>SCTP stream reset
-		vulnerability</para></entry>
-	    </row>
-	  </tbody>
-	</tgroup>
-      </informaltable>
+      &security;
     </sect2>
 
     <sect2 xml:id="errata">
       <title>Errata Notices</title>
 
-      <informaltable frame="none" pgwide="1">
-	<tgroup cols="3">
-	  <colspec colwidth="40%"/>
-	  <colspec colwidth="30%"/>
-	  <colspec colwidth="30%"/>
-	  <thead>
-	    <row>
-	      <entry>Errata</entry>
-	      <entry>Date</entry>
-	      <entry>Topic</entry>
-	    </row>
-	  </thead>
-
-	  <tbody>
-	    <row>
-	      <entry><link
-		  xlink:href="&security.url;/FreeBSD-EN-14:13.freebsd-update.asc">FreeBSD-EN-14:13.freebsd-update</link></entry>
-	      <entry>23&nbsp;December&nbsp;2014</entry>
-	      <entry><para>Fixed directory deletion issue in
-		&man.freebsd-update.8;</para></entry>
-	    </row>
-	  </tbody>
-	</tgroup>
-      </informaltable>
+      &errata;
     </sect2>
   </sect1>
 

Copied and modified: stable/10/release/doc/share/xml/errata.xml (from r278265, head/release/doc/share/xml/errata.xml)
==============================================================================
--- head/release/doc/share/xml/errata.xml	Thu Feb  5 15:46:01 2015	(r278265, copy source)
+++ stable/10/release/doc/share/xml/errata.xml	Thu Feb  5 16:28:18 2015	(r278267)
@@ -19,9 +19,11 @@
 
     <tbody>
       <row>
-	<entry><para>No errata notices.</para></entry>
-	<entry><para>&nbsp;</para></entry>
-	<entry><para>&nbsp;</para></entry>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-EN-14:13.freebsd-update.asc">FreeBSD-EN-14:13.freebsd-update</link></entry>
+	<entry>23&nbsp;December&nbsp;2014</entry>
+	<entry><para>Fixed directory deletion issue in
+	    &man.freebsd-update.8;</para></entry>
       </row>
     </tbody>
   </tgroup>

Copied and modified: stable/10/release/doc/share/xml/security.xml (from r278265, head/release/doc/share/xml/security.xml)
==============================================================================
--- head/release/doc/share/xml/security.xml	Thu Feb  5 15:46:01 2015	(r278265, copy source)
+++ stable/10/release/doc/share/xml/security.xml	Thu Feb  5 16:28:18 2015	(r278267)
@@ -19,9 +19,58 @@
 
     <tbody>
       <row>
-	<entry><para>No advisories.</para></entry>
-	<entry><para>&nbsp;</para></entry>
-	<entry><para>&nbsp;</para></entry>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-SA-14:27.stdio.asc">FreeBSD-SA-14:27.stdio</link></entry>
+	<entry>10&nbsp;December&nbsp;2014</entry>
+	<entry><para>Buffer overflow in stdio</para></entry>
+      </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-SA-14:28.file.asc">FreeBSD-SA-14:28.file</link></entry>
+	<entry>10&nbsp;December&nbsp;2014</entry>
+	<entry><para>Multiple vulnerabilities in &man.file.1;
+	    and &man.libmagic.3;</para></entry>
+      </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-SA-14:30.unbound.asc">FreeBSD-SA-14:30.unbound</link></entry>
+	<entry>17&nbsp;December&nbsp;2014</entry>
+	<entry><para>Remote denial of service
+	    vulnerability</para></entry>
+      </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-SA-14:31.ntp.asc">FreeBSD-SA-14:31.ntp</link></entry>
+	<entry>23&nbsp;December&nbsp;2014</entry>
+	<entry><para>Multiple vulnerabilities in NTP
+	    suite</para></entry>
+      </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-SA-15:01.openssl.asc">FreeBSD-SA-15:01.openssl</link></entry>
+	<entry>14&nbsp;January&nbsp;2015</entry>
+	<entry><para>Multiple vulnerabilities in
+	    OpenSSL</para></entry>
+      </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-SA-15:02.kmem.asc">FreeBSD-SA-15:02.kmem</link></entry>
+	<entry>27&nbsp;January&nbsp;2015</entry>
+	<entry><para>SCTP kernel memory corruption and
+	    disclosure vulnerability</para></entry>
+      </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-SA-15:03.sctp.asc">FreeBSD-SA-15:03.sctp</link></entry>
+	<entry>27&nbsp;January&nbsp;2015</entry>
+	<entry><para>SCTP stream reset
+	    vulnerability</para></entry>
       </row>
     </tbody>
   </tgroup>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502051628.t15GSJUi009808>