Changeset 7be99f2c for x/installing/x7server.xml

Timestamp:

05/25/2006 06:52:00 AM (18 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.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/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

04c940c3

Parents:

e639150

Message:

Updated to xorg-7.1, xterm-213, and MesaLib-6.5.

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

File:

• x/installing/x7server.xml (modified) (6 diffs)

x/installing/x7server.xml

@@ -7 +7 @@
   <!ENTITY xorg-server-download-http "http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-&xorg-server-version;.tar.bz2">
   <!ENTITY xorg-server-download-ftp  "">
-  <!ENTITY xorg-server-md5sum        "5cd3316f07ed32a05cbd69e73a71bc74">
-  <!ENTITY xorg-server-size          "5.8 MB">
-  <!ENTITY xorg-server-buildsize     "413 MB">
-  <!ENTITY xorg-server-time          "5.96 SBU">
+  <!ENTITY xorg-server-md5sum        "d070c58a598fb52c5cb86344725c4ad6">
+  <!ENTITY xorg-server-size          "6.1 MB">
+  <!ENTITY xorg-server-buildsize     "424 MB">
+  <!ENTITY xorg-server-time          "5.6 SBU">
 
 ]>
@@ -65 +65 @@
 
   <bridgehead renderas="sect4">Required</bridgehead>
-  <para role="required"><xref linkend="xorg7-font"/></para>
+  <para role="required"><xref linkend="xorg7-font"/> and
+  <xref linkend="xorg7-lib"/></para>
 
   <bridgehead renderas="sect4">Optional</bridgehead>
@@ -84 +85 @@
     </note>
 
-    <para>A serious security vulnerability was recently discovered that will
-    allow a malicious user to execute code as the root user.  Fix the
-    vulnerability with the following command:</para>
-
-<screen><userinput>sed -i 's/ntri &amp; sizeof/ntri * sizeof/' 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 
      around it to save the support list silly questions.  Should remove in
-     a couple of weeks -->       
+     a couple of weeks 
       <para>Recent <application>Glibc</application> may have a problem with its
       installed <filename>sys/kd.h</filename> file. This has recently been 
@@ -104 +99 @@
     sed -i.bak '/CONFIG_H/i #include &lt;linux/types.h&gt;' \
         hw/xfree86/os-support/linux/lnx_agp.c</userinput></screen>
-<!-- End remove -->
+ End remove -->
 
     <para>Install the server by running the following commands:</para>
 
-<screen><userinput>./configure $XORG_CONFIG \
+<screen><userinput>sed -i \
+    's@-I$(top_builddir)/include@-I$(top_builddir)/GL/mesa/main@8' \
+    GL/glx/Makefile.in &amp;&amp;
+sed -i \
+    's@-I$(top_builddir)/include@-I$(top_builddir)/GL/mesa/glapi@7' \
+    GL/glx/Makefile.in &amp;&amp;
+./configure $XORG_CONFIG \
     --with-mesa-source='<replaceable>&lt;/path/to&gt;</replaceable>/Mesa-&mesalib-version;' \
     --with-fontdir=$XORG_PREFIX/lib/X11/fonts \
     --with-module-dir=$XORG_PREFIX/lib/X11/modules \
+    --with-dri-driver-path=$XORG_PREFIX/lib/X11/modules/dri \
     --enable-install-setuid &amp;&amp;
 make</userinput></screen>
@@ -127 +129 @@
     <title>Command Explanations</title>
 
+    <para><command>sed -i '...' GL/glx/Makefile.in</command>: These commands
+    correct the search path for the <application>Mesa</application> headers.  
+    The 8th and 7th instance of '-I$(top_builddir)' in the existing search
+    search path are replaced with <application>Mesa</application> paths.</para>
+
     <para><parameter>--with-mesa-source=...</parameter>: This switch directs
     the build system to the location of the <application>Mesa</application>
@@ -132 +139 @@
     <application>Mesa</application>, omit this switch.</para>
 
+    <para><parameter>--with-module-dir=...</parameter>:  This parameter 
+    sets the destination for the installed modules.</para>
+
+    <para><parameter>--with-dri-driver-path=...</parameter>:  This is the
+    location of the <application>Mesa</application> dri drivers.</para>
+
     <para><parameter>--enable-install-setuid</parameter>: The Xorg binary must
     run as the root user.  This switch ensures that the binary is installed 
-    setuid when the build is done by an unprivileged user.</para>
+    setuid when make is run by an unprivileged user.</para>
 
     <para><parameter>--disable-glx</parameter>: Disable building of the GLX
-    extension.  This is required if building without 
+    extension.  This parameter 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
+    extension.  This parameter 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>
+    the <application>Xprint</application>  extension and server.  This 
+    parameter is required if building without 
+    <application>Mesa</application>.</para>
 
   </sect2>