From c3ccd27de1b33b38ed32ed5105ee194f1bd8f1cf Mon Sep 17 00:00:00 2001
From: matsuand <matsuand@d6661c75-0afd-443a-aae1-cb31083e41e8>
Date: Mon, 30 Dec 2013 04:24:11 +0000
Subject: [PATCH] =?utf8?q?[LFS-SVN]=20SVN-20131229,=20Changeset=2010434=20?=
 =?utf8?q?=E5=AF=BE=E5=BF=9C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: svn+ssh://svn.osdn.net/svnroot/lfsbookja/trunk@867 d6661c75-0afd-443a-aae1-cb31083e41e8
---
 lfsbook/configure                   |   2 +-
 lfsbook/src/chapter01/changelog.ch  |  84 +++++++++++++
 lfsbook/src/chapter01/jchangelog.ch |  15 +++
 lfsbook/src/chapter03/packages.ch   | 242 +++++++++---------------------------
 lfsbook/src/chapter03/patches.ch    |  20 ---
 lfsbook/src/chapter06/automake.ch   |   6 -
 lfsbook/src/chapter06/binutils.ch   |   4 +-
 lfsbook/src/chapter06/e2fsprogs.ch  |   8 +-
 lfsbook/src/chapter06/gcc.ch        |  22 +++-
 lfsbook/src/general.ch              |  10 +-
 lfsbook/version.ac                  |   2 +-
 11 files changed, 186 insertions(+), 229 deletions(-)

diff --git a/lfsbook/configure b/lfsbook/configure
index f3c83847..25c0a4e5 100755
--- 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-20131222
+TARGETVER=svn-20131229
 
 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/changelog.ch b/lfsbook/src/chapter01/changelog.ch
index a2e7a95f..99b5a898 100644
--- a/lfsbook/src/chapter01/changelog.ch
+++ b/lfsbook/src/chapter01/changelog.ch
@@ -48,6 +48,90 @@
 @z
 
 @x
+      <para>2013-12-29</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to e2fsprogs-1.42.9.  Fixes
+          <ulink url="&lfs-ticket-root;3462">#3462</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gdbm-1.11.  Fixes
+          <ulink url="&lfs-ticket-root;3459">#3459</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to kmod-16.  Fixes
+          <ulink url="&lfs-ticket-root;3455">#3455</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to automake-1.14.1.  Fixes
+          <ulink url="&lfs-ticket-root;3458">#3458</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update readline patch to upstream level.  Fixes
+          <ulink url="&lfs-ticket-root;3461">#3461</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Use gcc version of libiberty.a.  Fixes
+          <ulink url="&lfs-ticket-root;3456">#3456</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Use different URL for shadow.  Fixes
+          <ulink url="&lfs-ticket-root;3453">#3453</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update coreutils i18n patch to fix problem
+          with uniq. Fixes
+          <ulink url="&lfs-ticket-root;3457">#3457</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Remove no longer needed makeinfo from Host System
+          Requirements. Fixes
+          <ulink url="&lfs-ticket-root;3460">#3460</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2013-12-29</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - e2fsprogs-1.42.9 へのアップデート。
+          <ulink url="&lfs-ticket-root;3462">#3462</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - gdbm-1.11 へのアップデート。
+          <ulink url="&lfs-ticket-root;3459">#3459</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - kmod-16 へのアップデート。
+          <ulink url="&lfs-ticket-root;3455">#3455</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - automake-1.14.1 へのアップデート。
+          <ulink url="&lfs-ticket-root;3458">#3458</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - readline のパッチをアップストリームレベルに更新。
+          <ulink url="&lfs-ticket-root;3461">#3461</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - gcc バージョンの libiberty.a を利用することに。
+          <ulink url="&lfs-ticket-root;3456">#3456</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - shadow の URL を別のものに変更。
+          <ulink url="&lfs-ticket-root;3453">#3453</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - coreutils にて uniq の問題を解消するための i18n パッチを更新。
+          <ulink url="&lfs-ticket-root;3457">#3457</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - ホストシステム要件にて makeinfo を取り除く。
+          <ulink url="&lfs-ticket-root;3460">#3460</ulink> を Fix に。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
       <para>2013-12-22</para>
       <itemizedlist>
         <listitem>
diff --git a/lfsbook/src/chapter01/jchangelog.ch b/lfsbook/src/chapter01/jchangelog.ch
index e91fe518..8a2aef95 100644
--- a/lfsbook/src/chapter01/jchangelog.ch
+++ b/lfsbook/src/chapter01/jchangelog.ch
@@ -54,6 +54,21 @@
 -->
 
     <listitem>
+      <para>2013-12-30</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matsuand] -
+          SVN-20131229,
+          Changeset
+          <ulink url="&lfs-rev-root;10420">10420</ulink> ～
+          <ulink url="&lfs-rev-root;10434">10434</ulink>
+          対応。
+          </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2013-12-22</para>
       <itemizedlist>
         <listitem>
diff --git a/lfsbook/src/chapter03/packages.ch b/lfsbook/src/chapter03/packages.ch
index e43821e1..95b6e565 100644
--- a/lfsbook/src/chapter03/packages.ch
+++ b/lfsbook/src/chapter03/packages.ch
@@ -30,141 +30,113 @@
 @x autoconf
         <para>Home page: <ulink url="&autoconf-home;"/></para>
         <para>Download: <ulink url="&autoconf-url;"/></para>
