Changeset 62657eff

Timestamp:

07/09/2007 12:02:43 AM (17 years ago)

Author:

Dan Nichilson <dnicholson@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 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, gimp3, 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/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

3e249d1d

Parents:

17e3463

Message:

Applied Xorg-7.2 patchlevel updates in accordance with #2225

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• x/installing/x7app.xml (modified) (4 diffs)
• x/installing/x7data.xml (modified) (1 diff)
• x/installing/x7driver.xml (modified) (1 diff)
• x/installing/x7lib.xml (modified) (4 diffs)
• x/installing/x7util.xml (modified) (1 diff)

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[dnicholson] - Applied patchlevel updates for Xorg-7.2
+          packages.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Updated to CUPS-1.2.11.</para>
         </listitem>

x/installing/x7app.xml

@@ -11 +11 @@
   <!ENTITY x7apps-buildsize     "30.7 MB">
   <!ENTITY x7apps-time          "2.9 SBU">
-
-  <!-- Versions for patches -->
-  <!ENTITY xload-version        "1.0.1">
 
 ]>
@@ -60 +57 @@
     </itemizedlist>
 
-    <!-- Following patch is security related and should be
-        fixed for Xorg-7.2 -->
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/xload-&xload-version;-setuid-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Xorg Applications Dependencies</bridgehead>
 
@@ -108 +95 @@
     package:</para>
 
-<screen><userinput>case $(basename "$PWD") in
-xload-&xload-version; )
-    patch -Np1 -i ../xload-&xload-version;-setuid-1.patch
-    ;;
-esac &amp;&amp;
-./configure $XORG_CONFIG &amp;&amp;
+<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
 make</userinput></screen>
 
@@ -125 +107 @@
   </sect2>
 
+  <!--
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>patch -Np1 -i
-    ../xload-&xload-version;-setuid-1.patch</command>: This patch fixes a
-    <ulink url='http://wiki.x.org/wiki/Development/Security'>security
-    vulnerability</ulink> that has been identified in the xload package.</para>
-
   </sect2>
+  -->
 
   <sect2 role="content">

x/installing/x7data.xml

@@ -8 +8 @@
   <!ENTITY x7data-download-ftp  "ftp://ftp.x.org/pub/individual/data/">
   <!ENTITY x7data-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
-  <!ENTITY x7data-size          "2.4 MB">
+  <!ENTITY x7data-size          "2.1 MB">
   <!ENTITY x7data-buildsize     "19.5 MB">
   <!ENTITY x7data-time          "0.1 SBU">

x/installing/x7driver.xml

@@ -8 +8 @@
   <!ENTITY x7drivers-download-ftp  "ftp://ftp.x.org/pub/individual/driver/">
   <!ENTITY x7drivers-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
-  <!ENTITY x7drivers-size          "18.3 MB">
+  <!ENTITY x7drivers-size          "16.7 MB">
   <!ENTITY x7drivers-buildsize     "60.3 MB">
   <!ENTITY x7drivers-time          "6.9 SBU">

x/installing/x7lib.xml

@@ -8 +8 @@
   <!ENTITY x7libs-download-ftp  "ftp://ftp.x.org/pub/individual/lib/">
   <!ENTITY x7libs-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
-  <!ENTITY x7libs-size          "11.7 MB">
+  <!ENTITY x7libs-size          "11.8 MB">
   <!ENTITY x7libs-buildsize     "186 MB">
   <!ENTITY x7libs-time          "6.6 SBU">
 
   <!-- Versions for patches -->
-  <!ENTITY libX11-version       "1.1.1">
-  <!ENTITY libXfont-version     "1.2.7">
+  <!ENTITY libX11-version       "1.1.2">
 
 ]>
@@ -60 +59 @@
     </itemizedlist>
 
-    <!-- Following patches are security related and should be
-        fixed for Xorg-7.3 -->
+    <!-- Following patch should be fixed in libX11-1.1.3 if released
+        prior to Xorg-7.3 -->
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/libX11-&libX11-version;-xinitimage-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/libXfont-&libXfont-version;-bdf_fontsdir-1.patch"/></para>
+        url="&patch-root;/libX11-&libX11-version;-badargs-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -113 +108 @@
 <screen><userinput>case $(basename "$PWD") in
 libX11-&libX11-version; )
-    patch -Np1 -i ../libX11-&libX11-version;-xinitimage-1.patch
-    ;;
-libXfont-&libXfont-version; )
-    patch -Np1 -i ../libXfont-&libXfont-version;-bdf_fontsdir-1.patch
+    patch -Np1 -i ../libX11-&libX11-version;-badargs-1.patch &amp;&amp;
+    sed -i 's/_XGet/XGet/' modules/im/ximcp/imDefLkup.c
     ;;
 esac &amp;&amp;
@@ -140 +133 @@
     will be ignored for other packages.</para>
 
-    <para><command>patch -Np1 -i ...</command>: These commands apply patches
-    to fix <ulink url='http://wiki.x.org/wiki/Development/Security'>security
-    vulnerabilities</ulink> identified in the
-    <application>libX11</application> and <application>libXfont</application>
-    packages.</para>
+    <para><command>patch -Np1 -i ../libX11-&libX11-version;-badargs-1.patch</command>:
+    This patch fixes an error with argument ordering in one of the functions
+    in <application>libX11</application>.</para>
+
+    <para><command>sed -i 's/_XGet/XGet/' modules/im/ximcp/imDefLkup.c</command>:
+    This command fixes a locking bug in <application>libX11</application>.</para>
 
   </sect2>

x/installing/x7util.xml

@@ -8 +8 @@
   <!ENTITY x7utils-download-ftp  "ftp://ftp.x.org/pub/individual/util/">
   <!ENTITY x7utils-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
-  <!ENTITY x7utils-size          "659 KB">
+  <!ENTITY x7utils-size          "664 KB">
   <!ENTITY x7utils-buildsize     "5.2 MB">
   <!ENTITY x7utils-time          "0.1 SBU">