r6038 - in trunk/BOOK: . introduction/welcome x/installing

dj at linuxfromscratch.org dj at linuxfromscratch.org
Tue May 9 22:17:24 PDT 2006


Author: dj
Date: 2006-05-09 23:17:10 -0600 (Tue, 09 May 2006)
New Revision: 6038

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/installing/x-setup.xml
   trunk/BOOK/x/installing/x7app.xml
   trunk/BOOK/x/installing/x7font.xml
   trunk/BOOK/x/installing/x7lib.xml
   trunk/BOOK/x/installing/x7server.xml
   trunk/BOOK/x/installing/x7util.xml
   trunk/BOOK/x/installing/xorg.xml
   trunk/BOOK/x/installing/xorg7.xml
Log:
xorg and xorg7 cleanup

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2006-05-10 03:59:18 UTC (rev 6037)
+++ trunk/BOOK/general.ent	2006-05-10 05:17:10 UTC (rev 6038)
@@ -1,4 +1,4 @@
-<!ENTITY day          "09">                   <!-- Always 2 digits -->
+<!ENTITY day          "10">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
 <!ENTITY version      "svn-&year;&month;&day;">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2006-05-10 03:59:18 UTC (rev 6037)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2006-05-10 05:17:10 UTC (rev 6038)
@@ -41,6 +41,21 @@
 
 -->
 
+
+   <listitem>
+      <para>May 9th, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Added sed for additional xorg-6.9.0 security
+          vulnerability.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Udated dependencies for Xorg-7.0.0 section and 
+          corrected text.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>May 9th, 2006</para>
       <itemizedlist>

Modified: trunk/BOOK/x/installing/x-setup.xml
===================================================================
--- trunk/BOOK/x/installing/x-setup.xml	2006-05-10 03:59:18 UTC (rev 6037)
+++ trunk/BOOK/x/installing/x-setup.xml	2006-05-10 05:17:10 UTC (rev 6038)
@@ -139,13 +139,15 @@
     <command>twm</command>, see the man page.</para>
 
     <note>
-      <para>The default configuration for <application>Xorg</application> 
-      includes <application>xterm</application>.  
-      <application>Xorg</application>'s modular distribution no longer includes 
+      <para>Both the default, and the BLFS configuration for 
+      <application>Xorg</application> include <application>xterm</application>.
+      <application>Xorg</application>'s modular distribution no longer includes
       <application>xterm</application>, and 
       as a result, the <command>startx</command> command will fail if you have 
       not installed <xref linkend="xterm2"/> when using the modular X Window
-      System.</para>
+      System.  You can remove the <application>xterm</application> line in the 
+      above config file to test the xserver, or install one of the other 
+      terminal emulators and make appropriate changes.</para>
     </note>
 
     <indexterm zone="x-setup xconfig">

Modified: trunk/BOOK/x/installing/x7app.xml
===================================================================
--- trunk/BOOK/x/installing/x7app.xml	2006-05-10 03:59:18 UTC (rev 6037)
+++ trunk/BOOK/x/installing/x7app.xml	2006-05-10 05:17:10 UTC (rev 6038)
@@ -64,13 +64,14 @@
   <bridgehead renderas="sect3">Xorg Applications Dependencies</bridgehead>
 
   <bridgehead renderas="sect4">Required</bridgehead>
-  <para role="required"><xref linkend="xbitmaps"/></para>
+  <para role="required"><xref linkend="xbitmaps"/> and
+  <xref linkend="libpng"/></para>
 
   <bridgehead renderas="sect4">Recommended</bridgehead>
   <para><xref linkend="mesalib"/></para>
 
   <sect2>
-    <title>Downloading Xorg Applicatons</title>
+    <title>Downloading Xorg Applications</title>
 
     <para>To download the needed files using <application>wget</application>,
     use the following commands:</para>

Modified: trunk/BOOK/x/installing/x7font.xml
===================================================================
--- trunk/BOOK/x/installing/x7font.xml	2006-05-10 03:59:18 UTC (rev 6037)
+++ trunk/BOOK/x/installing/x7font.xml	2006-05-10 05:17:10 UTC (rev 6038)
@@ -61,7 +61,8 @@
   </itemizedlist>
 
   <bridgehead renderas="sect4">Required</bridgehead>
-  <para role="required"><xref linkend="xorg7-data"/></para>
+  <para role="required"><xref linkend="xorg7-data"/> and
+  <xref linkend="xorg7-app"/></para>
 
   <sect2>
     <title>Downloading Xorg Fonts</title>