-        <para>MD5 sum: <literal>&autoconf-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&autoconf-home;"/></para>
         <para>&Download;: <ulink url="&autoconf-url;"/></para>
-        <para>MD5 sum: <literal>&autoconf-md5;</literal></para>
 @z
 
 @x automake
         <para>Home page: <ulink url="&automake-home;"/></para>
         <para>Download: <ulink url="&automake-url;"/></para>
-        <para>MD5 sum: <literal>&automake-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&automake-home;"/></para>
         <para>&Download;: <ulink url="&automake-url;"/></para>
-        <para>MD5 sum: <literal>&automake-md5;</literal></para>
 @z
 
 @x bash
         <para>Home page: <ulink url="&bash-home;"/></para>
         <para>Download: <ulink url="&bash-url;"/></para>
-        <para>MD5 sum: <literal>&bash-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&bash-home;"/></para>
         <para>&Download;: <ulink url="&bash-url;"/></para>
-        <para>MD5 sum: <literal>&bash-md5;</literal></para>
 @z
 
 @x bc
         <para>Home page: <ulink url="&bc-home;"/></para>
         <para>Download: <ulink url="&bc-url;"/></para>
-        <para>MD5 sum: <literal>&bc-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&bc-home;"/></para>
         <para>&Download;: <ulink url="&bc-url;"/></para>
-        <para>MD5 sum: <literal>&bc-md5;</literal></para>
 @z
 
-@x
+@x binutils
         <para>Home page: <ulink url="&binutils-home;"/></para>
         <para>Download: <ulink url="&binutils-url;"/></para>
-        <para>MD5 sum: <literal>&binutils-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&binutils-home;"/></para>
         <para>&Download;: <ulink url="&binutils-url;"/></para>
-        <para>MD5 sum: <literal>&binutils-md5;</literal></para>
 @z
 
-@x
+@x bison
         <para>Home page: <ulink url="&bison-home;"/></para>
         <para>Download: <ulink url="&bison-url;"/></para>
-        <para>MD5 sum: <literal>&bison-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&bison-home;"/></para>
         <para>&Download;: <ulink url="&bison-url;"/></para>
-        <para>MD5 sum: <literal>&bison-md5;</literal></para>
 @z
 
-@x
+@x bzip2
         <para>Home page: <ulink url="&bzip2-home;"/></para>
         <para>Download: <ulink url="&bzip2-url;"/></para>
-        <para>MD5 sum: <literal>&bzip2-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&bzip2-home;"/></para>
         <para>&Download;: <ulink url="&bzip2-url;"/></para>
-        <para>MD5 sum: <literal>&bzip2-md5;</literal></para>
 @z
 
-@x
+@x check
         <para>Home page: <ulink url="&check-home;"/></para>
         <para>Download: <ulink url="&check-url;"/></para>
-        <para>MD5 sum: <literal>&check-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&check-home;"/></para>
         <para>&Download;: <ulink url="&check-url;"/></para>
-        <para>MD5 sum: <literal>&check-md5;</literal></para>
 @z
 
-@x
+@x coreutils
         <para>Home page: <ulink url="&coreutils-home;"/></para>
         <para>Download: <ulink url="&coreutils-url;"/></para>
-        <para>MD5 sum: <literal>&coreutils-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&coreutils-home;"/></para>
         <para>&Download;: <ulink url="&coreutils-url;"/></para>
-        <para>MD5 sum: <literal>&coreutils-md5;</literal></para>
 @z
 
-@x
+@x dejagnu
         <para>Home page: <ulink url="&dejagnu-home;"/></para>
         <para>Download: <ulink url="&dejagnu-url;"/></para>
-        <para>MD5 sum: <literal>&dejagnu-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&dejagnu-home;"/></para>
         <para>&Download;: <ulink url="&dejagnu-url;"/></para>
-        <para>MD5 sum: <literal>&dejagnu-md5;</literal></para>
 @z
 
-@x
+@x diffutils
         <para>Home page: <ulink url="&diffutils-home;"/></para>
         <para>Download: <ulink url="&diffutils-url;"/></para>
-        <para>MD5 sum: <literal>&diffutils-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&diffutils-home;"/></para>
         <para>&Download;: <ulink url="&diffutils-url;"/></para>
-        <para>MD5 sum: <literal>&diffutils-md5;</literal></para>
 @z
 
-@x
+@x e2fsprogs
         <para>Home page: <ulink url="&e2fsprogs-home;"/></para>
         <para>Download: <ulink url="&e2fsprogs-url;"/></para>
-        <para>MD5 sum: <literal>&e2fsprogs-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&e2fsprogs-home;"/></para>
         <para>&Download;: <ulink url="&e2fsprogs-url;"/></para>
-        <para>MD5 sum: <literal>&e2fsprogs-md5;</literal></para>
 @z
 
-@x
+@x expect
         <para>Home page: <ulink url="&expect-home;"/></para>
         <para>Download: <ulink url="&expect-url;"/></para>
-        <para>MD5 sum: <literal>&expect-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&expect-home;"/></para>
         <para>&Download;: <ulink url="&expect-url;"/></para>
