Merge r8256, r8260, r8262, r8263, r8264, r8266, r8267, r8269 and r8272 to x86_64 branch.

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

12 files changed, 113 insertions, 144 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b5895b116..b7a47a285 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,7 +36,37 @@
     </listitem>
 -->
 
-     <listitem>
+    <listitem>
+      <para>2007-08-06</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dnicholson] - Fixed a typo and clarified text on the Perl
+          page. Reported by Shawn.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2007-07-31</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dnicholson] - Updated to glibc-2.5.1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2007-07-30</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dnicholson] - Updated LFS-Bootscripts to 20070730 and added
+          the description for the new <command>consolelog</command>
+          script.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2007-07-26</para>
       <itemizedlist>
         <listitem>
@@ -1368,8 +1398,11 @@
       </itemizedlist>
     </listitem>
 
+=======
+>>>>>>> .merge-right.r8263
   </itemizedlist>
 
-  <para>LFS 6.2 released August 3, 2006.</para>
+<!-- Update this for each *-rcX up to final 6.3 release -->
+  <para>LFS 6.3-rc1 released July 24, 2007.</para>
 
 </sect1>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 43d5f5158..a4b4ec4f6 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -22,7 +22,13 @@
   <itemizedlist>
     <title>Upgraded to:</title>
 
+    <!--
     <listitem>
+      <para>None yet</para>
+    </listitem>
+    -->
+
+    <!--<listitem>
       <para>Autoconf &autoconf-version;</para>
     </listitem>
     <listitem>
@@ -45,50 +51,50 @@
     </listitem>
     <listitem>
       <para>Coreutils &coreutils-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>DejaGNU &dejagnu-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Diffutils &diffutils-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>E2fsprogs &e2fsprogs-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Expect &expect-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>File &file-version;</para>
     </listitem>
     <listitem>
       <para>Findutils &findutils-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Flex &flex-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Gawk &gawk-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>GCC &gcc-version;</para>
     </listitem>
     <listitem>
       <para>Gettext &gettext-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>Glibc &glibc-version;</para>
     </listitem>
     <!--<listitem>
       <para>Grep &grep-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Groff &groff-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>GRUB &grub-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Gzip &gzip-version;</para>
     </listitem>
     <listitem>
@@ -99,11 +105,11 @@
     </listitem>
     <listitem>
       <para>IPRoute2 &iproute2-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Kbd &kbd-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Less &less-version;</para>
     </listitem>
     <listitem>
@@ -120,29 +126,29 @@
     </listitem>
     <listitem>
       <para>Make &make-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Man-DB &man-db-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Man-pages &man-pages-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Mktemp &mktemp-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Module-Init-Tools &module-init-tools-version;</para>
     </listitem-->
-    <listitem>
+    <!--<listitem>
       <para>Ncurses &ncurses-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Patch &patch-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Perl &perl-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Procps &procps-version;</para>
     </listitem>
     <listitem>
@@ -150,20 +156,20 @@
     </listitem>
     <listitem>
       <para>Readline &readline-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Sed &sed-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Shadow &shadow-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Sysklogd &sysklogd-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>SysVinit &sysvinit-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Tar &tar-version;</para>
     </listitem>
     <listitem>
@@ -177,13 +183,13 @@
     </listitem>
     <listitem>
       <para>&udev-config;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Util-Linux &util-linux-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Vim &vim-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Zlib &zlib-version;</para>
     </listitem>-->
@@ -198,87 +204,22 @@
 
   </itemizedlist>-->
 
-  <itemizedlist>
+  <!--<itemizedlist>
     <title>Added:</title>
 
     <listitem>
-      <para>&bash-fixes-patch;</para>
-    </listitem>
-    <listitem>
-      <para>&db-fixes-patch;</para>
-    </listitem>
-    <listitem>
-      <para>&glibc-branch_update-patch;</para>
-    </listitem>
-    <listitem>
-      <para>&inetutils-man_pages-patch;</para>
-    </listitem>
-    <listitem>
-      <para>&ncurses-coverity-patch;</para>
-    </listitem>
-    <listitem>
-      <para>&readline-fixes-patch;</para>
-    </listitem>
-    <listitem>
-      <para>&util-linux-lseek-patch;</para>
-    </listitem>
-    <listitem>
-      <para>&vim-fixes-patch;</para>
+      <para>PLACEHOLDER</para>
     </listitem>
