aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml4
-rw-r--r--chapter01/whatsnew.xml12
-rw-r--r--chapter03/patches.xml16
-rw-r--r--chapter06/glibc.xml5
-rw-r--r--patches.ent8
5 files changed, 43 insertions, 2 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index db9edc8bb..98bc0f17f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
<para>2010-11-10</para>
<itemizedlist>
<listitem>
+ <para>[matthew] Add security fixes for Glibc. Fixes
+ <ulink url="&lfs-ticket-root;2790">#2790</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[matthew] Upgrade to Man-Pages-3.30. Fixes
<ulink url="&lfs-ticket-root;2788">#2788</ulink>.</para>
</listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 394c4b93a..7cc50d262 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -224,6 +224,10 @@
</listitem>
<listitem>
+ <para>bzip2-1.0.6-install_docs-1.patch</para>
+ </listitem>
+
+ <listitem>
<para>coreutils-8.6-i18n-1.patch</para>
</listitem>
@@ -232,11 +236,15 @@
</listitem>
<listitem>
- <para>perl-5.12.2-libc-1.patch</para>
+ <para>glibc-2.12.1-ld_audit_fix-1.patch</para>
</listitem>
<listitem>
- <para>bzip2-1.0.6-install_docs-1.patch</para>
+ <para>glibc-2.12.1-origin_fix-1.patch</para>
+ </listitem>
+
+ <listitem>
+ <para>perl-5.12.2-libc-1.patch</para>
</listitem>
<listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 2b393b2ae..34c33d492 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -91,6 +91,14 @@
</varlistentry>
<varlistentry>
+ <term>Glibc LD Audit Patch - <token>&glibc-ldaudit-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink url="&patches-root;&glibc-ldaudit-patch;"/></para>
+ <para>MD5 sum: <literal>&glibc-ldaudit-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Glibc Makefile Fix Patch - <token>&glibc-makefile_fix-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&glibc-makefile_fix-patch;"/></para>
@@ -98,6 +106,14 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>Glibc Origin Patch - <token>&glibc-origin-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink url="&patches-root;&glibc-origin-patch;"/></para>
+ <para>MD5 sum: <literal>&glibc-origin-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
<!--
<varlistentry>
<term>GRUB Disk Geometry Patch - <token>&grub-geometry-patch-size;</token>:</term>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 176e1497a..3430fa6c7 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -101,6 +101,11 @@ unset DL</userinput></screen>
<screen><userinput remap="pre">patch -Np1 -i ../&glibc-makefile_fix-patch;</userinput></screen>
+ <para>Apply 2 patches that fix security vulnerabilities in this version of Glibc:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-ldaudit-patch;
+patch -Np1 -i ../&glibc-origin-patch;</userinput></screen>
+
<para>The Glibc documentation recommends building Glibc outside of the source
directory in a dedicated build directory:</para>
diff --git a/patches.ent b/patches.ent
index 52da59d85..c676987a7 100644
--- a/patches.ent
+++ b/patches.ent
@@ -49,10 +49,18 @@
<!ENTITY glibc-gcc_fix-patch-md5 "d1f28cb98acb9417fe52596908bbb9fd">
<!ENTITY glibc-gcc_fix-patch-size "2.5 KB">
+<!ENTITY glibc-ldaudit-patch "glibc-&glibc-version;-ld_audit_fix-1.patch">
+<!ENTITY glibc-ldaudit-patch-md5 "10e1bae28413ec9086f63abba34a1e2e">
+<!ENTITY glibc-ldaudit-patch-size "7.9 KB">
+
<!ENTITY glibc-makefile_fix-patch "glibc-&glibc-version;-makefile_fix-1.patch">
<!ENTITY glibc-makefile_fix-patch-md5 "0ef634ac78e582f45d0e7643bfda7505">
<!ENTITY glibc-makefile_fix-patch-size "1 KB">
+<!ENTITY glibc-origin-patch "glibc-&glibc-version;-origin_fix-1.patch">
+<!ENTITY glibc-origin-patch-md5 "aa81dd9594648707e86c764ce8b2e1c8">
+<!ENTITY glibc-origin-patch-size "2.9 KB">
+
<!ENTITY grub-inode-patch "grub-&grub-version;-256byte_inode-1.patch">
<!ENTITY grub-inode-patch-md5 "2482bef9c1866b4045767a56268ba673">