r1635 - in profiles/LFS/branches/testing: . chapter05 chapter06 chapter07 chapter09 config_separate config_tarball scripts

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon Dec 6 16:05:45 PST 2004


Author: thomasp
Date: 2004-12-06 17:05:41 -0700 (Mon, 06 Dec 2004)
New Revision: 1635

Added:
   profiles/LFS/branches/testing/chapter05/adjustingtoolchain.xml
   profiles/LFS/branches/testing/chapter06/hotplug.xml
   profiles/LFS/branches/testing/chapter06/iproute2.xml
   profiles/LFS/branches/testing/chapter06/kernfs.xml
   profiles/LFS/branches/testing/chapter06/libol.xml
   profiles/LFS/branches/testing/chapter06/module-init-tools.xml
   profiles/LFS/branches/testing/chapter06/readjustingtoolchain.xml
   profiles/LFS/branches/testing/chapter06/syslog-ng.xml
   profiles/LFS/branches/testing/chapter07/profile.xml
   profiles/LFS/branches/testing/checkit.sh
Removed:
   profiles/LFS/branches/testing/chapter05/lockingglibc.xml
   profiles/LFS/branches/testing/chapter06/adjustingtoolchain.xml
   profiles/LFS/branches/testing/chapter06/iproute2.xml
   profiles/LFS/branches/testing/chapter06/module-tools.xml
   profiles/LFS/branches/testing/chapter06/proc.xml
   profiles/LFS/branches/testing/chapter06/sysklogd.xml
   profiles/LFS/branches/testing/chapter07/bash_startup.xml
   profiles/LFS/branches/testing/checkit.sh
Modified:
   profiles/LFS/branches/testing/LFS.xml
   profiles/LFS/branches/testing/README
   profiles/LFS/branches/testing/chapter05/addinguser.xml
   profiles/LFS/branches/testing/chapter05/bash.xml
   profiles/LFS/branches/testing/chapter05/binutils-pass1.xml
   profiles/LFS/branches/testing/chapter05/binutils-pass2.xml
   profiles/LFS/branches/testing/chapter05/bzip2.xml
   profiles/LFS/branches/testing/chapter05/coreutils.xml
   profiles/LFS/branches/testing/chapter05/creatingtoolsdir.xml
   profiles/LFS/branches/testing/chapter05/dejagnu.xml
   profiles/LFS/branches/testing/chapter05/diffutils.xml
   profiles/LFS/branches/testing/chapter05/expect.xml
   profiles/LFS/branches/testing/chapter05/findutils.xml
   profiles/LFS/branches/testing/chapter05/gawk.xml
   profiles/LFS/branches/testing/chapter05/gcc-pass1.xml
   profiles/LFS/branches/testing/chapter05/gcc-pass2.xml
   profiles/LFS/branches/testing/chapter05/gettext.xml
   profiles/LFS/branches/testing/chapter05/glibc.xml
   profiles/LFS/branches/testing/chapter05/grep.xml
   profiles/LFS/branches/testing/chapter05/gzip.xml
   profiles/LFS/branches/testing/chapter05/kernel-headers.xml
   profiles/LFS/branches/testing/chapter05/make.xml
   profiles/LFS/branches/testing/chapter05/ncurses.xml
   profiles/LFS/branches/testing/chapter05/patch.xml
   profiles/LFS/branches/testing/chapter05/perl.xml
   profiles/LFS/branches/testing/chapter05/sed.xml
   profiles/LFS/branches/testing/chapter05/settingenvironment.xml
   profiles/LFS/branches/testing/chapter05/tar.xml
   profiles/LFS/branches/testing/chapter05/tcl.xml
   profiles/LFS/branches/testing/chapter05/texinfo.xml
   profiles/LFS/branches/testing/chapter05/udev.xml
   profiles/LFS/branches/testing/chapter05/util-linux.xml
   profiles/LFS/branches/testing/chapter06/autoconf.xml
   profiles/LFS/branches/testing/chapter06/automake.xml
   profiles/LFS/branches/testing/chapter06/bash.xml
   profiles/LFS/branches/testing/chapter06/basic-dev.xml
   profiles/LFS/branches/testing/chapter06/binutils.xml
   profiles/LFS/branches/testing/chapter06/bison.xml
   profiles/LFS/branches/testing/chapter06/bzip2.xml
   profiles/LFS/branches/testing/chapter06/changingowner.xml
   profiles/LFS/branches/testing/chapter06/coreutils.xml
   profiles/LFS/branches/testing/chapter06/createfiles.xml
   profiles/LFS/branches/testing/chapter06/creatingdirs.xml
   profiles/LFS/branches/testing/chapter06/diffutils.xml
   profiles/LFS/branches/testing/chapter06/e2fsprogs.xml
   profiles/LFS/branches/testing/chapter06/file.xml
   profiles/LFS/branches/testing/chapter06/findutils.xml
   profiles/LFS/branches/testing/chapter06/flex.xml
   profiles/LFS/branches/testing/chapter06/gawk.xml
   profiles/LFS/branches/testing/chapter06/gcc.xml
   profiles/LFS/branches/testing/chapter06/gettext.xml
   profiles/LFS/branches/testing/chapter06/glibc.xml
   profiles/LFS/branches/testing/chapter06/grep.xml
   profiles/LFS/branches/testing/chapter06/groff.xml
   profiles/LFS/branches/testing/chapter06/grub.xml
   profiles/LFS/branches/testing/chapter06/gzip.xml
   profiles/LFS/branches/testing/chapter06/iana-etc.xml
   profiles/LFS/branches/testing/chapter06/inetutils.xml
   profiles/LFS/branches/testing/chapter06/kbd.xml
   profiles/LFS/branches/testing/chapter06/less.xml
   profiles/LFS/branches/testing/chapter06/libtool.xml
   profiles/LFS/branches/testing/chapter06/m4.xml
   profiles/LFS/branches/testing/chapter06/make.xml
   profiles/LFS/branches/testing/chapter06/man-pages.xml
   profiles/LFS/branches/testing/chapter06/man.xml
   profiles/LFS/branches/testing/chapter06/mktemp.xml
   profiles/LFS/branches/testing/chapter06/ncurses.xml
   profiles/LFS/branches/testing/chapter06/patch.xml
   profiles/LFS/branches/testing/chapter06/perl.xml
   profiles/LFS/branches/testing/chapter06/procps.xml
   profiles/LFS/branches/testing/chapter06/psmisc.xml
   profiles/LFS/branches/testing/chapter06/pwdgroup.xml
   profiles/LFS/branches/testing/chapter06/readline.xml
   profiles/LFS/branches/testing/chapter06/sed.xml
   profiles/LFS/branches/testing/chapter06/shadow.xml
   profiles/LFS/branches/testing/chapter06/sysvinit.xml
   profiles/LFS/branches/testing/chapter06/tar.xml
   profiles/LFS/branches/testing/chapter06/texinfo.xml
   profiles/LFS/branches/testing/chapter06/udev.xml
   profiles/LFS/branches/testing/chapter06/util-linux.xml
   profiles/LFS/branches/testing/chapter06/vim.xml
   profiles/LFS/branches/testing/chapter06/zlib.xml
   profiles/LFS/branches/testing/chapter07/bootscripts.xml
   profiles/LFS/branches/testing/chapter07/hostname.xml
   profiles/LFS/branches/testing/chapter07/hosts.xml
   profiles/LFS/branches/testing/chapter07/inputrc.xml
   profiles/LFS/branches/testing/chapter07/network.xml
   profiles/LFS/branches/testing/chapter07/setclock.xml
   profiles/LFS/branches/testing/chapter09/libxml2.xml
   profiles/LFS/branches/testing/config_separate/console.xml
   profiles/LFS/branches/testing/config_separate/fstab.xml
   profiles/LFS/branches/testing/config_separate/general.ent
   profiles/LFS/branches/testing/config_separate/grub.xml
   profiles/LFS/branches/testing/config_separate/kernel.xml
   profiles/LFS/branches/testing/config_separate/package.ent
   profiles/LFS/branches/testing/config_tarball/fstab.xml
   profiles/LFS/branches/testing/config_tarball/grub.xml
   profiles/LFS/branches/testing/config_tarball/kernel.xml
   profiles/LFS/branches/testing/runit
   profiles/LFS/branches/testing/scripts/wget.lfs
   profiles/LFS/branches/testing/scripts/wget.lfs.urls
Log:
merged changes from trunk to testing branch

Modified: profiles/LFS/branches/testing/LFS.xml
===================================================================
--- profiles/LFS/branches/testing/LFS.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/LFS.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -24,13 +24,13 @@
 
 <alfs version="3.1" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-<stage name="Chapter 5 - Constructing a temporary system">
+<stage name="Chapter 5 - Constructing a Temporary System">
 
 	<xi:include href="chapter05/creatingtoolsdir.xml" />
 	<xi:include href="chapter05/addinguser.xml" />
 	<xi:include href="chapter05/settingenvironment.xml" />
 
-	<stage name="Installing packages in /tools as &lfs-user;.">
+	<stage name="Installing packages in /tools as &lfs-user;">
 		<stageinfo>
 			<root>/</root>
 			<user>&lfs-user;</user>
@@ -48,9 +48,8 @@
 		<xi:include href="chapter05/binutils-pass1.xml" />
 		<xi:include href="chapter05/gcc-pass1.xml" />
 		<xi:include href="chapter05/libc-headers.xml" />
-		<xi:include href="chapter05/kernel-headers.xml" />
 		<xi:include href="chapter05/glibc.xml" />
-		<xi:include href="chapter05/lockingglibc.xml" />
+		<xi:include href="chapter05/adjustingtoolchain.xml" />
 		<xi:include href="chapter05/tcl.xml" />
 		<xi:include href="chapter05/expect.xml" />
 		<xi:include href="chapter05/dejagnu.xml" />
@@ -76,15 +75,13 @@
 		<xi:include href="chapter05/flex.xml" />
 		<xi:include href="chapter05/util-linux.xml" />
 		<xi:include href="chapter05/perl.xml" />
-		<xi:include href="chapter05/udev.xml" />
 		<xi:include href="chapter05/strip.xml" />
 	</stage>
-
 </stage>
 
-<stage name="Chapter 6 - Installing basic system software">
-	<stage name="Creating directories and mounting the proc and sysfs file systems">
-		<xi:include href="chapter06/proc.xml" />
+<stage name="Chapter 6 - Installing Basic System Software">
+	<stage name="Creating Directories and Mounting Virtual Kernel File Systems">
+		<xi:include href="chapter06/kernfs.xml" />
 	</stage>
 
 	<stage name="Chroot with /tools">
@@ -108,7 +105,7 @@
 		<xi:include href="chapter06/libc-headers.xml" />
 		<xi:include href="chapter06/man-pages.xml" />
 		<xi:include href="chapter06/glibc.xml" />
-		<xi:include href="chapter06/adjustingtoolchain.xml" />
+		<xi:include href="chapter06/readjustingtoolchain.xml" />
 		<xi:include href="chapter06/binutils.xml" />
 		<xi:include href="chapter06/gcc.xml" />
 		<xi:include href="chapter06/coreutils.xml" />
@@ -143,14 +140,16 @@
 		<xi:include href="chapter06/grep.xml" />
 		<xi:include href="chapter06/grub.xml" />
 		<xi:include href="chapter06/gzip.xml" />
+		<xi:include href="chapter06/hotplug.xml" />
 		<xi:include href="chapter06/man.xml" />
 		<xi:include href="chapter06/make.xml" />
-		<xi:include href="chapter06/module-tools.xml" />
+		<xi:include href="chapter06/module-init-tools.xml" />
 		<xi:include href="chapter06/patch.xml" />
 		<xi:include href="chapter06/procps.xml" />
 		<xi:include href="chapter06/psmisc.xml" />
 		<xi:include href="chapter06/shadow.xml" />
-		<xi:include href="chapter06/sysklogd.xml" />
+		<xi:include href="chapter06/libol.xml" />
+		<xi:include href="chapter06/syslog-ng.xml" />
 		<xi:include href="chapter06/sysvinit.xml" />
 		<xi:include href="chapter06/tar.xml" />
 		<xi:include href="chapter06/udev.xml" />
@@ -159,7 +158,7 @@
 	</stage>
 </stage>
 
-<stage name="Chapter 7 - Setting up system boot scripts">
+<stage name="Chapter 7 - Setting Up System Bootscripts">
 	<stageinfo>
 		<root>&LFS;</root>
 		<environment>
@@ -176,13 +175,13 @@
 	<xi:include href="chapter07/setclock.xml" />
 	<xi:include href="config/console.xml" />
 	<xi:include href="chapter07/inputrc.xml" />
-	<xi:include href="chapter07/bash_startup.xml" />
+	<xi:include href="chapter07/profile.xml" />
 	<xi:include href="chapter07/hostname.xml" />
 	<xi:include href="chapter07/hosts.xml" />
 	<xi:include href="chapter07/network.xml" />
 </stage>
 
-<stage name="Chapter 8 - Making the LFS system bootable">
+<stage name="Chapter 8 - Making the LFS System Bootable">
 	<stageinfo>
 		<root>&LFS;</root>
 		<environment>
