Merged r8371, r8373, parts of r8375, r8376, r8377, r8378, r8379, r8380 and r8381 to jh branch from trunk.

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

chapter01/changelog.xml

@@ -36,6 +36,46 @@
     </listitem>
 -->
 
+    <listitem>
+       <para>2007-09-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Add latest upstream patches for Vim.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to Sysklogd-1.5. Fixes
+          <ulink url="&lfs-ticket-root;2055">#2055</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Add latest upstream patches for Readline. Fixes
+          <ulink url="&lfs-ticket-root;2068">#2068</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to Man-pages 2.64. Fixes
+          <ulink url="&lfs-ticket-root;2061">#2061</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to Linux-2.6.22.6. Fixes
+          <ulink url="&lfs-ticket-root;2070">#2070</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[jhuntwork] - Remove --with-arch for GCC and adjust CFLAGS for
+	  Glibc instead.
+	  Thanks to Robert Connolly and Dan Nicholson for investigating how best
+	  to adjust CFLAGS, and Greg Schafer for showing the technical
+	  benefits of using CFLAGS with Glibc.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to DB-4.6.19. Fixes
+          <ulink url="&lfs-ticket-root;2051">#2051</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Add latest upstream patches for Bash. Fixes
+          <ulink url="&lfs-ticket-root;2067">#2067</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
      <listitem>
       <para>2007-09-07</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -36,10 +36,10 @@
     </listitem>
     <listitem>
       <para>Bash &bash-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>Berkeley DB &db-version;</para>
-    </listitem> -->
+    </listitem>
     <listitem>
       <para>Binutils &binutils-version;</para>
     </listitem>
@@ -121,7 +121,7 @@
     <listitem>
       <para>Linux &linux-version;</para>
     </listitem>
-   <!-- <listitem>
+    <!--<listitem>
       <para>M4 &m4-version;</para>
     </listitem>
     <listitem>
@@ -130,9 +130,9 @@
     <!--<listitem>
       <para>Man-DB &man-db-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Man-pages &man-pages-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Mktemp &mktemp-version;</para>
     </listitem>-->
@@ -163,9 +163,9 @@
     <!--<listitem>
       <para>Shadow &shadow-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Sysklogd &sysklogd-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>SysVinit &sysvinit-version;</para>
     </listitem>-->
@@ -204,22 +204,54 @@
 
   </itemizedlist>-->
 
-  <!--<itemizedlist>
+  <itemizedlist>
     <title>Added:</title>
 
     <listitem>
-      <para>PLACEHOLDER</para>
+      <para>&bash-fixes-patch;</para>
     </listitem>
 
-  </itemizedlist>-->
+    <listitem>
+      <para>&readline-fixes-patch;</para>
+    </listitem>
 
-  <!--<itemizedlist>
+    <listitem>
+      <para>&readline-fixes-patch;</para>
+    </listitem>
+
+  </itemizedlist>
+
+  <itemizedlist>
     <title>Removed:</title>
 
     <listitem>
-      <para>PLACEHOLDER</para>
+      <para>bash-3.2-fixes-5.patch</para>
     </listitem>
 
-  </itemizedlist>-->
+    <listitem>
+      <para>db-4.5.29-fixes-1.patch</para>
+    </listitem>
+
+    <listitem> 
+      <para>gcc-4.1.2-specs-1.patch</para>
+    </listitem>
+
+    <listitem>
+      <para>readline-5.4-fixes-4.patch</para>
+    </listitem>
+
+    <listitem>
+      <para>sysklogd-1.4.1-8bit-1.patch</para>
+    </listitem>
+
+    <listitem>
+      <para>sysklogd-1.4.1-fixes-2.patch</para>
+    </listitem>
+
+    <listitem>
+      <para>vim-7.1-fixes-1.patch</para>
+    </listitem>
+
+  </itemizedlist>
 
 </sect1>

chapter03/patches.xml

@@ -58,14 +58,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>DB Fixes Patch - <token>&db-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&db-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&db-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Diffutils Internationalization Fixes Patch - <token>&diffutils-i18n-patch-size;</token>:</term>
       <listitem>
