r4570 - in trunk/BOOK: . postlfs/editors x/installing

djensen at linuxfromscratch.org djensen at linuxfromscratch.org
Fri Jun 10 12:22:37 PDT 2005


Author: djensen
Date: 2005-06-10 13:22:37 -0600 (Fri, 10 Jun 2005)
New Revision: 4570

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/postlfs/editors/joe.xml
   trunk/BOOK/x/installing/xfree86.xml
Log:
joe-3.3 forgot checksum

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-06-10 17:23:20 UTC (rev 4569)
+++ trunk/BOOK/general.ent	2005-06-10 19:22:37 UTC (rev 4570)
@@ -273,7 +273,7 @@
 <!-- Part VII -->
 <!-- Chapter 25 -->
 <!ENTITY xorg-version                 "6.8.2">
-<!ENTITY xfree86-version              "4.4.0">
+<!ENTITY xfree86-version              "4.5.0">
 
 <!-- Chapter 26 -->
 <!ENTITY qt-version                   "3.3.4">

Modified: trunk/BOOK/postlfs/editors/joe.xml
===================================================================
--- trunk/BOOK/postlfs/editors/joe.xml	2005-06-10 17:23:20 UTC (rev 4569)
+++ trunk/BOOK/postlfs/editors/joe.xml	2005-06-10 19:22:37 UTC (rev 4570)
@@ -6,7 +6,7 @@
 
   <!ENTITY joe-download-http "http://prdownloads.sourceforge.net/joe-editor/joe-&joe-version;.tar.gz">
   <!ENTITY joe-download-ftp  " ">
-  <!ENTITY joe-md5sum        "2a6ef018870fca9b7df85401994fb0e0">
+  <!ENTITY joe-md5sum        "02221716679c039c5da00c275d61dbf4">
   <!ENTITY joe-size          "468 KB">
   <!ENTITY joe-buildsize     "6.4 MB">
   <!ENTITY joe-time          "0.15 SBU">

Modified: trunk/BOOK/x/installing/xfree86.xml
===================================================================
--- trunk/BOOK/x/installing/xfree86.xml	2005-06-10 17:23:20 UTC (rev 4569)
+++ trunk/BOOK/x/installing/xfree86.xml	2005-06-10 19:22:37 UTC (rev 4570)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY xfree86-download-http "http://gnu.kookel.org/ftp/XFree86/4.4.0/source/">
-  <!ENTITY xfree86-download-ftp  "ftp://ftp.xfree86.org/pub/XFree86/4.4.0/source/">
-  <!ENTITY xfree86-md5sum        "ftp://ftp.xfree86.org/pub/XFree86/4.4.0/source/SUMS.md5sum">
-  <!ENTITY xfree86-size          "52 MB">
+  <!ENTITY xfree86-download-http "http://gnu.kookel.org/ftp/XFree86/&xfree86-version;/source/">
+  <!ENTITY xfree86-download-ftp  "ftp://ftp.xfree86.org/pub/XFree86/&xfree86-version;/source/">
+  <!ENTITY xfree86-md5sum        "ftp://ftp.xfree86.org/pub/XFree86/&xfree86-version;/source/SUMS.md5sum">
+  <!ENTITY xfree86-size          "51 MB">
   <!ENTITY xfree86-buildsize     "775 MB">
-  <!ENTITY xfree86-time          "11.6 SBU">
+  <!ENTITY xfree86-time          "12 SBU">
 ]>
 
 <sect1 id="xfree86" xreflabel="XFree86-&xfree86-version;">
@@ -62,8 +62,8 @@
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
       <listitem>
-        <para>Security patch: <ulink
-        url="http://www.x.org/pub/X11R6.8.0/patches/xorg-CAN-2004-0687-0688.patch"/>
+        <para>Required patch: <ulink
+        url="&patch-root;/XFree86-&xfree86-version;-kernel_headers-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
@@ -96,25 +96,25 @@
 
     <itemizedlist spacing='compact'>
       <listitem>
