aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter01/whatsnew.xml2
-rw-r--r--chapter06/glibc.xml8
-rw-r--r--general.ent4
-rw-r--r--packages.ent6
5 files changed, 6 insertions, 24 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ac5b884bb..98ed99345 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,16 +37,6 @@
-->
<listitem>
- <para>2011-02-04</para>
- <itemizedlist>
- <listitem>
- <para>[matthew] Upgrade to Perl-5.12.3. Fixes
- <ulink url="&lfs-ticket-root;2824">#2824</ulink>.</para>
- </listitem>
- </itemizedlist>
- </listitem>
-
- <listitem>
<para>2011-01-27</para>
<itemizedlist>
<listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index c457646c4..adcce7d6d 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -248,7 +248,7 @@
</listitem>
<listitem>
- <para>perl-5.12.3-libc-1.patch</para>
+ <para>perl-5.12.2-libc-1.patch</para>
</listitem>
<listitem>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 7177b0081..8c4721020 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -84,14 +84,6 @@ sed -i &quot;s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|&quot; \
scripts/test-installation.pl
unset DL</userinput></screen>
- <para>In addition, there is a bug in the
- <filename>test-installation.pl</filename> script in that it tries to link
- a test program to a library that isn't installed by
- <command>make install</command>. Issue the following <command>sed</command>
- command to fix it:</para>
-
-<screen><userinput remap="pre">sed -i -e 's/"db1"/&amp; \&amp;\&amp; $name ne "nss_test1"/' scripts/test-installation.pl</userinput></screen>
-
<para>The <command>ldd</command> shell script contains Bash-specific
syntax. Change its default program interpreter to <command>/bin/bash</command>
in case another <command>/bin/sh</command> is installed as described in the
diff --git a/general.ent b/general.ent
index 6648d1514..da2c72006 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20110204">
-<!ENTITY releasedate "February 4, 2011">
+<!ENTITY version "SVN-20110127">
+<!ENTITY releasedate "January 27, 2011">
<!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "6.8">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index c780a9a8b..7a8013d8e 100644
--- a/packages.ent
+++ b/packages.ent
@@ -407,10 +407,10 @@
<!ENTITY patch-ch6-du "1.9 MB">
<!ENTITY patch-ch6-sbu "less than 0.1 SBU">
-<!ENTITY perl-version "5.12.3">
-<!ENTITY perl-size "11,759 KB">
+<!ENTITY perl-version "5.12.2">
+<!ENTITY perl-size "12,060 KB">
<!ENTITY perl-url "http://cpan.org/src/5.0/perl-&perl-version;.tar.bz2">
-<!ENTITY perl-md5 "72f3f7e1c700e79bbf9d9279ca5b42d9">
+<!ENTITY perl-md5 "7b018fe9c2f434eff0c629b4c515a8fc">
<!ENTITY perl-home "http://cpan.org/">
<!ENTITY perl-ch5-du "106 MB">
<!ENTITY perl-ch5-sbu "0.8 SBU">