-  </itemizedlist>
 
-  <itemizedlist>
+  </itemizedlist>-->
+
+  <!--<itemizedlist>
     <title>Removed:</title>
 
     <listitem>
-      <para>bash-3.1-fixes-8.patch </para>
-    </listitem>
-    <listitem>
-      <para>db-4.4.20-fixes-1.patch </para>
-    </listitem>
-    <listitem>
-      <para>glibc-2.3.6-inotify-1.patch </para>
-    </listitem>
-    <listitem>
-      <para>glibc-2.3.6-linux_types-1.patch</para>
-    </listitem>
-    <listitem>
-      <para>gzip-1.3.5-security_fixes-1.patch</para>
-    </listitem>
-    <listitem>
-      <para>inetutils-gcc4_fixes-3.patch</para>
-    </listitem>
-    <listitem>
-      <para>inetutils-no_server_man_pages-1.patch</para>
-    </listitem>
-    <listitem>
-      <para>less-394-signal_fix-1.patch</para>
-    </listitem>
-    <listitem>
-      <para>linux-2.6.17.13-utf8_input-1.patch</para>
-    </listitem>
-    <listitem>
-      <para>Linux-libc-headers 2.6.12.0</para>
-    </listitem>
-    <listitem>
-      <para>ncurses-5.5-fixes-1.patch</para>
-    </listitem>
-    <listitem>
-      <para>readline-5.1-fixes-3.patch</para>
-    </listitem>
-    <listitem>
-      <para>tar-1.15.1-gcc4_fix_tests-1.patch</para>
-    </listitem>
-    <listitem>
-      <para>tar-1.15.1-security_fixes-1.patch</para>
-    </listitem>
-    <listitem>
-      <para>tar-1.15.1-sparse_fix-1.patch</para>
-    </listitem>
-    <listitem>
-      <para>vim-7.0-fixes-7.patch</para>
+      <para>PLACEHOLDER</para>
     </listitem>
 
-  </itemizedlist>
+  </itemizedlist>-->
 
 </sect1>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 4e909e23f..0410125ba 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -99,14 +99,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Glibc Branch Update Patch - <token>&glibc-branch_update-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&glibc-branch_update-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-branch_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Grep RedHat Fixes Patch - <token>&grep-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&grep-fixes-patch;"/></para>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 0161c59ae..bd6dceea6 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -37,11 +37,6 @@
   <sect2 role="installation">
     <title>Installation of Glibc</title>
 
-    <para>Apply a patch to obtain various fixes that the upstream maintainers
-    have provided:</para>
-
-<screen><userinput>patch -Np1 -i ../&glibc-branch_update-patch;</userinput></screen>
-
     <para>The Glibc documentation recommends building Glibc outside of the source
     directory in a dedicated build directory:</para>
 
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 2cd272cbd..e306ee179 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -61,7 +61,7 @@
     <ulink url="&blfs-root;view/svn/general/libidn.html"/>).
     Unpack the tarball from within the Glibc source directory:</para>
 
-<screen><userinput>tar -xvf ../glibc-libidn-&glibc-version;.tar.bz2
+<screen><userinput>tar -xvf ../glibc-libidn-&glibc-version;.tar.gz
 mv glibc-libidn-&glibc-version; libidn</userinput></screen>
 
     <para>In the vi_VN.TCVN locale, <command>bash</command> enters an infinite loop
@@ -82,11 +82,6 @@ mv glibc-libidn-&glibc-version; libidn</userinput></screen>
 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux-x86-64.so.2 -o|' \
         scripts/test-installation.pl</userinput></screen>
 
-    <para>Apply a patch to obtain various fixes that the upstream maintainers
-    have provided:</para>
-
-<screen><userinput>patch -Np1 -i ../&glibc-branch_update-patch;</userinput></screen>
-
     <para>The <command>ldd</command> shell script contains Bash-specific
     syntax. Change it's default program interpreter to <command>/bin/bash</command>
     in case another <command>/bin/sh</command> is installed as described in the
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 9c9104eee..6e41b7bd0 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -35,9 +35,9 @@
   <sect2 role="installation">
     <title>Installation of Perl</title>
 