@@ -194,22 +186,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Sysklogd 8-Bit Cleanness Patch - <token>&sysklogd-8bit-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&sysklogd-8bit-patch;"/></para>
-        <para>MD5 sum: <literal>&sysklogd-8bit-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Sysklogd Fixes Patch - <token>&sysklogd-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&sysklogd-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&sysklogd-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Texinfo Multibyte Fixes Patch - <token>&texinfo-multibyte-patch-size;</token>:</term>
       <listitem>

chapter05/gcc-pass1.xml

@@ -49,17 +49,11 @@
 <screen><userinput>mkdir -v ../gcc-build
 cd ../gcc-build</userinput></screen>
 
-    <para>Set the --with-arch flag if the machine is x86:</para>
-
-<screen><userinput>test $(uname -m | grep i?86) &amp;&amp; WITHARCH="--with-arch=i486"</userinput></screen>
-
     <para>Prepare GCC for compilation:</para>
 
 <screen><userinput>CC="gcc -B/usr/bin/" ../gcc-&gcc-version;/configure --prefix=/tools \
     --with-local-prefix=/tools --disable-nls --disable-shared \
-    --enable-languages=c --disable-multilib \
-    $WITHARCH
-unset WITHARCH</userinput></screen>
+    --enable-languages=c --disable-multilib</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -108,23 +102,6 @@ unset WITHARCH</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><parameter>--with-arch=i486</parameter></term>
-        <listitem>
-    	  <para>On x86 machines Glibc-&glibc-version; needs to be built for a
-	  minimum architecture of <quote>i486</quote>. In fact, Glibc developers suggest
-	  setting the compiler flag <parameter>-march=i486</parameter> when compiling it.
-	  However, by using the above parameter for the GCC build, we can set a default
-	  value for <parameter>-march</parameter> at the compiler level, ensuring that
-	  the entire system is built consistently, i.e., for the same cpu-type.
-	  Of course, values greater or more specific than <quote>i486</quote> could be
-	  used. See <command>man gcc</command> for other acceptable cpu-types.
-	  Keep in mind that using an incompatible cpu-type for the machine will result
-	  in breakage. The advantage of <quote>i486</quote> is that it is a generic
-	  option and will work for all modern x86 machines.</para>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
     <para>The following command will compile GCC not once, but several times. It

chapter05/gcc-pass2.xml

@@ -140,10 +140,6 @@ cd ../gcc-build</userinput></screen>
     <para>Before starting to build GCC, remember to unset any environment
     variables that override the default optimization flags.</para>
 
-    <para>Set the --with-arch flag if the machine is x86:</para>
-
-<screen><userinput>test $(uname -m | grep i?86) &amp;&amp; WITHARCH="--with-arch=i486"</userinput></screen>
-
     <para>Now prepare GCC for compilation:</para>
 
 <screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
@@ -151,8 +147,7 @@ cd ../gcc-build</userinput></screen>
     --enable-shared --enable-threads=posix \
     --enable-__cxa_atexit --enable-languages=c,c++ \
     --disable-libstdcxx-pch --disable-multilib \
-    --disable-bootstrap $WITHARCH
-unset WITHARCH</userinput></screen>
+    --disable-bootstrap</userinput></screen>
 
     <variablelist>
       <title>The meaning of the new configure options:</title>

chapter05/glibc.xml

@@ -49,6 +49,17 @@
 <screen><userinput>mkdir -v ../glibc-build
 cd ../glibc-build</userinput></screen>
 
+    <para>Because Glibc no longer supports i386, its developers say to use the
+    compiler flag <parameter>-march=i486</parameter> when building it for x86
+    machines. There are several ways to accomplish that, but testing shows that
+    the flag is best placed inside the build variable <quote>CFLAGS</quote>.
+    Instead of overriding completely what Glibc's internal build system uses
+    for CFLAGS, append the new flag to the existing contents of CFLAGS by
+    making use of the special file <filename>configparms</filename>:</para>
+
+<screen><userinput>uname -m | grep -q i?86 &amp;&amp;
+echo "CFLAGS += -march=i486" &gt; configparms</userinput></screen>
+
     <para>Next, prepare Glibc for compilation:</para>
 
 <screen><userinput>../glibc-&glibc-version;/configure --prefix=/tools \

