cvs commit: BLFS/BOOK/x/installing/xfree86 xfree86-exp.xml xfree86-inst.xml xfree86-intro.xml

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Sat Feb 14 13:01:53 PST 2004


bdubbs      04/02/14 14:01:53

  Modified:    BOOK/introduction/welcome changelog.xml
               BOOK/x/installing/xfree86 xfree86-exp.xml xfree86-inst.xml
                        xfree86-intro.xml
  Log:
  Security patch and minor make instruction update for XFree86
  
  Revision  Changes    Path
  1.947     +4 -0      BLFS/BOOK/introduction/welcome/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/introduction/welcome/changelog.xml,v
  retrieving revision 1.946
  retrieving revision 1.947
  diff -u -r1.946 -r1.947
  --- changelog.xml	11 Feb 2004 21:30:51 -0000	1.946
  +++ changelog.xml	14 Feb 2004 21:01:53 -0000	1.947
  @@ -11,6 +11,10 @@
   
   <itemizedlist>
   
  +<listitem><para>February 14th, 2004 [bdubbs]: Added a security
  +patch to XFree86 and fixed a minor issue with the make 
  +instruction.</para></listitem>
  +
   <listitem><para>February 11th, 2004 [igor]: Updated to
   Qt-3.3.0 and LPRng-3.8.25.</para></listitem>
   
  
  
  
  1.9       +9 -5      BLFS/BOOK/x/installing/xfree86/xfree86-exp.xml
  
  Index: xfree86-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/installing/xfree86/xfree86-exp.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- xfree86-exp.xml	2 Oct 2003 15:28:49 -0000	1.8
  +++ xfree86-exp.xml	14 Feb 2004 21:01:53 -0000	1.9
  @@ -1,12 +1,16 @@
   <sect2>
   <title>Command explanations</title>
   
  -<para><command>WORLDOPTS="" make World 2>&1 | tee xfree-compile.log</command>: 
  +<para><command>( WORLDOPTS="" make World 2>&1 | tee xfree-compile.log 
  +   && exit $PIPESTATUS )</command>: 
   This command runs multiple makefiles to completely rebuild the system. 
  -<envar>WORLDOPTS</envar>="" disables the default setting to continue after encountering an error.
  -<parameter>2>&1</parameter> redirects error messages to the same location
  -as normal output. The <command>tee</command> command allows viewing of 
  -the output while logging the results to a file.</para>
  +<envar>WORLDOPTS</envar>="" disables the default setting to continue after 
  +encountering an error. <parameter>2>&1</parameter> redirects error messages 
  +to the same location as normal output. The <command>tee</command> command 
  +allows viewing of the output while logging the results to a file. The parentheses 
  +around the command run the entire comand in a subshell and finally the 
  +<command>exit $PIPESTATUS</command> ensures the result of the <command>make</command>
  +is returned as the result and not the result of the <command>tee</command> command.</para>
   
   <note><para>When rebuilding <application>XFree86</application>, a separate command that may be used if only minor 
   changes are made to the sources is <command>make 
  
  
  
  1.24      +1 -1      BLFS/BOOK/x/installing/xfree86/xfree86-inst.xml
  
  Index: xfree86-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/installing/xfree86/xfree86-inst.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- xfree86-inst.xml	25 Jan 2004 18:06:22 -0000	1.23
  +++ xfree86-inst.xml	14 Feb 2004 21:01:53 -0000	1.24
  @@ -205,7 +205,7 @@
   <para>Install <application>XFree86</application> by running the following commands:</para>
   
   
  -<screen><userinput><command>WORLDOPTS="" make World 2>&1 | tee xfree-compile.log &&
  +<screen><userinput><command>( WORLDOPTS="" make World 2>&1 | tee xfree-compile.log && exit $PIPESTATUS ) &&
   make install &&
   make install.man &&
   ln -sf /usr/X11R6/bin /usr/bin/X11 &&
  
  
  
  1.20      +16 -5     BLFS/BOOK/x/installing/xfree86/xfree86-intro.xml
  
  Index: xfree86-intro.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/installing/xfree86/xfree86-intro.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- xfree86-intro.xml	10 Nov 2003 15:17:12 -0000	1.19
  +++ xfree86-intro.xml	14 Feb 2004 21:01:53 -0000	1.20
  @@ -52,8 +52,15 @@
   <listitem><para><filename>X430src-7.tgz</filename></para></listitem>  
   </itemizedlist> 
   
  -<para>You should also download the patch file:
  -<ulink url="ftp://ftp.xfree86.org/pub/XFree86/4.3.0/fixes/4.3.0-4.3.0.1.diff.gz" /></para>
  +<para>You should also download the patch files:</para>
  +<itemizedlist spacing='compact'> 
  +<listitem><para>
  +  <ulink url="ftp://ftp.xfree86.org/pub/XFree86/4.3.0/fixes/4.3.0-4.3.0.1.diff.gz" />
  +  </para></listitem>
  +<listitem><para>
  +  <ulink url="ftp://ftp.xfree86.org/pub/XFree86/4.3.0/fixes/fontfile.diff" />
  +  </para></listitem>
  +</itemizedlist>
   
   <para>The first three packages are the <application>XFree86</application> programs, 
   the fourth and fifth are fonts, the sixth is normal documentation, and the seventh 
  @@ -76,13 +83,17 @@
   <para>The fixes subdirectory also has a <filename>SUMS.md5sum</filename>.  Note that
   this is the same filename as the sums for the main sources, so you need to rename the
   file if you download it.  Otherwise, you can just look at it and use it to 
  -check against the patch file:</para>
  -<screen><userinput><command>md5sum 4.3.0-4.3.0.1.diff.gz</command></userinput></screen>
  +check against the patch files:</para>
  +<screen><userinput><command>md5sum 4.3.0-4.3.0.1.diff.gz</command></userinput>
  +<userinput><command>md5sum fontfile.diff</command></userinput></screen>
   
   <para>After unpacking the <filename>X430src-?.tgz</filename> files and uncompressing the 
   diff file, change to the <filename class="directory">xc</filename> directory and run:</para>
   
  -<screen><userinput><command>patch -Np1 -i ../4.3.0-4.3.0.1.diff</command></userinput></screen>
  +<screen><userinput><command>patch -Np1 -i ../4.3.0-4.3.0.1.diff</command></userinput>
  +<userinput><command>pushd  lib/font/fontfile/</command></userinput>
  +<userinput><command>patch -N -i ../../../../fontfile.diff</command></userinput>
  +<userinput><command>popd</command></userinput></screen>
   
   </sect3>
   </sect2>
  
  
  



More information about the blfs-book mailing list