Author: dnicholson
Date: 2006-08-07 15:02:28 -0600 (Mon, 07 Aug 2006)
New Revision: 6280
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/x/installing/xorg.xml
Log:
Fixed vulnerability and removed Glibc hack in Xorg-6.9.0.
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2006-08-06 20:54:29 UTC (rev 6279)
+++ trunk/BOOK/general.ent 2006-08-07 21:02:28 UTC (rev 6280)
@@ -1,4 +1,4 @@
-<!ENTITY day "06"> <!-- Always 2 digits -->
+<!ENTITY day "07"> <!-- Always 2 digits -->
<!ENTITY month "08"> <!-- Always 2 digits -->
<!ENTITY year "2006">
<!ENTITY version "svn-&year;&month;&day;">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2006-08-06 20:54:29 UTC
(rev 6279)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2006-08-07 21:02:28 UTC
(rev 6280)
@@ -42,6 +42,17 @@
-->
<listitem>
+ <para>August 7th, 2006</para>
+ <itemizedlist>
+ <listitem>
+ <para>[dnicholson] - Added a patch to fix security
+ vulnerabilities in Xorg-6.9.0. See ticket #2100. Removed
+ fix for Glibc sys/kd.h as it is now in LFS stable.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>August 6th, 2006</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/x/installing/xorg.xml
===================================================================
--- trunk/BOOK/x/installing/xorg.xml 2006-08-06 20:54:29 UTC (rev 6279)
+++ trunk/BOOK/x/installing/xorg.xml 2006-08-07 21:02:28 UTC (rev 6280)
@@ -89,6 +89,10 @@
<para>Required patch: <ulink
url="&patch-root;/xorg-&xorg-version;-luit_race-1.patch"/></para>
</listitem>
+ <listitem>
+ <para>Required patch: <ulink
+ url="&patch-root;/xorg-&xorg-version;-security-2.patch"/></para>
+ </listitem>
</itemizedlist>
<bridgehead renderas="sect3">Xorg Dependencies</bridgehead>
@@ -197,34 +201,13 @@
<para>The <application>Xorg</application> sources must be patched in
order to avoid a race condition with the <application>luit</application>
- program. Additionally, the server portion of
- <application>Xorg</application> contains 2
+ program. Additionally, <application>Xorg</application> contains 3
<ulink url="http://wiki.x.org/wiki/SecurityPage";>security
vulnerabilities</ulink>.
Fix these issues with the following commands:</para>
<screen><userinput>patch -Np1 -i ../xorg-&xorg-version;-luit_race-1.patch
&&
-sed -i 's/geteuid /geteuid() /' \
- programs/Xserver/hw/xfree86/common/xf86Init.c &&
-sed -i 's/ntri & sizeof/ntri * sizeof/'
programs/Xserver/render/mitri.c</userinput></screen>
+patch -Np1 -i ../xorg-&xorg-version;-security-2.patch</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 -->
- <para>Recent <application>Glibc</application> may have a problem with its
- installed <filename>sys/kd.h</filename> file.
- This has recently been fixed in LFS SVN. Execute the
- following commands to work around a broken <filename>kd.h</filename>
- file. The commands will only make the modification if needed:</para>
-
-<screen><userinput>grep "__undef_LINUX" \
- /usr/include/sys/kd.h 2>&1 > /dev/null || \
- sed -i.bak '/CONFIG_H/i #include <linux/types.h>' \
- programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c</userinput></screen>
-<!-- End remove -->
-
-
-
<para>Additionally, if you choose to install
<application>Xorg</application> to any prefix other than
<filename class="directory">/usr/X11R6</filename>, the
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