-        <para>MD5 sum: <literal>&expect-md5;</literal></para>
 @z
 
-@x
+@x file
         <para>Home page: <ulink url="&file-home;"/></para>
         <para>Download: <ulink url="&file-url;"/></para>
-        <para>MD5 sum: <literal>&file-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&file-home;"/></para>
         <para>&Download;: <ulink url="&file-url;"/></para>
-        <para>MD5 sum: <literal>&file-md5;</literal></para>
 @z
 
 @x
@@ -183,224 +155,180 @@
           </para>
 @z
 
-@x
+@x findutils
         <para>Home page: <ulink url="&findutils-home;"/></para>
         <para>Download: <ulink url="&findutils-url;"/></para>
-        <para>MD5 sum: <literal>&findutils-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&findutils-home;"/></para>
         <para>&Download;: <ulink url="&findutils-url;"/></para>
-        <para>MD5 sum: <literal>&findutils-md5;</literal></para>
 @z
 
-@x
+@x flex
         <para>Home page: <ulink url="&flex-home;"/></para>
         <para>Download: <ulink url="&flex-url;"/></para>
-        <para>MD5 sum: <literal>&flex-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&flex-home;"/></para>
         <para>&Download;: <ulink url="&flex-url;"/></para>
-        <para>MD5 sum: <literal>&flex-md5;</literal></para>
 @z
 
-@x
+@x gawk
         <para>Home page: <ulink url="&gawk-home;"/></para>
         <para>Download: <ulink url="&gawk-url;"/></para>
-        <para>MD5 sum: <literal>&gawk-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&gawk-home;"/></para>
         <para>&Download;: <ulink url="&gawk-url;"/></para>
-        <para>MD5 sum: <literal>&gawk-md5;</literal></para>
 @z
 
-@x
+@x gcc
         <para>Home page: <ulink url="&gcc-home;"/></para>
         <para>Download: <ulink url="&gcc-url;"/></para>
-        <para>MD5 sum: <literal>&gcc-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&gcc-home;"/></para>
         <para>&Download;: <ulink url="&gcc-url;"/></para>
-        <para>MD5 sum: <literal>&gcc-md5;</literal></para>
 @z
 
-@x
+@x gdbm
         <para>Home page: <ulink url="&gdbm-home;"/></para>
         <para>Download: <ulink url="&gdbm-url;"/></para>
-        <para>MD5 sum: <literal>&gdbm-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&gdbm-home;"/></para>
         <para>&Download;: <ulink url="&gdbm-url;"/></para>
-        <para>MD5 sum: <literal>&gdbm-md5;</literal></para>
 @z
 
-@x
+@x gettext
         <para>Home page: <ulink url="&gettext-home;"/></para>
         <para>Download: <ulink url="&gettext-url;"/></para>
-        <para>MD5 sum: <literal>&gettext-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&gettext-home;"/></para>
         <para>&Download;: <ulink url="&gettext-url;"/></para>
-        <para>MD5 sum: <literal>&gettext-md5;</literal></para>
 @z
 
-@x
+@x glibc
         <para>Home page: <ulink url="&glibc-home;"/></para>
         <para>Download: <ulink url="&glibc-url;"/></para>
-        <para>MD5 sum: <literal>&glibc-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&glibc-home;"/></para>
         <para>&Download;: <ulink url="&glibc-url;"/></para>
-        <para>MD5 sum: <literal>&glibc-md5;</literal></para>
 @z
 
-@x
+@x gmp
         <para>Home page: <ulink url="&gmp-home;"/></para>
         <para>Download: <ulink url="&gmp-url;"/></para>
-        <para>MD5 sum: <literal>&gmp-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&gmp-home;"/></para>
         <para>&Download;: <ulink url="&gmp-url;"/></para>
-        <para>MD5 sum: <literal>&gmp-md5;</literal></para>
 @z
 
-@x
+@x grep
         <para>Home page: <ulink url="&grep-home;"/></para>
         <para>Download: <ulink url="&grep-url;"/></para>
-        <para>MD5 sum: <literal>&grep-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&grep-home;"/></para>
         <para>&Download;: <ulink url="&grep-url;"/></para>
-        <para>MD5 sum: <literal>&grep-md5;</literal></para>
 @z
 
-@x
+@x groff
         <para>Home page: <ulink url="&groff-home;"/></para>
         <para>Download: <ulink url="&groff-url;"/></para>
-        <para>MD5 sum: <literal>&groff-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&groff-home;"/></para>
         <para>&Download;: <ulink url="&groff-url;"/></para>
-        <para>MD5 sum: <literal>&groff-md5;</literal></para>
 @z
 
-@x
+@x grub
         <para>Home page: <ulink url="&grub-home;"/></para>
         <para>Download: <ulink url="&grub-url;"/></para>
-        <para>MD5 sum: <literal>&grub-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&grub-home;"/></para>
         <para>&Download;: <ulink url="&grub-url;"/></para>
-        <para>MD5 sum: <literal>&grub-md5;</literal></para>
 @z
 
-@x
+@x gzip
         <para>Home page: <ulink url="&gzip-home;"/></para>
         <para>Download: <ulink url="&gzip-url;"/></para>
