[lfsja-git] r11.1-76 対応。

diff --git a/configure b/configure
index 3dabe02..3c4e756 100755 (executable)
--- a/configure
+++ b/configure
@@ -4737,7 +4737,7 @@ fi
 
 
 
-TARGETVER=r11.1-69
+TARGETVER=r11.1-76
 if test "x$revspec" = "xsystemd"; then
   TARGETVER="$TARGETVER-systemd"
 fi

diff --git a/src/chapter01/changelog.ch b/src/chapter01/changelog.ch
index 181be91..bc45661 100644 (file)
--- a/src/chapter01/changelog.ch
+++ b/src/chapter01/changelog.ch
@@ -44,6 +44,48 @@
 @z
 
 @x
+      <para>2022-04-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Patch Xz for a security fix.  Fixes
+          <ulink url="&lfs-ticket-root;5047">#5047</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.64.  Fixes
+          <ulink url="&lfs-ticket-root;5044">#5044</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.17.3.  Fixes
+          <ulink url="&lfs-ticket-root;5043">#5043</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gzip-1.12.  Fixes
+          <ulink url="&lfs-ticket-root;5042">#5042</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2022-04-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Xz のセキュリティフィックスパッチ。
+          <ulink url="&lfs-ticket-root;5047">#5047</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - libcap-2.64 へのアップデート。
+          <ulink url="&lfs-ticket-root;5044">#5044</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - linux-5.17.3 へのアップデート。
+          <ulink url="&lfs-ticket-root;5043">#5043</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - gzip-1.12 へのアップデート。
+          <ulink url="&lfs-ticket-root;5042">#5042</ulink> を Fix に。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
       <para>2022-03-31</para>
       <itemizedlist>
         <listitem revision="sysv">
@@ -51,7 +93,7 @@
           <ulink url="&lfs-ticket-root;5041">#5041</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to zlib-1.2.12.  Fixes
+          <para>[bdubbs] - Update to zlib-1.2.12 (Security Update).  Fixes
           <ulink url="&lfs-ticket-root;5040">#5040</ulink>.</para>
         </listitem>
         <listitem>
@@ -79,7 +121,7 @@
           <ulink url="&lfs-ticket-root;5034">#5034</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to linux-5.17.1.  Fixes
+          <para>[bdubbs] - Update to linux-5.17.1 (Security Update).  Fixes
           <ulink url="&lfs-ticket-root;5033">#5033</ulink>.</para>
         </listitem>
         <listitem>
@@ -95,7 +137,7 @@
           <ulink url="&lfs-ticket-root;5041">#5041</ulink> を Fix に。</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] -  zlib-1.2.12 へのアップデート。
+          <para>[bdubbs] -  zlib-1.2.12 へのアップデート (セキュリティアップデート)。
           <ulink url="&lfs-ticket-root;5040">#5040</ulink> を Fix に。</para>
         </listitem>
         <listitem>
@@ -123,7 +165,7 @@
           <ulink url="&lfs-ticket-root;5034">#5034</ulink> を Fix に。</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] -  linux-5.17.1 へのアップデート。
+          <para>[bdubbs] -  linux-5.17.1 へのアップデート (セキュリティアップデート)。
           <ulink url="&lfs-ticket-root;5033">#5033</ulink> を Fix に。</para>
         </listitem>
         <listitem>

diff --git a/src/chapter01/jchangelog.ch b/src/chapter01/jchangelog.ch
index 4bed18d..28a611e 100644 (file)
--- a/src/chapter01/jchangelog.ch
+++ b/src/chapter01/jchangelog.ch
@@ -50,6 +50,28 @@
 
 -->
    <listitem>
+      <para>2022-04-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matsuand] -
+          r11.1-76 (<ulink url="&lfs-changeset;1d694184b">1d694184b</ulink>) までの対応。
+          </para>
+        </listitem>
+      </itemizedlist>
+   </listitem>
+
+   <listitem>
+      <para>2022-04-13</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matsuand] -
+          r11.1-73 (<ulink url="&lfs-changeset;b861051f1">b861051f1</ulink>) までの対応。
+          </para>
+        </listitem>
+      </itemizedlist>
+   </listitem>
+
+   <listitem>
       <para>2022-03-31</para>
       <itemizedlist>
         <listitem>

