[LFS-SVN] SVN-20140221, Changeset 10491 対応。

git-svn-id: svn+ssh://svn.osdn.net/svnroot/lfsbookja/trunk@898 d6661c75-0afd-443a-aae1-cb31083e41e8

diff --git a/lfsbook/configure b/lfsbook/configure
index 9dd235a..e287ea1 100755 (executable)
--- a/lfsbook/configure
+++ b/lfsbook/configure
@@ -3879,7 +3879,7 @@ if test "$TIDY" = no; then
  as_fn_error $? "tidy not found in $PATH" "$LINENO" 5
 fi;
 
-TARGETVER=svn-20140218
+TARGETVER=svn-20140221
 
 SVNVER=`grep 'ENTITY version' ${bookdir}/general.ent | sed -e 's/^<!ENTITY version         \"//' -e 's/\">$//' | tr 'A-Z' 'a-z'`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the original XML version" >&5

diff --git a/lfsbook/src/chapter01/jchangelog.ch b/lfsbook/src/chapter01/jchangelog.ch
index 03e9dba..defea2e 100644 (file)
--- a/lfsbook/src/chapter01/jchangelog.ch
+++ b/lfsbook/src/chapter01/jchangelog.ch
@@ -54,6 +54,21 @@
 -->
 
     <listitem>
+      <para>2014-02-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matsuand] -
+          SVN-20140221,
+          Changeset
+          <ulink url="&lfs-rev-root;10490">10490</ulink>,
+          <ulink url="&lfs-rev-root;10491">10491</ulink>
+          対応。
+          </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2014-02-20</para>
       <itemizedlist>
         <listitem>

diff --git a/lfsbook/src/chapter06/coreutils.ch b/lfsbook/src/chapter06/coreutils.ch
index ae365d3..521de19 100644 (file)
--- a/lfsbook/src/chapter06/coreutils.ch
+++ b/lfsbook/src/chapter06/coreutils.ch
@@ -203,7 +203,7 @@
         timeout, touch, tr, true, truncate, tsort, tty, uname, unexpand, uniq,
         unlink, users, vdir, wc, who, whoami, and yes</seg>
         <seg>libstdbuf.so</seg>
