From 957653ab19337294b5d164b8a92c3385f288e867 Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn.lists@gmail.com>
Date: Thu, 8 May 2008 14:42:06 -0700
Subject: [PATCH] Updated to libXfont-1.3.2, fixes #2518
---
BOOK/introduction/welcome/changelog.xml | 9 +++++++++
BOOK/x/installing/x7lib.xml | 16 ----------------
auxfiles/xorg/lib-7.2.md5 | 2 +-
auxfiles/xorg/lib-7.2.wget | 2 +-
4 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/BOOK/introduction/welcome/changelog.xml b/BOOK/introduction/welcome/changelog.xml
index e6b812f..ddee1cb 100644
a
|
b
|
|
42 | 42 | --> |
43 | 43 | |
44 | 44 | <listitem> |
| 45 | <para>May 8th, 2008</para> |
| 46 | <itemizedlist> |
| 47 | <listitem> |
| 48 | <para>[dnicholson] - Updated to libXfont-1.3.2. Fixes #2518.</para> |
| 49 | </listitem> |
| 50 | </itemizedlist> |
| 51 | </listitem> |
| 52 | |
| 53 | <listitem> |
45 | 54 | <para>May 7th, 2008</para> |
46 | 55 | <itemizedlist> |
47 | 56 | <listitem> |
diff --git a/BOOK/x/installing/x7lib.xml b/BOOK/x/installing/x7lib.xml
index da26faf..387898f 100644
a
|
b
|
|
72 | 72 | <para>Required patch: <ulink |
73 | 73 | url="&patch-root;/libX11-&libX11-version;-badargs-1.patch"/></para> |
74 | 74 | </listitem> |
75 | | |
76 | | <!-- Following patch is fixed in libXfont-1.3.2, which is compatible |
77 | | with Xorg-7.3+ --> |
78 | | <listitem> |
79 | | <para>Required patch: <ulink |
80 | | url="&patch-root;/libXfont-&libXfont-version;-pcf_parser-1.patch"/></para> |
81 | | </listitem> |
82 | 75 | </itemizedlist> |
83 | 76 | |
84 | 77 | <bridgehead renderas="sect3">Xorg Libraries Dependencies</bridgehead> |
… |
… |
libX11-&libX11-version; )
|
122 | 115 | patch -Np1 -i ../libX11-&libX11-version;-badargs-1.patch && |
123 | 116 | sed -i 's/_XGet/XGet/' modules/im/ximcp/imDefLkup.c |
124 | 117 | ;; |
125 | | libXfont-&libXfont-version; ) |
126 | | patch -Np1 -i ../libXfont-&libXfont-version;-pcf_parser-1.patch |
127 | | ;; |
128 | 118 | esac && |
129 | 119 | ./configure $XORG_CONFIG && |
130 | 120 | make</userinput></screen> |
… |
… |
ldconfig</userinput></screen>
|
155 | 145 | <para><command>sed -i 's/_XGet/XGet/' modules/im/ximcp/imDefLkup.c</command>: |
156 | 146 | This command fixes a locking bug in <application>libX11</application>.</para> |
157 | 147 | |
158 | | <para><command>patch -Np1 -i ../libXfont-&libXfont-version;-pcf_parser-1.patch</command>: |
159 | | This patch fixes a <ulink |
160 | | url="http://wiki.x.org/wiki/Development/Security">security |
161 | | vulnerability</ulink> in the PCF font parser in |
162 | | <application>libXfont</application>.</para> |
163 | | |
164 | 148 | </sect2> |
165 | 149 | |
166 | 150 | <sect2 role="configuration"> |
diff --git a/auxfiles/xorg/lib-7.2.md5 b/auxfiles/xorg/lib-7.2.md5
index b162ece..e93f185 100644
a
|
b
|
ec2acd10a7736a85dd1e1ed9ea5bec96 libXcursor-1.1.8.tar.bz2
|
19 | 19 | 88e9bf535364e7c821ef4014fb1ca2dd libXevie-1.0.2.tar.bz2 |
20 | 20 | 1bf6fa1c26f9957d7cc0bd90b038dfa6 libXext-1.0.3.tar.bz2 |
21 | 21 | 1990d19725a3c7f32290037f02d3737f libXfixes-4.0.3.tar.bz2 |
22 | | 83b8e21f6ee22512a8f72ba51e2d74f6 libXfont-1.2.8.tar.bz2 |
| 22 | 64f510ebf9679f3a97a3d633cbee4f50 libXfont-1.3.2.tar.bz2 |
23 | 23 | 1adca018aa7bf2d215f20a69c10828ad libXfontcache-1.0.4.tar.bz2 |
24 | 24 | 1309301e2d979bd475dc58325cb8c056 libXft-2.1.12.tar.bz2 |
25 | 25 | 321b917512e96d1b0cb945ab72d27c6a libXi-1.0.4.tar.bz2 |
diff --git a/auxfiles/xorg/lib-7.2.wget b/auxfiles/xorg/lib-7.2.wget
index cd925aa..cc13f95 100644
a
|
b
|
libXcomposite-0.3.2.tar.bz2
|
28 | 28 | libXcursor-1.1.8.tar.bz2 |
29 | 29 | libXdamage-1.0.4.tar.bz2 |
30 | 30 | libXevie-1.0.2.tar.bz2 |
31 | | libXfont-1.2.8.tar.bz2 |
| 31 | libXfont-1.3.2.tar.bz2 |
32 | 32 | libXfontcache-1.0.4.tar.bz2 |
33 | 33 | libXft-2.1.12.tar.bz2 |
34 | 34 | libXi-1.0.4.tar.bz2 |