@@ -198,7 +197,6 @@
 	<xi:include href="config/fstab.xml" />
 	<xi:include href="config/kernel.xml" />
 	<xi:include href="config/grub.xml" />
-
 </stage>
 
 <stage name="Chapter 9 - The End">

Modified: profiles/LFS/branches/testing/README
===================================================================
--- profiles/LFS/branches/testing/README	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/README	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,18 +10,18 @@
 
 To use the profile you should :-
 
-1) If you downloaded the LFS packages seperately you should copy 
+1) If you downloaded the LFS packages seperately you should copy
    the config_separate directory to a directory named config :-
 
   	cp -r config_separate config
-	
+
 or
 
    If you downloaded the lfs-package tarball you should copy the
    config_tarball directory to a directory named config :-
 
    	cp -r config_tarball config
-  
+
 2) Customize the files in the new configuration directory
    - the file general.ent contains a bunch of entity declarations
      (Note: this file contains an entity called TERM that should be
@@ -30,13 +30,13 @@
             value for a GNU/Linux system.)
    - the file fstab.xml contains the commands to generate the fstab file
    - the file kernel.xml contains the commands for building the kernel
-   - the file grub.xml contains the commands for configuring the grub 
-     bootloader although the steps to do this are commented out by 
+   - the file grub.xml contains the commands for configuring the grub
+     bootloader although the steps to do this are commented out by
      default
    - the files keymap-ch6.xml and keymap-ch8.xml are used to set up
      the default keymap
    - the file console.xml is for setting up the default keymap with
-     support for i18n.	
+     support for i18n.
 
 3) This profile contains two additional packages that are installed
    during chapter 9, libxml2 and nALFS. This is done under the
@@ -44,7 +44,7 @@
    your new LFS system to continue building other packages (via BLFS
    or other profiles).
 
-4) Execute sh ./runit as root. Please note that if you have installed 
+4) Execute sh ./runit as root. Please note that if you have installed
    nALFS into a location other than /usr/local/bin you will need to edit
    runit to point to your copy of nALFS.
 

Modified: profiles/LFS/branches/testing/chapter05/addinguser.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/addinguser.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/addinguser.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -7,7 +7,7 @@
 
 <alfs>
 
-<stage name="Adding lfs user">
+<stage name="Adding the LFS User">
 	<execute command="groupadd -f lfs" />
 	
 	<execute command="id -u &lfs-user; &> /dev/null || useradd -s /bin/bash -g lfs -m -k /dev/null &lfs-user;" />

Copied: profiles/LFS/branches/testing/chapter05/adjustingtoolchain.xml (from rev 1598, profiles/LFS/trunk/chapter05/adjustingtoolchain.xml)

Modified: profiles/LFS/branches/testing/chapter05/bash.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/bash.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/bash.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="bash" version="&bash-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&bash-md5;</digest>
 			<archive>&packages_dir;/&bash-package;</archive>
@@ -18,11 +18,17 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&bash-directory;</base>
 		</stageinfo>
 
+		<patch>
+			<param>-N</param>
+			<param>-p1</param>
+			<param>-i &packages_dir;/&bash-wcontinued-patch;</param>
+		</patch>
+
 		<configure>
 			<param>--prefix=/tools</param>
 			<param>--without-bash-malloc</param>
@@ -47,7 +53,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&bash-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter05/binutils-pass1.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/binutils-pass1.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/binutils-pass1.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="binutils-pass1" version="&binutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&binutils-md5;</digest>
 			<archive>&packages_dir;/&binutils-package;</archive>
@@ -23,7 +23,7 @@
 		</mkdir>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<environment>
 				<variable name="CFLAGS" />

Modified: profiles/LFS/branches/testing/chapter05/binutils-pass2.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/binutils-pass2.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/binutils-pass2.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="binutils-pass2" version="&binutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&binutils-md5;</digest>
 			<archive>&packages_dir;/&binutils-package;</archive>
@@ -23,7 +23,7 @@
 		</mkdir>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<environment>
 				<variable name="CFLAGS" />
@@ -42,7 +42,7 @@
 
 <!--
 		<make>
-			<param>check</param>
+			<param>-k check</param>
 		</make>
 -->
 

Modified: profiles/LFS/branches/testing/chapter05/bzip2.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/bzip2.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/bzip2.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="bzip2" version="&bzip2-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&bzip2-md5;</digest>
 			<archive>&packages_dir;/&bzip2-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&bzip2-directory;</base>
 		</stageinfo>
@@ -31,7 +31,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&bzip2-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter05/coreutils.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/coreutils.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/coreutils.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="coreutils" version="&coreutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&coreutils-md5;</digest>
 			<archive>&packages_dir;/&coreutils-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&coreutils-directory;</base>
 		</stageinfo>
@@ -42,7 +42,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&coreutils-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter05/creatingtoolsdir.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/creatingtoolsdir.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/creatingtoolsdir.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -9,7 +9,7 @@
 
 <alfs>
 
-<stage name="Creating tools directory.">
+<stage name="Creating the $LFS/tools Directory">
 	<mkdir>
 		<option>parents</option>
 		<name>&LFS;/tools</name>
@@ -60,7 +60,8 @@
 			<source>&autoconf-package;</source>
 			<source>&automake-package;</source>
 			<source>&bash-package;</source>
-			<source>&bash-display-wrap-patch;</source>
+			<source>&bash-fixes-patch;</source>
+			<source>&bash-wcontinued-patch;</source>
 			<source>&binutils-package;</source>
 			<source>&bison-package;</source>
 			<source>&bzip2-package;</source>
@@ -77,10 +78,10 @@
 			<source>&flex-package;</source>
 			<source>&flex-debian-fixes-patch;</source>
 			<source>&gawk-package;</source>
-<!--			<source>&gcc-package;</source> -->
-			<source>&gcc-core-package;</source>
-			<source>&gcc-gpp-package;</source>
-			<source>&gcc-testsuite-package;</source>
+			<source>&gcc-package;</source>
+<!--			<source>&gcc-core-package;</source> -->
+<!--			<source>&gcc-gpp-package;</source> -->
+<!--			<source>&gcc-testsuite-package;</source> -->
 			<source>&gcc-linkonce-patch;</source>
 			<source>&gcc-no-fixincludes-patch;</source>
 			<source>&gcc-specs-patch;</source>
@@ -90,15 +91,17 @@
 			<source>&groff-package;</source>
 			<source>&grub-package;</source>
 			<source>&gzip-package;</source>
+			<source>&hotplug-package;</source>
 			<source>&iana-etc-package;</source>
 			<source>&inetutils-package;</source>
 			<source>&inetutils-no-man-pages-patch;</source>
 			<source>&inetutils-kernel-headers-patch;</source>
-			<source>&iproute2-package;</source>
-			<source>&iproute2-remove-db-patch;</source>
+ 			<source>&iproute2-package;</source>
+ 			<source>&iproute2-remove-db-patch;</source>
 			<source>&kbd-package;</source>
 			<source>&less-package;</source>
 			<source>&lfs-bootscripts-package;</source>
+			<source>&libol-package;</source>
 			<source>&libtool-package;</source>
 			<source>&libxml2-package;</source>
 			<source>&linux-package;</source>
@@ -111,7 +114,7 @@
 			<source>&man-pages-package;</source>
 			<source>&mktemp-package;</source>
 			<source>&mktemp-tempfile-patch;</source>
-			<source>&module-tools-package;</source>
+			<source>&module-init-tools-package;</source>
 			<source>&ncurses-package;</source>
 			<source>&nALFS-package;</source>
 			<source>&patch-package;</source>
@@ -120,12 +123,10 @@
 			<source>&procps-package;</source>
 			<source>&psmisc-package;</source>
 			<source>&readline-package;</source>
-			<source>&readline-display-wrap-patch;</source>
+			<source>&readline-fixes-patch;</source>
 			<source>&sed-package;</source>
 			<source>&shadow-package;</source>
-			<source>&sysklogd-package;</source>
-			<source>&sysklogd-kernel-headers-patch;</source>
-			<source>&sysklogd-signal-patch;</source>
+			<source>&syslog-ng-package;</source>
 			<source>&sysvinit-package;</source>
 			<source>&sysvinit-proclen-patch;</source>
 			<source>&tar-package;</source>
@@ -136,11 +137,9 @@
 			<source>&udev-permissions-file;</source>
 			<source>&udev-rules-file;</source>
 			<source>&util-linux-package;</source>
-			<source>&util-linux-sfdisk-patch;</source>
 			<source>&vim-package;</source>
 			<source>&vim-lang-package;</source>
 			<source>&zlib-package;</source>
-			<source>&zlib-security-patch;</source>
 			<destination>&LFS;&packages_dir;</destination>
 		</copy>
 	</stage>

Modified: profiles/LFS/branches/testing/chapter05/dejagnu.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/dejagnu.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/dejagnu.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="dejagnu" version="&dejagnu-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&dejagnu-md5;</digest>
 			<archive>&packages_dir;/&dejagnu-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&dejagnu-directory;</base>
 		</stageinfo>
@@ -32,7 +32,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&dejagnu-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter05/diffutils.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/diffutils.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/diffutils.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="diffutils" version="&diffutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&diffutils-md5;</digest>
 			<archive>&packages_dir;/&diffutils-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&diffutils-directory;</base>
 		</stageinfo>
@@ -34,7 +34,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&diffutils-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter05/expect.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/expect.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/expect.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="expect" version="&expect-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&expect-md5;</digest>
 			<archive>&packages_dir;/&expect-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&expect-directory;</base>
 		</stageinfo>
@@ -49,7 +49,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&tcl-directory;</remove>
 		<remove>&build_dir;/&expect-directory;</remove>
 	</stage>

Modified: profiles/LFS/branches/testing/chapter05/findutils.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/findutils.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/findutils.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="findutils" version="&findutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&findutils-md5;</digest>
 			<archive>&packages_dir;/&findutils-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&findutils-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&findutils-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter05/gawk.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/gawk.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/gawk.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="gawk" version="&gawk-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&gawk-md5;</digest>
 			<archive>&packages_dir;/&gawk-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&gawk-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&gawk-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter05/gcc-pass1.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/gcc-pass1.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/gcc-pass1.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="gcc-pass1" version="&gcc-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&gcc-core-md5;</digest>
 			<archive>&packages_dir;/&gcc-core-package;</archive>
@@ -29,7 +29,7 @@
 		</mkdir>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<environment>
 				<variable name="CFLAGS" />
@@ -39,6 +39,7 @@
 		</stageinfo>
 
 		<configure command="../&gcc-directory;/configure">
+			<prefix>CC="gcc -B/usr/bin"</prefix>
 			<param>--prefix=/tools</param>
 			<param>--libexecdir=/tools/lib</param>
 			<param>--with-local-prefix=/tools</param>
@@ -63,7 +64,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/gcc-build</remove>
 		<remove>&build_dir;/&gcc-directory;</remove>
 	</stage>

Modified: profiles/LFS/branches/testing/chapter05/gcc-pass2.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/gcc-pass2.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/gcc-pass2.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="gcc-pass2" version="&gcc-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&gcc-core-md5;</digest>
 			<archive>&packages_dir;/&gcc-core-package;</archive>
@@ -28,14 +28,13 @@
 			<destination>&build_dir;</destination>
 		</unpack>-->
 
-
 		<mkdir base="&build_dir;">
 			<option>parents</option>
 			<name>gcc-build</name>
 		</mkdir>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<environment>
 				<variable name="CFLAGS" />
@@ -90,7 +89,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&gcc-directory;</remove>
 		<remove>&build_dir;/gcc-build</remove>
 	</stage>

Modified: profiles/LFS/branches/testing/chapter05/gettext.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/gettext.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/gettext.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="gettext" version="&gettext-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&gettext-md5;</digest>
 			<archive>&packages_dir;/&gettext-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&gettext-directory;</base>
 		</stageinfo>
@@ -42,7 +42,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&gettext-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter05/glibc.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/glibc.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/glibc.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="glibc" version="&glibc-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&glibc-md5;</digest>
 			<archive>&packages_dir;/&glibc-package;</archive>
@@ -23,7 +23,7 @@
 		</mkdir>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<environment>
 				<variable name="CFLAGS" />
@@ -35,23 +35,19 @@
 		<configure command="../&glibc-directory;/configure">
 			<param>--prefix=/tools</param>
 			<param>--disable-profile</param>
-			<param>--enable-add-ons=nptl</param>
-			<param>--with-tls</param>
-			<param>--with-__thread</param>
+			<param>--enable-add-ons</param>
 			<param>--enable-kernel=2.6.0</param>
 			<param>--with-binutils=/tools/bin</param>
 			<param>--without-gd</param>
 			<param>--without-cvs</param>
-			<param>--with-headers=/tools/glibc-kernheaders</param>
+			<param>--with-headers=/tools/include</param>
 		</configure>
 
 		<make />
 
-<!--
 		<make>
 			<param>check</param>
 		</make>
--->
 
 		<mkdir>
 			<name>/tools/etc</name>
@@ -70,6 +66,12 @@
 			<name>/tools/lib/locale</name>
 		</mkdir>
 