chapter06/db.xml

@@ -61,11 +61,6 @@
   <sect2 role="installation">
     <title>Installation of Berkeley DB</title>
 
-    <para>Apply a patch to Berkeley DB to fix a couple of bugs when accessing
-    databases via its Java API:</para>
-
-<screen><userinput>patch -Np1 -i ../&db-fixes-patch;</userinput></screen>
-
     <para>Prepare Berkeley DB for compilation:</para>
 
 <screen><userinput>cd build_unix

chapter06/gcc.xml

@@ -78,19 +78,13 @@
 <screen><userinput>mkdir -v ../gcc-build
 cd ../gcc-build</userinput></screen>
 
-    <para>Set the --with-arch flag if the machine is x86:</para>
-
-<screen><userinput>test $(uname -m | grep i?86) &amp;&amp; WITHARCH="--with-arch=i486"</userinput></screen>
-
     <para>Prepare GCC for compilation:</para>
 
 <screen><userinput>../gcc-&gcc-version;/configure --prefix=/usr \
     --libexecdir=/usr/lib --enable-shared \
     --enable-threads=posix --enable-__cxa_atexit \
     --enable-clocale=gnu --enable-languages=c,c++ \
-    --disable-multilib --disable-bootstrap \
-    $WITHARCH
-unset WITHARCH</userinput></screen>
+    --disable-multilib --disable-bootstrap</userinput></screen>
 
     <para>Compile the package:</para>
 

chapter06/glibc.xml

@@ -104,6 +104,11 @@ unset DL</userinput></screen>
 <screen><userinput>mkdir -v ../glibc-build
 cd ../glibc-build</userinput></screen>
 
+    <para>Again, add the needed compiler flag to CFLAGS for x86 machines:</para>
+
+<screen><userinput>uname -m | grep -q i?86 &amp;&amp;
+echo "CFLAGS += -march=i486" &gt; configparms</userinput></screen>
+
     <para>Prepare Glibc for compilation:</para>
 
 <screen><userinput>../glibc-&glibc-version;/configure --prefix=/usr \

chapter06/sysklogd.xml

@@ -41,17 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Sysklogd</title>
 
-    <para>The following patch fixes various issues, including a problem building
-    Sysklogd with Linux 2.6 series kernels:</para>
-
-<screen><userinput>patch -Np1 -i ../&sysklogd-fixes-patch;</userinput></screen>
-
-    <para>The following patch makes sysklogd treat bytes in the 0x80--0x9f range
-    literally in the messages being logged, instead of replacing them with octal
-    codes. Unpatched sysklogd would damage messages in the UTF-8 encoding:</para>
-
-<screen><userinput>patch -Np1 -i ../&sysklogd-8bit-patch;</userinput></screen>
-
     <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>

general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-JH-20070907">
-<!ENTITY releasedate "September 07, 2007">
+<!ENTITY version "SVN-JH-20070915">
+<!ENTITY releasedate "September 15, 2007">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 

packages.ent

@@ -80,10 +80,10 @@
 <!ENTITY coreutils-ch6-du "72.4 MB">
 <!ENTITY coreutils-ch6-sbu "1.0 SBU">
 
-<!ENTITY db-version "4.5.20">
-<!ENTITY db-size "9,064 KB">
+<!ENTITY db-version "4.6.19">
+<!ENTITY db-size "11,600 KB">
 <!ENTITY db-url "http://download-east.oracle.com/berkeley-db/db-&db-version;.tar.gz">
