diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index da98e2ce6..aeb5939f1 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
2012-05-30
+
+ [matthew] - Upgrade to Perl-5.16.0. Fixes
+ #3094.
+
[matthew] - Upgrade to IPRoute2-3.4.0. Fixes
#3096.
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index e537f2d83..63e516854 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -154,9 +154,9 @@
-
+
@@ -219,6 +219,10 @@
Added:
+
+ &automake-perl_fix-patch;
+
+
&bash-fixes-patch;
@@ -243,6 +247,10 @@
&kbd-fixes-patch;
+
+ &perl-libc-patch;
+
+
@@ -284,6 +292,14 @@
glibc-2.14.1-sort-1.patch
+
+ perl-5.14.2-libc-1.patch
+
+
+
+ perl-5.14.2-security-1.patch
+
+
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 7c3898f13..1ef365a64 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -18,6 +18,14 @@
+
+ Automake Perl-&perl-version; Patch - &automake-perl_fix-patch-size;:
+
+ Download:
+ MD5 sum: &automake-perl_fix-patch-md5;
+
+
+
Bash Upstream Fixes Patch - &bash-fixes-patch-size;:
@@ -131,15 +139,6 @@
-
- Perl Security Patch - &perl-security-patch-size;:
-
- Download:
- MD5 sum: &perl-security-patch-md5;
-
-
-
-
Procps HZ Errors Patch - &procps-hz_fixes-patch-size;:
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 9458c6647..4786c44c9 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -41,6 +41,10 @@
Installation of Automake
+ Apply a patch to fix an incomatibility between Automake-&automake-version; and Perl-&perl-version;:
+
+patch -Np1 -i ../&automake-perl_fix-patch;
+
Prepare Automake for compilation:
./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 285c4ec98..b0f0a4464 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -47,10 +47,6 @@
echo "127.0.0.1 localhost $(hostname)" > /etc/hosts
- Apply a patch to fix a security vulnerability in Perl:
-
-patch -Np1 -i ../&perl-security-patch;
-
This version of Perl now builds the Compress::Raw::Zlib module. By
default Perl will use an internal copy of the Zlib source for the build.
Issue the following command so that Perl will use the Zlib library
diff --git a/packages.ent b/packages.ent
index bafa93a31..0c425d265 100644
--- a/packages.ent
+++ b/packages.ent
@@ -419,10 +419,10 @@
-
-
+
+
-
+
diff --git a/patches.ent b/patches.ent
index b5b677e94..a710a4f90 100644
--- a/patches.ent
+++ b/patches.ent
@@ -2,6 +2,11 @@
+
+
+
+
+
@@ -79,10 +84,6 @@
-
-
-
-