aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2012-05-06 09:59:44 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2012-05-06 09:59:44 +0000
commit740ace609ff31844a7454a37d124b46223b77d8c (patch)
tree21f92c39c503079a93ebe1ef1548bdbeb7fbfcf2
parent72f3ca780d57852a5b4ec40cac0424ebae49d817 (diff)
Add back a patch for Glibc that prevents various BLFS programs, including aplay, from segfaulting.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9843 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter01/whatsnew.xml4
-rw-r--r--chapter03/patches.xml8
-rw-r--r--chapter06/glibc.xml3
-rw-r--r--general.ent4
-rw-r--r--patches.ent4
6 files changed, 31 insertions, 2 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index dcc6b3c55..16b8bfe14 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -47,6 +47,16 @@
</listitem>
<listitem>
+ <para>2012-05-06</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] - Add back a patch for Glibc that prevents various
+ BLFS programs, such as aplay, from segfaulting.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2012-05-01</para>
<itemizedlist>
<listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index b2157758f..3d99d1572 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -232,6 +232,10 @@
</listitem>
<listitem>
+ <para>&glibc-fixes-patch;</para>
+ </listitem>
+
+ <listitem>
<para>&glibc-gcc_fix-patch;</para>
</listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index ef8b804c0..7c3898f13 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -59,6 +59,14 @@
</varlistentry>
<varlistentry>
+ <term>Glibc Fixes Patch - <token>&glibc-fixes-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink url="&patches-root;&glibc-fixes-patch;"/></para>
+ <para>MD5 sum: <literal>&glibc-fixes-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Glibc GCC Fix Patch - <token>&glibc-gcc_fix-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&glibc-gcc_fix-patch;"/></para>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 1c0609eaa..984c7dcea 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -100,6 +100,9 @@ unset DL</userinput></screen>
<screen><userinput remap="pre">sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in</userinput></screen>
+ <para>Fix a bug that causes several BLFS packages to segfault:</para>
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-fixes-patch;</userinput></screen>
+
<para>Fix a bug that prevents Glibc from building with GCC-&gcc-version;:</para>
<screen><userinput remap="pre">patch -Np1 -i ../&glibc-gcc_fix-patch;</userinput></screen>
diff --git a/general.ent b/general.ent
index 468b7c930..542b2b930 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120505">
-<!ENTITY releasedate "May 05, 2012">
+<!ENTITY version "SVN-20120506">
+<!ENTITY releasedate "May 06, 2012">
<!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.2">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/patches.ent b/patches.ent
index 93334a86c..df71dcbf8 100644
--- a/patches.ent
+++ b/patches.ent
@@ -37,6 +37,10 @@
<!ENTITY gcc-startfiles-patch-size "1.5 KB">
+<!ENTITY glibc-fixes-patch "glibc-&glibc-version;-fixes-1.patch">
+<!ENTITY glibc-fixes-patch-md5 "78659b024e7175dcc28e9fc4552b1a27">
+<!ENTITY glibc-fixes-patch-size "6.5 KB">
+
<!ENTITY glibc-gcc_fix-patch "glibc-&glibc-version;-gcc_fix-1.patch">
<!ENTITY glibc-gcc_fix-patch-md5 "d1f28cb98acb9417fe52596908bbb9fd">
<!ENTITY glibc-gcc_fix-patch-size "2.5 KB">