+<!--
+		<make>
+			<param>localedata/install-locales</param>
+		</make>
+-->
+
 		<execute command="localedef -i de_DE -f ISO-8859-1 de_DE" />
 		<execute command="localedef -i de_DE at euro -f ISO-8859-15 de_DE at euro" />
 		<execute command="localedef -i en_HK -f ISO-8859-1 en_HK" />
@@ -83,7 +85,7 @@
 		<execute command="localedef -i ja_JP -f EUC-JP ja_JP" />
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&glibc-directory;</remove>
 		<remove>&build_dir;/glibc-build</remove>
 	</stage>

Modified: profiles/LFS/branches/testing/chapter05/grep.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/grep.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/grep.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="grep" version="&grep-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&grep-md5;</digest>
 			<archive>&packages_dir;/&grep-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&grep-directory;</base>
 		</stageinfo>
@@ -42,7 +42,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&grep-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter05/gzip.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/gzip.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/gzip.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="gzip" version="&gzip-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&gzip-md5;</digest>
 			<archive>&packages_dir;/&gzip-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&gzip-directory;</base>
 		</stageinfo>
@@ -34,7 +34,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&gzip-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter05/kernel-headers.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/kernel-headers.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/kernel-headers.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="kernel-headers" version="&linux-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&linux-md5;</digest>
 			<archive>&packages_dir;/&linux-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&linux-directory;</base>
 		</stageinfo>

Deleted: profiles/LFS/branches/testing/chapter05/lockingglibc.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/lockingglibc.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/lockingglibc.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/package.ent">
-
-%general_entities;
-%package_entities;
-]>
-
-<alfs>
-
-<stage name="Locking glibc.">
-	<stage name="Adjusting the linker.">
-		<stageinfo>
-			<base>&build_dir;/binutils-build</base>
-		</stageinfo>
-
-		<make>
-			<param>-C ld</param>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<remove>&build_dir;/&binutils-directory;</remove>
-	<remove>&build_dir;/binutils-build</remove>
-
-	<search_replace>
-		<file>/tools/lib/gcc/&gcc_target;/&gcc-version;/specs</file>
-		<find> /lib/&glibc-loader;</find>
-		<replace> /tools/lib/&glibc-loader;</replace>
-	</search_replace>
-
-	<remove>/tools/lib/gcc/*/*/include/{pthread.h,bits/sigthread.h}</remove>
-
-<!-- Test basic functions of toolchain with:
-	echo 'main(){}' > dummy.c; gcc dummy.c; readelf -l a.out | grep ': /tools';
-Output of last line s/b: [Requesting program interpreter: /tools/lib/ld-linux.so.2]
-If so:  
-	rm dummy.c a.out
-Otherwise, STOP HERE & find & fix the problem
--->
-
-</stage>
-
-</alfs>

Modified: profiles/LFS/branches/testing/chapter05/make.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/make.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/make.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="make" version="&make-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&make-md5;</digest>
 			<archive>&packages_dir;/&make-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&make-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&make-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter05/ncurses.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/ncurses.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/ncurses.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="ncurses" version="&ncurses-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&ncurses-md5;</digest>
 			<archive>&packages_dir;/&ncurses-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&ncurses-directory;</base>
 		</stageinfo>
@@ -38,7 +38,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&ncurses-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter05/patch.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/patch.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/patch.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="patch" version="&patch-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&patch-md5;</digest>
 			<archive>&packages_dir;/&patch-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&patch-directory;</base>
 		</stageinfo>
@@ -35,7 +35,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&patch-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter05/perl.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/perl.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/perl.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="perl" version="&perl-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&perl-md5;</digest>
 			<archive>&packages_dir;/&perl-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&perl-directory;</base>
 		</stageinfo>
@@ -57,7 +57,7 @@
 		</copy>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&perl-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter05/sed.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/sed.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/sed.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="sed" version="&sed-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&sed-md5;</digest>
 			<archive>&packages_dir;/&sed-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&sed-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&sed-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter05/settingenvironment.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/settingenvironment.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/settingenvironment.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -7,7 +7,7 @@
 
 <alfs>
 
-<stage name="Setting up the environment.">
+<stage name="Setting Up the Environment">
 	<stageinfo>
 		<user>&lfs-user;</user>
 	</stageinfo>

Modified: profiles/LFS/branches/testing/chapter05/tar.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/tar.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/tar.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="tar" version="&tar-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&tar-md5;</digest>
 			<archive>&packages_dir;/&tar-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&tar-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&tar-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter05/tcl.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/tcl.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/tcl.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="tcl" version="&tcl-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&tcl-md5;</digest>
 			<archive>&packages_dir;/&tcl-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&tcl-directory;/unix</base>
 		</stageinfo>

Modified: profiles/LFS/branches/testing/chapter05/texinfo.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/texinfo.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/texinfo.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="texinfo" version="&texinfo-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&texinfo-md5;</digest>
 			<archive>&packages_dir;/&texinfo-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&texinfo-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&texinfo-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter05/udev.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/udev.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/udev.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -23,26 +23,19 @@
 			<base>&build_dir;/&udev-directory;</base>
 		</stageinfo>
 
-		<search_replace>
-		  	<file>udevstart.c</file>
-			<find>/sbin/udev</find>
-			<replace>/tools/sbin/udev</replace>
-		</search_replace>
+		<patch>
+			<param>-N</param>
+			<param>-p1</param>
+			<param>-i &packages_dir;/&udev-etcdir-patch;</param>
+		</patch>
 
-		<search_replace>
-		  	<file>etc/udev/udev.conf.in</file>
-			<find>/etc</find>
-			<replace>/tools/etc</replace>
-		</search_replace>
-
 		<make>
 		  	<param>prefix=/tools</param>
-			<param>etcdir=/tools/etc</param>
+			<param>udevdir=/dev</param>
 		</make>
 
 		<make>
-		  	<param>DESTDIR=/tools</param>
-			<param>udevdir=/dev</param>
+			<param>prefix=/tools</param>	
 			<param>install</param>
 		</make>
 		

Modified: profiles/LFS/branches/testing/chapter05/util-linux.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/util-linux.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter05/util-linux.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="util-linux" version="&util-linux-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&util-linux-md5;</digest>
 			<archive>&packages_dir;/&util-linux-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&util-linux-directory;</base>
 		</stageinfo>
@@ -53,7 +53,7 @@
 		</copy>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&util-linux-directory;</remove>
 	</stage>
 </package>

Deleted: profiles/LFS/branches/testing/chapter06/adjustingtoolchain.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/adjustingtoolchain.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/adjustingtoolchain.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/package.ent">
-
-%general_entities;
-%package_entities;
-]>
-
-<alfs>
-
-<stage name="Re-adjusting the toolchain.">
-	<stage name="Adjusting the linker.">
-		<stageinfo>
-			<base>&build_dir;/binutils-build</base>
-		</stageinfo>
-
-		<make>
-			<param>-C ld</param>
-			<param>INSTALL=/tools/bin/install</param>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<remove>&build_dir;/&binutils-directory;</remove>
-	<remove>&build_dir;/binutils-build</remove>
-
-	<stage name="Amending GCC specs file.">
-		<search_replace>
-			<file>/tools/lib/gcc/&gcc_target;/&gcc-version;/specs</file>
-			<find> /tools/lib/&glibc-loader;</find>
-			<replace> /lib/&glibc-loader;</replace>
-		</search_replace>
-	</stage>
-
-	<!-- Test basic functions of toolchain with:
-		echo 'main(){}' > dummy.c; gcc dummy.c; readelf -l a.out | grep ': /lib';
-	Output of last line s/b: [Requesting program interpreter: /lib/ld-linux.so.2]
-	If so:
-		rm dummy.c a.out
-	Otherwise, STOP HERE & find & fix the problem
-	-->
-</stage>
-
-</alfs>

Modified: profiles/LFS/branches/testing/chapter06/autoconf.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/autoconf.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/autoconf.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="autoconf" version="&autoconf-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&autoconf-md5;</digest>
 			<archive>&packages_dir;/&autoconf-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&autoconf-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&autoconf-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/automake.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/automake.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/automake.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="automake" version="&automake-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&automake-md5;</digest>
 			<archive>&packages_dir;/&automake-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&automake-directory;</base>
 		</stageinfo>
@@ -41,7 +41,7 @@
 
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&automake-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/bash.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/bash.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/bash.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="bash" version="&bash-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&bash-md5;</digest>
 			<archive>&packages_dir;/&bash-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&bash-directory;</base>
 		</stageinfo>
@@ -26,9 +26,15 @@
 		<patch>
 			<param>-N</param>
 			<param>-p1</param>
-			<param>-i &packages_dir;/&bash-display-wrap-patch;</param>
+			<param>-i &packages_dir;/&bash-fixes-patch;</param>
 		</patch>
 
+		<patch>
+			<param>-N</param>
+			<param>-p1</param>
+			<param>-i &packages_dir;/&bash-wcontinued-patch;</param>
+		</patch>
+
 		<configure>
 			<param>--prefix=/usr</param>
 			<param>--bindir=/bin</param>
@@ -49,7 +55,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&bash-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/basic-dev.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/basic-dev.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/basic-dev.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -3,8 +3,8 @@
 
 <alfs>
 
-<stage name="Building initial /dev directory.">
-  <stage name="Create permanent /dev/console and /dev/null.">
+<stage name="Populating /dev">
+  <stage name="Creating Initial Device Nodes">
     <execute command="mknod">
 	<param>-m 600</param>
 	<param>/dev/console</param>
@@ -18,58 +18,104 @@
     </execute>
   </stage>
 
-  <stage name="Create dynamic /dev directory.">
-	  <execute command="mount">
-		  <param>-n</param>
-		  <param>-t ramfs</param>
-		  <param>none</param>
-		  <param>/dev</param>
-	  </execute>
+  <stage name="Mounting ramfs and Populating /dev">
+    <execute command="mount">
+      <param>-n</param>
+      <param>-t ramfs</param>
+      <param>none</param>
+      <param>/dev</param>
+    </execute>
 
-	  <execute command="/tools/sbin/udevstart" />
+    <execute command="mknod">
+	<param>-m 622</param>
+	<param>/dev/console</param>
+	<param>c 5 1</param>
+    </execute>
 
-	  <link>
-		<target>/proc/self/fd</target>
-		<name>/dev/fd</name>
-	  </link>
+    <execute command="mknod">
+  	<param>-m 666</param>
+	<param>/dev/null</param>
+	<param>c 1 3</param>
+    </execute>
 
-	  <link>
-	   	<target>/proc/self/fd/0</target>
-		<name>/dev/stdin</name>
-	  </link>
+    <execute command="mknod">
+  	<param>-m 666</param>
+	<param>/dev/zero</param>
+	<param>c 1 5</param>
+    </execute>
 
-	  <link>
-	  	<target>/proc/self/fd/1</target>
-		<name>/dev/stdout</name>
-	  </link>
+    <execute command="mknod">
+  	<param>-m 666</param>
+	<param>/dev/ptmx</param>
+	<param>c 5 2</param>
+    </execute>
 
-	  <link>
-	        <target>/proc/self/fd/2</target>
-		<name>/dev/stderr</name>
-	  </link>
+    <execute command="mknod">
+  	<param>-m 666</param>
+	<param>/dev/tty</param>
+	<param>c 5 0</param>
+    </execute>
 
-	  <link>
-	 	<target>/proc/kcore</target>
-		<name>/dev/core</name>
-	  </link>
+    <execute command="mknod">
+  	<param>-m 444</param>
+	<param>/dev/random</param>
+	<param>c 1 8</param>
+    </execute>
 
-	  <mkdir>
-	  	<name>/dev/shm</name>
-		<name>/dev/pts</name>
-	  </mkdir>
+    <execute command="mknod">
+  	<param>-m 444</param>
+	<param>/dev/urandom</param>
+	<param>c 1 9</param>
+    </execute>
 
-	  <execute command="mount">
-		  <param>-t devpts</param>
-	          <param>-o gid=4,mode=620</param>
-		  <param>none</param>
-		  <param>/dev/pts</param>
-	  </execute>
+    <ownership base="/dev" user="root" group="tty">
+	<name>console</name>
+	<name>ptmx</name>
+	<name>tty</name>
+    </ownership>
 
-	  <execute command="mount">
-		  <param>-t tmpfs</param>
-		  <param>none</param>
-		  <param>/dev/shm</param>
-	  </execute>
+    <link>
+      <target>/proc/self/fd</target>
+      <name>/dev/fd</name>
+    </link>
+
+    <link>
+      <target>/proc/self/fd/0</target>
+      <name>/dev/stdin</name>
+    </link>
+
+    <link>
+      <target>/proc/self/fd/1</target>
+      <name>/dev/stdout</name>
+    </link>
+
+    <link>
+      <target>/proc/self/fd/2</target>
+      <name>/dev/stderr</name>
+    </link>
+
+    <link>
+      <target>/proc/kcore</target>
+      <name>/dev/core</name>
+    </link>
+
+    <mkdir>
+      <name>/dev/shm</name>
+      <name>/dev/pts</name>
+    </mkdir>
+
+    <execute command="mount">
+      <param>-t devpts</param>
+      <param>-o gid=4,mode=620</param>
+      <param>none</param>
+      <param>/dev/pts</param>
+    </execute>
+
+    <execute command="mount">
+      <param>-t tmpfs</param>
+      <param>none</param>
+      <param>/dev/shm</param>
+    </execute>
   </stage>
 </stage>
 

