Changeset 8d23795


Ignore:
Timestamp:
05/31/2007 07:26:12 AM (15 years ago)
Author:
Dan Nichilson <dnicholson@…>
Branches:
10.0, 10.1, 11.0, 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, ken/refactor-virt, krejzi/svn, lazarus, nosym, perl-modules, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
048bc8cc
Parents:
9ae8612
Message:

Streamlined the commands in the Xorg sections

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

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • introduction/welcome/changelog.xml

    r9ae8612 r8d23795  
    5050          DJ Lucas.</para>
    5151        </listitem>
     52        <listitem>
     53          <para>[dnicholson] - Streamlined the commands for each Xorg
     54          section.</para>
     55        </listitem>
    5256      </itemizedlist>
    5357    </listitem>
  • x/installing/x7app.xml

    r9ae8612 r8d23795  
    1111  <!ENTITY x7apps-buildsize     "30.7 MB">
    1212  <!ENTITY x7apps-time          "2.9 SBU">
     13
     14  <!-- Versions for patches -->
     15  <!ENTITY xload-version        "1.0.1">
    1316
    1417]>
     
    6366      <listitem>
    6467        <para>Required patch: <ulink
    65         url="&patch-root;/xload-1.0.1-setuid-1.patch"/></para>
     68        url="&patch-root;/xload-&xload-version;-setuid-1.patch"/></para>
    6669      </listitem>
    6770    </itemizedlist>
     
    105108    deprecated and should not be installed.</para></warning>
    106109
    107     <para>A <ulink url='http://wiki.x.org/wiki/Development/Security'>security
    108     vulnerability</ulink> has been identified in the xload package.
    109     Before building this package with the commands
    110     shown below, be sure to apply the supplied patches. The patch can be
    111     applied with with the following command:</para>
    112 
    113 <screen><userinput>patch -Np1 -i ../xload-1.0.1-setuid-1.patch</userinput></screen>
    114 
    115110    <para>Install the applications by running the following commands for each
    116     chosen package:</para>
    117 
    118 <screen><userinput>./configure $XORG_CONFIG &amp;&amp;
     111    package:</para>
     112
     113<screen><userinput>case $(basename "$PWD") in
     114xload-&xload-version; )
     115    patch -Np1 -i ../xload-&xload-version;-setuid-1.patch
     116    ;;
     117esac &amp;&amp;
     118./configure $XORG_CONFIG &amp;&amp;
    119119make</userinput></screen>
    120120
     
    125125
    126126<screen role="root"><userinput>make install</userinput></screen>
     127
     128  </sect2>
     129
     130  <sect2 role="commands">
     131    <title>Command Explanations</title>
     132
     133    <para><command>patch -Np1 -i
     134    ../xload-&xload-version;-setuid-1.patch</command>: This patch fixes a
     135    <ulink url='http://wiki.x.org/wiki/Development/Security'>security
     136    vulnerability</ulink> that has been identified in the xload package.</para>
    127137
    128138  </sect2>
  • x/installing/x7driver.xml

    r9ae8612 r8d23795  
    8686    <title>Installation of Xorg Drivers</title>
    8787
    88     <para>The <application>xf86-input-evdev</application>,
    89     <application>xf86-video-ati</application>,
    90     <application>xf86-video-fbdev</application>,
    91     <application>xf86-video-glint</application>, and
    92     <application>xf86-video-newport</application> packages install
    93     man pages in UTF-8 encoding, and they will not display correctly
    94     using <application>Man-DB</application>. Issue the following
    95     command before building these packages to replace the offending
    96     characters with ones that <command>man</command> can properly
    97     display.</para>
    98 
    99 <screen><userinput>sed -i -e "s/\xc3\xb8/\\\\[\/o]/" \
    100        -e "s/\xc3\xa4/\\\\[:a]/" \
    101        -e "s/\xc3\x9c/\\\\[:U]/" man/*.man</userinput></screen>
    102 
    10388    <warning><para>It is very important not to build display drivers that
    10489    cannot be used with your hardware.  For instance, do not build Sun drivers
     
    11196    package:</para>
    11297
    113 <screen><userinput>./configure $XORG_CONFIG \
     98<screen><userinput>case $(basename "$PWD") in
     99xf86-input-evdev-[0-9]* | xf86-video-ati-[0-9]* | \
     100xf86-video-fbdev-[0-9]* | xf86-video-glint-[0-9]* | \
     101xf86-video-newport-[0-9]* )
     102    sed -i -e "s/\xc3\xb8/\\\\[\/o]/" \
     103           -e "s/\xc3\xa4/\\\\[:a]/" \
     104           -e "s/\xc3\x9c/\\\\[:U]/" man/*.man
     105    ;;
     106esac &amp;&amp;
     107./configure $XORG_CONFIG \
    114108    --with-xorg-module-dir=$XORG_PREFIX/lib/X11/modules &amp;&amp;
    115109make</userinput></screen>
     
    126120  <sect2 role="commands">
    127121    <title>Command Explanations</title>
     122
     123    <para><command>sed -i ... man/*.man</command>: A few packages install
     124    man pages in UTF-8 encoding, and they will not display correctly
     125    using <application>Man-DB</application>. This command converts the
     126    offending characters to ones that <command>man</command> can properly
     127    display.</para>
    128128
    129129    <para><parameter>--with-xorg-module-dir=...</parameter>: This switch
  • x/installing/x7lib.xml

    r9ae8612 r8d23795  
    1111  <!ENTITY x7libs-buildsize     "186 MB">
    1212  <!ENTITY x7libs-time          "6.6 SBU">
     13
     14  <!-- Versions for patches -->
     15  <!ENTITY libX11-version       "1.1.1">
     16  <!ENTITY libXfont-version     "1.2.7">
    1317
    1418]>
     
    6266      <listitem>
    6367        <para>Required patch: <ulink
    64         url="&patch-root;/libX11-1.1.1-xinitimage-1.patch"/></para>
     68        url="&patch-root;/libX11-&libX11-version;-xinitimage-1.patch"/></para>
    6569      </listitem>
    6670      <listitem>
    6771        <para>Required patch: <ulink
    68         url="&patch-root;/libXfont-1.2.7-bdf_fontsdir-1.patch"/></para>
     72        url="&patch-root;/libXfont-&libXfont-version;-bdf_fontsdir-1.patch"/></para>
    6973      </listitem>
    7074    </itemizedlist>
     
    104108    <title>Installation of Xorg Libraries</title>
    105109
    106     <para><ulink url='http://wiki.x.org/wiki/Development/Security'>Security
    107     vulnerabilities</ulink> have been identified in the
    108     <application>libX11</application> and <application>libXfont</application>
    109     packages. Before building these packages with the commands shown below,
    110     be sure to apply the supplied patches. For <application>libX11</application>,
    111     this can be done by issuing the following command:</para>
    112 
    113 <screen><userinput>patch -Np1 -i ../libX11-1.1.1-xinitimage-1.patch</userinput></screen>
    114 
    115     <para>For <application>libXfont</application>, the patch can be applied
    116     with the following command:</para>
    117 
    118 <screen><userinput>patch -Np1 -i ../libXfont-1.2.7-bdf_fontsdir-1.patch</userinput></screen>
    119 
    120110    <para>Install the libraries by running the following commands for each
    121     of the chosen packages:</para>
    122 
    123 <screen><userinput>./configure $XORG_CONFIG --without-xcb &amp;&amp;
     111    package:</para>
     112
     113<screen><userinput>case $(basename "$PWD") in
     114libX11-&libX11-version; )
     115    patch -Np1 -i ../libX11-&libX11-version;-xinitimage-1.patch
     116    ;;
     117libXfont-&libXfont-version; )
     118    patch -Np1 -i ../libXfont-&libXfont-version;-bdf_fontsdir-1.patch
     119    ;;
     120esac &amp;&amp;
     121./configure $XORG_CONFIG &amp;&amp;
    124122make</userinput></screen>
    125123
     
    141139    for it's transport layer unless this parameter is supplied. This parameter
    142140    will be ignored for other packages.</para>
     141
     142    <para><command>patch -Np1 -i ...</command>: These commands apply patches
     143    to fix <ulink url='http://wiki.x.org/wiki/Development/Security'>security
     144    vulnerabilities</ulink> identified in the
     145    <application>libX11</application> and <application>libXfont</application>
     146    packages.</para>
    143147
    144148  </sect2>
Note: See TracChangeset for help on using the changeset viewer.