[LFS-SVN] SVN-20200927, チェンジセット 12050 対応。

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

diff --git a/lfsbook/configure b/lfsbook/configure
index 2ecf71d..2717fd5 100755 (executable)
--- a/lfsbook/configure
+++ b/lfsbook/configure
@@ -4034,7 +4034,7 @@ fi
 
 
 
-TARGETVER=svn-20200915
+TARGETVER=svn-20200927
 
 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 10b2826..ddf3f5c 100644 (file)
--- a/lfsbook/src/chapter01/changelog.ch
+++ b/lfsbook/src/chapter01/changelog.ch
@@ -54,6 +54,22 @@
 @z
 
 @x
+      <para>2020-09-27</para>
+        <listitem>
+           <para>[bdubbs] - Add autoconf-2.69-consolidated_fixes-1.patch
+           which allows autoconf tests to pass.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2020-09-27</para>
+        <listitem>
+           <para>[bdubbs] - autoconf-2.69-consolidated_fixes-1.patch を追加。
+           autoconf のテストを成功させるため。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
       <para>2020-09-15</para>
         <listitem>
           <para>[bdubbs] - Update to linux-5.8.9. Fixes

diff --git a/lfsbook/src/chapter01/jchangelog.ch b/lfsbook/src/chapter01/jchangelog.ch
index 08e0e8b..48bf2ed 100644 (file)
--- a/lfsbook/src/chapter01/jchangelog.ch
+++ b/lfsbook/src/chapter01/jchangelog.ch
@@ -60,6 +60,21 @@
 -->
 
    <listitem>
+      <para>2020-09-28</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matsuand] -
+          <phrase revision="sysv">SVN-20200927</phrase>
+          <phrase revision="systemd">20200927-systemd</phrase>,
+          チェンジセット
+          <ulink url="&lfs-rev-root;12050">12050</ulink>
+          対応。
+          </para>
+        </listitem>
+      </itemizedlist>
+   </listitem>
+
+   <listitem>
       <para>2020-09-16</para>
       <itemizedlist>
         <listitem>

diff --git a/lfsbook/src/chapter03/patches.ch b/lfsbook/src/chapter03/patches.ch
index bc6b1a5..936ef15 100644 (file)
--- a/lfsbook/src/chapter03/patches.ch
+++ b/lfsbook/src/chapter03/patches.ch
@@ -41,6 +41,12 @@
 </note>
 @z
 
+@x Autoconf Consolidated Fixes Patch
+        <para>Download: <ulink url="&patches-root;&autoconf-fixes-patch;"/></para>
+@y
+        <para>&Download;: <ulink url="&patches-root;&autoconf-fixes-patch;"/></para>
+@z
+
 @x Bash Upstream Fixes Patch
         <para>Download: <ulink url="&patches-root;&bash-fixes-patch;"/></para>
 @y

diff --git a/lfsbook/src/chapter08/autoconf.ch b/lfsbook/src/chapter08/autoconf.ch
index 7c84c77..fe84a9f 100644 (file)
--- a/lfsbook/src/chapter08/autoconf.ch
+++ b/lfsbook/src/chapter08/autoconf.ch
@@ -29,10 +29,11 @@
 @z
 
 @x
-    <para>First, fix a bug generated by Perl 5.28.</para>
+    <para>First, apply a patch fixes several problems that occur with the latest
+    perl, libtool, and bash version.</para>
 @y
     <para>
-    Perl 5.28 において発生するバグを修正します。
+    まず、perl、libtool、bash の最新版を用いている際に発生する問題を解消するためのパッチを提供します。
     </para>
 @z
 
@@ -49,6 +50,14 @@
 @z
 
 @x
+    <para>To test the results, issue:</para>
+@y
+    <para>
+    ビルド結果をテストするには、以下を実行します。
+    </para>
+@z
+
+@x
     <para>The test suite is currently broken by bash-5 and libtool-2.4.3.
     To run the tests anyway, issue:</para>
 @y

diff --git a/lfsbook/src/general.ch b/lfsbook/src/general.ch
index 0ca90da..be9d58a 100644 (file)
--- a/lfsbook/src/general.ch
+++ b/lfsbook/src/general.ch
@@ -8,24 +8,24 @@
 % $Date::                           $
 %
 @x
-<!ENTITY version         "SVN-20200915">
+<!ENTITY version         "SVN-20200927">
 @y
 <?xml version="1.0" encoding="UTF-8"?>
-<!ENTITY version         "SVN-20200915">
+<!ENTITY version         "SVN-20200927">
 @z
 
 @x
-<!ENTITY versiond        "20200915-systemd">
+<!ENTITY versiond        "20200927-systemd">
 @y
-<!ENTITY versiond        "20200915-systemd">
+<!ENTITY versiond        "20200927-systemd">
 @z
 
 @x
-<!ENTITY releasedate     "September 15th, 2020">
+<!ENTITY releasedate     "September 27th, 2020">
 @y
-<!ENTITY releasedate     "2020/09/15">
-<!ENTITY jversion        "20200916">
-<!ENTITY jversiond       "20200916">
+<!ENTITY releasedate     "2020/09/27">
+<!ENTITY jversion        "20200928">
+<!ENTITY jversiond       "20200928">
 <!ENTITY dir-jversion    "svn-ja">
 <!ENTITY dir-jversiond   "svn-sysdja">
 @z

diff --git a/lfsbook/version.ac b/lfsbook/version.ac
index f604b9e..d6f8fd6 100644 (file)
--- a/lfsbook/version.ac
+++ b/lfsbook/version.ac
@@ -6,5 +6,5 @@ dnl  $Rev$
 dnl  $Date::                           $
 dnl
 dnl m4-include this file to define the current LFS version
-m4_define([lfs_version], [svn-20200915])
-m4_define([lfsd_version], [20200915-systemd])
+m4_define([lfs_version], [svn-20200927])
+m4_define([lfsd_version], [20200927-systemd])