Modified: profiles/LFS/branches/testing/chapter06/binutils.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/binutils.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/binutils.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="binutils" version="&binutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&binutils-md5;</digest>
 			<archive>&packages_dir;/&binutils-package;</archive>
@@ -23,7 +23,7 @@
 		</mkdir>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<environment>
 				<variable name="CFLAGS" />
@@ -49,7 +49,8 @@
 		</make>
 
 		<make>
-			<param>check</param>
+			<param>-k check</param>
+			<param>|| true</param>
 		</make>
 
 		<make>
@@ -63,7 +64,7 @@
 		</copy>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&binutils-directory;</remove>
 		<remove>&build_dir;/binutils-build</remove>
 	</stage>

Modified: profiles/LFS/branches/testing/chapter06/bison.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/bison.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/bison.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="bison" version="&bison-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&bison-md5;</digest>
 			<archive>&packages_dir;/&bison-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&bison-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&bison-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/bzip2.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/bzip2.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/bzip2.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="bzip2" version="&bzip2-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&bzip2-md5;</digest>
 			<archive>&packages_dir;/&bzip2-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&bzip2-directory;</base>
 		</stageinfo>
@@ -58,6 +58,12 @@
 		<remove>/usr/bin/bzcat</remove>
 		<remove>/usr/bin/bzip2</remove>
 
+		<move base="/usr/bin">
+			<source>bzip2recover</source>
+			<source>bzless</source>
+			<source>bzmore</source>
+			<destination>/bin</destination>
+		</move>
 
 		<link>
 			<option>force</option>
@@ -72,7 +78,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&bzip2-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/changingowner.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/changingowner.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/changingowner.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -3,7 +3,7 @@
 
 <alfs>
 
-<stage name="Changing ownership of tools directory">
+<stage name="Changing Ownership">
 	<ownership user="0" group="0">
 		<option>recursive</option>
 		<name>/tools</name>

Modified: profiles/LFS/branches/testing/chapter06/coreutils.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/coreutils.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/coreutils.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="coreutils" version="&coreutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&coreutils-md5;</digest>
 			<archive>&packages_dir;/&coreutils-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&coreutils-directory;</base>
 		</stageinfo>
@@ -123,7 +123,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&coreutils-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/createfiles.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/createfiles.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/createfiles.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -3,7 +3,7 @@
 
 <alfs>
 
-<stage name="Creating essential symlinks.">
+<stage name="Creating Essential Symlinks">
 	<link>
 		<option>force</option>
 		<target>/tools/bin/bash</target>
@@ -21,6 +21,7 @@
 
 	<link>
 		<option>force</option>
+		<target>/tools/lib/libgcc_s.so</target>
 		<target>/tools/lib/libgcc_s.so.1</target>
 		<name>/usr/lib</name>
 	</link>

Modified: profiles/LFS/branches/testing/chapter06/creatingdirs.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/creatingdirs.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/creatingdirs.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -3,7 +3,7 @@
 
 <alfs>
 
-<stage name="Creating directory tree">
+<stage name="Creating Directories">
 	<mkdir base="/">
 		<option>parents</option>
 	

Modified: profiles/LFS/branches/testing/chapter06/diffutils.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/diffutils.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/diffutils.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="diffutils" version="&diffutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&diffutils-md5;</digest>
 			<archive>&packages_dir;/&diffutils-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&diffutils-directory;</base>
 		</stageinfo>
@@ -34,7 +34,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&diffutils-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/e2fsprogs.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/e2fsprogs.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/e2fsprogs.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="e2fsprogs" version="&e2fsprogs-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&e2fsprogs-md5;</digest>
 			<archive>&packages_dir;/&e2fsprogs-package;</archive>
@@ -22,7 +22,7 @@
 		</mkdir>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/e2fsprogs-build</base>
 		</stageinfo>
@@ -51,7 +51,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&e2fsprogs-directory;</remove>
 		<remove>&build_dir;/e2fsprogs-build</remove>
 	</stage>

Modified: profiles/LFS/branches/testing/chapter06/file.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/file.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/file.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="file" version="&file-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&file-md5;</digest>
 			<archive>&packages_dir;/&file-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&file-directory;</base>
 		</stageinfo>
@@ -34,7 +34,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&file-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/findutils.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/findutils.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/findutils.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="findutils" version="&findutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&findutils-md5;</digest>
 			<archive>&packages_dir;/&findutils-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&findutils-directory;</base>
 		</stageinfo>
@@ -42,7 +42,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&findutils-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/flex.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/flex.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/flex.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="flex" version="&flex-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&flex-md5;</digest>
 			<archive>&packages_dir;/&flex-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&flex-directory;</base>
 		</stageinfo>
@@ -30,7 +30,7 @@
 		</patch>
 
 		<execute command="touch">
-			<param>doc/flex.1</param>
+			<param>doc/*.1</param>
 		</execute>
 
 		<configure>
@@ -72,7 +72,7 @@
 		</permissions>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&flex-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/gawk.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/gawk.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/gawk.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="gawk" version="&gawk-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&gawk-md5;</digest>
 			<archive>&packages_dir;/&gawk-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&gawk-directory;</base>
 		</stageinfo>
@@ -41,7 +41,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&gawk-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/gcc.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/gcc.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/gcc.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="gcc" version="&gcc-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&gcc-core-md5;</digest>
 			<archive>&packages_dir;/&gcc-core-package;</archive>
@@ -33,14 +33,13 @@
 			<destination>&build_dir;</destination>
 		</unpack>-->
 
-
 		<mkdir base="&build_dir;">
 			<option>parents</option>
 			<name>gcc-build</name>
 		</mkdir>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<environment>
 				<variable name="CFLAGS" />
@@ -104,7 +103,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&gcc-directory;</remove>
 		<remove>&build_dir;/gcc-build</remove>
 	</stage>

Modified: profiles/LFS/branches/testing/chapter06/gettext.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/gettext.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/gettext.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="gettext" version="&gettext-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&gettext-md5;</digest>
 			<archive>&packages_dir;/&gettext-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&gettext-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&gettext-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/glibc.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/glibc.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/glibc.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="glibc" version="&glibc-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&glibc-md5;</digest>
 			<archive>&packages_dir;/&glibc-package;</archive>
@@ -23,7 +23,7 @@
 		</mkdir>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<environment>
 				<variable name="CFLAGS" />
@@ -35,13 +35,10 @@
 		<configure command="../&glibc-directory;/configure">
 			<param>--prefix=/usr</param>
 			<param>--disable-profile</param>
-			<param>--enable-add-ons=nptl</param>
-			<param>--with-tls</param>
-			<param>--with-__thread</param>
+			<param>--enable-add-ons</param>
 			<param>--enable-kernel=2.6.0</param>
 			<param>--without-cvs</param>
 			<param>--libexecdir=/usr/lib/glibc</param>
-			<param>--with-headers=/tools/glibc-kernheaders</param>
 		</configure>
 
 		<make />
@@ -85,7 +82,7 @@
 		</make>
 	</stage>
 
-	<stage name="Configuring.">
+	<stage name="Configuring">
 		<textdump>
 			<file>/etc/nsswitch.conf</file>
 			<content>
@@ -127,7 +124,7 @@
 		</textdump>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&glibc-directory;</remove>
 		<remove>&build_dir;/glibc-build</remove>
 	</stage>

Modified: profiles/LFS/branches/testing/chapter06/grep.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/grep.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/grep.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="grep" version="&grep-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&grep-md5;</digest>
 			<archive>&packages_dir;/&grep-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&grep-directory;</base>
 		</stageinfo>
@@ -42,7 +42,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&grep-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/groff.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/groff.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/groff.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="groff" version="&groff-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&groff-md5;</digest>
 			<archive>&packages_dir;/&groff-package;</archive>
@@ -18,13 +18,13 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&groff-directory;</base>
 		</stageinfo>
 
 		<configure>
-			<prefix>PAGE=letter</prefix>
+			<prefix>PAGE=&paper_size;</prefix>
 			<param>--prefix=/usr</param>
 		</configure>
 
@@ -53,7 +53,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&groff-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/grub.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/grub.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/grub.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="grub" version="&grub-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&grub-md5;</digest>
 			<archive>&packages_dir;/&grub-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<environment>
 				<variable name="CFLAGS" />
@@ -49,7 +49,7 @@
 		</copy>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&grub-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/gzip.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/gzip.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/gzip.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="gzip" version="&gzip-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&gzip-md5;</digest>
 			<archive>&packages_dir;/&gzip-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&gzip-directory;</base>
 		</stageinfo>
@@ -66,7 +66,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&gzip-directory;</remove>
 	</stage>
 </package>

Copied: profiles/LFS/branches/testing/chapter06/hotplug.xml (from rev 1598, profiles/LFS/trunk/chapter06/hotplug.xml)

Modified: profiles/LFS/branches/testing/chapter06/iana-etc.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/iana-etc.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/iana-etc.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="iana-etc" version="&iana-etc-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&iana-etc-md5;</digest>
 			<archive>&packages_dir;/&iana-etc-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&iana-etc-directory;</base>
 		</stageinfo>
@@ -30,7 +30,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&iana-etc-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/inetutils.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/inetutils.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/inetutils.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="inetutils" version="&inetutils-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&inetutils-md5;</digest>
 			<archive>&packages_dir;/&inetutils-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&inetutils-directory;</base>
 		</stageinfo>
@@ -26,18 +26,18 @@
 		<patch>
 			<param>-N</param>
 			<param>-p1</param>
-			<param>-i &packages_dir;/&inetutils-kernel-headers-patch;</param>
+			<param>-i &packages_dir;/&inetutils-no-man-pages-patch;</param>
 		</patch>
 
 		<patch>
 			<param>-N</param>
 			<param>-p1</param>
-			<param>-i &packages_dir;/&inetutils-no-man-pages-patch;</param>
+			<param>-i &packages_dir;/&inetutils-kernel-headers-patch;</param>
 		</patch>
 
 		<configure>
 			<param>--prefix=/usr</param>
-			<param>--libexecdir=/usr/sbin</param>
+			<param>--libexecdir=/usr/sbin</param>	
 			<param>--sysconfdir=/etc</param>
 			<param>--localstatedir=/var</param>
 			<param>--disable-logger</param>
@@ -58,7 +58,7 @@
 		</move>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&inetutils-directory;</remove>
 	</stage>
 </package>

Deleted: profiles/LFS/branches/testing/chapter06/iproute2.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/iproute2.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/iproute2.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/package.ent">
-
-%general_entities;
-%package_entities;
-]>
-
-<alfs>
-
-<package name="iproute2" version="&iproute2-version;">
-	<stage name="Unpacking.">
-		<unpack>
-			<digest>&iproute2-md5;</digest>
-			<archive>&packages_dir;/&iproute2-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing.">
-		<stageinfo>
-			<base>&build_dir;/&iproute2-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&iproute2-remove-db-patch;</param>
-		</patch>
-
-		<configure />
-
-		<make>
-			<param>SBINDIR=/sbin</param>
-		</make>
-
-		<make>
-			<param>SBINDIR=/sbin</param>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleaning up.">
-		<remove>&build_dir;/&iproute2-directory;</remove>
-	</stage>
-</package>
-
-</alfs>

Copied: profiles/LFS/branches/testing/chapter06/iproute2.xml (from rev 1598, profiles/LFS/trunk/chapter06/iproute2.xml)

Modified: profiles/LFS/branches/testing/chapter06/kbd.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/kbd.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/kbd.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="kbd" version="&kbd-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&kbd-md5;</digest>
 			<archive>&packages_dir;/&kbd-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&kbd-directory;</base>
 		</stageinfo>
@@ -35,7 +35,7 @@
 
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&kbd-directory;</remove>
 	</stage>
 </package>

Copied: profiles/LFS/branches/testing/chapter06/kernfs.xml (from rev 1598, profiles/LFS/trunk/chapter06/kernfs.xml)

Modified: profiles/LFS/branches/testing/chapter06/less.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/less.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/less.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="less" version="&less-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&less-md5;</digest>
 			<archive>&packages_dir;/&less-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&less-directory;</base>
 		</stageinfo>
@@ -36,7 +36,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&less-directory;</remove>
 	</stage>
 </package>

Copied: profiles/LFS/branches/testing/chapter06/libol.xml (from rev 1598, profiles/LFS/trunk/chapter06/libol.xml)

Modified: profiles/LFS/branches/testing/chapter06/libtool.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/libtool.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/libtool.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="libtool" version="&libtool-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&libtool-md5;</digest>
 			<archive>&packages_dir;/&libtool-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&libtool-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&libtool-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/m4.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/m4.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/m4.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="m4" version="&m4-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&m4-md5;</digest>
 			<archive>&packages_dir;/&m4-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&m4-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&m4-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/make.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/make.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/make.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="make" version="&make-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&make-md5;</digest>
 			<archive>&packages_dir;/&make-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&make-directory;</base>
 		</stageinfo>
@@ -40,7 +40,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&make-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/man-pages.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/man-pages.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/man-pages.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="man-pages" version="&man-pages-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&man-pages-md5;</digest>
 			<archive>&packages_dir;/&man-pages-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&man-pages-directory;</base>
 		</stageinfo>
@@ -28,7 +28,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&man-pages-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/man.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/man.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/man.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="man" version="&man-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&man-md5;</digest>
 			<archive>&packages_dir;/&man-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&man-directory;</base>
 		</stageinfo>
@@ -52,7 +52,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&man-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/mktemp.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/mktemp.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/mktemp.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="mktemp" version="&mktemp-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&mktemp-md5;</digest>
 			<archive>&packages_dir;/&mktemp-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&mktemp-directory;</base>
 		</stageinfo>
@@ -45,7 +45,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&mktemp-directory;</remove>
 	</stage>
 </package>

Copied: profiles/LFS/branches/testing/chapter06/module-init-tools.xml (from rev 1598, profiles/LFS/trunk/chapter06/module-init-tools.xml)

Deleted: profiles/LFS/branches/testing/chapter06/module-tools.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/module-tools.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/module-tools.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/package.ent">
-
-%general_entities;
-%package_entities;
-]>
-
-<alfs>
-
-<package name="module-init-tools" version="&module-tools-version;">
-	<stage name="Unpacking">
-		<unpack>
-			<digest>&module-tools-md5;</digest>
-			<archive>&packages_dir;/&module-tools-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&module-tools-directory;</base>
-		</stageinfo>
-
-		<configure>
-		  	<param>--prefix=""</param>
-			<param>--enable-zlib</param>
-		</configure>
-
-		<make />
-
-		<make>
-  			<param>check</param>
-		</make>
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&module-tools-directory;</remove>
-	</stage>
-</package>
-
-</alfs>

Modified: profiles/LFS/branches/testing/chapter06/ncurses.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/ncurses.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/ncurses.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="ncurses" version="&ncurses-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&ncurses-md5;</digest>
 			<archive>&packages_dir;/&ncurses-package;</archive>
@@ -19,7 +19,7 @@
 
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&ncurses-directory;</base>
 		</stageinfo>
@@ -62,7 +62,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&ncurses-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/patch.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/patch.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/patch.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="patch" version="&patch-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&patch-md5;</digest>
 			<archive>&packages_dir;/&patch-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&patch-directory;</base>
 		</stageinfo>
@@ -35,7 +35,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&patch-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/perl.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/perl.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/perl.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="perl" version="&perl-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&perl-md5;</digest>
 			<archive>&packages_dir;/&perl-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&perl-directory;</base>
 		</stageinfo>
@@ -46,7 +46,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&perl-directory;</remove>
 	</stage>
 </package>

Deleted: profiles/LFS/branches/testing/chapter06/proc.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/proc.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/proc.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-
-%general_entities;
-]>
-
-<alfs>
-
-<stage name="Creating directories and mounting file systems">
-
-	<mkdir base="&LFS;">
-		<option>parents</option>
-		<name>proc</name>
-		<name>sys</name>
-	</mkdir>
-
-	<execute command="mount">
-		<param>-t proc</param>
-		<param>proc</param>
-		<param>&LFS;/proc</param>
-	</execute>
-
-	<execute command="mount">
-		<param>-t sysfs</param>
-		<param>sysfs</param>
-		<param>&LFS;/sys</param>
-	</execute>
-
-	<execute command="mount">
-		<param>-f</param>
-		<param>-t ramfs</param>
-		<param>ramfs</param>
-		<param>&LFS;/dev</param>
-	</execute>
-
-	<execute command="mount">
-		<param>-f</param>
-		<param>-t tmpfs</param>
-		<param>tmpfs</param>
-		<param>&LFS;/dev/shm</param>
-	</execute>
-
-	<execute command="mount">
-		<param>-f</param>
-		<param>-t devpts</param>
-		<param>-o gid=4,mode=620</param>
-		<param>devpts</param>
-		<param>&LFS;/dev/pts</param>
-	</execute>
-</stage>
-
-</alfs>

Modified: profiles/LFS/branches/testing/chapter06/procps.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/procps.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/procps.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="procps" version="&procps-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&procps-md5;</digest>
 			<archive>&packages_dir;/&procps-package;</archive>
@@ -19,7 +19,7 @@
 
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&procps-directory;</base>
 		</stageinfo>
@@ -31,7 +31,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&procps-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/psmisc.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/psmisc.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/psmisc.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="psmisc" version="&psmisc-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&psmisc-md5;</digest>
 			<archive>&packages_dir;/&psmisc-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&psmisc-directory;</base>
 		</stageinfo>
@@ -52,7 +52,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&psmisc-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/pwdgroup.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/pwdgroup.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/pwdgroup.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -3,7 +3,7 @@
 
 <alfs>
 
-<stage name="Creating the passwd, group and log files.">
+<stage name="Creating the passwd, group, and log Files">
 	<textdump base="/etc">
 		<file>passwd</file>
 		<content>=root:x:0:0:root:/root:/bin/bash</content>
@@ -44,7 +44,6 @@
 		<name>run/utmp</name>
 		<name>log/lastlog</name>
 	</permissions>
-
 </stage>
 
 </alfs>

Copied: profiles/LFS/branches/testing/chapter06/readjustingtoolchain.xml (from rev 1598, profiles/LFS/trunk/chapter06/readjustingtoolchain.xml)

Modified: profiles/LFS/branches/testing/chapter06/readline.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/readline.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/readline.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="readline" version="&readline-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&readline-md5;</digest>
 			<archive>&packages_dir;/&readline-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&readline-directory;</base>
 		</stageinfo>
@@ -26,7 +26,7 @@
 		<patch>
 			<param>-N</param>
 			<param>-p1</param>
-			<param>-i &packages_dir;/&readline-display-wrap-patch;</param>
+			<param>-i &packages_dir;/&readline-fixes-patch;</param>
 		</patch>
 
 		<configure>
@@ -64,7 +64,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&readline-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/sed.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/sed.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/sed.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="sed" version="&sed-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&sed-md5;</digest>
 			<archive>&packages_dir;/&sed-package;</archive>
@@ -18,11 +18,11 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&sed-directory;</base>
-		</stageinfo>	
-		
+		</stageinfo>
+
 		<configure>
 			<param>--prefix=/usr</param>
 			<param>--bindir=/bin</param>
@@ -41,7 +41,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&sed-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/shadow.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/shadow.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/shadow.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="shadow" version="&shadow-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&shadow-md5;</digest>
 			<archive>&packages_dir;/&shadow-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&shadow-directory;</base>
 		</stageinfo>
@@ -28,19 +28,6 @@
 			<param>--enable-shared</param>
 		</configure>
 
-		<textdump mode="append">
-			<file>config.h</file>
-			<content>
-				=#define HAVE_SETLOCALE 1
-			</content>
-		</textdump>
-
-		<search_replace>
-		  	<file>libmisc/xmalloc.c</file>
-			<find>extern char *malloc ();</find>
-			<replace>/* extern char *malloc (); */</replace>
-		</search_replace>
-		
 		<make />
 
 		<make>
