More security patches for Xorg

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6336 af4574ff-66df-0310-9fd7-8a98e5e911e0

introduction/welcome/changelog.xml

@@ -44,6 +44,10 @@
     <listitem>
       <para>October 11th, 2006</para>
       <itemizedlist>
+        <listitem>
+          <para>[dnicholson] - Applied security patches to
+          Xorg-6.9.0 and libXfont-1.1.0.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Updated to NSS-3.11.3.</para>
         </listitem>

x/installing/x7lib.xml

@@ -55,7 +55,7 @@
       </listitem>
     </itemizedlist>
 
-    <!-- Following two patches are security related and should be
+    <!-- Following three patches are security related and should be
         fixed for Xorg-7.2 -->
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -67,6 +67,10 @@
         <para>Required patch: <ulink
         url="&patch-root;/xtrans-1.0.0-setuid-1.patch"/></para>
       </listitem>
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/libXfont-1.1.0-cidfonts-1.patch"/></para>
+      </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">Xorg Libraries Dependencies</bridgehead>
@@ -101,11 +105,12 @@ wget -B http://xorg.freedesktop.org/releases/individual/lib/ -i ../lib-7.1.wget<
   <sect2 role="installation">
     <title>Installation of Xorg Libraries</title>
 
-    <para>A <ulink url='http://wiki.x.org/wiki/SecurityPage'>security
-    vulnerability</ulink> has been identified in the libX11 and xtrans
-    packages. Before building these packages with the commands shown below,
-    be sure to apply the supplied patches. For libX11, this can be
-    accomplished with with the following command:</para>
+    <para><ulink url='http://wiki.x.org/wiki/SecurityPage'>Security
+    vulnerabilities</ulink> have been identified in the libX11, xtrans
+    and libXfont packages. Before building these packages with the
+    commands shown below, be sure to apply the supplied patches.
+    For libX11, this can be accomplished with with the following
+    command:</para>
 
 <screen><userinput>patch -Np1 -i ../libX11-1.0.1-setuid-1.patch</userinput></screen>
 
@@ -114,6 +119,11 @@ wget -B http://xorg.freedesktop.org/releases/individual/lib/ -i ../lib-7.1.wget<
 
 <screen><userinput>patch -Np1 -i ../xtrans-1.0.0-setuid-1.patch</userinput></screen>
 
+    <para>For libXfont, the patch can be applied with the following
+    command:</para>
+
+<screen><userinput>patch -Np1 -i ../libXfont-1.1.0-cidfonts-1.patch</userinput></screen>
+
     <para>Install the libraries by running the following commands for each
     of the chosen packages:</para>
 

x/installing/xorg.xml

@@ -91,7 +91,7 @@
       </listitem>
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/xorg-&xorg-version;-security-2.patch"/></para>
+        url="&patch-root;/xorg-&xorg-version;-security-3.patch"/></para>
       </listitem>
     </itemizedlist>
 
@@ -201,12 +201,13 @@
 
       <para>The <application>Xorg</application> sources must be patched in
       order to avoid a race condition with the <application>luit</application>
-      program.  Additionally, <application>Xorg</application> contains 3
-      <ulink url="http://wiki.x.org/wiki/SecurityPage">security vulnerabilities</ulink>.
-      Fix these issues with the following commands:</para>
+      program.  Additionally, <application>Xorg</application> contains 4
+      <ulink url="http://wiki.x.org/wiki/SecurityPage">security
+      vulnerabilities</ulink>. Fix these issues with the following
+      commands:</para>
 
 <screen><userinput>patch -Np1 -i ../xorg-&xorg-version;-luit_race-1.patch &amp;&amp;
-patch -Np1 -i ../xorg-&xorg-version;-security-2.patch</userinput></screen>
+patch -Np1 -i ../xorg-&xorg-version;-security-3.patch</userinput></screen>
 
       <para>Additionally, if you choose to install
       <application>Xorg</application> to any prefix other than