-        <para>MD5 sum: <literal>&gzip-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&gzip-home;"/></para>
         <para>&Download;: <ulink url="&gzip-url;"/></para>
-        <para>MD5 sum: <literal>&gzip-md5;</literal></para>
 @z
 
-@x
+@x iana-etc
         <para>Home page: <ulink url="&iana-etc-home;"/></para>
         <para>Download: <ulink url="&iana-etc-url;"/></para>
-        <para>MD5 sum: <literal>&iana-etc-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&iana-etc-home;"/></para>
         <para>&Download;: <ulink url="&iana-etc-url;"/></para>
-        <para>MD5 sum: <literal>&iana-etc-md5;</literal></para>
 @z
 
-@x
+@x inetutils
         <para>Home page: <ulink url="&inetutils-home;"/></para>
         <para>Download: <ulink url="&inetutils-url;"/></para>
-        <para>MD5 sum: <literal>&inetutils-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&inetutils-home;"/></para>
         <para>&Download;: <ulink url="&inetutils-url;"/></para>
-        <para>MD5 sum: <literal>&inetutils-md5;</literal></para>
 @z
 
-@x
+@x iproute2
         <para>Home page: <ulink url="&iproute2-home;"/></para>
         <para>Download: <ulink url="&iproute2-url;"/></para>
-        <para>MD5 sum: <literal>&iproute2-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&iproute2-home;"/></para>
         <para>&Download;: <ulink url="&iproute2-url;"/></para>
-        <para>MD5 sum: <literal>&iproute2-md5;</literal></para>
 @z
 
-@x
+@x kbd
         <para>Home page: <ulink url="&kbd-home;"/></para>
         <para>Download: <ulink url="&kbd-url;"/></para>
-        <para>MD5 sum: <literal>&kbd-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&kbd-home;"/></para>
         <para>&Download;: <ulink url="&kbd-url;"/></para>
-        <para>MD5 sum: <literal>&kbd-md5;</literal></para>
 @z
 
-@x
+@x kmod
         <para>Home page: <ulink url="&kmod-home;"/></para>
         <para>Download: <ulink url="&kmod-url;"/></para>
-        <para>MD5 sum: <literal>&kmod-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&kmod-home;"/></para>
         <para>&Download;: <ulink url="&kmod-url;"/></para>
-        <para>MD5 sum: <literal>&kmod-md5;</literal></para>
 @z
 
-@x
+@x less
         <para>Home page: <ulink url="&less-home;"/></para>
         <para>Download: <ulink url="&less-url;"/></para>
-        <para>MD5 sum: <literal>&less-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&less-home;"/></para>
         <para>&Download;: <ulink url="&less-url;"/></para>
-        <para>MD5 sum: <literal>&less-md5;</literal></para>
 @z
 
-@x
+@x lfs-bootscripts
         <para>Home page: <ulink url="&lfs-bootscripts-home;"/></para>
         <para>Download: <ulink url="&lfs-bootscripts-url;"/></para>
-        <para>MD5 sum: <literal>&lfs-bootscripts-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&lfs-bootscripts-home;"/></para>
         <para>&Download;: <ulink url="&lfs-bootscripts-url;"/></para>
-        <para>MD5 sum: <literal>&lfs-bootscripts-md5;</literal></para>
 @z
 
-@x
+@x libpipeline
         <para>Home page: <ulink url="&libpipeline-home;"/></para>
         <para>Download: <ulink url="&libpipeline-url;"/></para>
-        <para>MD5 sum: <literal>&libpipeline-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&libpipeline-home;"/></para>
         <para>&Download;: <ulink url="&libpipeline-url;"/></para>
-        <para>MD5 sum: <literal>&libpipeline-md5;</literal></para>
 @z
 
-@x
+@x libtool
         <para>Home page: <ulink url="&libtool-home;"/></para>
         <para>Download: <ulink url="&libtool-url;"/></para>
-        <para>MD5 sum: <literal>&libtool-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&libtool-home;"/></para>
         <para>&Download;: <ulink url="&libtool-url;"/></para>
-        <para>MD5 sum: <literal>&libtool-md5;</literal></para>
 @z
 
-@x
+@x linux
         <para>Home page: <ulink url="&linux-home;"/></para>
         <para>Download: <ulink url="&linux-url;"/></para>
-        <para>MD5 sum: <literal>&linux-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&linux-home;"/></para>
         <para>&Download;: <ulink url="&linux-url;"/></para>
-        <para>MD5 sum: <literal>&linux-md5;</literal></para>
 @z
 
 @x
@@ -430,272 +358,218 @@
           </para>
 @z
 
-@x
+@x m4
         <para>Home page: <ulink url="&m4-home;"/></para>
         <para>Download: <ulink url="&m4-url;"/></para>
-        <para>MD5 sum: <literal>&m4-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&m4-home;"/></para>
         <para>&Download;: <ulink url="&m4-url;"/></para>
-        <para>MD5 sum: <literal>&m4-md5;</literal></para>
 @z
 
-@x
+@x make
         <para>Home page: <ulink url="&make-home;"/></para>
         <para>Download: <ulink url="&make-url;"/></para>
-        <para>MD5 sum: <literal>&make-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&make-home;"/></para>
         <para>&Download;: <ulink url="&make-url;"/></para>
