aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2012-02-24 23:40:48 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2012-02-24 23:40:48 +0000
commit6d6a2f029d2becb77294e87be17c2bb58b66564b (patch)
tree575ddca7f59a81a2fefd20e429c04f8c223ec026
parent5dcff99d108ff9c005795e57f8692fb0d7195a88 (diff)
Add a patch for glibc that fixes a segfault's dlopen
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9755 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, 30 insertions, 3 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 7f0ad3116..ad3cc1eb7 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,16 @@
-->
<listitem>
+ <para>2012-02-24</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Add a patch for glibc that fixes a problem
+ (segfault) for dlopen() in some cases.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2012-02-23</para>
<itemizedlist>
<listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 0ab59263f..a67293735 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -220,6 +220,10 @@
<title>Added:</title>
<listitem>
+ <para>&glibc-sort-patch;</para>
+ </listitem>
+
+ <listitem>
<para>Kmod-&kmod-version;</para>
</listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 051d0129a..5d1db169a 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -83,6 +83,14 @@
</varlistentry>
<varlistentry>
+ <term>Glibc Bug Sort Relocatable Objects Patch - <token>&glibc-sort-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink url="&patches-root;&glibc-sort-patch;"/></para>
+ <para>MD5 sum: <literal>&glibc-sort-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Glibc GCC Build 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 33beee5bf..37ec19105 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -102,7 +102,8 @@ unset DL</userinput></screen>
<para>Fix a couple of bugs in Glibc that can cause crashes and core dumps:</para>
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-fixes-patch;</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-fixes-patch;
+patch -Np1 -i ../&glibc-sort-patch;</userinput></screen>
<para>Fix a bug that prevents Glibc from building with GCC-&gcc-version;:</para>
diff --git a/general.ent b/general.ent
index 57fcc9ad0..ef71b418a 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120223">
-<!ENTITY releasedate "Feb 23, 2012">
+<!ENTITY version "SVN-20120224">
+<!ENTITY releasedate "Feb 24, 2012">
<!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.1">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/patches.ent b/patches.ent
index 3cfc4eee6..ec40be708 100644
--- a/patches.ent
+++ b/patches.ent
@@ -51,6 +51,10 @@
<!ENTITY glibc-cpuid-patch-md5 "4f110dc9c8d4754fbda841492ce796b4">
<!ENTITY glibc-cpuid-patch-size "0.8 KB">
+<!ENTITY glibc-sort-patch "glibc-&glibc-version;-sort-1.patch">
+<!ENTITY glibc-sort-patch-md5 "740e71017059a4290761db0cc9dd63f3">
+<!ENTITY glibc-sort-patch-size "8.0 KB">
+
<!ENTITY grub-inode-patch "grub-&grub-version;-256byte_inode-1.patch">
<!ENTITY grub-inode-patch-md5 "2482bef9c1866b4045767a56268ba673">