aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml4
-rw-r--r--chapter01/whatsnew.xml4
-rw-r--r--chapter03/patches.xml6
-rw-r--r--chapter05/perl.xml6
-rw-r--r--chapter06/perl.xml19
-rw-r--r--packages.ent8
-rw-r--r--patches.ent6
7 files changed, 20 insertions, 33 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 0e0a1bbb4..14a857f59 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
<para>2009-08-26</para>
<itemizedlist>
<listitem>
+ <para>[matthew] Upgraded to Perl-5.10.1. Fixes
+ <ulink url="&lfs-ticket-root;2479">#2479</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[matthew] Upgraded to Linux-2.6.30.5. Fixes
<ulink url="&lfs-ticket-root;2475">#2475</ulink>.</para>
</listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 2cf9dffcf..d149862f1 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -148,9 +148,9 @@
<!--<listitem>
<para>Patch &patch-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>Perl &perl-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>Procps &procps-version;</para>
</listitem>-->
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 508b9afc7..d9a9a83ee 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -163,10 +163,10 @@
</varlistentry> -->
<varlistentry>
- <term>Perl Consolidated Patch - <token>&perl-consolidated-patch-size;</token>:</term>
+ <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
<listitem>
- <para>Download: <ulink url="&patches-root;&perl-consolidated-patch;"/></para>
- <para>MD5 sum: <literal>&perl-consolidated-patch-md5;</literal></para>
+ <para>Download: <ulink url="&patches-root;&perl-libc-patch;"/></para>
+ <para>MD5 sum: <literal>&perl-libc-patch-md5;</literal></para>
</listitem>
</varlistentry>
diff --git a/chapter05/perl.xml b/chapter05/perl.xml
index 3320d452c..32cb79b07 100644
--- a/chapter05/perl.xml
+++ b/chapter05/perl.xml
@@ -43,10 +43,10 @@
<sect2 role="installation">
<title>Installation of Perl</title>
- <para>First apply the following patch to address security issues and adapt
- some hard-wired paths to the C library:</para>
+ <para>First apply the following patch to adapt some hard-wired paths to the
+ C library:</para>
-<screen><userinput remap="pre">patch -Np1 -i ../&perl-consolidated-patch;</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
<!-- <para>Fix an incompatibility with gcc-&gcc-version;:</para>
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 84788d648..bccbd3ea3 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -47,23 +47,6 @@
<screen><userinput remap="pre">echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
- <para>The following patch fixes known vulnerabilities and other issues
- identified by the developers:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&perl-consolidated-patch;</userinput></screen>
-
- <!-- <para>The following patch fixes an incompatibility with
- Glibc-&glibc-version;:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&perl-page-patch;</userinput></screen>
- -->
-
- <!-- Confirmed that this is not required any longer
- <para>Fix an incompatibility with gcc-&gcc-version;:</para>
-
-<screen><userinput remap="pre">sed -i 's/command /command[ -]/' makedepend.SH</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
@@ -72,7 +55,7 @@
<screen><userinput remap="pre">sed -i -e "s|BUILD_ZLIB\s*= True|BUILD_ZLIB = False|" \
-e "s|INCLUDE\s*= ./zlib-src|INCLUDE = /usr/include|" \
-e "s|LIB\s*= ./zlib-src|LIB = /usr/lib|" \
- ext/Compress/Raw/Zlib/config.in</userinput></screen>
+ ext/Compress-Raw-Zlib/config.in</userinput></screen>
<para>To have full control over the way Perl is set up, you can run the
interactive <command>Configure</command> script and hand-pick the way this
diff --git a/packages.ent b/packages.ent
index 4c077eb01..bf93b1fa3 100644
--- a/packages.ent
+++ b/packages.ent
@@ -398,10 +398,10 @@
<!ENTITY patch-ch6-du "1.9 MB">
<!ENTITY patch-ch6-sbu "less than 0.1 SBU">
-<!ENTITY perl-version "5.10.0">
-<!ENTITY perl-size "15,230 KB">
-<!ENTITY perl-url "http://cpan.org/src/perl-&perl-version;.tar.gz">
-<!ENTITY perl-md5 "d2c39b002ebfd2c3c5dba589365c5a71">
+<!ENTITY perl-version "5.10.1">
+<!ENTITY perl-size "11,336 KB">
+<!ENTITY perl-url "http://cpan.org/src/perl-&perl-version;.tar.bz2">
+<!ENTITY perl-md5 "82400c6d34f7b7b43d0196c76cd2bbb1">
<!ENTITY perl-home "http://cpan.org/">
<!ENTITY perl-ch5-du "106 MB">
<!ENTITY perl-ch5-sbu "0.8 SBU">
diff --git a/patches.ent b/patches.ent
index a571f67ce..a90c7063f 100644
--- a/patches.ent
+++ b/patches.ent
@@ -84,9 +84,9 @@
<!ENTITY patch-fixes-patch-size "1.7 KB">
-<!ENTITY perl-consolidated-patch "perl-&perl-version;-consolidated-1.patch">
-<!ENTITY perl-consolidated-patch-md5 "d1bcffb5d671bd659f7ca5c451a0c752">
-<!ENTITY perl-consolidated-patch-size "7.1 KB">
+<!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
+<!ENTITY perl-libc-patch-md5 "c463ad3abf6304392e5d635ed5dd627b">
+<!ENTITY perl-libc-patch-size "1 KB">
<!ENTITY procps-watch-patch "procps-&procps-version;-watch_unicode-1.patch">
<!ENTITY procps-watch-patch-md5 "cd1a757e532d93662a7ed71da80e6b58">