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

diff --git a/configure b/configure
index f592960..6f102d9 100755 (executable)
--- a/configure
+++ b/configure
@@ -4737,7 +4737,7 @@ fi
 
 
 
-TARGETVER=r11.1-151
+TARGETVER=r11.1-158
 if test "x$revspec" = "xsystemd"; then
   TARGETVER="$TARGETVER-systemd"
 fi

diff --git a/src/chapter01/changelog.ch b/src/chapter01/changelog.ch
index 4160a31..7bad381 100644 (file)
--- a/src/chapter01/changelog.ch
+++ b/src/chapter01/changelog.ch
@@ -44,6 +44,76 @@
 @z
 
 @x
+      <para>2022-08-06</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to binutils-2.38. Fixes
+          <ulink url="&lfs-ticket-root;5089">#5089</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to util-linux-2.38.1. Fixes
+          <ulink url="&lfs-ticket-root;5088">#5088</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Python3-3.10.6. Fixes
+          <ulink url="&lfs-ticket-root;5087">#5087</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to glibc-2.36. Fixes
+          <ulink url="&lfs-ticket-root;5083">#5084</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2022-08-06</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - binutils-2.38 へのアップデート。
+          <ulink url="&lfs-ticket-root;5089">#5089</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - util-linux-2.38.1 へのアップデート。
+          <ulink url="&lfs-ticket-root;5088">#5088</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Python3-3.10.6 へのアップデート。
+          <ulink url="&lfs-ticket-root;5087">#5087</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - glibc-2.36 へのアップデート。
+          <ulink url="&lfs-ticket-root;5083">#5084</ulink> を Fix に。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
+      <para>2022-07-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.18.14. (Security fixes
+          for machines affected by the RETBleed vulnerability). Fixes
+          <ulink url="&lfs-ticket-root;5082">#5082</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.65. Fixes
+          <ulink url="&lfs-ticket-root;5083">#5083</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2022-07-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - linux-5.18.14 へのアップデート。
+          (RETBleed ぜい弱性の影響があるマシン向けのセキュリティフィックス)
+          <ulink url="&lfs-ticket-root;5082">#5082</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - libcap-2.65 へのアップデート。
+          <ulink url="&lfs-ticket-root;5083">#5083</ulink> を Fix に。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
       <para>2022-07-15</para>
       <itemizedlist>
         <listitem>

diff --git a/src/chapter01/jchangelog.ch b/src/chapter01/jchangelog.ch
index 3adb933..32afa16 100644 (file)
--- a/src/chapter01/jchangelog.ch
+++ b/src/chapter01/jchangelog.ch
@@ -50,6 +50,17 @@
 
 -->
    <listitem>
+      <para>2022-08-07</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matsuand] -
+          r11.1-158 (<ulink url="&lfs-changeset;e06065fc2">e06065fc2</ulink>) までの対応。
+          </para>
+        </listitem>
+      </itemizedlist>
+   </listitem>
+
+   <listitem>
       <para>2022-07-17</para>
       <itemizedlist>
         <listitem>

diff --git a/src/chapter03/patches.ch b/src/chapter03/patches.ch
index 2b4350e..0d25947 100644 (file)
--- a/src/chapter03/patches.ch
+++ b/src/chapter03/patches.ch
@@ -73,10 +73,10 @@
         <para>&Download;: <ulink url="&patches-root;&coreutils-chmod-patch;"/></para>
 @z
 
-@x File Upstream Fixes Patch
-        <para>Download: <ulink url="&patches-root;&file-upstream-fixes-patch;"/></para>
+@x Gcc glibc-2.36 Fixes Patch
+        <para>Download: <ulink url="&patches-root;&gcc-upstream-fixes-patch;"/></para>
 @y
-        <para>&Download;: <ulink url="&patches-root;&file-upstream-fixes-patch;"/></para>
+        <para>&Download;: <ulink url="&patches-root;&gcc-upstream-fixes-patch;"/></para>
 @z
 
 @x Glibc FHS Patch
@@ -121,6 +121,12 @@
         <para>&Download;: <ulink url="&patches-root;&sysvinit-consolidated-patch;"/></para>
 @z
 