@@ -71,23 +58,12 @@
 		</search_replace>
 
 		<move>
-			<source>/bin/sg</source>
-			<destination>/usr/bin</destination>
-		</move>
-
-		<move>
-			<source>/bin/vigr</source>
-			<destination>/usr/sbin</destination>
-		</move>
-
-		<move>
 			<source>/usr/bin/passwd</source>
 			<destination>/bin</destination>
 		</move>
 
 		<move base="/usr/lib">
 			<source>libshadow.so.0*</source>
-			<source>libmisc.so.0*</source>
 			<destination>/lib</destination>
 		</move>
 
@@ -97,12 +73,6 @@
 			<name>/usr/lib/libshadow.so</name>
 		</link>
 
-		<link>
-			<option>force</option>
-			<target>../../lib/libmisc.so.0</target>
-			<name>/usr/lib/libmisc.so</name>
-		</link>
-		
 		<mkdir>
 			<name>/etc/default</name>
 		</mkdir>
@@ -110,7 +80,7 @@
 		<remove>/bin/groups</remove>
 	</stage>
 
-	<stage name="Configuring.">
+	<stage name="Configuring">
 		<execute command="pwconv" />
 		<execute command="grpconv" />
 
@@ -121,7 +91,7 @@
 	</stage>
 
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&shadow-directory;</remove>
 	</stage>
 </package>

Deleted: profiles/LFS/branches/testing/chapter06/sysklogd.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/sysklogd.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/sysklogd.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/package.ent">
-
-%general_entities;
-%package_entities;
-]>
-
-<alfs>
-
-<package name="sysklogd" version="&sysklogd-version;">
-	<stage name="Unpacking.">
-		<unpack>
-			<digest>&sysklogd-md5;</digest>
-			<archive>&packages_dir;/&sysklogd-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing.">
-		<stageinfo>
-			<base>&build_dir;/&sysklogd-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&sysklogd-kernel-headers-patch;</param>
-		</patch>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&sysklogd-signal-patch;</param>
-		</patch>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-
-		<textdump>
-			<file>/etc/syslog.conf</file>
-			<content>
-				=# Begin /etc/syslog.conf
-				=
-				=auth,authpriv.* -/var/log/auth.log
-				=*.*;auth,authpriv.none -/var/log/sys.log
-				=daemon.* -/var/log/daemon.log
-				=kern.* -/var/log/kern.log
-				=mail.* -/var/log/mail.log
-				=user.* -/var/log/user.log
-				=*.emerg *
-				=
-				=# End /etc/syslog.conf
-			</content>
-		</textdump>
-	</stage>
-
-	<stage name="Cleaning up.">
-		<remove>&build_dir;/&sysklogd-directory;</remove>
-	</stage>
-</package>
-
-</alfs>

Copied: profiles/LFS/branches/testing/chapter06/syslog-ng.xml (from rev 1598, profiles/LFS/trunk/chapter06/syslog-ng.xml)

Modified: profiles/LFS/branches/testing/chapter06/sysvinit.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/sysvinit.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/sysvinit.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="sysvinit" version="&sysvinit-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&sysvinit-md5;</digest>
 			<archive>&packages_dir;/&sysvinit-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&sysvinit-directory;</base>
 		</stageinfo>
@@ -78,7 +78,7 @@
 
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&sysvinit-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/tar.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/tar.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/tar.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="tar" version="&tar-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&tar-md5;</digest>
 			<archive>&packages_dir;/&tar-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&tar-directory;</base>
 		</stageinfo>
@@ -42,7 +42,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&tar-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/texinfo.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/texinfo.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/texinfo.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="texinfo" version="&texinfo-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&texinfo-md5;</digest>
 			<archive>&packages_dir;/&texinfo-package;</archive>
@@ -18,12 +18,12 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&texinfo-directory;</base>
 		</stageinfo>
 
-		<patch base="&build_dir;/&texinfo-directory;">
+		<patch>
 			<param>-N</param>
 			<param>-p1</param>
 			<param>-i &packages_dir;/&texinfo-segfault-patch;</param>
@@ -51,7 +51,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&texinfo-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/udev.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/udev.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/udev.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -28,7 +28,7 @@
 		</make>
 
 		<make>
-		  	<param>udevdir=/dev</param>
+			<param>udevdir=/dev</param>
 			<param>install</param>
 		</make>
 
@@ -42,7 +42,9 @@
         		<option>force</option>
         		<source>&udev-rules-file;</source>
         		<destination>/etc/udev/rules.d/25-lfs.rules</destination>
-		</copy>		
+		</copy>
+
+		<execute command="/sbin/udevstart" />	
 	</stage>
 
 	<stage name="Cleanup">

Modified: profiles/LFS/branches/testing/chapter06/util-linux.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/util-linux.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/util-linux.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="util-linux" version="&util-linux-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&util-linux-md5;</digest>
 			<archive>&packages_dir;/&util-linux-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&util-linux-directory;</base>
 		</stageinfo>
@@ -33,13 +33,7 @@
 			<option>parents</option>
 			<name>/var/lib/hwclock</name>
 		</mkdir>
-
-		<patch base="&build_dir;/&util-linux-directory;">
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&util-linux-sfdisk-patch;</param>
-		</patch>
-
+ 
 		<configure />
 
 		<make>
@@ -54,7 +48,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&util-linux-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/vim.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/vim.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/vim.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="vim" version="&vim-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&vim-md5;</digest>
 			<archive>&packages_dir;/&vim-package;</archive>
@@ -23,7 +23,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&vim-directory;</base>
 		</stageinfo>
@@ -78,7 +78,7 @@
 
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&vim-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter06/zlib.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/zlib.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter06/zlib.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="zlib" version="&zlib-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&zlib-md5;</digest>
 			<archive>&packages_dir;/&zlib-package;</archive>
@@ -18,17 +18,11 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&zlib-directory;</base>
 		</stageinfo>
 
-		<patch base="&build_dir;/&zlib-directory;">
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&zlib-security-patch;</param>
-		</patch>
-
 		<configure>
 			<param>--prefix=/usr</param>
 			<param>--shared</param>
@@ -82,7 +76,7 @@
 		</link>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&zlib-directory;</remove>
 	</stage>
 </package>

