Changeset b534991

Timestamp:

02/14/2004 09:01:53 PM (20 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 6.0, 6.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/inkscape-core-mods, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/python-mods, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, v5_1, v5_1-pre1, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

b0e424f

Parents:

58738de

Message:

Security patch and minor make instruction update for XFree86

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• x/installing/xfree86/xfree86-exp.xml (modified) (1 diff)
• x/installing/xfree86/xfree86-inst.xml (modified) (1 diff)
• x/installing/xfree86/xfree86-intro.xml (modified) (2 diffs)

introduction/welcome/changelog.xml

@@ -11 +11 @@
 
 <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

x/installing/xfree86/xfree86-exp.xml

@@ -2 +2 @@
 <title>Command explanations</title>
 
-<para><command>WORLDOPTS="" make World 2&gt;&amp;1 | tee xfree-compile.log</command>: 
+<para><command>( WORLDOPTS="" make World 2&gt;&amp;1 | tee xfree-compile.log 
+   &amp;&amp; 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&gt;&amp;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&gt;&amp;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 

x/installing/xfree86/xfree86-inst.xml

@@ -206 +206 @@
 
 
-<screen><userinput><command>WORLDOPTS="" make World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp;
+<screen><userinput><command>( WORLDOPTS="" make World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp; exit $PIPESTATUS ) &amp;&amp;
 make install &amp;&amp;
 make install.man &amp;&amp;

x/installing/xfree86/xfree86-intro.xml

@@ -53 +53 @@
 </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, 
@@ -77 +84 @@
 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>