-        <para>MD5 sum: <literal>&make-md5;</literal></para>
 @z
 
-@x
+@x man-db
         <para>Home page: <ulink url="&man-db-home;"/></para>
         <para>Download: <ulink url="&man-db-url;"/></para>
-        <para>MD5 sum: <literal>&man-db-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&man-db-home;"/></para>
         <para>&Download;: <ulink url="&man-db-url;"/></para>
-        <para>MD5 sum: <literal>&man-db-md5;</literal></para>
 @z
 
-@x
+@x man-pages
         <para>Home page: <ulink url="&man-pages-home;"/></para>
         <para>Download: <ulink url="&man-pages-url;"/></para>
-        <para>MD5 sum: <literal>&man-pages-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&man-pages-home;"/></para>
         <para>&Download;: <ulink url="&man-pages-url;"/></para>
-        <para>MD5 sum: <literal>&man-pages-md5;</literal></para>
 @z
 
-@x
+@x mpc
         <para>Home page: <ulink url="&mpc-home;"/></para>
         <para>Download: <ulink url="&mpc-url;"/></para>
-        <para>MD5 sum: <literal>&mpc-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&mpc-home;"/></para>
         <para>&Download;: <ulink url="&mpc-url;"/></para>
-        <para>MD5 sum: <literal>&mpc-md5;</literal></para>
 @z
 
-@x
+@x mpfr
         <para>Home page: <ulink url="&mpfr-home;"/></para>
         <para>Download: <ulink url="&mpfr-url;"/></para>
-        <para>MD5 sum: <literal>&mpfr-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&mpfr-home;"/></para>
         <para>&Download;: <ulink url="&mpfr-url;"/></para>
-        <para>MD5 sum: <literal>&mpfr-md5;</literal></para>
 @z
 
-@x
+@x ncurses
         <para>Home page: <ulink url="&ncurses-home;"/></para>
         <para>Download: <ulink url="&ncurses-url;"/></para>
-        <para>MD5 sum: <literal>&ncurses-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&ncurses-home;"/></para>
         <para>&Download;: <ulink url="&ncurses-url;"/></para>
-        <para>MD5 sum: <literal>&ncurses-md5;</literal></para>
 @z
 
-@x
+@x patch
         <para>Home page: <ulink url="&patch-home;"/></para>
         <para>Download: <ulink url="&patch-url;"/></para>
-        <para>MD5 sum: <literal>&patch-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&patch-home;"/></para>
         <para>&Download;: <ulink url="&patch-url;"/></para>
-        <para>MD5 sum: <literal>&patch-md5;</literal></para>
 @z
 
-@x
+@x perl
         <para>Home page: <ulink url="&perl-home;"/></para>
         <para>Download: <ulink url="&perl-url;"/></para>
-        <para>MD5 sum: <literal>&perl-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&perl-home;"/></para>
         <para>&Download;: <ulink url="&perl-url;"/></para>
-        <para>MD5 sum: <literal>&perl-md5;</literal></para>
 @z
 
-@x
+@x pkgconfig
         <para>Home page: <ulink url="&pkgconfig-home;"/></para>
         <para>Download: <ulink url="&pkgconfig-url;"/></para>
-        <para>MD5 sum: <literal>&pkgconfig-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&pkgconfig-home;"/></para>
         <para>&Download;: <ulink url="&pkgconfig-url;"/></para>
-        <para>MD5 sum: <literal>&pkgconfig-md5;</literal></para>
 @z
 
-@x
+@x procps-ng
         <para>Home page: <ulink url="&procps-ng-home;"/></para>
         <para>Download: <ulink url="&procps-ng-url;"/></para>
-        <para>MD5 sum: <literal>&procps-ng-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&procps-ng-home;"/></para>
         <para>&Download;: <ulink url="&procps-ng-url;"/></para>
-        <para>MD5 sum: <literal>&procps-ng-md5;</literal></para>
 @z
 
-@x
+@x psmisc
         <para>Home page: <ulink url="&psmisc-home;"/></para>
         <para>Download: <ulink url="&psmisc-url;"/></para>
-        <para>MD5 sum: <literal>&psmisc-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&psmisc-home;"/></para>
         <para>&Download;: <ulink url="&psmisc-url;"/></para>
-        <para>MD5 sum: <literal>&psmisc-md5;</literal></para>
 @z
 
-@x
+@x readline
         <para>Home page: <ulink url="&readline-home;"/></para>
         <para>Download: <ulink url="&readline-url;"/></para>
-        <para>MD5 sum: <literal>&readline-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&readline-home;"/></para>
         <para>&Download;: <ulink url="&readline-url;"/></para>
-        <para>MD5 sum: <literal>&readline-md5;</literal></para>
 @z
 
-@x
+@x sed
         <para>Home page: <ulink url="&sed-home;"/></para>
         <para>Download: <ulink url="&sed-url;"/></para>
-        <para>MD5 sum: <literal>&sed-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&sed-home;"/></para>
         <para>&Download;: <ulink url="&sed-url;"/></para>
-        <para>MD5 sum: <literal>&sed-md5;</literal></para>
 @z
 
