Merged r8393:8398 from trunk to jh branch

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/jh/BOOK@8399 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

7 files changed, 61 insertions, 31 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index a022685be..c26bbcd3e 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -94,7 +94,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-          <seg>Bash, Bison, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
+          <seg>Bash, Bison, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, Make,
 	  Ncurses, Patch, Readline, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -103,7 +103,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Diffutils and Gawk</seg>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -569,8 +569,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, Make,
-         Patch, Sed, and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, Grep,
+         Make, Patch, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -578,7 +578,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Diffutils and Gawk</seg>
+          <seg>Gawk</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -653,8 +653,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
-         Patch, Sed, and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make,
+         Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -662,7 +662,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No testsuite available</seg>
+          <seg>Diffutils</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -876,7 +876,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Sed, and
+         Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -896,15 +897,15 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Man-DB dependency info -->
-  <bridgehead renderas="sect2" id="man-db-dep">Man-DB</bridgehead>
+<!-- Begin Make dependency info -->
+  <bridgehead renderas="sect2" id="make-dep">Make</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Berkeley DB, Binutils, Bzip2, Coreutils, Flex, GCC, Gettext,
-         Glibc, Grep, Groff, Gzip, Less, Make, and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep,
+         Make, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -912,7 +913,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Not run. Requires Man-DB testsuite package</seg>
+          <seg>Perl and Procps</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -924,15 +925,15 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Make dependency info -->
-  <bridgehead renderas="sect2" id="make-dep">Make</bridgehead>
+<!-- Begin Man-DB dependency info -->
+  <bridgehead renderas="sect2" id="man-db-dep">Man-DB</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, Grep,
-         Make, Sed, and Texinfo</seg>
+         <seg>Bash, Berkeley DB, Binutils, Bzip2, Coreutils, Flex, GCC, Gettext,
+         Glibc, Grep, Groff, Gzip, Less, Make, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -940,7 +941,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Perl</seg>
+          <seg>Not run. Requires Man-DB testsuite package</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -986,8 +987,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Sed,
-         and Zlib</seg>
+         <seg>Bash, Binutils, Coreutils, Findutils, GCC, Glibc, Grep, Make,
+         Patch, Sed, and Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -995,7 +996,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>File, Findutils, and Gawk</seg>
+          <seg>Diffutils, File, Gawk, Gzip, and Mktemp</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1125,7 +1126,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Coreutils, GCC, Gettext, Glibc, Grep, Make, Ncurses,
+         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make, Ncurses,
          and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1292,7 +1293,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Bison, Coreutils, GCC, Gettext, Glibc,
-         Grep, Inetutils, Make, Patch, Sed, and Texinfo</seg>
+         Grep, Inetutils, Make, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1300,7 +1301,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Diffutils, Findutils, and Gawk</seg>
+          <seg>Diffutils, Findutils, Gawk, and Gzip</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c87ea9c3a..09d06f543 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,35 @@
 -->
 
      <listitem>
+      <para>2007-09-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[manuel] - More updates in dependencies list. Thanks to
+          Chris Staub for the patch.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+     <listitem>
+      <para>2007-09-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[manuel] - Updated dependencies list. Thanks to
+          Chris Staub for the patch.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+     <listitem>
+      <para>2007-09-21</para>
+      <itemizedlist>
+        <listitem>
+          <para>[manuel] - Fixed glibc-libidn tarball extension.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+     <listitem>
       <para>2007-09-18</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 68449ae05..569f8db07 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -67,7 +67,7 @@
     <ulink url="&blfs-root;view/svn/general/libidn.html"/>).
     Unpack the tarball from within the Glibc source directory:</para>
 
-<screen><userinput remap="pre">tar -xvf ../glibc-libidn-&glibc-version;.tar.gz
+<screen><userinput remap="pre">tar -xvf ../glibc-libidn-&glibc-version;.tar.bz2
 mv glibc-libidn-&glibc-version; libidn</userinput></screen>
 
     <para>In the vi_VN.TCVN locale, <command>bash</command> enters an infinite loop
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index 47660a649..6f7b15b7f 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -49,7 +49,7 @@
     <para>Create some devices and directories that Udev cannot handle due to
     them being required very early in the boot process:</para>
 
-<screen><userinput remap="pre">install -dv /lib/{firmware,udev/devices/{pts,shm}}
+<screen><userinput remap="install">install -dv /lib/{firmware,udev/devices/{pts,shm}}
 mknod -m0666 /lib/udev/devices/null c 1 3
 ln -sv /proc/self/fd /lib/udev/devices/fd
 ln -sv /proc/self/fd/0 /lib/udev/devices/stdin
diff --git a/chapter07/profile.xml b/chapter07/profile.xml
index e68172ccc..76ddcca89 100644
--- a/chapter07/profile.xml
+++ b/chapter07/profile.xml
@@ -140,7 +140,7 @@ LC_ALL=&lt;locale name&gt; locale int_prefix</userinput></screen>
 <screen><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
 <literal># Begin /etc/profile
 
-export LANG=<replaceable>&lt;ll&gt;</replaceable>_<replaceable>&lt;CC&gt;</replaceable>.<replaceable>&lt;charmap&gt;</replaceable><replaceable>&lt;@modifiers&gt;</replaceable>
+export LANG=<replaceable>&lt;ll&gt;_&lt;CC&gt;.&lt;charmap&gt;&lt;@modifiers&gt;</replaceable>
 
 # End /etc/profile</literal>
 EOF</userinput></screen>
diff --git a/general.ent b/general.ent
index 0536a4864..3c6f61846 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-JH-20070918">
-<!ENTITY releasedate "September 18, 2007">
+<!ENTITY version "SVN-JH-20071004">
+<!ENTITY releasedate "October 4, 2007">
 <!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 6cd4d974c..a485f82a2 100644
--- a/patches.ent
+++ b/patches.ent
@@ -2,7 +2,7 @@
 
 <!-- Start of Common Patches -->
 <!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-6.patch">
-<!ENTITY bash-fixes-patch-md5 "b81a6b53cd361b3b2291a762dcba87d0">
+<!ENTITY bash-fixes-patch-md5 "6787b1c94648fde6edb3bbf5e3f042f8">
 <!ENTITY bash-fixes-patch-size "24 KB">