diff options
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 7 | ||||
| -rw-r--r-- | chapter03/patches.xml | 15 | ||||
| -rw-r--r-- | chapter05/perl.xml | 4 | ||||
| -rw-r--r-- | chapter06/perl.xml | 7 | ||||
| -rw-r--r-- | packages.ent | 6 | ||||
| -rw-r--r-- | patches.ent | 4 |
7 files changed, 15 insertions, 32 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 62cb7b463..b40c862ee 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,10 @@ <para>2010-04-20</para> <itemizedlist> <listitem> + <para>[matthew] Upgrade to Perl-5.12.0. Fixes + <ulink url="&lfs-ticket-root;2635">#2635</ulink>.</para> + </listitem> + <listitem> <para>[matthew] Upgrade to Kbd-1.15.2. Fixes <ulink url="&lfs-ticket-root;2634">#2634</ulink>.</para> </listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index e6f2af558..fd3aa51ac 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>--> @@ -223,6 +223,9 @@ <para>grep-2.5.4-debian_fixes-1.patch</para> </listitem> <listitem> + <para>perl-5.10.1-utf8-1.patch</para> + </listitem> + <listitem> <para>vim-7.2-fixes-5.patch</para> </listitem> </itemizedlist> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 1b17f5b24..6c28a6e75 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -147,21 +147,6 @@ </listitem> </varlistentry> - <varlistentry> - <term>Perl UTF8 Patch - <token>&perl-utf8-patch-size;</token>:</term> - <listitem> - <para>Download: <ulink url="&patches-root;&perl-utf8-patch;"/></para> - <para>MD5 sum: <literal>&perl-utf8-patch-md5;</literal></para> - </listitem> - </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 Watch Patch - <token>&procps-watch-patch-size;</token>:</term> diff --git a/chapter05/perl.xml b/chapter05/perl.xml index 32cb79b07..d18fbfaf9 100644 --- a/chapter05/perl.xml +++ b/chapter05/perl.xml @@ -54,11 +54,11 @@ sed 's/command /command[ -]/' makedepend.SH.orig > makedepend.SH</userinput></screen> --> <para>Prepare Perl for compilation (make sure to get the - 'Data/Dumper Fcntl IO POSIX' part of the command correct—they are all + 'Data/Dumper Fcntl IO' part of the command correct—they are all letters):</para> <screen><userinput remap="configure">sh Configure -des -Dprefix=/tools \ - -Dstatic_ext='Data/Dumper Fcntl IO POSIX'</userinput></screen> + -Dstatic_ext='Data/Dumper Fcntl IO'</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> diff --git a/chapter06/perl.xml b/chapter06/perl.xml index 1f7fceb19..7487ca6ae 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -47,11 +47,6 @@ <screen><userinput remap="pre">echo "127.0.0.1 localhost $(hostname)" > /etc/hosts</userinput></screen> - <para>Fix a problem where invalid utf-8 characters cause a segmentation - fault:</para> - -<screen><userinput remap="pre">patch -Np1 -i ../&perl-utf8-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 @@ -60,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> + cpan/Compress-Raw-Zlib/config.in</userinput></screen> <para>To have full control over the way Perl is set up, you can remove the <quote>-des</quote> options from the following command and hand-pick the way diff --git a/packages.ent b/packages.ent index 559e7dce3..b14dec3ef 100644 --- a/packages.ent +++ b/packages.ent @@ -394,10 +394,10 @@ <!ENTITY patch-ch6-du "1.9 MB"> <!ENTITY patch-ch6-sbu "less than 0.1 SBU"> -<!ENTITY perl-version "5.10.1"> -<!ENTITY perl-size "11,336 KB"> +<!ENTITY perl-version "5.12.0"> +<!ENTITY perl-size "12,016 KB"> <!ENTITY perl-url "http://cpan.org/src/5.0/perl-&perl-version;.tar.bz2"> -<!ENTITY perl-md5 "82400c6d34f7b7b43d0196c76cd2bbb1"> +<!ENTITY perl-md5 "3e15696f4160775a90f6b2fb3ccc98c2"> <!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 278a847f3..2c312dc44 100644 --- a/patches.ent +++ b/patches.ent @@ -76,10 +76,6 @@ <!ENTITY perl-libc-patch-md5 "800dfd3c9618731ee5cf57f77a7942b4"> <!ENTITY perl-libc-patch-size "1 KB"> -<!ENTITY perl-utf8-patch "perl-&perl-version;-utf8-1.patch"> -<!ENTITY perl-utf8-patch-md5 "f0c8a66598708bd7def8e85eed82bb95"> -<!ENTITY perl-utf8-patch-size "8 KB"> - <!ENTITY procps-watch-patch "procps-&procps-version;-watch_unicode-1.patch"> <!ENTITY procps-watch-patch-md5 "cd1a757e532d93662a7ed71da80e6b58"> <!ENTITY procps-watch-patch-size "3.5 KB"> |