diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 6cb388635..632687389 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
2009-05-23
+
+ [matthew] - Upgrade to Glibc-2.10.1. Fixes
+ #2401.
+
[matthew] - Upgrade to Linux-2.6.29.4. Fixes
#2402.
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index c3db51635..7cc557eeb 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -235,10 +235,6 @@
&gettext-upstream_fixes-patch;
-
- &glibc-ildoubl-test-fix-patch;
-
-
&grep-debian-patch;
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 99b026d81..cc37890fa 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -106,14 +106,6 @@
-
- Glibc Ildoubl Test Fix Patch - &glibc-ildoubl-test-fix-patch-size;:
-
- Download:
- MD5 sum: &glibc-ildoubl-test-fix-patch-md5;
-
-
-
Grep Debian Patch - &grep-debian-patch-size;:
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 19e693415..3014adcda 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -64,6 +64,11 @@ Ask your system administrator to create more.
rm -fv etc/standards.info
sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in
+ Fix an issue that causes one of the tests to fail to compile against
+ Glibc-&glibc-version;:
+
+sed -i -e 's/getline/get_line/' libiberty/testsuite/test-demangle.c
+
The Binutils documentation recommends building Binutils outside of the
source directory in a dedicated build directory:
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 94d69b021..4dc69b9a7 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -90,11 +90,6 @@ sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|" \
scripts/test-installation.pl
unset DL
- First apply a patch which corrects a failure in the test suite:
-
-patch -Np1 -i ../&glibc-ildoubl-test-fix-patch;
-
-
The ldd shell script contains Bash-specific
syntax. Change its default program interpreter to /bin/bash
in case another /bin/sh is installed as described in the
diff --git a/packages.ent b/packages.ent
index da3cfd3c2..fffd89d77 100644
--- a/packages.ent
+++ b/packages.ent
@@ -197,10 +197,10 @@
-
-
+
+
-
+
@@ -209,7 +209,7 @@
-
+
diff --git a/patches.ent b/patches.ent
index 677f85480..a6672db99 100644
--- a/patches.ent
+++ b/patches.ent
@@ -54,10 +54,6 @@
-
-
-
-