[LFS-SVN] SVN-20200501, チェンジセット 11824-11827 対応。

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

diff --git a/lfsbook/configure b/lfsbook/configure
index a1b0f25..f4de7a4 100755 (executable)
--- a/lfsbook/configure
+++ b/lfsbook/configure
@@ -4034,7 +4034,7 @@ fi
 
 
 
-TARGETVER=svn-20200423
+TARGETVER=svn-20200501
 
 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/appendices/dependencies.ch b/lfsbook/src/appendices/dependencies.ch
index a366eec..b7b33f8 100644 (file)
--- a/lfsbook/src/appendices/dependencies.ch
+++ b/lfsbook/src/appendices/dependencies.ch
@@ -562,9 +562,9 @@
           <seg>なし</seg>
 @z
 @x
-          <seg>None</seg>
+          <seg>libsigsegv</seg>
 @y
-          <seg>なし</seg>
+          <seg>libsigsegv</seg>
 @z
 
 %----------------------------------------------------------------------

diff --git a/lfsbook/src/chapter01/changelog.ch b/lfsbook/src/chapter01/changelog.ch
index 92bbbc2..be130c8 100644 (file)
--- a/lfsbook/src/chapter01/changelog.ch
+++ b/lfsbook/src/chapter01/changelog.ch
@@ -54,6 +54,48 @@
 @z
 
 @x
+      <para>2020-05-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to tzdata-2020a. Fixes
+          <ulink url="&lfs-ticket-root;4644">#4644</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to meson-0.54.1. Fixes
+          <ulink url="&lfs-ticket-root;4646">#4646</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20200429. Fixes
+          <ulink url="&lfs-ticket-root;4645">#4645</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.6.8. Fixes
+          <ulink url="&lfs-ticket-root;4630">#4630</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2020-05-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - tzdata-2020a へのアップデート。
+          <ulink url="&lfs-ticket-root;4644">#4644</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - meson-0.54.1 へのアップデート。
+          <ulink url="&lfs-ticket-root;4646">#4646</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - iana-etc-20200429 へのアップデート。
+          <ulink url="&lfs-ticket-root;4645">#4645</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - linux-5.6.8 へのアップデート。
+          <ulink url="&lfs-ticket-root;4630">#4630</ulink> を Fix に。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
       <para>2020-04-23</para>
       <itemizedlist>
         <listitem>
@@ -72,14 +114,27 @@
 @z
 
 @x
+    <listitem>
+      <para>2020-04-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to openssl-1.1.1g (Security Fix). Fixes
+          <ulink url="&lfs-ticket-root;4643">#4643</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+@y
+@z
+
+@x
       <para>2020-04-20</para>
       <itemizedlist>
         <listitem>
           <para>[pierre] - Change -isystem to -idirafter in "Adjusting the
           toolchain". This allows to search g++ private headers before
           the public ones, which is the normal search order, with the
-         drawback that it includes the headers in /tools if they exist
-         in both /usr and /tools. Fix most of
+          drawback that it includes the headers in /tools if they exist
+          in both /usr and /tools. Fix most of
           <ulink url="&lfs-ticket-root;4641">#4641</ulink>.</para>
         </listitem>
       </itemizedlist>

diff --git a/lfsbook/src/chapter01/jchangelog.ch b/lfsbook/src/chapter01/jchangelog.ch
index d1da0c8..3f2a7b0 100644 (file)
--- a/lfsbook/src/chapter01/jchangelog.ch
+++ b/lfsbook/src/chapter01/jchangelog.ch
@@ -60,6 +60,22 @@
 -->
 
    <listitem>
+      <para>2020-05-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matsuand] -
+          <phrase revision="sysv">SVN-20200501</phrase>
+          <phrase revision="systemd">20200501-systemd</phrase>,
+          チェンジセット
+          <ulink url="&lfs-rev-root;11824">11824</ulink> ～
+          <ulink url="&lfs-rev-root;11827">11827</ulink>
+          対応。
+          </para>
+        </listitem>
+      </itemizedlist>
+   </listitem>
+
+   <listitem>
       <para>2020-04-24</para>
       <itemizedlist>
         <listitem>

diff --git a/lfsbook/src/chapter06/iana-etc.ch b/lfsbook/src/chapter06/iana-etc.ch
index 2e363b5..7279887 100644 (file)
--- a/lfsbook/src/chapter06/iana-etc.ch
+++ b/lfsbook/src/chapter06/iana-etc.ch
@@ -29,29 +29,14 @@
 @z
 
 @x
-    <para>The following command converts the raw data provided by IANA into the
-    correct formats for the <filename>/etc/protocols</filename> and
-    <filename>/etc/services</filename> data files:</para>
+    <para>For this package, we only need to copy the files into place:</para>
 @y
     <para>
-    以下のコマンドを実行します。
-    これは IANA が提供している生のデータを正しい書式のデータとして変換し <filename>/etc/protocols</filename> ファイルと <filename>/etc/services</filename> ファイルとして生成します。
+    このパッケージでは、必要とするファイルを所定の場所にコピーするだけにします。
     </para>
 @z
 
 @x
-    <para>This package does not come with a test suite.</para>
-@y
-    <para>&NotExistTestsuite;</para>
-@z
-
-@x
-    <para>Install the package:</para>
-@y
-    <para>&InstallThePackage;</para>
-@z
-
-@x
     <title>Contents of Iana-Etc</title>
 @y
     <title>&ContentsOf1;Iana-Etc&ContentsOf2;</title>

diff --git a/lfsbook/src/general.ch b/lfsbook/src/general.ch
index 4397bee..99c4b42 100644 (file)
--- a/lfsbook/src/general.ch
+++ b/lfsbook/src/general.ch
@@ -8,24 +8,24 @@
 % $Date::                           $
 %
 @x
-<!ENTITY version         "SVN-20200423">
+<!ENTITY version         "SVN-20200501">
 @y
 <?xml version="1.0" encoding="UTF-8"?>
-<!ENTITY version         "SVN-20200423">
+<!ENTITY version         "SVN-20200501">
 @z
 
 @x
-<!ENTITY versiond        "20200423-systemd">
+<!ENTITY versiond        "20200501-systemd">
 @y
-<!ENTITY versiond        "20200423-systemd">
+<!ENTITY versiond        "20200501-systemd">
 @z
 
 @x
-<!ENTITY releasedate     "April 23rd, 2020">
+<!ENTITY releasedate     "May 1st, 2020">
 @y
-<!ENTITY releasedate     "2020/04/23">
-<!ENTITY jversion        "20200424">
-<!ENTITY jversiond       "20200424">
+<!ENTITY releasedate     "2020/05/01">
+<!ENTITY jversion        "20200502">
+<!ENTITY jversiond       "20200502">
 <!ENTITY dir-jversion    "svn-ja">
 <!ENTITY dir-jversiond   "svn-sysdja">
 @z

diff --git a/lfsbook/version.ac b/lfsbook/version.ac
index 394709c..adc477d 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-20200423])
-m4_define([lfsd_version], [20200423-systemd])
+m4_define([lfs_version], [svn-20200501])
+m4_define([lfsd_version], [20200501-systemd])