Modified: trunk/BOOK/x/installing/x7lib.xml
===================================================================
--- trunk/BOOK/x/installing/x7lib.xml	2006-05-10 03:59:18 UTC (rev 6037)
+++ trunk/BOOK/x/installing/x7lib.xml	2006-05-10 05:17:10 UTC (rev 6038)
@@ -65,7 +65,6 @@
   <bridgehead renderas="sect4">Required</bridgehead>
   <para role="required"><xref linkend="ed"/>,
   <xref linkend="fontconfig"/>,
-  <xref linkend="libpng"/>,
   <xref linkend="pkgconfig"/>, and
   <xref linkend="xorg7-proto"/></para>
 

Modified: trunk/BOOK/x/installing/x7server.xml
===================================================================
--- trunk/BOOK/x/installing/x7server.xml	2006-05-10 03:59:18 UTC (rev 6037)
+++ trunk/BOOK/x/installing/x7server.xml	2006-05-10 05:17:10 UTC (rev 6038)
@@ -114,6 +114,18 @@
     run as the root user.  This switch ensures that the binary is installed 
     setuid when the build is done by an unprivileged user.</para>
 
+    <para><parameter>--disable-glx</parameter>: Disable building of the GLX
+    extension.  This is required if building without 
+    <application>Mesa</application>.</para>
+
+    <para><parameter>--disable-dri</parameter>: Disable building of the DRI
+    extension.  This is required if building without
+    <application>Mesa</application>.</para>
+
+    <para><parameter>--disable-xprint</parameter>: Disable building of
+    the <application>Xprint</application>  extension and server.  This is 
+    required if building without <application>Mesa</application>.</para>
+
   </sect2>
 
 </sect1>

Modified: trunk/BOOK/x/installing/x7util.xml
===================================================================
--- trunk/BOOK/x/installing/x7util.xml	2006-05-10 03:59:18 UTC (rev 6037)
+++ trunk/BOOK/x/installing/x7util.xml	2006-05-10 05:17:10 UTC (rev 6038)
@@ -66,7 +66,8 @@
   <bridgehead renderas="sect3">Xorg Utilities Dependencies</bridgehead>
 
   <bridgehead renderas="sect4">Required</bridgehead>
-  <para role="required"><xref linkend="pkgconfig"/></para>
+  <para role="required"><xref linkend="pkgconfig"/> and
+  <xref linkend="xorg7-proto"/></para>
 
   <sect2>
     <title>Downloading Xorg Utilities</title>

Modified: trunk/BOOK/x/installing/xorg.xml
===================================================================
--- trunk/BOOK/x/installing/xorg.xml	2006-05-10 03:59:18 UTC (rev 6037)
+++ trunk/BOOK/x/installing/xorg.xml	2006-05-10 05:17:10 UTC (rev 6038)
@@ -202,13 +202,14 @@
       <para>The <application>Xorg</application> sources must be patched in
       order to avoid a race condition with the <application>luit</application>
       program.  Additionally, the server portion of
-      <application>Xorg</application> contains a <ulink
-      url="http://wiki.x.org/wiki/SecurityPage">security vulnerability</ulink>.
+      <application>Xorg</application> contains 2   
+      <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 &&
 sed -i 's/geteuid /geteuid() /' \
-    programs/Xserver/hw/xfree86/common/xf86Init.c</userinput></screen>
+    programs/Xserver/hw/xfree86/common/xf86Init.c &&
+sed -i 's/ntri & sizeof/ntri * sizeof/' programs/Xserver/render/mitri.c</userinput></screen>
 
 <!-- To be removed if/when proposed glibc patch is added to LFS SVN
      Leave in in for a couple of weeks with 'you may need' and a testcase

Modified: trunk/BOOK/x/installing/xorg7.xml
===================================================================
--- trunk/BOOK/x/installing/xorg7.xml	2006-05-10 03:59:18 UTC (rev 6037)
+++ trunk/BOOK/x/installing/xorg7.xml	2006-05-10 05:17:10 UTC (rev 6038)
@@ -41,7 +41,7 @@
   <bridgehead renderas="sect3">Xorg Download and Installation
   Instructions</bridgehead>
 
-  <para>Xorg-7.0.0 introduced a completly auto-tooled, modular build system.
+  <para>Xorg-7.0.0 introduced a completely auto-tooled, modular build system.
   The code is otherwise identical to that in the Xorg-6.9.0 release.
   With the new modular build system, it is no longer possible to download
   the entire package in a single file.  In fact, there may be as many as
@@ -63,7 +63,7 @@
     <para>Even if you intend to download only the necessary packages, you
     should download the wget file lists and use the package versions in the
     file.  Newer packages are likely intended for the next release of
-    <application>Xorg</application> and have already proven to be
+    <application>Xorg</application> and have already proved to be
     incompatible with the current version of
     <application>GTK+</application>.  The installed size of 
     <application>Xorg</application> can be reduced considerably by 




More information about the blfs-book mailing list