diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4138ff95b..5603de930 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,11 @@
2010-03-01
+
+ [matthew] Upgrade to Diffutils-2.9. Fixes
+ #2577. This also drops
+ the i18n patch as it has been rejected upstream.
+
[matthew] Upgrade to GMP-5.0.1. Fixes
#2572.
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index a97ac9f5c..e1b9a4a50 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -49,9 +49,9 @@
-
+
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 6bb535544..a070701ff 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -42,14 +42,6 @@
-
- Diffutils Internationalization Fixes Patch - &diffutils-i18n-patch-size;:
-
- Download:
- MD5 sum: &diffutils-i18n-patch-md5;
-
-
-
Expect Spawn Patch - &expect-spawn-patch-size;:
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml
index 4ad5ea535..25c4443da 100644
--- a/chapter06/diffutils.xml
+++ b/chapter06/diffutils.xml
@@ -41,20 +41,6 @@
Installation of Diffutils
- POSIX requires the diff command to treat whitespace
- characters according to the current locale. The following patch fixes the
- non-compliance issue:
-
-patch -Np1 -i ../&diffutils-i18n-patch;
-
- The above patch will cause the Diffutils build system to attempt to
- rebuild the diff.1 man page using the unavailable
- program help2man. The result is an unreadable man page for
- diff. We can avoid this by updating the timestamp on
- the file man/diff.1:
-
-touch man/diff.1
-
Prepare Diffutils for compilation:
./configure --prefix=/usr
diff --git a/packages.ent b/packages.ent
index ea8002f76..7f5da884f 100644
--- a/packages.ent
+++ b/packages.ent
@@ -85,10 +85,10 @@
-
-
+
+
-
+