-@x
-        <para>Home page: <ulink url="&shadow-home;"/></para>
+@x shadow
+        <!-- <para>Home page: <ulink url="&shadow-home;"/></para> -->
         <para>Download: <ulink url="&shadow-url;"/></para>
-        <para>MD5 sum: <literal>&shadow-md5;</literal></para>
 @y
-        <para>&Homepage;: <ulink url="&shadow-home;"/></para>
+        <!-- <para>&Homepage;: <ulink url="&shadow-home;"/></para> -->
         <para>&Download;: <ulink url="&shadow-url;"/></para>
-        <para>MD5 sum: <literal>&shadow-md5;</literal></para>
 @z
 
-@x
+@x sysklogd
         <para>Home page: <ulink url="&sysklogd-home;"/></para>
         <para>Download: <ulink url="&sysklogd-url;"/></para>
-        <para>MD5 sum: <literal>&sysklogd-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&sysklogd-home;"/></para>
         <para>&Download;: <ulink url="&sysklogd-url;"/></para>
-        <para>MD5 sum: <literal>&sysklogd-md5;</literal></para>
 @z
 
-@x
+@x sysvinit
         <para>Home page: <ulink url="&sysvinit-home;"/></para>
         <para>Download: <ulink url="&sysvinit-url;"/></para>
-        <para>MD5 sum: <literal>&sysvinit-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&sysvinit-home;"/></para>
         <para>&Download;: <ulink url="&sysvinit-url;"/></para>
-        <para>MD5 sum: <literal>&sysvinit-md5;</literal></para>
 @z
 
-@x
+@x tar
         <para>Home page: <ulink url="&tar-home;"/></para>
         <para>Download: <ulink url="&tar-url;"/></para>
-        <para>MD5 sum: <literal>&tar-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&tar-home;"/></para>
         <para>&Download;: <ulink url="&tar-url;"/></para>
-        <para>MD5 sum: <literal>&tar-md5;</literal></para>
 @z
 
-@x
+@x tcl
         <para>Home page: <ulink url="&tcl-home;"/></para>
         <para>Download: <ulink url="&tcl-url;"/></para>
-        <para>MD5 sum: <literal>&tcl-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&tcl-home;"/></para>
         <para>&Download;: <ulink url="&tcl-url;"/></para>
-        <para>MD5 sum: <literal>&tcl-md5;</literal></para>
 @z
 
-@x
+@x tzdata
         <para>Home page: <ulink url="&tzdata-home;"/></para>
         <para>Download: <ulink url="&tzdata-url;"/></para>
-        <para>MD5 sum: <literal>&tzdata-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&tzdata-home;"/></para>
         <para>&Download;: <ulink url="&tzdata-url;"/></para>
-        <para>MD5 sum: <literal>&tzdata-md5;</literal></para>
 @z
 
-@x
+@x texinfo
         <para>Home page: <ulink url="&texinfo-home;"/></para>
         <para>Download: <ulink url="&texinfo-url;"/></para>
-        <para>MD5 sum: <literal>&texinfo-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&texinfo-home;"/></para>
         <para>&Download;: <ulink url="&texinfo-url;"/></para>
-        <para>MD5 sum: <literal>&texinfo-md5;</literal></para>
 @z
 
 @x Systemd
         <para>Home page: <ulink url="&systemd-home;"/></para>
         <para>Download: <ulink url="&systemd-url;"/></para>
-        <para>MD5 sum: <literal>&systemd-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&systemd-home;"/></para>
         <para>&Download;: <ulink url="&systemd-url;"/></para>
-        <para>MD5 sum: <literal>&systemd-md5;</literal></para>
 @z
 
 @x Udev-lfs Tarball
         <para>Download: <ulink url="&udev-lfs-url;"/></para>
-        <para>MD5 sum: <literal>&udev-lfs-md5;</literal></para>
 @y
         <para>&Download;: <ulink url="&udev-lfs-url;"/></para>
-        <para>MD5 sum: <literal>&udev-lfs-md5;</literal></para>
 @z
 
-@x
+@x util-linux
         <para>Home page: <ulink url="&util-linux-home;"/></para>
         <para>Download: <ulink url="&util-linux-url;"/></para>
-        <para>MD5 sum: <literal>&util-linux-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&util-linux-home;"/></para>
         <para>&Download;: <ulink url="&util-linux-url;"/></para>
-        <para>MD5 sum: <literal>&util-linux-md5;</literal></para>
 @z
 
-@x
+@x vim
         <para>Home page: <ulink url="&vim-home;"/></para>
         <para>Download: <ulink url="&vim-url;"/></para>
-        <para>MD5 sum: <literal>&vim-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&vim-home;"/></para>
         <para>&Download;: <ulink url="&vim-url;"/></para>
-        <para>MD5 sum: <literal>&vim-md5;</literal></para>
 @z
 
 @x Xz
         <para>Home page: <ulink url="&xz-home;"/></para>
         <para>Download: <ulink url="&xz-url;"/></para>
-        <para>MD5 sum: <literal>&xz-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&xz-home;"/></para>
         <para>&Download;: <ulink url="&xz-url;"/></para>
-        <para>MD5 sum: <literal>&xz-md5;</literal></para>
 @z
 
-@x
+@x zlib
         <para>Home page: <ulink url="&zlib-home;"/></para>
         <para>Download: <ulink url="&zlib-url;"/></para>