diff --git a/src/chapter03/introduction.ch b/src/chapter03/introduction.ch
index 5a6437e..06fc088 100644 (file)
--- a/src/chapter03/introduction.ch
+++ b/src/chapter03/introduction.ch
@@ -227,7 +227,7 @@ wget -N --input-file=wget-list.orig --continue --directory-prefix=$LFS/sources</
 @x
     The <filename>wget-list</filename> file mentioned above retrieves all
     packages for both the sysV and systemd versions of LFS.  There are a total
-    of five additional small packages not needed for the currrent book.  The
+    of five additional small packages not needed for the current book.  The
     <filename>md5sums</filename> file mentioned below is specific to the
     current book.
 @y

diff --git a/src/chapter03/patches.ch b/src/chapter03/patches.ch
index 13b5b54..2ce1dca 100644 (file)
--- a/src/chapter03/patches.ch
+++ b/src/chapter03/patches.ch
@@ -127,6 +127,18 @@
         <para>&Download;: <ulink url="&patches-root;&systemd-upstream-fixes-patch;"/></para>
 @z
 
+@x Systemd Kernel Fixes Patch
+        <para>Download: <ulink url="&patches-root;&systemd-kernel-fixes-patch;"/></para>
+@y
+        <para>&Download;: <ulink url="&patches-root;&systemd-kernel-fixes-patch;"/></para>
+@z
+
+@x Xz Upstream Fix Patch
+        <para>Download: <ulink url="&patches-root;&xz-upstream-fix-patch;"/></para>
+@y
+        <para>&Download;: <ulink url="&patches-root;&xz-upstream-fix-patch;"/></para>
+@z
+
 @x Zstd Upstream Fixes Patch
         <para>Download: <ulink url="&patches-root;&zstd-upstream-fixes-patch;"/></para>
 @y

diff --git a/src/chapter08/perl.ch b/src/chapter08/perl.ch
index fe4db1e..218a0ea 100644 (file)
--- a/src/chapter08/perl.ch
+++ b/src/chapter08/perl.ch
@@ -138,14 +138,13 @@
     </para>
 @z
 
-%@x
-%    <note><para>One test fails due to using the most recent version of gdbm.
-%    </para></note>
-%@y
-%    <note><para>
-%    gdbm の最新バージョンを用いていることから、テストが 1 つ失敗します。
-%    </para></note>
-%@z
+@x
+       <para>Nine tests fail due to using the most recent version of zlib.</para>
+@y
+       <para>
+       zlib の最新バージョンを用いていることから、9 つのテストが失敗します。
+       </para>
+@z
 
 @x
     <para>Install the package and clean up:</para>

diff --git a/src/chapter08/procps.ch b/src/chapter08/procps.ch
index efe1629..0695c94 100644 (file)
--- a/src/chapter08/procps.ch
+++ b/src/chapter08/procps.ch
@@ -18,23 +18,6 @@
 @z
 
 @x
-    <note>
-      <para>This package extracts to the directory
-      <filename class="directory">procps-3.3.17</filename>,
-      not the expected
-      <filename class="directory">procps-ng-3.3.17</filename>.</para>
-    </note>
-@y
-    <note>
-      <para>
-      本パッケージのソースは <filename
-      class="directory">procps-3.3.17</filename> ディレクトリへ伸長（解凍）されます。
-      <filename class="directory">procps-ng-3.3.17</filename> ではないので注意してください。
-      </para>
-    </note>
-@z
-
-@x
     <title>Installation of Procps-ng</title>
 @y
     <title>&InstallationOf1;Procps-ng&InstallationOf2;</title>
@@ -124,13 +107,13 @@
 @x
         <seg>free, pgrep, pidof, pkill, pmap, ps, pwdx, slabtop,
         sysctl, tload, top, uptime, vmstat, w, and watch</seg>