-        <para><filename>XFree86-4.4.0-src-1.tgz</filename></para>
+        <para><filename>XFree86-&xfree86-version;-src-1.tgz</filename></para>
       </listitem>
       <listitem>
-        <para><filename>XFree86-4.4.0-src-2.tgz</filename></para>
+        <para><filename>XFree86-&xfree86-version;-src-2.tgz</filename></para>
       </listitem>
       <listitem>
-        <para><filename>XFree86-4.4.0-src-3.tgz</filename></para>
+        <para><filename>XFree86-&xfree86-version;-src-3.tgz</filename></para>
       </listitem>
       <listitem>
-        <para><filename>XFree86-4.4.0-src-4.tgz</filename></para>
+        <para><filename>XFree86-&xfree86-version;-src-4.tgz</filename></para>
       </listitem>
       <listitem>
-        <para><filename>XFree86-4.4.0-src-5.tgz</filename></para>
+        <para><filename>XFree86-&xfree86-version;-src-5.tgz</filename></para>
       </listitem>
       <listitem>
-        <para><filename>XFree86-4.4.0-src-6.tgz</filename></para>
+        <para><filename>XFree86-&xfree86-version;-src-6.tgz</filename></para>
       </listitem>
       <listitem>
-        <para><filename>XFree86-4.4.0-src-7.tgz</filename></para>
+        <para><filename>XFree86-&xfree86-version;-src-7.tgz</filename></para>
       </listitem>
     </itemizedlist>
 
@@ -199,6 +199,34 @@
     <title>Installation of XFree86</title>
 
     <sect3>
+      <title>Setting Up a Shadow Directory</title>
+
+      <para>When building <application>XFree86</application>, you should create
+      a shadow directory of symbolic links for the compiled code. To do that,
+      first make <command>lndir</command>. Starting from the
+      <filename class='directory'>xc</filename> directory:</para>
+
+<screen><userinput>pushd config/util &&
+make -f Makefile.ini lndir</userinput></screen>
+
+      <para>Now, as the <systemitem class="username">root</systemitem>
+      user:</para>
+
+<screen role="root"><userinput>cp -v lndir /usr/bin/</userinput></screen>
+
+      <para>And back as a regular user:</para>
+
+<screen><userinput>popd</userinput></screen>
+
+      <para>Now create the shadow tree:</para>
+
+<screen><userinput>mkdir ../xcbuild &&
+cd ../xcbuild &&
+lndir ../xc</userinput></screen>
+
+    </sect3>
+
+    <sect3>
       <title>Creating 'host.def'</title>
 
       <para>Although <application>XFree86</application> will compile without
@@ -349,19 +377,11 @@
     <sect3>
       <title>Build Commands</title>
 
-      <para>Some vulnerabilities were reported in <filename
-      class="libraryfile">libXpm</filename>. A remote user may be able to
-      execute arbitrary code on applications that use <filename
-      class="libraryfile">libXpm</filename>. The <application>Xorg</application>
-      team released a patch for their version 6.8.0 but it works for
-      <application>XFree86</application> as well. Apply the patch:</para>
-
-<screen><userinput>patch -Np1 -i ../xorg-CAN-2004-0687-0688.patch</userinput></screen>
-
       <para>Install <application>XFree86</application> by running the
       following commands:</para>
 
-<screen><userinput>sed -i -e "s@^#include <linux/config.h>@/* & */@" \
+<screen><userinput>patch -Np1 -i ../XFree86-&xfree86-version;-kernel_headers-1.patch &&
+sed -i -e "s@^#include <linux/config.h>@/* & */@" \
     `grep -lr linux/config.h *` &&
 ( make WORLDOPTS="" World 2>&1 | \
     tee xfree-compile.log && exit $PIPESTATUS )</userinput></screen>




More information about the blfs-book mailing list