Browse Source

Merge r8333 to jh branch

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/jh/BOOK@8350 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Jeremy Huntwork 18 years ago
parent
commit
f65c4599a2
6 changed files with 33 additions and 6 deletions
  1. 10 0
      chapter01/changelog.xml
  2. 8 0
      chapter03/patches.xml
  3. 6 1
      chapter06/man-db.xml
  4. 2 2
      general.ent
  5. 3 3
      packages.ent
  6. 4 0
      patches.ent

+ 10 - 0
chapter01/changelog.xml

@@ -46,6 +46,16 @@
       </itemizedlist>
       </itemizedlist>
     </listitem>
     </listitem>
 
 
+    <listitem>
+      <para>2007-08-21</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Synced to 6.3 updates:  linux 2.6.22.4,
+          man-db patch, update acknowledgements page.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
     <listitem>
       <para>2007-08-20</para>
       <para>2007-08-20</para>
       <itemizedlist>
       <itemizedlist>

+ 8 - 0
chapter03/patches.xml

@@ -138,6 +138,14 @@
       </listitem>
       </listitem>
     </varlistentry>
     </varlistentry>
 
 
+    <varlistentry>
+      <term>Man-DB Fix Patch - <token>&man-db-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&man-db-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&man-db-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
     <varlistentry>
       <term>Mktemp Tempfile Patch - <token>&mktemp-tempfile-patch-size;</token>:</term>
       <term>Mktemp Tempfile Patch - <token>&mktemp-tempfile-patch-size;</token>:</term>
       <listitem>
       <listitem>

+ 6 - 1
chapter06/man-db.xml

@@ -35,7 +35,7 @@
   <sect2 role="installation">
   <sect2 role="installation">
     <title>Installation of Man-DB</title>
     <title>Installation of Man-DB</title>
 
 
-    <para>Three adjustments need to be made to the sources of Man-DB.</para>
+    <para>Four adjustments need to be made to the sources of Man-DB.</para>
 
 
     <para>The first one changes the location of translated manual pages that come
     <para>The first one changes the location of translated manual pages that come
     with Man-DB, in order for them to be accessible in both traditional and
     with Man-DB, in order for them to be accessible in both traditional and
@@ -73,6 +73,11 @@ EOF</userinput></screen>
     manual pages. They are not part of LFS or BLFS, but you should be able
     manual pages. They are not part of LFS or BLFS, but you should be able
     to install them yourself after finishing LFS if you wish to do so.</para>
     to install them yourself after finishing LFS if you wish to do so.</para>
 
 
+    <para>Finally, patch the sources to fix output errors if the man page is 
+    prematurely aborted by pressing the 'q' key.</para>
+
+<screen><userinput>patch -Np1 -i ../&man-db-fixes-patch;</userinput></screen>
+
     <para>Prepare Man-DB for compilation:</para>
     <para>Prepare Man-DB for compilation:</para>
 
 
 <screen><userinput>./configure --prefix=/usr --enable-mb-groff --disable-setuid</userinput></screen>
 <screen><userinput>./configure --prefix=/usr --enable-mb-groff --disable-setuid</userinput></screen>

+ 2 - 2
general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-JH-20070820">
-<!ENTITY releasedate "August 20, 2007">
+<!ENTITY version "SVN-JH-20070830">
+<!ENTITY releasedate "August 30, 2007">
 <!ENTITY milestone "7.0">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
 

+ 3 - 3
packages.ent

@@ -295,11 +295,11 @@
 
 
 <!ENTITY linux-major-version "2.6">
 <!ENTITY linux-major-version "2.6">
 <!ENTITY linux-minor-version "22">
 <!ENTITY linux-minor-version "22">
-<!ENTITY linux-patch-version "3">
+<!ENTITY linux-patch-version "4">
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "44,049 KB">
+<!ENTITY linux-size "44,051 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;/linux-&linux-version;.tar.bz2">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;/linux-&linux-version;.tar.bz2">
-<!ENTITY linux-md5 "13dd3e1fff368190a4d4be8838016880">
+<!ENTITY linux-md5 "6cf83acf21e65dcea4a5170c0bbc7125">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!ENTITY linux-ch8-du "350 - 450 MB">
 <!ENTITY linux-ch8-du "350 - 450 MB">
 <!ENTITY linux-ch8-sbu "1.5 - 3.5 SBU">
 <!ENTITY linux-ch8-sbu "1.5 - 3.5 SBU">

+ 4 - 0
patches.ent

@@ -72,6 +72,10 @@
 <!ENTITY kbd-gcc4_fixes-patch-size "1.4 KB">
 <!ENTITY kbd-gcc4_fixes-patch-size "1.4 KB">
 
 
 
 
+<!ENTITY man-db-fixes-patch "man-db-&man-db-version;-fixes-1.patch">
+<!ENTITY man-db-fixes-patch-md5 "f75b3c44bb801778cf188b87454ff9c1">
+<!ENTITY man-db-fixes-patch-size "2.0 KB">
+
 <!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-3.patch">
 <!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-3.patch">
 <!ENTITY mktemp-tempfile-patch-md5 "65d73faabe3f637ad79853b460d30a19">
 <!ENTITY mktemp-tempfile-patch-md5 "65d73faabe3f637ad79853b460d30a19">
 <!ENTITY mktemp-tempfile-patch-size "3.5 KB">
 <!ENTITY mktemp-tempfile-patch-size "3.5 KB">