From 4d2dd2eddd186eb50abc91ef55855ae3a9461c56 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Fri, 26 Feb 2010 16:38:41 +0000
Subject: Add patch make and another patch to perl

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9204 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml   | 14 ++++++++++++++
 chapter01/whatsnew.xml    |  8 ++++++++
 chapter03/patches.xml     | 18 +++++++++++++-----
 chapter06/make.xml        |  5 +++++
 chapter06/perl.xml        |  5 +++++
 general.ent               |  4 ++--
 patches.ent               |  7 +++++++
 prologue/architecture.xml |  2 +-
 8 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 2668a4586..768ceb60e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,20 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2010-02-26</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] Add make-3.81-upstream_fixes-1.patch. Fixes
+          <ulink url="&lfs-ticket-root;2588">#2588</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] Add perl-5.10.1-utf8-1.patch. Fixes
+          <ulink url="&lfs-ticket-root;2589">#2589</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
 
     <listitem>
       <para>2010-02-22</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 82f69867f..7ba750072 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -218,10 +218,18 @@
       <para>coreutils-8.4-uname-1.patch</para>
     </listitem>
 
+    <listitem>
+      <para>&make-upstream_fixes-patch;</para>
+    </listitem>
+
     <listitem>
       <para>patch-2.6.1-test_fix-1.patch</para>
     </listitem>
 
+    <listitem>
+      <para>&perl-utf8-patch;</para>
+    </listitem>
+
 
   </itemizedlist>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 4393e7672..6bb535544 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -122,6 +122,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Make Upstream Fixes Patch - <token>&make-upstream_fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&make-upstream_fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&make-upstream_fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Patch Testsuite Fix Patch - <token>&patch-test-patch-size;</token>:</term>
       <listitem>
@@ -146,14 +154,14 @@
       </listitem>
     </varlistentry>
 
-    <!-- <varlistentry>
-      <term>Perl Page Patch - <token>&perl-page-patch-size;</token>:</term>
+    <varlistentry>
+      <term>Perl UTF8 Patch - <token>&perl-utf8-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&perl-page-patch;"/></para>
-        <para>MD5 sum: <literal>&perl-page-patch-md5;</literal></para>
+        <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>
diff --git a/chapter06/make.xml b/chapter06/make.xml
index 791908683..461eab8d4 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -40,6 +40,11 @@
   <sect2 role="installation">
     <title>Installation of Make</title>
 
+    <para>First fix some problems that have been identified since
+    the last package release:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&make-upstream_fixes-patch;</userinput></screen>
+
     <para>Prepare Make for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index bccbd3ea3..da5d41145 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -47,6 +47,11 @@
 
 <screen><userinput remap="pre">echo "127.0.0.1 localhost $(hostname)" &gt; /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
diff --git a/general.ent b/general.ent
index 840c5aab3..3de205ce8 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-201002022">
-<!ENTITY releasedate "February 22, 2010">
+<!ENTITY version "SVN-201002026">
+<!ENTITY releasedate "February 26, 2010">
 <!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/patches.ent b/patches.ent
index e3f989ded..60f77ae7a 100644
--- a/patches.ent
+++ b/patches.ent
@@ -63,6 +63,9 @@
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
+<!ENTITY make-upstream_fixes-patch "make-&make-version;-upstream_fixes-1.patch">
+<!ENTITY make-upstream_fixes-patch-md5 "8b1e478d8e733dc2d72e31bc7af1defa">
+<!ENTITY make-upstream_fixes-patch-size "5 KB">
 
 <!ENTITY patch-test-patch "patch-&patch-version;-test_fix-1.patch">
 <!ENTITY patch-test-patch-md5 "c51e1a95bfc5310635d05081472c3534">
@@ -73,6 +76,10 @@
 <!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">
diff --git a/prologue/architecture.xml b/prologue/architecture.xml
index 3527d5956..5c7c3162e 100644
--- a/prologue/architecture.xml
+++ b/prologue/architecture.xml
@@ -42,7 +42,7 @@ data that exceeds 4GB, the advantages of a 64-bit system are substantial.</para>
 64-bit system. That is, it supports 64-bit executables only. Building a
 "multi-lib" system requires compiling many applications twice, once for a
 32-bit system and once for a 64-bit system. This is not directly supported in
-LFS becuase it would interfere with the educational objective of providing the
+LFS because it would interfere with the educational objective of providing the
 instructions needed for a straightforward base Linux system.  You can refer to
 the <ulink url="http://trac.cross-lfs.org/">Cross Linux From Scratch</ulink>
 project for this advanced topic.</para>
-- 
cgit v1.2.3-54-g00ecf