Deleted: profiles/LFS/branches/testing/chapter07/bash_startup.xml
===================================================================
--- profiles/LFS/branches/testing/chapter07/bash_startup.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter07/bash_startup.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-
-%general_entities;
-]>
-
-<alfs>
-
-<stage name="Bash Shell Startup Files">
-	<textdump base="/etc">
-		<file>profile</file>
-		<content>
-		=# Begin /etc/profile
-		=# Written for Linux From Scratch
-		=# by Alexander E. Patrakov
-		=
-		=export LC_ALL=&locale-language;_&locale-country;
-		=export LANG=&locale-language;_&locale-country;
-		=export INPUTRC=/etc/inputrc
-		=
-		=# End /etc/profile
-		</content>
-	</textdump>
-</stage>
-
-</alfs>

Modified: profiles/LFS/branches/testing/chapter07/bootscripts.xml
===================================================================
--- profiles/LFS/branches/testing/chapter07/bootscripts.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter07/bootscripts.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="bootscripts" version="&lfs-bootscripts-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&lfs-bootscripts-md5;</digest>
 			<archive>&packages_dir;/&lfs-bootscripts-package;</archive>
@@ -18,17 +18,19 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&lfs-bootscripts-directory;</base>
 		</stageinfo>
 
 		<make>
 			<param>install</param>
+			<param>install-hotplug</param>
+			<param>install-syslog-ng</param>
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&lfs-bootscripts-directory;</remove>
 	</stage>
 </package>

Modified: profiles/LFS/branches/testing/chapter07/hostname.xml
===================================================================
--- profiles/LFS/branches/testing/chapter07/hostname.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter07/hostname.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -7,7 +7,7 @@
 
 <alfs>
 
-<stage name="Configuring the localnet script">
+<stage name="Configuring the localnet Script">
 	<textdump>
 		<file>/etc/sysconfig/network</file>
 		<content>=HOSTNAME=&hostname;</content>

Modified: profiles/LFS/branches/testing/chapter07/hosts.xml
===================================================================
--- profiles/LFS/branches/testing/chapter07/hosts.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter07/hosts.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -7,7 +7,7 @@
 
 <alfs>
 
-<stage name="Creating the /etc/hosts file">
+<stage name="Creating the /etc/hosts File">
 	<textdump>
 		<file>/etc/hosts</file>
 		<content>

Modified: profiles/LFS/branches/testing/chapter07/inputrc.xml
===================================================================
--- profiles/LFS/branches/testing/chapter07/inputrc.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter07/inputrc.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -7,7 +7,7 @@
 
 <alfs>
 
-<stage name="Creating /etc/inputrc">
+<stage name="Creating the /etc/inputrc File">
 	<textdump base="/etc">
         	<file>inputrc</file>
         	<content>

Modified: profiles/LFS/branches/testing/chapter07/network.xml
===================================================================
--- profiles/LFS/branches/testing/chapter07/network.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter07/network.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -7,7 +7,7 @@
 
 <alfs>
 
-<stage name="Configuring the network script">
+<stage name="Configuring the network Script">
 	<mkdir>
 		<option>parents</option>
 		<name>/etc/sysconfig/network-devices/ifconfig.eth0</name>

Copied: profiles/LFS/branches/testing/chapter07/profile.xml (from rev 1598, profiles/LFS/trunk/chapter07/profile.xml)

Modified: profiles/LFS/branches/testing/chapter07/setclock.xml
===================================================================
--- profiles/LFS/branches/testing/chapter07/setclock.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter07/setclock.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -7,7 +7,7 @@
 
 <alfs>
 
-<stage name="Configuring the setclock script">
+<stage name="Configuring the setclock Script">
 	<textdump>
 		<file>/etc/sysconfig/clock</file>
 		<content>

Modified: profiles/LFS/branches/testing/chapter09/libxml2.xml
===================================================================
--- profiles/LFS/branches/testing/chapter09/libxml2.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/chapter09/libxml2.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="libxml2" version="&libxml2-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&libxml2-md5;</digest>
 			<archive>&packages_dir;/&libxml2-package;</archive>
@@ -18,7 +18,7 @@
 		</unpack>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&build_dir;/&libxml2-directory;</base>
 		</stageinfo>
@@ -34,7 +34,7 @@
 		</make>
 	</stage>
 
-	<stage name="Cleaning up.">
+	<stage name="Cleanup">
 		<remove>&build_dir;/&libxml2-directory;</remove>
 	</stage>
 </package>

Deleted: profiles/LFS/branches/testing/checkit.sh
===================================================================
--- profiles/LFS/branches/testing/checkit.sh	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/checkit.sh	2004-12-07 00:05:41 UTC (rev 1635)
@@ -1 +0,0 @@
-xmllint --noent --nonet --noout --xinclude --postvalid LFS.xml

Copied: profiles/LFS/branches/testing/checkit.sh (from rev 1598, profiles/LFS/trunk/checkit.sh)


Property changes on: profiles/LFS/branches/testing/checkit.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: profiles/LFS/branches/testing/config_separate/console.xml
===================================================================
--- profiles/LFS/branches/testing/config_separate/console.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/config_separate/console.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -37,7 +37,7 @@
 	<textdump>
 		<file>/etc/kbd/bs-sends-del</file>
 		<content>
-		=                keycode 14 =    Delete  Delete Delete  Delete
+		=                keycode 14 =    Delete  Delete          Delete  Delete
 		=        alt     keycode 14 =    Meta_Delete
 		=altgr   alt     keycode 14 =    Meta_Delete
 		=                keycode 111 =   Remove

Modified: profiles/LFS/branches/testing/config_separate/fstab.xml
===================================================================
--- profiles/LFS/branches/testing/config_separate/fstab.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/config_separate/fstab.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -7,7 +7,7 @@
 
 <alfs>
 
-<stage name="Creating the /etc/fstab file">
+<stage name="Creating the /etc/fstab File">
 	<textdump>
 		<file>/etc/fstab</file>
 		<content>

Modified: profiles/LFS/branches/testing/config_separate/general.ent
===================================================================
--- profiles/LFS/branches/testing/config_separate/general.ent	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/config_separate/general.ent	2004-12-07 00:05:41 UTC (rev 1635)
@@ -26,7 +26,7 @@
                  enter the wrong directory, nALFS will try to download
                  all the packages in it !!!
      -->
-<!ENTITY orig_packages_dir "/your/LFS-CVS/packages">
+<!ENTITY orig_packages_dir "/your/LFS-SVN/packages">
 
 <!-- Partition of your new LFS system.
      This entity is used only to initialize the new fstab file.
@@ -121,7 +121,7 @@
 <!ENTITY password "r00tme">
 
 <!-- LFS book version -->
-<!ENTITY LFS-version "SVN-testing-4176">
+<!ENTITY LFS-version "6.1-testing-4341">
 
 <!-- THE FOLLOWING TWO ENTITIES DECLARATIONS SHOULDN'T BE MOFIFIED
      UNLESS YOU KNOW WHAT YOU ARE DOING
@@ -176,3 +176,11 @@
 <!-- locale setting for /etc/profile -->
 <!ENTITY locale-language "en">
 <!ENTITY locale-country "US">
+
+<!--  Groff expects the environment variable PAGE to contain the default 
+	paper size.
+      For those in the United States, this would be 'letter'.
+      If you live elsewhere, it could also be 'A4'.
+      -->
+
+<!ENTITY paper_size "letter">

Modified: profiles/LFS/branches/testing/config_separate/grub.xml
===================================================================
--- profiles/LFS/branches/testing/config_separate/grub.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/config_separate/grub.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -9,7 +9,7 @@
 
 <alfs>
 
-<stage name="Making the LFS system bootable">
+<stage name="Making the LFS System Bootable">
 	<!--
 	The following shell command sets up grub.  The batch param on the first line
 	has to have the space between the dashes removed for this to work.	

Modified: profiles/LFS/branches/testing/config_separate/kernel.xml
===================================================================
--- profiles/LFS/branches/testing/config_separate/kernel.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/config_separate/kernel.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs xmlns:xi="http://www.w3.org/2001/XInclude">
 
 <package name="linux" version="&linux-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&linux-md5;</digest>
 			<archive>&packages_dir;/&linux-package;</archive>
@@ -23,7 +23,7 @@
 		</ownership>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&linux-src-location;/&linux-directory;</base>
 		</stageinfo>

Modified: profiles/LFS/branches/testing/config_separate/package.ent
===================================================================
--- profiles/LFS/branches/testing/config_separate/package.ent	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/config_separate/package.ent	2004-12-07 00:05:41 UTC (rev 1635)
@@ -3,8 +3,8 @@
 <!ENTITY autoconf-package "autoconf-&autoconf-version;.tar.bz2">
 <!ENTITY autoconf-directory "autoconf-&autoconf-version;">
 
-<!ENTITY automake-md5 "65143af82931c2c4d703d3a17c1c9d15">
-<!ENTITY automake-version "1.9.1">
+<!ENTITY automake-md5 "0ee08fb0ee48d20a4f8da99137340efd">
+<!ENTITY automake-version "1.9.3">
 <!ENTITY automake-package "automake-&automake-version;.tar.bz2">
 <!ENTITY automake-directory "automake-&automake-version;">
 
@@ -13,11 +13,14 @@
 <!ENTITY bash-package "bash-&bash-version;.tar.bz2">
 <!ENTITY bash-directory "bash-&bash-version;">
 
-<!ENTITY bash-display-wrap-patch-md5 "e6c29f2841c297ad85c3753aada6cc3f">
-<!ENTITY bash-display-wrap-patch "bash-&bash-version;-display_wrap-1.patch">
+<!ENTITY bash-fixes-patch-md5 "a2eec57fcbd4e03d913853e66f3836ca">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-1.patch">
 
-<!ENTITY binutils-md5 "41983069bef07af4f1350c6d30666b2d">
-<!ENTITY binutils-version "2.15.91.0.2">
+<!ENTITY bash-wcontinued-patch-md5 "93eb380f4dd903ee25e47c7950894578">
+<!ENTITY bash-wcontinued-patch "bash-&bash-version;-avoid_WCONTINUED-1.patch">
+
+<!ENTITY binutils-md5 "702bc82d8b10914e112fb5c5d8b66498">
+<!ENTITY binutils-version "2.15.92.0.2">
 <!ENTITY binutils-package "binutils-&binutils-version;.tar.bz2">
 <!ENTITY binutils-directory "binutils-&binutils-version;">
 
@@ -52,7 +55,7 @@
 <!ENTITY diffutils-package "diffutils-&diffutils-version;.tar.bz2">
 <!ENTITY diffutils-directory "diffutils-&diffutils-version;">
 
-<!ENTITY e2fsprogs-md5 "8d25ffd60d405ef32d341704a2323807">
+<!ENTITY e2fsprogs-md5 "fc61cf48057d4c2beb0e0aa20351648f">
 <!ENTITY e2fsprogs-version "1.35">
 <!ENTITY e2fsprogs-package "e2fsprogs-&e2fsprogs-version;.tar.bz2">
 <!ENTITY e2fsprogs-directory "e2fsprogs-&e2fsprogs-version;">
@@ -65,13 +68,13 @@
 <!ENTITY expect-spawn-patch-md5 "ef6d0d0221c571fb420afb7033b3bbba">
 <!ENTITY expect-spawn-patch "expect-&expect-version;-spawn-1.patch">
 
-<!ENTITY file-md5 "424fd354001dcbe913a1c21d21c77a08">
-<!ENTITY file-version "4.10">
+<!ENTITY file-md5 "12a41cc46ea6792857eb61a1a7331194">
+<!ENTITY file-version "4.12">
 <!ENTITY file-package "file-&file-version;.tar.bz2">
 <!ENTITY file-directory "file-&file-version;">
 
-<!ENTITY findutils-md5 "7225c2705b01e47811066f4e9dc8d677">
-<!ENTITY findutils-version "4.1.20">
+<!ENTITY findutils-md5 "edef84f57a5d53bce40ff8074655f1bd">
+<!ENTITY findutils-version "4.2.3">
 <!ENTITY findutils-package "findutils-&findutils-version;.tar.bz2">
 <!ENTITY findutils-directory "findutils-&findutils-version;">
 
@@ -88,29 +91,29 @@
 <!ENTITY gawk-package "gawk-&gawk-version;.tar.bz2">
 <!ENTITY gawk-directory "gawk-&gawk-version;">
 
-<!ENTITY gcc-version "3.4.1">
+<!ENTITY gcc-version "3.4.2">
 <!ENTITY gcc-cvs-tag "">
 <!ENTITY gcc-directory "gcc-&gcc-version;&gcc-cvs-tag;">
 
-<!ENTITY gcc-md5 "31b459062499f9f68d451db9cbf3205c">
+<!ENTITY gcc-md5 "2fada3a3effd2fd791df09df1f1534b3">
 <!ENTITY gcc-package "gcc-&gcc-version;&gcc-cvs-tag;.tar.bz2">
 
-<!ENTITY gcc-core-md5 "4b05b134baf92457494a0f4a28aa5213">
+<!ENTITY gcc-core-md5 "cb1613efd03f4ed9969f076c012b9fee">
 <!ENTITY gcc-core-package "gcc-core-&gcc-version;&gcc-cvs-tag;.tar.bz2">
 