-        <para>MD5 sum: <literal>&zlib-md5;</literal></para>
 @y
         <para>&Homepage;: <ulink url="&zlib-home;"/></para>
         <para>&Download;: <ulink url="&zlib-url;"/></para>
-        <para>MD5 sum: <literal>&zlib-md5;</literal></para>
 @z
 
 @x
diff --git a/lfsbook/src/chapter03/patches.ch b/lfsbook/src/chapter03/patches.ch
index a5f4f6a5..f8bf5281 100644
--- a/lfsbook/src/chapter03/patches.ch
+++ b/lfsbook/src/chapter03/patches.ch
@@ -41,66 +41,46 @@
 </note>
 @z
 
-@x Automake Test Fix Patch
-        <para>Download: <ulink url="&patches-root;&automake-test-patch;"/></para>
-@y
-        <para>&Download;: <ulink url="&patches-root;&automake-test-patch;"/></para>
-@z
-
 @x Bash Upstream Fixes Patch
         <para>Download: <ulink url="&patches-root;&bash-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para>
 @y
         <para>&Download;: <ulink url="&patches-root;&bash-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para>
 @z
 
 @x Bzip2 Documentation Patch
         <para>Download: <ulink url="&patches-root;&bzip2-docs-patch;"/></para>
-        <para>MD5 sum: <literal>&bzip2-docs-patch-md5;</literal></para>
 @y
         <para>&Download;: <ulink url="&patches-root;&bzip2-docs-patch;"/></para>
-        <para>MD5 sum: <literal>&bzip2-docs-patch-md5;</literal></para>
 @z
 
 @x Coreutils Internationalization Fixes Patch
         <para>Download: <ulink url="&patches-root;&coreutils-i18n-patch;"/></para>
-        <para>MD5 sum: <literal>&coreutils-i18n-patch-md5;</literal></para>
 @y
         <para>&Download;: <ulink url="&patches-root;&coreutils-i18n-patch;"/></para>
-        <para>MD5 sum: <literal>&coreutils-i18n-patch-md5;</literal></para>
 @z
 
 @x Kbd Backspace/Delete Fix Patch
         <para>Download: <ulink url="&patches-root;&kbd-backspace-patch;"/></para>
-        <para>MD5 sum: <literal>&kbd-backspace-patch-md5;</literal></para>
 @y
         <para>&Download;: <ulink url="&patches-root;&kbd-backspace-patch;"/></para>
-        <para>MD5 sum: <literal>&kbd-backspace-patch-md5;</literal></para>
 @z
 
 @x Perl Libc Patch
         <para>Download: <ulink url="&patches-root;&perl-libc-patch;"/></para>
-        <para>MD5 sum: <literal>&perl-libc-patch-md5;</literal></para>
 @y
         <para>&Download;: <ulink url="&patches-root;&perl-libc-patch;"/></para>
-        <para>MD5 sum: <literal>&perl-libc-patch-md5;</literal></para>
 @z
 
 @x Readline Upstream Fixes Patch
         <para>Download: <ulink url="&patches-root;&readline-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para>
 @y
         <para>&Download;: <ulink url="&patches-root;&readline-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para>
 @z
 
 @x Sysvinit Consolidated Patch
         <para>Download: <ulink url="&patches-root;&sysvinit-consolidated-patch;"/></para>
-        <para>MD5 sum: <literal>&sysvinit-consolidated-patch-md5;</literal></para>
 @y
         <para>&Download;: <ulink url="&patches-root;&sysvinit-consolidated-patch;"/></para>
-        <para>MD5 sum: <literal>&sysvinit-consolidated-patch-md5;</literal></para>
 @z
 
 @x Tar Manpage Patch
diff --git a/lfsbook/src/chapter06/automake.ch b/lfsbook/src/chapter06/automake.ch
index 24887c37..25ad18f5 100644
--- a/lfsbook/src/chapter06/automake.ch
+++ b/lfsbook/src/chapter06/automake.ch
@@ -29,12 +29,6 @@
 @z
 
 @x
-    <para>Fix an intermittent test failure:</para>
-@y
-    <para>断続的にテストが失敗する点を修正します。</para>
-@z
-
-@x
     <para>Prepare Automake for compilation:</para>
 @y
     <para>&PreparePackage1;Automake&PreparePackage2;</para>
diff --git a/lfsbook/src/chapter06/binutils.ch b/lfsbook/src/chapter06/binutils.ch
index fe95fa1d..2deaac32 100644
--- a/lfsbook/src/chapter06/binutils.ch
+++ b/lfsbook/src/chapter06/binutils.ch
@@ -170,12 +170,12 @@
 @x
         <seg>addr2line, ar, as, c++filt, elfedit, gprof, ld, ld.bfd, nm,
         objcopy, objdump, ranlib, readelf, size, strings, and strip</seg>
-        <seg>libiberty.a, libbfd.{a,so}, and libopcodes.{a,so}</seg>
+        <seg><!--libiberty.a,--> libbfd.{a,so}, and libopcodes.{a,so}</seg>
         <seg>/usr/lib/ldscripts</seg>
 @y
         <seg>addr2line, ar, as, c++filt, elfedit, gprof, ld, ld.bfd, nm,
         objcopy, objdump, ranlib, readelf, size, strings, strip</seg>