-    <para>First create a basic <filename>/etc/hosts</filename> file which will be
-    referenced in one of Perl's configuration files as well as being used used by
-    the testsuite if you run that:</para>
+    <para>First create a basic <filename>/etc/hosts</filename> file to be
+    referenced in one of Perl's configuration files as well as the optional
+    testsuite:</para>
 
 <screen><userinput>echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
 
diff --git a/chapter07/bootscripts.xml b/chapter07/bootscripts.xml
index 9c3d93a8c..9cc95dd34 100644
--- a/chapter07/bootscripts.xml
+++ b/chapter07/bootscripts.xml
@@ -48,8 +48,8 @@
       <segtitle>Installed scripts</segtitle>
 
       <seglistitem>
-        <seg>checkfs, cleanfs, console, functions, halt, ifdown, ifup,
-        localnet, modules, mountfs, mountkernfs, network, rc, reboot,
+        <seg>checkfs, cleanfs, console, consolelog, functions, halt, ifdown,
+        ifup, localnet, modules, mountfs, mountkernfs, network, rc, reboot,
         sendsignals, setclock, static, swap, sysctl, sysklogd, template,
         udev, and udev_retry</seg>
       </seglistitem>
@@ -97,6 +97,17 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="consolelog-bootscripts">
+        <term><command>consolelog</command></term>
+        <listitem>
+          <para>Sets the kernel log level to control messages reaching the
+          console.</para>
+          <indexterm zone="ch-scripts-bootscripts consolelog-bootscripts">
+            <primary sortas="d-consolelog">consolelog</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="functions-bootscripts">
         <term><command>functions</command></term>
         <listitem>
diff --git a/chapter07/console.xml b/chapter07/console.xml
index 8a614ea7d..db6c0c72f 100644
--- a/chapter07/console.xml
+++ b/chapter07/console.xml
@@ -15,6 +15,11 @@
     <secondary>configuring</secondary>
   </indexterm>
 
+  <indexterm zone="ch-scripts-console">
+    <primary sortas="d-consolelog">consolelog</primary>
+    <secondary>configuring</secondary>
+  </indexterm>
+
   <para>This section discusses how to configure the <command>console</command>
   bootscript that sets up the keyboard map and the console font. If non-ASCII
   characters (e.g., the copyright sign, the British pound sign and Euro symbol)
diff --git a/chapter07/introduction.xml b/chapter07/introduction.xml
index ab56836be..8faa87840 100644
--- a/chapter07/introduction.xml
+++ b/chapter07/introduction.xml
@@ -17,8 +17,7 @@
 
   <para>System-V style init scripts are employed in this book because they are
   widely used. For additional options, a hint detailing the BSD style init setup
-  is available at <ulink
-  url="http://www.linuxfromscratch.org/hints/downloads/files/bsd-init.txt"/>.
+  is available at <ulink url="&hints-root;bsd-init.txt"/>.
   Searching the LFS mailing lists for <quote>depinit</quote> will also offer
   additional choices.</para>
 
diff --git a/general.ent b/general.ent
index 4cf40edef..d27142467 100644
--- a/general.ent
+++ b/general.ent
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-x86_64-20070728">
-<!ENTITY releasedate "July 28, 2007">
-<!ENTITY milestone "6.3">
+<!ENTITY version "SVN-x86_64-20070806">
+<!ENTITY releasedate "August 6, 2007">
+<!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
@@ -11,6 +11,7 @@
 <!ENTITY hints-root "&lfs-root;hints/downloads/files/">
 <!ENTITY hints-index "&lfs-root;hints/list.html">
 <!ENTITY patches-root "&lfs-root;patches/lfs/&generic-version;/">
+<!ENTITY downloads-root "&lfs-root;lfs/downloads/&generic-version;/">
 <!ENTITY livecd-root "&lfs-root;livecd/">
 <!ENTITY test-results "&lfs-root;lfs/build-logs/&generic-version;/">
 <!ENTITY errata "&lfs-root;lfs/errata/&generic-version;/">
