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

diff --git a/configure b/configure
index d562d7c..b849b5b 100755 (executable)
--- a/configure
+++ b/configure
@@ -4737,7 +4737,7 @@ fi
 
 
 
-TARGETVER=r11.1-133
+TARGETVER=r11.1-135
 if test "x$revspec" = "xsystemd"; then
   TARGETVER="$TARGETVER-systemd"
 fi

diff --git a/src/chapter01/changelog.ch b/src/chapter01/changelog.ch
index f7c4b70..2c9d18e 100644 (file)
--- a/src/chapter01/changelog.ch
+++ b/src/chapter01/changelog.ch
@@ -44,6 +44,64 @@
 @z
 
 @x
+      <para>2022-06-14</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to python3-3.10.5. Fixes
+          <ulink url="&lfs-ticket-root;5070">#5070</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to meson-0.62.2. Fixes
+          <ulink url="&lfs-ticket-root;5068">#5068</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to kbd-2.5.0. Fixes
+          <ulink url="&lfs-ticket-root;5067">#5067</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to file-5.42. Fixes
+          <ulink url="&lfs-ticket-root;5072">#5072</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.18.3. Fixes
+          <ulink url="&lfs-ticket-root;5069">#5069</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bc-5.3.1. Fixes
+          <ulink url="&lfs-ticket-root;5071">#5071</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2022-06-14</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - python3-3.10.5 へのアップデート。
+          <ulink url="&lfs-ticket-root;5070">#5070</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - meson-0.62.2 へのアップデート。
+          <ulink url="&lfs-ticket-root;5068">#5068</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - kbd-2.5.0 へのアップデート。
+          <ulink url="&lfs-ticket-root;5067">#5067</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - file-5.42 へのアップデート。
+          <ulink url="&lfs-ticket-root;5072">#5072</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - linux-5.18.3 へのアップデート。
+          <ulink url="&lfs-ticket-root;5069">#5069</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - bc-5.3.1 へのアップデート。
+          <ulink url="&lfs-ticket-root;5071">#5071</ulink> を Fix に。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
       <para>2022-05-29</para>
       <itemizedlist>
         <listitem>

diff --git a/src/chapter01/jchangelog.ch b/src/chapter01/jchangelog.ch
index 494133c..519e557 100644 (file)
--- a/src/chapter01/jchangelog.ch
+++ b/src/chapter01/jchangelog.ch
@@ -50,6 +50,17 @@
 
 -->
    <listitem>
+      <para>2022-06-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matsuand] -
+          r11.1-135 (<ulink url="&lfs-changeset;c7b29be1c">c7b29be1c</ulink>) までの対応。
+          </para>
+        </listitem>
+      </itemizedlist>
+   </listitem>
+
+   <listitem>
       <para>2022-06-02</para>
       <itemizedlist>
         <listitem>

diff --git a/src/chapter08/dbus.ch b/src/chapter08/dbus.ch
index ef7623d..3be7e50 100644 (file)
--- a/src/chapter08/dbus.ch
+++ b/src/chapter08/dbus.ch
@@ -45,15 +45,6 @@
       <title>&MeaningOfOption1;configure&MeaningOfOption2;</title>
 @z
 
-@x --with-console-auth-dir=/run/console
-          <para>This specifies the location of the ConsoleKit authorization
-          directory.</para>
-@y
-          <para>
-          ConsoleKit の authorization ディレクトリを指定します。
-          </para>
-@z
-
 @x
           <parameter>--runstatedir=/run</parameter> and
           <parameter>--with-system-socket=/run/dbus/system_bus_socket</parameter>

diff --git a/src/general.ch b/src/general.ch
index ab98122..795f5cc 100644 (file)
--- a/src/general.ch
+++ b/src/general.ch
@@ -47,9 +47,9 @@
 <!ENTITY copyrightdate   "%crdate;">
 ]]>
 
-<!ENTITY jversion        "20220602">
-<!ENTITY jversiond       "20220602">
-<!ENTITY jcorrespondSHA  "9bc47a117"> <!-- lfs-git SHA 値； 本箇所での記載のみ -->
+<!ENTITY jversion        "20220616">
+<!ENTITY jversiond       "20220616">
+<!ENTITY jcorrespondSHA  "c7b29be1c"> <!-- lfs-git SHA 値； 本箇所での記載のみ -->
 <!ENTITY dir-jversion    "git-ja">
 <!ENTITY dir-jversiond   "git-sysdja">
 @z

diff --git a/version.ac b/version.ac
index e6697a1..ddd44eb 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-133])
+m4_define([lfs_version], [r11.1-135])