-        <seg>libiberty.a, libbfd.{a,so}, libopcodes.{a,so}</seg>
+        <seg><!--libiberty.a,--> libbfd.{a,so}, libopcodes.{a,so}</seg>
         <seg>/usr/lib/ldscripts</seg>
 @z
 
diff --git a/lfsbook/src/chapter06/e2fsprogs.ch b/lfsbook/src/chapter06/e2fsprogs.ch
index a6665290..9826127e 100644
--- a/lfsbook/src/chapter06/e2fsprogs.ch
+++ b/lfsbook/src/chapter06/e2fsprogs.ch
@@ -35,12 +35,6 @@
 @z
 
 @x
-    <para>First, fix a regression test:</para>
-@y
-    <para>はじめに縮退テストに対する修正を行います。</para>
-@z
-
-@x
     <para>The E2fsprogs documentation recommends that the package be built in
     a subdirectory of the source tree: </para>
 @y
@@ -218,7 +212,7 @@
         mkfs.ext2, mkfs.ext3, mkfs.ext4, mkfs.ext4dev, 
         resize2fs, and tune2fs</seg>
         <seg>libcom_err.{a,so}, libe2p.{a,so}, libext2fs.{a,so},
-        libquota.a and libss.{a,so}</seg>
+        libquota.a, and libss.{a,so}</seg>
         <seg>/usr/include/e2p, /usr/include/et, /usr/include/ext2fs,
         /usr/include/quota, /usr/include/ss, /usr/share/et, /usr/share/ss</seg>
 @y
diff --git a/lfsbook/src/chapter06/gcc.ch b/lfsbook/src/chapter06/gcc.ch
index d3016e67..41b88d36 100644
--- a/lfsbook/src/chapter06/gcc.ch
+++ b/lfsbook/src/chapter06/gcc.ch
@@ -309,7 +309,7 @@
         gcc-ar, gcc-nm, gcc-ranlib, and gcov</seg>
 
         <seg>libasan.{a,so}, libatomic.{a,so}, libgcc.a, libgcc_eh.a, 
-        libgcc_s.so, libgcov.a, libgomp.{a,so}, libitm.{a,so},
+        libgcc_s.so, libgcov.a, libgomp.{a,so}, libiberty.a, libitm.{a,so},
         liblto_plugin.so, libmudflap.{a,so}, libmudflapth.{a,so},
         libquadmath.{a,so}, libssp.{a,so},
         libssp_nonshared.a, libstdc++.{a,so}, libsupc++.a and libtsan.{a,so}</seg>
@@ -320,7 +320,7 @@
         gcc-ar, gcc-nm, gcc-ranlib, gcov</seg>
 
         <seg>libasan.{a,so}, libatomic.{a,so}, libgcc.a, libgcc_eh.a, 
-        libgcc_s.so, libgcov.a, libgomp.{a,so}, libitm.{a,so},
+        libgcc_s.so, libgcov.a, libgomp.{a,so}, libiberty.a, libitm.{a,so},
         liblto_plugin.so, libmudflap.{a,so}, libmudflapth.{a,so},
         libquadmath.{a,so}, libssp.{a,so},
         libssp_nonshared.a, libstdc++.{a,so}, libsupc++.a, libtsan.{a,so}</seg>
@@ -453,7 +453,23 @@
           </para>
 @z
 
-@x
+@x libiberty
+          <para>Contains routines used by various GNU programs, including
+          <command>getopt</command>, <command>obstack</command>,
+          <command>strerror</command>, <command>strtol</command>, and
+          <command>strtoul</command></para>
+@y
+          <para>
+          以下に示すような数多くの GNU プログラムが利用する処理ルーチンを提供します。
+          <command>getopt</command>、
+          <command>obstack</command>、
+          <command>strerror</command>、
+          <command>strtol</command>、
+          <command>strtoul</command>
+          </para>
+@z
+
+@x liblto_plugin
           <para>GCC's Link Time Optimization (LTO) plugin allows GCC to perform
           optimizations across compilation units.</para>
 @y
diff --git a/lfsbook/src/general.ch b/lfsbook/src/general.ch
index c640fcfe..73ba9b86 100644
--- a/lfsbook/src/general.ch
+++ b/lfsbook/src/general.ch
@@ -8,13 +8,13 @@
 % $Date::                           $
 %
 @x
-<!ENTITY version         "SVN-20131222">
-<!ENTITY releasedate     "December 22, 2013">
+<!ENTITY version         "SVN-20131229">
+<!ENTITY releasedate     "December 29, 2013">
 @y
 <?xml version="1.0" encoding="UTF-8"?>
-<!ENTITY version         "SVN-20131222">
-<!ENTITY releasedate     "2013年12月22日">
-<!ENTITY jversion        "20131222">
+<!ENTITY version         "SVN-20131229">
+<!ENTITY releasedate     "2013年12月29日">
+<!ENTITY jversion        "20131230">
 @z
 
 @x
diff --git a/lfsbook/version.ac b/lfsbook/version.ac
index 414f8e65..11c963a4 100644
--- 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-20131222])
+m4_define([lfs_version], [svn-20131229])
-- 
2.11.0