-<!ENTITY gcc-gpp-md5 "7517c88648883e3d92e1e8525ab823fa">
+<!ENTITY gcc-gpp-md5 "247e312c5f4d8baa7fdfc16597ec2b4b">
 <!ENTITY gcc-gpp-package "gcc-g++-&gcc-version;&gcc-cvs-tag;.tar.bz2">
   
-<!ENTITY gcc-testsuite-md5 "641f45606e17db4a3079cb7364a9e295">
+<!ENTITY gcc-testsuite-md5 "70046557dd99761709dd0613ace12329">
 <!ENTITY gcc-testsuite-package "gcc-testsuite-&gcc-version;&gcc-cvs-tag;.tar.bz2">
 
-<!ENTITY gcc-linkonce-patch-md5 "a068347f66b14f1a9f32bb66ed16d72c">
+<!ENTITY gcc-linkonce-patch-md5 "6d0b7e6b38cfc3d059c9bcb370623db0">
 <!ENTITY gcc-linkonce-patch "gcc-&gcc-version;-linkonce-1.patch">
 
-<!ENTITY gcc-no-fixincludes-patch-md5 "78fa00bc9f7173b9658eeb86ce9291c9">
+<!ENTITY gcc-no-fixincludes-patch-md5 "0105c14285a5bfcdd893365ce32043a2">
 <!ENTITY gcc-no-fixincludes-patch "gcc-&gcc-version;-no_fixincludes-1.patch">
 
-<!ENTITY gcc-specs-patch-md5 "a0d586aaa048622379836020c5040a5c">
+<!ENTITY gcc-specs-patch-md5 "c170a1b67daccaa4f2e15b8a1fd79bae">
 <!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-1.patch">
 
 <!ENTITY gettext-md5 "c9f6b7c52eb9da4a84340966d1a08d0f">
@@ -118,14 +121,14 @@
 <!ENTITY gettext-package "gettext-&gettext-version;.tar.bz2">
 <!ENTITY gettext-directory "gettext-&gettext-version;">
 
-<!ENTITY glibc-md5 "508188d136cbc32935637c17398d7748">
-<!ENTITY glibc-version "2.3.4">
-<!ENTITY glibc-cvs-tag "-20040701">
+<!ENTITY glibc-md5 "9a79721c5edf1684fcb0f24e8c7618c3">
+<!ENTITY glibc-version "20041011">
+<!ENTITY glibc-cvs-tag "">
 <!ENTITY glibc-package "glibc-&glibc-version;&glibc-cvs-tag;.tar.bz2">
 <!ENTITY glibc-directory "glibc-&glibc-version;&glibc-cvs-tag;">
 
-<!ENTITY grep-md5 "ddd99e2d5d4f4611357e31e97f080cf2">
-<!ENTITY grep-version "2.5.1">
+<!ENTITY grep-md5 "52202fe462770fa6be1bb667bd6cf30c">
+<!ENTITY grep-version "2.5.1a">
 <!ENTITY grep-package "grep-&grep-version;.tar.bz2">
 <!ENTITY grep-directory "grep-&grep-version;">
 
@@ -144,8 +147,13 @@
 <!ENTITY gzip-package "gzip-&gzip-version;.tar.bz2">
 <!ENTITY gzip-directory "gzip-&gzip-version;">
 
-<!ENTITY iana-etc-md5 "b1461e457d6ad84ceba5a6c565af189f">
-<!ENTITY iana-etc-version "1.01">
+<!ENTITY hotplug-md5 "58e6995f9df71ce59b0ec2787019e5fe">
+<!ENTITY hotplug-version "2004_09_23">
+<!ENTITY hotplug-package "hotplug-&hotplug-version;.tar.bz2">
+<!ENTITY hotplug-directory "hotplug-&hotplug-version;">
+
+<!ENTITY iana-etc-md5 "670da9e41179d618498f5d614b7f4636">
+<!ENTITY iana-etc-version "1.03">
 <!ENTITY iana-etc-package "iana-etc-&iana-etc-version;.tar.bz2">
 <!ENTITY iana-etc-directory "iana-etc-&iana-etc-version;">
 
@@ -160,9 +168,9 @@
 <!ENTITY inetutils-kernel-headers-patch-md5 "de1f835265b7ed818d7c0fb8c0be334b">
 <!ENTITY inetutils-kernel-headers-patch "inetutils-&inetutils-version;-kernel_headers-1.patch">
 
-<!ENTITY iproute2-md5 "ff51b7e4369b25016d5a8f4238604a5b">
-<!ENTITY iproute2-version "2.6.8">
-<!ENTITY iproute2-cvs-ver "040823">
+<!ENTITY iproute2-md5 "5f9f23581c01c7f1f8cdb2c12e9a8a81">
+<!ENTITY iproute2-version "2.6.9">
+<!ENTITY iproute2-cvs-ver "041019">
 <!ENTITY iproute2-package "iproute2-&iproute2-version;-&iproute2-cvs-ver;.tar.bz2">
 <!ENTITY iproute2-directory "iproute2-&iproute2-version;">
 
@@ -179,13 +187,18 @@
 <!ENTITY less-package "less-&less-version;.tar.bz2">
 <!ENTITY less-directory "less-&less-version;">
 
-<!ENTITY lfs-bootscripts-md5 "1ce531e61c060124def9897d9f6ca026">
-<!ENTITY lfs-bootscripts-version "2.2.2">
+<!ENTITY lfs-bootscripts-md5 "8a39d48d7d1316e93877b9095f4574ea">
+<!ENTITY lfs-bootscripts-version "2.2.3">
 <!ENTITY lfs-bootscripts-package "lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-directory "lfs-bootscripts-&lfs-bootscripts-version;">
 
-<!ENTITY libtool-md5 "0436f0a2c4ae3f874c2b6b98c132b297">
-<!ENTITY libtool-version "1.5.8">
+<!ENTITY libol-md5 "4183c9fc4d92af1249d0a7cf8041acbe">
+<!ENTITY libol-version "0.3.14">
+<!ENTITY libol-package "libol-&libol-version;.tar.bz2">
+<!ENTITY libol-directory "libol-&libol-version;">
+
+<!ENTITY libtool-md5 "0761073cd2deacee6dc6c951ba07bae0">
+<!ENTITY libtool-version "1.5.10">
 <!ENTITY libtool-package "libtool-&libtool-version;.tar.bz2">
 <!ENTITY libtool-directory "libtool-&libtool-version;">
 
@@ -194,14 +207,14 @@
 <!ENTITY libxml2-package "libxml2-&libxml2-version;.tar.bz2">
 <!ENTITY libxml2-directory "libxml2-&libxml2-version;">
 
-<!ENTITY linux-md5 "9517ca999e822b898fbdc7e72796b1aa">
-<!ENTITY linux-version "2.6.8.1">
+<!ENTITY linux-md5 "e921200f074ca97184e150ef5a4af825">
+<!ENTITY linux-version "2.6.9">
 <!ENTITY linux-package "linux-&linux-version;.tar.bz2">
 <!ENTITY linux-directory "linux-&linux-version;">
 <!ENTITY linux-src-location "/usr/src">
 
-<!ENTITY linux-libc-headers-md5 "a75c264f90b07b4f3ba05febc7386f4b">
-<!ENTITY linux-libc-headers-version "2.6.8.1">
+<!ENTITY linux-libc-headers-md5 "d3507b2c0203a0760a677022badcf455">
+<!ENTITY linux-libc-headers-version "2.6.9.1">
 <!ENTITY linux-libc-headers-package "linux-libc-headers-&linux-libc-headers-version;.tar.bz2">
 <!ENTITY linux-libc-headers-directory "linux-libc-headers-&linux-libc-headers-version;">
 
@@ -215,16 +228,16 @@
 <!ENTITY make-package "make-&make-version;.tar.bz2">
 <!ENTITY make-directory "make-&make-version;">
 
-<!ENTITY man-md5 "52ce909335d85203478da5ff69cd0e14">
-<!ENTITY man-version "1.5o">
+<!ENTITY man-md5 "ead468e61db27ffb4e416a15bc40aaeb">
+<!ENTITY man-version "1.5o1">
 <!ENTITY man-package "man-&man-version;.tar.bz2">
 <!ENTITY man-directory "man-&man-version;">
 
 <!ENTITY man-80cols-patch-md5 "9c93fd4384b6b69273278ae5621e1f4a">
 <!ENTITY man-80cols-patch "man-&man-version;-80cols-1.patch">
 
-<!ENTITY man-pages-md5 "c31112bbfdd907f77c1419308a8cafba">
-<!ENTITY man-pages-version "1.67">
+<!ENTITY man-pages-md5 "c28daa285ad9c7eeab629056a711fdb7">
+<!ENTITY man-pages-version "1.70">
 <!ENTITY man-pages-package "man-pages-&man-pages-version;.tar.bz2">
 <!ENTITY man-pages-directory "man-pages-&man-pages-version;">
 
@@ -236,8 +249,8 @@
 <!ENTITY mktemp-tempfile-patch-md5 "1b65466c0238120110dc1d906ad66de4">
 <!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-1.patch">
 
-<!ENTITY module-init-tools-md5 "f8bfc480c4168978eca7037cd341da07">
-<!ENTITY module-init-tools-version "3.0">
+<!ENTITY module-init-tools-md5 "8ddecbcf0e56aef8617f67a3906faf3e">
+<!ENTITY module-init-tools-version "3.1">
 <!ENTITY module-init-tools-package "module-init-tools-&module-init-tools-version;.tar.bz2">
 <!ENTITY module-init-tools-directory "module-init-tools-&module-init-tools-version;">
 
@@ -264,8 +277,8 @@
 <!ENTITY perl-libc-1-patch-md5 "f033161efa8b4b174ec6667e4e739efa">
 <!ENTITY perl-libc-1-patch "perl-&perl-version;-libc-1.patch">
 
-<!ENTITY procps-md5 "a327aa1b701f9201b2a2bee6d22f23cb">
-<!ENTITY procps-version "3.2.3">
+<!ENTITY procps-md5 "213e7783317c672afccfecda7b81528c">
+<!ENTITY procps-version "3.2.4">
 <!ENTITY procps-package "procps-&procps-version;.tar.bz2">
 <!ENTITY procps-directory "procps-&procps-version;">
 
@@ -279,30 +292,24 @@
 <!ENTITY readline-package "readline-&readline-version;.tar.bz2">
 <!ENTITY readline-directory "readline-&readline-version;">
 
-<!ENTITY readline-display-wrap-patch-md5 "5280d7b859bb8d80e7b8ca709f137970">
-<!ENTITY readline-display-wrap-patch "readline-&readline-version;-display_wrap-1.patch">
+<!ENTITY readline-fixes-patch-md5 "6693bff25f522b2f7b42a6f48aafac3f">
+<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-1.patch">
 
 <!ENTITY sed-md5 "537f96fa633ed949b0bf1dc9d1c678b4">
 <!ENTITY sed-version "4.1.2">
 <!ENTITY sed-package "sed-&sed-version;.tar.bz2">
 <!ENTITY sed-directory "sed-&sed-version;">
 
-<!ENTITY shadow-md5 "3a3d17d3d7c630b602baf66ae7434c61">
-<!ENTITY shadow-version "4.0.4.1">
+<!ENTITY shadow-md5 "3ca79b02c0aaa82128f4c32cb68ffe4f">
+<!ENTITY shadow-version "4.0.6">
 <!ENTITY shadow-package "shadow-&shadow-version;.tar.bz2">
 <!ENTITY shadow-directory "shadow-&shadow-version;">
 
-<!ENTITY sysklogd-md5 "f587720988bc1670071f31d3694ca0fb">
-<!ENTITY sysklogd-version "1.4.1">
-<!ENTITY sysklogd-package "sysklogd-&sysklogd-version;.tar.bz2">
-<!ENTITY sysklogd-directory "sysklogd-&sysklogd-version;">
+<!ENTITY syslog-ng-md5 "ebd1e0630fccc34b860a3211b9980838">
+<!ENTITY syslog-ng-version "1.6.5">
+<!ENTITY syslog-ng-package "syslog-ng-&syslog-ng-version;.tar.bz2">
+<!ENTITY syslog-ng-directory "syslog-ng-&syslog-ng-version;">
 
-<!ENTITY sysklogd-kernel-headers-patch-md5 "290ef10e5fe52676899da43cb8dd2914">
-<!ENTITY sysklogd-kernel-headers-patch "sysklogd-&sysklogd-version;-kernel_headers-1.patch">
-
-<!ENTITY sysklogd-signal-patch-md5 "cbe6093ef2fb8089d86d8dd636224cc7">
-<!ENTITY sysklogd-signal-patch "sysklogd-&sysklogd-version;-signal-1.patch">
-
 <!ENTITY sysvinit-md5 "ee1a5fb0725500f38dc08d5ef4577581">
 <!ENTITY sysvinit-version "2.85">
 <!ENTITY sysvinit-package "sysvinit-&sysvinit-version;.tar.bz2">