-<!ENTITY db-md5 "b0f1c777708cb8e9d37fb47e7ed3312d">
+<!ENTITY db-md5 "89c7390ff120d5ebf3eccc5f97249e79">
 <!ENTITY db-home "http://www.oracle.com/technology/software/products/berkeley-db/index.html">
 <!ENTITY db-ch6-du "77 MB">
 <!ENTITY db-ch6-sbu "1.2 SBU">
@@ -187,7 +187,7 @@
 <!ENTITY gettext-ch6-sbu "1 SBU">
 
 <!ENTITY glibc-version "2.6.1">
-<!ENTITY glibc-size "15,397 KB">
+<!ENTITY glibc-size "15,398 KB">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2">
 <!ENTITY glibc-md5 "11cf6d3fc86dbe0890b8d00372eb6286">
 <!ENTITY glibc-home "&gnu-software;libc/">
@@ -196,9 +196,9 @@
 <!ENTITY glibc-ch6-du "556 MB testsuite included">
 <!ENTITY glibc-ch6-sbu "19.5 SBU testsuite included">
 <!ENTITY glibc-libidn-version "&glibc-version;">
-<!ENTITY glibc-libidn-size "99 KB">
-<!ENTITY glibc-libidn-url "&gnu;glibc/glibc-libidn-&glibc-libidn-version;.tar.gz">
-<!ENTITY glibc-libidn-md5 "f42ba45d685d51d9c0095c6706210a0d">
+<!ENTITY glibc-libidn-size "100 KB">
+<!ENTITY glibc-libidn-url "&gnu;glibc/glibc-libidn-&glibc-libidn-version;.tar.bz2">
+<!ENTITY glibc-libidn-md5 "503f1315afd808728ebaa75b3d87a7d9">
 <!ENTITY glibc-libidn-home " ">
 
 <!ENTITY grep-version "2.5.1a">
@@ -295,11 +295,11 @@
 
 <!ENTITY linux-major-version "2.6">
 <!ENTITY linux-minor-version "22">
-<!ENTITY linux-patch-version "5">
+<!ENTITY linux-patch-version "6">
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "44,053 KB">
+<!ENTITY linux-size "44,052 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;/linux-&linux-version;.tar.bz2">
-<!ENTITY linux-md5 "f36616d74f2fde72040bccf50db03522">
+<!ENTITY linux-md5 "20af4d1e05bd725e89b691da483276e9">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!ENTITY linux-ch8-du "350 - 450 MB">
 <!ENTITY linux-ch8-sbu "1.5 - 3.5 SBU">
@@ -337,10 +337,10 @@
 <!ENTITY man-db-ch6-du "9 MB">
 <!ENTITY man-db-ch6-sbu "0.2 SBU">
 
-<!ENTITY man-pages-version "2.63">
-<!ENTITY man-pages-size "1,795 KB">
+<!ENTITY man-pages-version "2.64">
+<!ENTITY man-pages-size "1,799 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/manpages/Archive/man-pages-&man-pages-version;.tar.bz2">
-<!ENTITY man-pages-md5 "aeddbf93dbb0aeac1c8ad950e80aad54">
+<!ENTITY man-pages-md5 "80683dd76cd4eb5aed36ac4401aef4d6">
 <!ENTITY man-pages-home " ">
 <!ENTITY man-pages-ch6-du "37.4 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
@@ -437,10 +437,10 @@
 <!ENTITY shadow-ch6-du "20.7 MB">
 <!ENTITY shadow-ch6-sbu "0.3 SBU">
 
-<!ENTITY sysklogd-version "1.4.1">
-<!ENTITY sysklogd-size "80 KB">
+<!ENTITY sysklogd-version "1.5">
+<!ENTITY sysklogd-size "85 KB">
 <!ENTITY sysklogd-url "http://www.infodrom.org/projects/sysklogd/download/sysklogd-&sysklogd-version;.tar.gz">
-<!ENTITY sysklogd-md5 "d214aa40beabf7bdb0c9b3c64432c774">
+<!ENTITY sysklogd-md5 "e053094e8103165f98ddafe828f6ae4b">
 <!ENTITY sysklogd-home "http://www.infodrom.org/projects/sysklogd/">
 <!ENTITY sysklogd-ch6-du "0.6 MB">
 <!ENTITY sysklogd-ch6-sbu "less than 0.1 SBU">

