aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2005-11-24 19:30:13 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2005-11-24 19:30:13 +0000
commit348741621737316fc7f266723953334bcb7961e9 (patch)
treec055bc1ec3fc1e44188d33b81309ffd50e733817
parentfd80ade0646e79b04c78ee1740550bba737f1868 (diff)
Fix a Glibc bug that prevents some programs from running
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1.1/BOOK@7178 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml4
-rw-r--r--chapter03/patches.xml7
-rw-r--r--chapter06/glibc.xml5
-rw-r--r--general.ent4
-rw-r--r--patches.ent1
5 files changed, 19 insertions, 2 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ab90d8389..71a04255e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -30,6 +30,7 @@ First a summary, then a detailed log.</para>
<listitem><para>&bzip2-docs-patch;</para></listitem>
<listitem><para>&bzip2-bzgrep-patch;</para></listitem>
<listitem><para>&glibc-rtld-patch;</para></listitem>
+<listitem><para>&glibc-tls_assert-patch;</para></listitem>
<listitem><para>&texinfo-tempfile_fix-patch;</para></listitem>
<listitem><para>&util-linux-umount-patch;</para></listitem>
<listitem><para>&vim-security_fix-patch;</para></listitem>
@@ -42,6 +43,9 @@ First a summary, then a detailed log.</para>
</itemizedlist>
</listitem>
+<listitem><para>November 24, 2005 [matt]: Fix an issue with Glibc that prevents
+some programs (including OpenOffice.org) from running.</para></listitem>
+
<listitem><para>November 23, 2005 [gerard]: Corrected reference to 'man page' to
'HTML documentation' in chapter 6/sec</para></listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 4cca898e2..e7f8897cb 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -114,6 +114,13 @@ needed to build an LFS system:</para>
</varlistentry>
<varlistentry>
+<term>Glibc TLS Assertion Patch - 6 KB:</term>
+<listitem>
+<para><ulink url="&patches-root;&glibc-tls_assert-patch;"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
<term>Gzip Security Patch - 2 KB:</term><listitem>
<para><ulink url="&patches-root;&gzip-security_fix-patch;"/></para>
</listitem>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index a30b2e308..c05af0054 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -71,6 +71,11 @@ nor the kernel. This patch fixes the problem:</para>
<screen><userinput>patch -Np1 -i ../&glibc-testfix-patch;</userinput></screen>
+<para>Apply the following patch to fix a bug in Glibc that can prevent some
+programs (including OpenOffice.org) from running:</para>
+
+<screen><userinput>patch -Np1 -i ../&glibc-tls_assert-patch;</userinput></screen>
+
<para>The Glibc documentation recommends building Glibc outside of the source
directory in a dedicated build directory:</para>
diff --git a/general.ent b/general.ent
index 4ca7b6307..d3f8887aa 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "TESTING-20051118">
-<!ENTITY releasedate "November 18, 2005">
+<!ENTITY version "TESTING-20051124">
+<!ENTITY releasedate "November 24, 2005">
<!ENTITY milestone "6.1.1">
<!ENTITY generic-version "testing"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
diff --git a/patches.ent b/patches.ent
index 0c8874280..eac48fb73 100644
--- a/patches.ent
+++ b/patches.ent
@@ -22,6 +22,7 @@
<!ENTITY glibc-rtld-patch "glibc-&glibc-version;-rtld_search_dirs-1.patch">
<!ENTITY glibc-testfix-patch "glibc-&glibc-version;-fix_test-1.patch">
+<!ENTITY glibc-tls_assert-patch "glibc-&glibc-version;-tls_assert-1.patch">
<!ENTITY gzip-security_fix-patch "gzip-&gzip-version;-security_fixes-1.patch">