+@x Systemd Upstream Patch
+        <para>Download: <ulink url="&patches-root;&systemd-upstream-patch;"/></para>
+@y
+        <para>&Download;: <ulink url="&patches-root;&systemd-upstream-patch;"/></para>
+@z
+
 @x Xz Upstream Fix Patch
         <para>Download: <ulink url="&patches-root;&xz-upstream-fix-patch;"/></para>
 @y

diff --git a/src/chapter05/binutils-pass1.ch b/src/chapter05/binutils-pass1.ch
index b963bd8..75af973 100644 (file)
--- a/src/chapter05/binutils-pass1.ch
+++ b/src/chapter05/binutils-pass1.ch
@@ -127,7 +127,7 @@
           </para>
 @z
 
-@x
+@x --disable-nls
           <para>This disables internationalization as i18n is not needed for the
           temporary tools.</para>
 @y
@@ -136,7 +136,17 @@
           </para>
 @z
 
-@x
+@x --enable-gprofng=no
+          <para>This disables building gprofng which is not needed for the
+          temporary tools.</para>
+@y
+          <para>
+          これは gprofng のビルドを無効にします。
+          gprofng は一時的ツールにおいては不要であるからです。
+          </para>
+@z
+
+@x --disable-werror
           <para>This prevents the build from stopping in the event that there
           are warnings from the host's compiler.</para>
 @y

diff --git a/src/chapter06/gcc-pass2.ch b/src/chapter06/gcc-pass2.ch
index 3ca675d..3f32bb8 100644 (file)
--- a/src/chapter06/gcc-pass2.ch
+++ b/src/chapter06/gcc-pass2.ch
@@ -40,6 +40,14 @@
 @z
 
 @x
+    <para>First fix a problem with the latest version of glibc:</para>
+@y
+    <para>
+    まずは glibc の最新版における問題を修正します。
+    </para>
+@z
+
+@x
     <para>As in the first build of GCC, the GMP, MPFR, and MPC packages are
     required. Unpack the tarballs and move them into the required directory
     names:</para>

diff --git a/src/chapter08/gcc.ch b/src/chapter08/gcc.ch
index 75f0290..79efa17 100644 (file)
--- a/src/chapter08/gcc.ch
+++ b/src/chapter08/gcc.ch
@@ -36,6 +36,14 @@
 @z
 
 @x
+    <para>First fix a problem with the latest version of glibc:</para>
+@y
+    <para>
+    まずは glibc の最新版における問題を修正します。
+    </para>
+@z
+
+@x
     <para>If building on x86_64, change the default directory name for 64-bit
     libraries to <quote>lib</quote>:</para>
 @y

diff --git a/src/chapter08/perl.ch b/src/chapter08/perl.ch
index 218a0ea..746a944 100644 (file)
--- a/src/chapter08/perl.ch
+++ b/src/chapter08/perl.ch
@@ -139,14 +139,6 @@
 @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>
 @y
     <para>パッケージはインストールしクリーンアップします。</para>

diff --git a/src/chapter08/systemd.ch b/src/chapter08/systemd.ch
index 56383aa..5203247 100644 (file)
--- a/src/chapter08/systemd.ch
+++ b/src/chapter08/systemd.ch
@@ -25,6 +25,14 @@
 @z
 
 @x
+    <para>First, fix an issue introduced by glibc-2.36.</para>
+@y
+    <para>
+    はじめに glibc-2.36 において発生する問題を修正します。
+    </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/general.ch b/src/general.ch
index a9d1494..b952f4d 100644 (file)
--- a/src/general.ch
+++ b/src/general.ch
@@ -47,9 +47,9 @@
 <!ENTITY copyrightdate   "%crdate;">
 ]]>
 
-<!ENTITY jversion        "20220717">
-<!ENTITY jversiond       "20220717">
-<!ENTITY jcorrespondSHA  "d060b3354"> <!-- lfs-git SHA 値； 本箇所での記載のみ -->
+<!ENTITY jversion        "20220807">
+<!ENTITY jversiond       "20220807">
+<!ENTITY jcorrespondSHA  "e06065fc2"> <!-- lfs-git SHA 値； 本箇所での記載のみ -->
 <!ENTITY dir-jversion    "git-ja">
 <!ENTITY dir-jversiond   "git-sysdja">
 @z

diff --git a/version.ac b/version.ac
index 39f5f41..15641c5 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-151])
+m4_define([lfs_version], [r11.1-158])