patches.ent

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!-- Start of Common Patches -->
-<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-5.patch">
-<!ENTITY bash-fixes-patch-md5 "70e2c3983575a8e82f8601a417e126f0">
-<!ENTITY bash-fixes-patch-size "32 KB">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-6.patch">
+<!ENTITY bash-fixes-patch-md5 "b81a6b53cd361b3b2291a762dcba87d0">
+<!ENTITY bash-fixes-patch-size "24 KB">
 
 
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
@@ -24,11 +24,6 @@
 <!ENTITY coreutils-uname-patch-size "4.6 KB">
 
 
-<!ENTITY db-fixes-patch "db-&db-version;-fixes-1.patch">
-<!ENTITY db-fixes-patch-md5 "4d6a476c9ccd1bb9fba9de0b5229f0da">
-<!ENTITY db-fixes-patch-size "2.8 KB">
-
-
 <!ENTITY diffutils-i18n-patch "diffutils-&diffutils-version;-i18n-1.patch">
 <!ENTITY diffutils-i18n-patch-md5 "c8d481223db274a33b121fb8c25af9f7">
 <!ENTITY diffutils-i18n-patch-size "18 KB">
@@ -95,9 +90,9 @@
 <!ENTITY perl-libc-patch-size "1.1 KB">
 
 
-<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-3.patch">
-<!ENTITY readline-fixes-patch-md5 "dfa4b750f226cf9ea034ec753a78a742">
-<!ENTITY readline-fixes-patch-size "3.4 KB">
+<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-4.patch">
+<!ENTITY readline-fixes-patch-md5 "4da6bf2066a7603c7bb0ab1f52243316">
+<!ENTITY readline-fixes-patch-size "12.5 KB">
 
 
 <!ENTITY shadow-useradd-patch "shadow-&shadow-version;-useradd_fix-2.patch">
@@ -105,15 +100,6 @@
 <!ENTITY shadow-useradd-patch-size "6.1 KB">
 
 
-<!ENTITY sysklogd-8bit-patch "sysklogd-&sysklogd-version;-8bit-1.patch">
-<!ENTITY sysklogd-8bit-patch-md5 "cc0d9c3bd67a6b6357e42807cf06073e">
-<!ENTITY sysklogd-8bit-patch-size "0.9 KB">
-
-<!ENTITY sysklogd-fixes-patch "sysklogd-&sysklogd-version;-fixes-2.patch">
-<!ENTITY sysklogd-fixes-patch-md5 "ed5b25ca9a4eeb4f4f82b300a27b1ef4">
-<!ENTITY sysklogd-fixes-patch-size "32 KB">
-
-
 <!ENTITY texinfo-multibyte-patch "texinfo-&texinfo-version;-multibyte-1.patch">
 <!ENTITY texinfo-multibyte-patch-md5 "6cb5b760cfdd2dd53a0430eb572a8aaa">
 <!ENTITY texinfo-multibyte-patch-size "1.5 KB">
@@ -130,9 +116,9 @@
 <!ENTITY util-linux-lseek-patch-md5 "5d6c86321c1ea74d7ed7cf57861da423">
 <!ENTITY util-linux-lseek-patch-size "10 KB">
 
-<!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-1.patch">
-<!ENTITY vim-fixes-patch-md5 "744bc215560d3fbe80bfef4bab270f9a">
-<!ENTITY vim-fixes-patch-size "19.6 KB">
+<!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-2.patch">
+<!ENTITY vim-fixes-patch-md5 "4b33bda20c4e75601cd581b745477a2d">
+<!ENTITY vim-fixes-patch-size "294 KB">
 
 <!ENTITY vim-mandir-patch "vim-&vim-version;-mandir-1.patch">
 <!ENTITY vim-mandir-patch-md5 "b6426eb4192faba1e867ddd502323f5b">