-        <seg>/usr/lib/coreutils</seg>
+        <seg>/usr/libexec/coreutils</seg>
 @y
         <seg>[, base64, basename, cat, chcon, chgrp, chmod, chown, chroot, cksum,
         comm, cp, csplit, cut, date, dd, df, dir, dircolors, dirname, du, echo,
@@ -216,7 +216,7 @@
         timeout, touch, tr, true, truncate, tsort, tty, uname, unexpand, uniq,
         unlink, users, vdir, wc, who, whoami, yes</seg>
         <seg>libstdbuf.so</seg>
-        <seg>/usr/lib/coreutils</seg>
+        <seg>/usr/libexec/coreutils</seg>
 @z
 
 @x

diff --git a/lfsbook/src/chapter06/gawk.ch b/lfsbook/src/chapter06/gawk.ch
index 37c1f59..6d69a43 100644 (file)
--- a/lfsbook/src/chapter06/gawk.ch
+++ b/lfsbook/src/chapter06/gawk.ch
@@ -76,13 +76,15 @@
         <seg>filefuncs.so, fnmatch.so, fork.so, inplace.so, ordchr.so,
         readdir.so, readfile.so, revoutput.so, revtwoway.so, rwarray.so,
         testext.so, and time.so</seg>
-        <seg>/usr/lib/{,g}awk, /usr/share/awk, /usr/share/doc/gawk-&gawk-version;</seg>
+        <seg>/usr/lib/gawk, /usr/libexec/awk, /usr/share/awk, 
+        /usr/share/doc/gawk-&gawk-version;</seg>
 @y
         <seg>awk (gawk へのリンク), gawk, gawk-&gawk-version;, igawk</seg>
         <seg>filefuncs.so, fnmatch.so, fork.so, inplace.so, ordchr.so,
         readdir.so, readfile.so, revoutput.so, revtwoway.so, rwarray.so,
         testext.so, time.so</seg>
-        <seg>/usr/lib/{,g}awk, /usr/share/awk, /usr/share/doc/gawk-&gawk-version;</seg>
+        <seg>/usr/lib/gawk, /usr/libexec/awk, /usr/share/awk, 
+        /usr/share/doc/gawk-&gawk-version;</seg>
 @z
 
 @x

diff --git a/lfsbook/src/chapter06/gcc.ch b/lfsbook/src/chapter06/gcc.ch
index 7cd04b1..824eeba 100644 (file)
--- a/lfsbook/src/chapter06/gcc.ch
+++ b/lfsbook/src/chapter06/gcc.ch
@@ -313,7 +313,8 @@
         libquadmath.{a,so}, libssp.{a,so},
         libssp_nonshared.a, libstdc++.{a,so}, libsupc++.a and libtsan.{a,so}</seg>
 
-        <seg>/usr/include/c++, /usr/lib/gcc, /usr/share/gcc-&gcc-version;</seg>
+        <seg>/usr/include/c++, /usr/lib/gcc, /usr/libexec/gcc, 
+        /usr/share/gcc-&gcc-version;</seg>
 @y
         <seg>c++, cc (gcc へのリンク), cpp, g++, gcc,
         gcc-ar, gcc-nm, gcc-ranlib, gcov</seg>
@@ -324,7 +325,8 @@
         libquadmath.{a,so}, libssp.{a,so},
         libssp_nonshared.a, libstdc++.{a,so}, libsupc++.a, libtsan.{a,so}</seg>
 
-        <seg>/usr/include/c++, /usr/lib/gcc, /usr/share/gcc-&gcc-version;</seg>
+        <seg>/usr/include/c++, /usr/lib/gcc, /usr/libexec/gcc, 
+        /usr/share/gcc-&gcc-version;</seg>
 @z
 
 @x

diff --git a/lfsbook/src/chapter06/man-db.ch b/lfsbook/src/chapter06/man-db.ch
index b72657e..67ec877 100644 (file)
--- a/lfsbook/src/chapter06/man-db.ch
+++ b/lfsbook/src/chapter06/man-db.ch
@@ -423,12 +423,12 @@
         <seg>accessdb, apropos (link to whatis), catman, lexgrog, man, mandb,
         manpath, whatis, and zsoelim</seg>
         <seg>libman.so, libmandb.so</seg>
-        <seg>/usr/lib/man-db, /usr/share/doc/man-db-&man-db-version;</seg>
+        <seg>/usr/lib/man-db, /usr/libexec/man-db, /usr/share/doc/man-db-&man-db-version;</seg>
 @y
         <seg>accessdb, apropos (whatis へのリンク), catman, lexgrog, man, mandb,
         manpath, whatis, zsoelim</seg>
         <seg>libman.so, libmandb.so</seg>
-        <seg>/usr/lib/man-db, /usr/share/doc/man-db-&man-db-version;</seg>
+        <seg>/usr/lib/man-db, /usr/libexec/man-db, /usr/share/doc/man-db-&man-db-version;</seg>
 @z
 
 @x

diff --git a/lfsbook/src/chapter08/kernel.ch b/lfsbook/src/chapter08/kernel.ch
index f082d99..35c9a5b 100644 (file)
--- a/lfsbook/src/chapter08/kernel.ch
+++ b/lfsbook/src/chapter08/kernel.ch
@@ -305,17 +305,22 @@
 @z
 
 @x
-      <para>The headers in the system's
-      <filename class="directory">include</filename> directory should
+      <para>The headers in the system's <filename
+      class="directory">include</filename> directory (<filename
+      class="directory">/usr/include</filename>) should
       <emphasis>always</emphasis> be the ones against which Glibc was compiled,
-      that is, the sanitised headers from this Linux kernel tarball.
-      Therefore, they should <emphasis>never</emphasis> be replaced by either
-      the raw kernel headers or any other kernel sanitized headers.</para>
+      that is, the sanitised headers installed in <xref
+      linkend="ch-system-linux-headers"/>.  Therefore, they should
+      <emphasis>never</emphasis> be replaced by either the raw kernel headers
+      or any other kernel sanitized headers.</para>
 @y
       <para>
       さらに <filename
-      class="directory">include</filename> ディレクトリにあるヘッダーファイルは、<emphasis>必ず</emphasis> Glibc のコンパイルによって得られるものでなければならず、つまりは Linux カーネルの tarball によって提供されるものでなければなりません。
-      したがってカーネルヘッダーによって上書きされてしまうのは避けなければなりません。
+      class="directory">include</filename> ディレクトリ (<filename
+      class="directory">/usr/include</filename>) にあるヘッダーファイルは、<emphasis>必ず</emphasis> Glibc のコンパイルによって得られるものでなければなりません。
+      つまり <xref
+      linkend="ch-system-linux-headers"/> によってインストールされた、健全化 (sanitizing) したものです。
+      したがって生のカーネルヘッダーや他のカーネルにて健全化されたヘッダーによって上書きされてしまうのは避けなければなりません。
       </para>
 @z
 

diff --git a/lfsbook/src/general.ch b/lfsbook/src/general.ch
index 0b32df7..81a5ecb 100644 (file)
--- a/lfsbook/src/general.ch
+++ b/lfsbook/src/general.ch
@@ -8,13 +8,13 @@
 % $Date::                           $
 %
 @x
-<!ENTITY version         "SVN-20140218">
-<!ENTITY releasedate     "February 18, 2015">
+<!ENTITY version         "SVN-20140221">
+<!ENTITY releasedate     "February 21, 2014">
 @y
 <?xml version="1.0" encoding="UTF-8"?>
-<!ENTITY version         "SVN-20140218">
-<!ENTITY releasedate     "2014年2月18日">
-<!ENTITY jversion        "20140220">
+<!ENTITY version         "SVN-20140221">
+<!ENTITY releasedate     "2014年2月21日">
+<!ENTITY jversion        "20140225">
 @z
 
 @x

diff --git a/lfsbook/src/prologue/standards.ch b/lfsbook/src/prologue/standards.ch
index 24d6fc3..090c354 100644 (file)
--- a/lfsbook/src/prologue/standards.ch
+++ b/lfsbook/src/prologue/standards.ch
@@ -191,14 +191,14 @@
 @x
         <term><emphasis>LSB Core:</emphasis></term>
         <listitem>
-          <para>At, Batch (a part of At), Cpio, Ed, Fcrontab, Initd-tools,
+          <para>At, Batch (a part of At), Cpio, Fcrontab, Initd-tools,
           Lsb_release, PAM, Sendmail (or Postfix or Exim) </para>
         </listitem>
 @y
         <term><emphasis>LSB コア:</emphasis></term>
         <listitem>
-          <para>At, Batch (At の一部), Cpio, Ed, Fcrontab, Initd-tools,
-          Lsb_release, PAM, Sendmail (または Postfix または Exim) </para>
+          <para>At, Batch (At の一部), Cpio, Fcrontab, Initd-tools,
+          Lsb_release, PAM, Sendmail (Postfix または Exim) </para>
         </listitem>
 @z
 

diff --git a/lfsbook/version.ac b/lfsbook/version.ac
index a4209b6..6b88572 100644 (file)
--- a/lfsbook/version.ac
+++ b/lfsbook/version.ac
@@ -7,4 +7,4 @@ dnl  $Date::                           $
 dnl 
 dnl
 dnl m4-include this file to define the current LFS version
-m4_define([lfs_version], [svn-20140218])
+m4_define([lfs_version], [svn-20140221])