-        <seg>libprocps.so</seg>
-        <seg>/usr/include/proc and /usr/share/doc/procps-ng-&procps-ng-version;</seg>
+        <seg>libproc-2.so</seg>
+        <seg>/usr/include/procps and /usr/share/doc/procps-ng-&procps-ng-version;</seg>
 @y
         <seg>free, pgrep, pidof, pkill, pmap, ps, pwdx, slabtop,
         sysctl, tload, top, uptime, vmstat, w, watch</seg>
-        <seg>libprocps.so</seg>
-        <seg>/usr/include/proc, /usr/share/doc/procps-ng-&procps-ng-version;</seg>
+        <seg>libproc-2.so</seg>
+        <seg>/usr/include/procps, /usr/share/doc/procps-ng-&procps-ng-version;</seg>
 @z
 
 @x
@@ -279,7 +262,7 @@
           </para>
 @z
 
-@x libproc
+@x libproc-2
           <para>Contains the functions used by most programs in this
           package</para>
 @y

diff --git a/src/chapter08/systemd.ch b/src/chapter08/systemd.ch
index 5eb966f..a8047f0 100644 (file)
--- a/src/chapter08/systemd.ch
+++ b/src/chapter08/systemd.ch
@@ -34,6 +34,15 @@
 @z
 
 @x
+    <para>Now, apply a patch to fix a problem with the linux kernel's headers in 
+    version 5.17 and later:</para>
+@y
+    <para>
+    また linux カーネルヘッダー、バージョン 5.17 以降に対する問題の修正のため、以下のパッチを適用します。
+    version 5.17 and later:</para>
+@z
+
+@x
     <para>Remove two unneeded groups,
     <systemitem class="groupname">render</systemitem> and
     <systemitem class="groupname">sgx</systemitem>, from the default udev

diff --git a/src/chapter08/util-linux.ch b/src/chapter08/util-linux.ch
index ac10abb..9d92b67 100644 (file)
--- a/src/chapter08/util-linux.ch
+++ b/src/chapter08/util-linux.ch
@@ -75,9 +75,9 @@
 @z
 
 @x
-    <note><para>There is one test that fails in the chroot envronment and
+    <note><para>There is one test that fails in the chroot environment and
     causes the tests to hang forever.  The problem does not occur outside
-    of the chroot envronment.
+    of the chroot environment.
     To work around the problem, delete the test:</para>
 @y
     <note><para>

diff --git a/src/chapter08/xz.ch b/src/chapter08/xz.ch
index f61b903..cf3ee3d 100644 (file)
--- a/src/chapter08/xz.ch
+++ b/src/chapter08/xz.ch
@@ -30,6 +30,14 @@
 @z
 
 @x
+    <para>Apply a patch to fix an issue in xzgrep:</para>
+@y
+    <para>
+    xzgrep における問題を修正するためのパッチを適用します。
+    </para>
+@z
+
+@x
     <para>Prepare Xz for compilation with:</para>
 @y
     <para>&PreparePackage1;Xz&PreparePackage2;</para>

diff --git a/src/general.ch b/src/general.ch
index 27a48ae..884567f 100644 (file)
--- a/src/general.ch
+++ b/src/general.ch
@@ -47,9 +47,9 @@
 <!ENTITY copyrightdate   "%crdate;">
 ]]>
 
-<!ENTITY jversion        "20220331">
-<!ENTITY jversiond       "20220331">
-<!ENTITY jcorrespondSHA  "676f0fdce"> <!-- lfs-git SHA 値； 本箇所での記載のみ -->
+<!ENTITY jversion        "20220416">
+<!ENTITY jversiond       "20220416">
+<!ENTITY jcorrespondSHA  "1d694184b"> <!-- lfs-git SHA 値； 本箇所での記載のみ -->
 <!ENTITY dir-jversion    "git-ja">
 <!ENTITY dir-jversiond   "git-sysdja">
 @z

diff --git a/version.ac b/version.ac
index d7d3aac..d5bcc9d 100644 (file)
--- a/version.ac
+++ b/version.ac
@@ -2,4 +2,4 @@ dnl
 dnl  This is part of LFSbookja package.
 dnl 
 dnl m4-include this file to define the current LFS version
-m4_define([lfs_version], [r11.1-69])
+m4_define([lfs_version], [r11.1-76])