aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml4
-rw-r--r--chapter01/whatsnew.xml20
-rw-r--r--chapter03/patches.xml17
-rw-r--r--chapter06/automake.xml4
-rw-r--r--chapter06/perl.xml4
-rw-r--r--packages.ent6
-rw-r--r--patches.ent9
7 files changed, 42 insertions, 22 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index da98e2ce6..aeb5939f1 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
<para>2012-05-30</para>
<itemizedlist>
<listitem>
+ <para>[matthew] - Upgrade to Perl-5.16.0. Fixes
+ <ulink url="&lfs-ticket-root;3094">#3094</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[matthew] - Upgrade to IPRoute2-3.4.0. Fixes
<ulink url="&lfs-ticket-root;3096">#3096</ulink>.</para>
</listitem>
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 @@
<!--<listitem>
<para>Patch &patch-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>Perl &perl-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>Procps &procps-version;</para>
</listitem>-->
@@ -220,6 +220,10 @@
<title>Added:</title>
<listitem>
+ <para>&automake-perl_fix-patch;</para>
+ </listitem>
+
+ <listitem>
<para>&bash-fixes-patch;</para>
</listitem>
@@ -243,6 +247,10 @@
<para>&kbd-fixes-patch;</para>
</listitem>
+ <listitem>
+ <para>&perl-libc-patch;</para>
+ </listitem>
+
</itemizedlist>
<itemizedlist>
@@ -284,6 +292,14 @@
<para>glibc-2.14.1-sort-1.patch</para>
</listitem>
+ <listitem>
+ <para>perl-5.14.2-libc-1.patch</para>
+ </listitem>
+
+ <listitem>
+ <para>perl-5.14.2-security-1.patch</para>
+ </listitem>
+
</itemizedlist>
</sect1>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 7c3898f13..1ef365a64 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -19,6 +19,14 @@
<variablelist role="materials">
<varlistentry>
+ <term>Automake Perl-&perl-version; Patch - <token>&automake-perl_fix-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink url="&patches-root;&automake-perl_fix-patch;"/></para>
+ <para>MD5 sum: <literal>&automake-perl_fix-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&bash-fixes-patch;"/></para>
@@ -132,15 +140,6 @@
</varlistentry>
<varlistentry>
- <term>Perl Security Patch - <token>&perl-security-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink url="&patches-root;&perl-security-patch;"/></para>
- <para>MD5 sum: <literal>&perl-security-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
-
- <varlistentry>
<term>Procps HZ Errors Patch - <token>&procps-hz_fixes-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&procps-hz_fixes-patch;"/></para>
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 @@
<sect2 role="installation">
<title>Installation of Automake</title>
+ <para>Apply a patch to fix an incomatibility between Automake-&automake-version; and Perl-&perl-version;:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&automake-perl_fix-patch;</userinput></screen>
+
<para>Prepare Automake for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
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 @@
<screen><userinput remap="pre">echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
- <para>Apply a patch to fix a security vulnerability in Perl:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&perl-security-patch;</userinput></screen>
-
<para>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 @@
<!ENTITY patch-ch6-du "1.9 MB">
<!ENTITY patch-ch6-sbu "less than 0.1 SBU">
-<!ENTITY perl-version "5.14.2">
-<!ENTITY perl-size "12,917 KB">
+<!ENTITY perl-version "5.16.0">
+<!ENTITY perl-size "13,251 KB">
<!ENTITY perl-url "http://www.cpan.org/src/5.0/perl-&perl-version;.tar.bz2">
-<!ENTITY perl-md5 "04a4c5d3c1f9f19d77daff8e8cd19a26">
+<!ENTITY perl-md5 "15a2f95fb27231e10998240f13acf961">
<!ENTITY perl-home "http://www.perl.org/">
<!ENTITY perl-ch5-du "223 MB">
<!ENTITY perl-ch5-sbu "1.8 SBU">
diff --git a/patches.ent b/patches.ent
index b5b677e94..a710a4f90 100644
--- a/patches.ent
+++ b/patches.ent
@@ -2,6 +2,11 @@
<!-- Start of Common Patches -->
+<!ENTITY automake-perl_fix-patch "automake-&automake-version;-perl_fix-1.patch">
+<!ENTITY automake-perl_fix-patch-md5 "97e7f0c0ed29018323f6aa03afbd9764">
+<!ENTITY automake-perl_fix-patch-size "2.9 KB">
+
+
<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-6.patch">
<!ENTITY bash-fixes-patch-md5 "fcca082d3a6e51afc5c02c92221036a6">
<!ENTITY bash-fixes-patch-size "28.3 KB">
@@ -79,10 +84,6 @@
<!ENTITY perl-libc-patch-md5 "23682f20b6785e97f99d33be7719c9d6">
<!ENTITY perl-libc-patch-size "1 KB">
-<!ENTITY perl-security-patch "perl-&perl-version;-security_fix-1.patch">
-<!ENTITY perl-security-patch-md5 "7fa3e7e11fecf9d75f65452d700c3dd5">
-<!ENTITY perl-security-patch-size "1 KB">
-
<!ENTITY procps-hz_fixes-patch "procps-&procps-version;-fix_HZ_errors-1.patch">
<!ENTITY procps-hz_fixes-patch-md5 "2ea4c8e9a2c2a5a291ec63c92d7c6e3b">