diff --git a/packages.ent b/packages.ent
index 6f0df6600..3163f48b7 100644
--- a/packages.ent
+++ b/packages.ent
@@ -190,19 +190,19 @@
 <!ENTITY gettext-ch6-du "65 MB">
 <!ENTITY gettext-ch6-sbu "1 SBU">
 
-<!ENTITY glibc-version "2.5">
-<!ENTITY glibc-size "14,963 KB">
+<!ENTITY glibc-version "2.5.1">
+<!ENTITY glibc-size "15,060 KB">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2">
-<!ENTITY glibc-md5 "1fb29764a6a650a4d5b409dda227ac9f">
+<!ENTITY glibc-md5 "10ea72e2c4d56c6aa13dabb7c4f9b195">
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-ch5-du "342 MB">
 <!ENTITY glibc-ch5-sbu "7 SBU">
 <!ENTITY glibc-ch6-du "556 MB testsuite included">
 <!ENTITY glibc-ch6-sbu "19.5 SBU testsuite included">
 <!ENTITY glibc-libidn-version "&glibc-version;">
-<!ENTITY glibc-libidn-size "100 KB">
-<!ENTITY glibc-libidn-url "&gnu;glibc/glibc-libidn-&glibc-libidn-version;.tar.bz2">
-<!ENTITY glibc-libidn-md5 "8787868ba8962d9b125997ec2f25ac01">
+<!ENTITY glibc-libidn-size "123 KB">
+<!ENTITY glibc-libidn-url "&gnu;glibc/glibc-libidn-&glibc-libidn-version;.tar.gz">
+<!ENTITY glibc-libidn-md5 "51b46f055908a5f8e409c4200d828093">
 <!ENTITY glibc-libidn-home " ">
 
 <!ENTITY grep-version "2.5.1a">
@@ -281,10 +281,10 @@
 <!ENTITY less-ch6-du "2.8 MB">
 <!ENTITY less-ch6-sbu "0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20070420">
+<!ENTITY lfs-bootscripts-version "20070730">
 <!ENTITY lfs-bootscripts-size "39 KB">
-<!ENTITY lfs-bootscripts-url "http://www.linuxfromscratch.org/lfs/downloads/development/lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
-<!ENTITY lfs-bootscripts-md5 "e27ed8fc5f4438020b79c4fe6962a2ab">
+<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
+<!ENTITY lfs-bootscripts-md5 "d50c72aa2f45c646f384a1ffeb20fafe">
 <!ENTITY lfs-bootscripts-home " ">
 <!ENTITY lfs-bootscripts-ch7-du "0.4 MB">
 <!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
@@ -490,10 +490,10 @@
 <!ENTITY udev-ch6-du "5.8 MB">
 <!ENTITY udev-ch6-sbu "0.1 SBU">
 
-<!ENTITY udev-config "udev-config-20070304">
-<!ENTITY udev-config-size "12 KB">
-<!ENTITY udev-config-url "http://www.linuxfromscratch.org/lfs/downloads/development/&udev-config;.tar.bz2">
-<!ENTITY udev-config-md5 "5f387296f1771c1c6b652284cfab5d9b">
+<!ENTITY udev-config "udev-config-20070731">
+<!ENTITY udev-config-size "13 KB">
+<!ENTITY udev-config-url "&downloads-root;&udev-config;.tar.bz2">
+<!ENTITY udev-config-md5 "49c72e712f38c18884bd11a9a3b7e968">
 <!ENTITY udev-config-home " ">
 
 <!ENTITY util-linux-version "2.12r">
diff --git a/patches.ent b/patches.ent
index 680bfa17a..2711cb9bd 100644
--- a/patches.ent
+++ b/patches.ent
@@ -47,9 +47,6 @@
 <!ENTITY gcc-specs-patch-md5 "a17be8ccfb978e73f382be5093dd8abd">
 <!ENTITY gcc-specs-patch-size "14.8 KB">
 
-<!ENTITY glibc-branch_update-patch "glibc-&glibc-version;-branch_update-3.patch">
-<!ENTITY glibc-branch_update-patch-md5 "cbad3863a39eed9e52af083c5035f283">
-<!ENTITY glibc-branch_update-patch-size "2,538 KB">
 
 
 <!ENTITY grep-fixes-patch "grep-&grep-version;-redhat_fixes-2.patch">