diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8355f9ed7..26c93e724 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
2007-12-08
+
+ [matthew] - Upgraded to Texinfo-4.11. Fixes
+ #2074.
+
[matthew] - Upgraded to Psmisc-22.6. Fixes
#2104.
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 6d241bc4f..55583c90a 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -176,9 +176,9 @@
TCL &tcl-version;
-
+
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 321030b31..e0c6712cb 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -26,6 +26,14 @@
+
+ Binutils Texinfo Version Patch - &binutils-configure-patch-size;:
+
+ Download:
+ MD5 sum: &binutils-configure-patch-md5;
+
+
+
Bzip2 Documentation Patch - &bzip2-docs-patch-size;:
@@ -170,23 +178,6 @@
-
- Texinfo Multibyte Fixes Patch - &texinfo-multibyte-patch-size;:
-
- Download:
- MD5 sum: &texinfo-multibyte-patch-md5;
-
-
-
-
-
- Texinfo Tempfile Fix Patch - &texinfo-tempfile_fix-patch-size;:
-
- Download:
- MD5 sum: &texinfo-tempfile_fix-patch-md5;
-
-
-
Udev usb_id Segfault Patch - &udev-usbid-patch-size;:
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 09c2e0a30..805f7c996 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -48,6 +48,11 @@
linker and assembler to determine which of their own features to
enable.
+ Binutils does not recognize versions of Texinfo newer than 4.9. Fix
+ this issue by applying the following patch:
+
+patch -Np1 -i ../&binutils-configure-patch;
+
The Binutils documentation recommends building Binutils outside of the
source directory in a dedicated build directory:
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index d0c7a5ac5..7cfcb6421 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -43,6 +43,11 @@
Re-installation of Binutils
+ Binutils does not recognize versions of Texinfo newer than 4.9. Fix
+ this issue by applying the following patch:
+
+patch -Np1 -i ../&binutils-configure-patch;
+
Create a separate build directory again:
mkdir -v ../binutils-build
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 24770bb17..b747c97ce 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -56,6 +56,11 @@ Ask your system administrator to create more.
This issue needs to be resolved before running the test suites
for Binutils and GCC.
+ Binutils does not recognize versions of Texinfo newer than 4.9. Fix
+ this issue by applying the following patch:
+
+patch -Np1 -i ../&binutils-configure-patch;
+
The Binutils documentation recommends building Binutils outside of the
source directory in a dedicated build directory:
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 69916295a..447580764 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -41,19 +41,6 @@
Installation of Texinfo
- The info program makes assumptions such as that
- a string occupies the same number of character cells on the screen and
- bytes in memory and that one can break the string anywhere, which fail
- in UTF-8 based locales. The patch below makes them valid by falling back
- to English messages when a multibyte locale is in use:
-
-patch -Np1 -i ../&texinfo-multibyte-patch;
-
- Texinfo allows local users to overwrite arbitrary files via a symlink
- attack on temporary files. Apply the following patch to fix this:
-
-patch -Np1 -i ../&texinfo-tempfile_fix-patch;
-
Prepare Texinfo for compilation:
./configure --prefix=/usr
@@ -64,7 +51,7 @@
To test the results, issue:
-make check
+make -k check
Install the package:
diff --git a/packages.ent b/packages.ent
index 7c288dc79..5e2ccf2ae 100644
--- a/packages.ent
+++ b/packages.ent
@@ -475,10 +475,10 @@
-
-
+
+
-
+
diff --git a/patches.ent b/patches.ent
index dae9b6796..418b74694 100644
--- a/patches.ent
+++ b/patches.ent
@@ -6,6 +6,11 @@
+
+
+
+
+
@@ -91,14 +96,6 @@
-
-
-
-
-
-
-
-