@@ -316,8 +323,8 @@
 <!ENTITY tar-package "tar-&tar-version;.tar.bz2">
 <!ENTITY tar-directory "tar-&tar-version;">
 
-<!ENTITY tcl-md5 "e3c11f3a9e8723e6acc126b8c405e1e4">
-<!ENTITY tcl-version "8.4.7">
+<!ENTITY tcl-md5 "7add1c1900f874ecd049100d750ce968">
+<!ENTITY tcl-version "8.4.8">
 <!ENTITY tcl-package "tcl&tcl-version;-src.tar.bz2">
 <!ENTITY tcl-directory "tcl&tcl-version;">
 
@@ -329,8 +336,8 @@
 <!ENTITY texinfo-segfault-patch-md5 "ce5aa1bb05b3c6638e071d2b0283fdd6">
 <!ENTITY texinfo-segfault-patch "texinfo-&texinfo-version;-segfault-1.patch">
 
-<!ENTITY udev-md5 "8202bf86e9f2cb5483d473f9977eeafc">
-<!ENTITY udev-version "030">
+<!ENTITY udev-md5 "51d6b9722c1097ed4d28d2e46af4d9a3">
+<!ENTITY udev-version "046">
 <!ENTITY udev-package "udev-&udev-version;.tar.bz2">
 <!ENTITY udev-directory "udev-&udev-version;">
 
@@ -342,14 +349,11 @@
 <!ENTITY udev-permissions-version "2">
 <!ENTITY udev-permissions-file "udev-config-&udev-permissions-version;.permissions">
 
-<!ENTITY util-linux-md5 "8f3299ad2b193340c31c1ff99e2be903">
-<!ENTITY util-linux-version "2.12b">
+<!ENTITY util-linux-md5 "e59e1e20e78d8d50ba26c43e1d887a19">
+<!ENTITY util-linux-version "2.12i">
 <!ENTITY util-linux-package "util-linux-&util-linux-version;.tar.bz2">
 <!ENTITY util-linux-directory "util-linux-&util-linux-version;">
 
-<!ENTITY util-linux-sfdisk-patch-md5 "abccfbd333292073cd619a604bd19231">
-<!ENTITY util-linux-sfdisk-patch "util-linux-&util-linux-version;-sfdisk-2.patch">
-
 <!ENTITY vim-md5 "821fda8f14d674346b87e3ef9cb96389">
 <!ENTITY vim-version "6.3">
 <!ENTITY vim-package "vim-&vim-version;.tar.bz2">
@@ -358,10 +362,8 @@
 <!ENTITY vim-lang-md5 "58dcbac0857f916a9c46c6731662fbd5">
 <!ENTITY vim-lang-package "vim-&vim-version;-lang.tar.bz2">
 
-<!ENTITY zlib-md5 "8106069990476a3c5187301465bd7a60">
-<!ENTITY zlib-version "1.2.1">
+<!ENTITY zlib-md5 "1b8aab042d40979e456194c468fd72c5">
+<!ENTITY zlib-version "1.2.2">
 <!ENTITY zlib-package "zlib-&zlib-version;.tar.bz2">
 <!ENTITY zlib-directory "zlib-&zlib-version;">
 
-<!ENTITY zlib-security-patch-md5 "1b451d8388afcbc5455f670bcb3c856b">
-<!ENTITY zlib-security-patch "zlib-&zlib-version;-security-1.patch">

Modified: profiles/LFS/branches/testing/config_tarball/fstab.xml
===================================================================
--- profiles/LFS/branches/testing/config_tarball/fstab.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/config_tarball/fstab.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -7,7 +7,7 @@
 
 <alfs>
 
-<stage name="Creating the /etc/fstab file">
+<stage name="Creating the /etc/fstab File">
 	<textdump>
 		<file>/etc/fstab</file>
 		<content>

Modified: profiles/LFS/branches/testing/config_tarball/grub.xml
===================================================================
--- profiles/LFS/branches/testing/config_tarball/grub.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/config_tarball/grub.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -9,7 +9,7 @@
 
 <alfs>
 
-<stage name="Making the LFS system bootable">
+<stage name="Making the LFS System Bootable">
 	<!--
 	The following shell command sets up grub.  The batch param on the first line
 	has to have the space between the dashes removed for this to work.	

Modified: profiles/LFS/branches/testing/config_tarball/kernel.xml
===================================================================
--- profiles/LFS/branches/testing/config_tarball/kernel.xml	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/config_tarball/kernel.xml	2004-12-07 00:05:41 UTC (rev 1635)
@@ -10,7 +10,7 @@
 <alfs>
 
 <package name="linux" version="&linux-version;">
-	<stage name="Unpacking.">
+	<stage name="Unpacking">
 		<unpack>
 			<digest>&linux-md5;</digest>
 			<archive>&packages_dir;/&linux-package;</archive>
@@ -23,7 +23,7 @@
 		</ownership>
 	</stage>
 
-	<stage name="Installing.">
+	<stage name="Installing">
 		<stageinfo>
 			<base>&linux-src-location;/&linux-directory;</base>
 		</stageinfo>

Modified: profiles/LFS/branches/testing/runit
===================================================================
--- profiles/LFS/branches/testing/runit	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/runit	2004-12-07 00:05:41 UTC (rev 1635)
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 if [ $(id -u) -ne 0 ]; then
-   echo "Attention: this profile should be run as root."
+   echo "Attention: this profile should be run as root"
    exit 3
 fi
 
 if [ ! -e config ]; then
-  echo "Attention: You must create a config directory (or link)."
+  echo "Attention: You must create a config directory (or link)"
 fi
 
 umask 022

Modified: profiles/LFS/branches/testing/scripts/wget.lfs
===================================================================
--- profiles/LFS/branches/testing/scripts/wget.lfs	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/scripts/wget.lfs	2004-12-07 00:05:41 UTC (rev 1635)
@@ -5,4 +5,4 @@
 	exit 1
 fi
 
-wget -b -nc -P $1 -i wget.lfs.urls -o wget.lfs.log
+wget -b -nv -nc -P $1 -i wget.lfs.urls -o wget.lfs.log

Modified: profiles/LFS/branches/testing/scripts/wget.lfs.urls
===================================================================
--- profiles/LFS/branches/testing/scripts/wget.lfs.urls	2004-12-06 01:33:17 UTC (rev 1634)
+++ profiles/LFS/branches/testing/scripts/wget.lfs.urls	2004-12-07 00:05:41 UTC (rev 1635)
@@ -1,7 +1,7 @@
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/autoconf/autoconf-2.59.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/automake/automake-1.9.1.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/automake/automake-1.9.3.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/bash/bash-3.0.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/binutils/binutils-2.15.91.0.2.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/binutils/binutils-2.15.92.0.2.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/bison/bison-1.875a.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/bzip2/bzip2-1.0.2.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/coreutils/coreutils-5.2.1.tar.bz2
@@ -9,75 +9,76 @@
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/diffutils/diffutils-2.8.1.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/e2fsprogs/e2fsprogs-1.35.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/expect/expect-5.42.1.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/file/file-4.10.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/findutils/findutils-4.1.20.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/file/file-4.12.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/findutils/findutils-4.2.3.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/flex/flex-2.5.31.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/gawk/gawk-3.1.4.tar.bz2
-#ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.1/gcc-3.4.1.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/gcc/gcc-core-3.4.1.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/gcc/gcc-g++-3.4.1.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/gcc/gcc-testsuite-3.4.1.tar.bz2
+#ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.2/gcc-3.4.2.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/gcc/gcc-core-3.4.2.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/gcc/gcc-g++-3.4.2.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/gcc/gcc-testsuite-3.4.2.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/gettext/gettext-0.14.1.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/glibc/glibc-2.3.4-20040701.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/grep/grep-2.5.1.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/glibc/glibc-20041011.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/grep/grep-2.5.1a.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/groff/groff-1.19.1.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/grub/grub-0.95.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/gzip/gzip-1.3.5.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/iana-etc/iana-etc-1.01.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/hotplug/hotplug-2004_09_23.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/iana-etc/iana-etc-1.03.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/inetutils/inetutils-1.4.2.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/iproute2/iproute2-2.6.8-040823.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/iproute2/iproute2-2.6.9-041019.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/kbd/kbd-1.12.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/less/less-382.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/lfs-bootscripts/lfs-bootscripts-2.2.2.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/libtool/libtool-1.5.8.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/linux/linux-2.6.8.1.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/linux-libc-headers/linux-libc-headers-2.6.8.1.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/lfs-bootscripts/lfs-bootscripts-2.2.3.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/libol/libol-0.3.14.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/libtool/libtool-1.5.10.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/linux/linux-2.6.9.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/linux-libc-headers/linux-libc-headers-2.6.9.1.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/m4/m4-1.4.2.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/make/make-3.80.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/man/man-1.5o.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/man-pages/man-pages-1.67.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/man/man-1.5o1.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/man-pages/man-pages-1.70.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/mktemp/mktemp-1.5.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/module-init-tools/module-init-tools-3.0.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/module-init-tools/module-init-tools-3.1.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/ncurses/ncurses-5.4.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/patch/patch-2.5.4.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/perl/perl-5.8.5.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/procps/procps-3.2.3.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/procps/procps-3.2.4.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/psmisc/psmisc-21.5.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/readline/readline-5.0.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/sed/sed-4.1.2.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/shadow/shadow-4.0.4.1.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/sysklogd/sysklogd-1.4.1.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/shadow/shadow-4.0.6.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/syslog-ng/syslog-ng-1.6.5.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/sysvinit/sysvinit-2.85.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/tar/tar-1.14.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/tcl/tcl8.4.7-src.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/tcl/tcl8.4.8-src.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/texinfo/texinfo-4.7.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/udev/udev-030.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/util-linux/util-linux-2.12b.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/udev/udev-046.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/util-linux/util-linux-2.12i.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/vim/vim-6.3.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/vim/vim-6.3-lang.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/zlib/zlib-1.2.1.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/zlib/zlib-1.2.2.tar.bz2
 
-http://www.linuxfromscratch.org/patches/lfs/cvs/testing/bash-3.0-display_wrap-1.patch
+http://downloads.linuxfromscratch.org/udev-config-2.permissions
+http://downloads.linuxfromscratch.org/udev-config-1.rules
+http://www.linuxfromscratch.org/patches/lfs/cvs/testing/bash-3.0-fixes-1.patch
+http://www.linuxfromscratch.org/patches/lfs/cvs/testing/bash-3.0-avoid_WCONTINUED-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/testing/coreutils-5.2.1-suppress_uptime_kill_su-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/testing/coreutils-5.2.1-uname-2.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/testing/expect-5.42.1-spawn-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/testing/flex-2.5.31-debian_fixes-2.patch
-http://www.linuxfromscratch.org/patches/lfs/cvs/testing/gcc-3.4.1-linkonce-1.patch
-http://www.linuxfromscratch.org/patches/lfs/cvs/testing/gcc-3.4.1-no_fixincludes-1.patch
-http://www.linuxfromscratch.org/patches/lfs/cvs/testing/gcc-3.4.1-specs-1.patch
+http://www.linuxfromscratch.org/patches/lfs/cvs/testing/gcc-3.4.2-linkonce-1.patch
+http://www.linuxfromscratch.org/patches/lfs/cvs/testing/gcc-3.4.2-no_fixincludes-1.patch
+http://www.linuxfromscratch.org/patches/lfs/cvs/testing/gcc-3.4.2-specs-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/testing/inetutils-1.4.2-kernel_headers-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/testing/inetutils-1.4.2-no_server_man_pages-1.patch
-http://www.linuxfromscratch.org/patches/lfs/cvs/testing/iproute2-2.6.8_040823-remove_db-1.patch
-http://www.linuxfromscratch.org/patches/lfs/cvs/testing/man-1.5o-80cols-1.patch
+http://www.linuxfromscratch.org/patches/lfs/cvs/testing/iproute2-2.6.9_041019-remove_db-1.patch
+http://www.linuxfromscratch.org/patches/lfs/cvs/testing/man-1.5o1-80cols-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/testing/mktemp-1.5-add_tempfile-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/testing/perl-5.8.5-libc-1.patch
-http://www.linuxfromscratch.org/patches/lfs/cvs/testing/readline-5.0-display_wrap-1.patch
-http://www.linuxfromscratch.org/patches/lfs/cvs/testing/sysklogd-1.4.1-kernel_headers-1.patch
-http://www.linuxfromscratch.org/patches/lfs/cvs/testing/sysklogd-1.4.1-signal-1.patch
+http://www.linuxfromscratch.org/patches/lfs/cvs/testing/readline-5.0-fixes-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/testing/sysvinit-2.85-proclen-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/testing/texinfo-4.7-segfault-1.patch
-http://www.linuxfromscratch.org/patches/lfs/cvs/testing/util-linux-2.12b-sfdisk-2.patch
-http://www.linuxfromscratch.org/patches/lfs/cvs/testing/zlib-1.2.1-security-1.patch
 
 ftp://ftp.gnome.org/pub/gnome/sources/libxml2/2.6/libxml2-2.6.16.tar.bz2
 http://lfs.securewebservices.co.uk/alfs/downloads/stable/nALFS-1.2.4.tar.bz2 




More information about the alfs-log mailing list