• R/O
  • HTTP
  • SSH
  • HTTPS

lfsja-git: Commit

lfsja-git


Commit MetaInfo

Revisão4adf50f2bd2a8e552932acfa2564ec4ed64cb634 (tree)
Hora2022-04-16 09:29:48
Autormatsuand <30614168+matsuand@user...>
Commitermatsuand

Mensagem de Log

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

Mudança Sumário

Diff

--- a/configure
+++ b/configure
@@ -4737,7 +4737,7 @@ fi
47374737
47384738
47394739
4740-TARGETVER=r11.1-69
4740+TARGETVER=r11.1-76
47414741 if test "x$revspec" = "xsystemd"; then
47424742 TARGETVER="$TARGETVER-systemd"
47434743 fi
--- a/src/chapter01/changelog.ch
+++ b/src/chapter01/changelog.ch
@@ -44,6 +44,48 @@
4444 @z
4545
4646 @x
47+ <para>2022-04-15</para>
48+ <itemizedlist>
49+ <listitem>
50+ <para>[ken] - Patch Xz for a security fix. Fixes
51+ <ulink url="&lfs-ticket-root;5047">#5047</ulink>.</para>
52+ </listitem>
53+ <listitem>
54+ <para>[bdubbs] - Update to libcap-2.64. Fixes
55+ <ulink url="&lfs-ticket-root;5044">#5044</ulink>.</para>
56+ </listitem>
57+ <listitem>
58+ <para>[bdubbs] - Update to linux-5.17.3. Fixes
59+ <ulink url="&lfs-ticket-root;5043">#5043</ulink>.</para>
60+ </listitem>
61+ <listitem>
62+ <para>[bdubbs] - Update to gzip-1.12. Fixes
63+ <ulink url="&lfs-ticket-root;5042">#5042</ulink>.</para>
64+ </listitem>
65+ </itemizedlist>
66+@y
67+ <para>2022-04-15</para>
68+ <itemizedlist>
69+ <listitem>
70+ <para>[ken] - Xz のセキュリティフィックスパッチ。
71+ <ulink url="&lfs-ticket-root;5047">#5047</ulink> を Fix に。</para>
72+ </listitem>
73+ <listitem>
74+ <para>[bdubbs] - libcap-2.64 へのアップデート。
75+ <ulink url="&lfs-ticket-root;5044">#5044</ulink> を Fix に。</para>
76+ </listitem>
77+ <listitem>
78+ <para>[bdubbs] - linux-5.17.3 へのアップデート。
79+ <ulink url="&lfs-ticket-root;5043">#5043</ulink> を Fix に。</para>
80+ </listitem>
81+ <listitem>
82+ <para>[bdubbs] - gzip-1.12 へのアップデート。
83+ <ulink url="&lfs-ticket-root;5042">#5042</ulink> を Fix に。</para>
84+ </listitem>
85+ </itemizedlist>
86+@z
87+
88+@x
4789 <para>2022-03-31</para>
4890 <itemizedlist>
4991 <listitem revision="sysv">
@@ -51,7 +93,7 @@
5193 <ulink url="&lfs-ticket-root;5041">#5041</ulink>.</para>
5294 </listitem>
5395 <listitem>
54- <para>[bdubbs] - Update to zlib-1.2.12. Fixes
96+ <para>[bdubbs] - Update to zlib-1.2.12 (Security Update). Fixes
5597 <ulink url="&lfs-ticket-root;5040">#5040</ulink>.</para>
5698 </listitem>
5799 <listitem>
@@ -79,7 +121,7 @@
79121 <ulink url="&lfs-ticket-root;5034">#5034</ulink>.</para>
80122 </listitem>
81123 <listitem>
82- <para>[bdubbs] - Update to linux-5.17.1. Fixes
124+ <para>[bdubbs] - Update to linux-5.17.1 (Security Update). Fixes
83125 <ulink url="&lfs-ticket-root;5033">#5033</ulink>.</para>
84126 </listitem>
85127 <listitem>
@@ -95,7 +137,7 @@
95137 <ulink url="&lfs-ticket-root;5041">#5041</ulink> を Fix に。</para>
96138 </listitem>
97139 <listitem>
98- <para>[bdubbs] - zlib-1.2.12 へのアップデート。
140+ <para>[bdubbs] - zlib-1.2.12 へのアップデート (セキュリティアップデート)。
99141 <ulink url="&lfs-ticket-root;5040">#5040</ulink> を Fix に。</para>
100142 </listitem>
101143 <listitem>
@@ -123,7 +165,7 @@
123165 <ulink url="&lfs-ticket-root;5034">#5034</ulink> を Fix に。</para>
124166 </listitem>
125167 <listitem>
126- <para>[bdubbs] - linux-5.17.1 へのアップデート。
168+ <para>[bdubbs] - linux-5.17.1 へのアップデート (セキュリティアップデート)。
127169 <ulink url="&lfs-ticket-root;5033">#5033</ulink> を Fix に。</para>
128170 </listitem>
129171 <listitem>
--- a/src/chapter01/jchangelog.ch
+++ b/src/chapter01/jchangelog.ch
@@ -50,6 +50,28 @@
5050
5151 -->
5252 <listitem>
53+ <para>2022-04-16</para>
54+ <itemizedlist>
55+ <listitem>
56+ <para>[matsuand] -
57+ r11.1-76 (<ulink url="&lfs-changeset;1d694184b">1d694184b</ulink>) までの対応。
58+ </para>
59+ </listitem>
60+ </itemizedlist>
61+ </listitem>
62+
63+ <listitem>
64+ <para>2022-04-13</para>
65+ <itemizedlist>
66+ <listitem>
67+ <para>[matsuand] -
68+ r11.1-73 (<ulink url="&lfs-changeset;b861051f1">b861051f1</ulink>) までの対応。
69+ </para>
70+ </listitem>
71+ </itemizedlist>
72+ </listitem>
73+
74+ <listitem>
5375 <para>2022-03-31</para>
5476 <itemizedlist>
5577 <listitem>
--- 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</
227227 @x
228228 The <filename>wget-list</filename> file mentioned above retrieves all
229229 packages for both the sysV and systemd versions of LFS. There are a total
230- of five additional small packages not needed for the currrent book. The
230+ of five additional small packages not needed for the current book. The
231231 <filename>md5sums</filename> file mentioned below is specific to the
232232 current book.
233233 @y
--- a/src/chapter03/patches.ch
+++ b/src/chapter03/patches.ch
@@ -127,6 +127,18 @@
127127 <para>&Download;: <ulink url="&patches-root;&systemd-upstream-fixes-patch;"/></para>
128128 @z
129129
130+@x Systemd Kernel Fixes Patch
131+ <para>Download: <ulink url="&patches-root;&systemd-kernel-fixes-patch;"/></para>
132+@y
133+ <para>&Download;: <ulink url="&patches-root;&systemd-kernel-fixes-patch;"/></para>
134+@z
135+
136+@x Xz Upstream Fix Patch
137+ <para>Download: <ulink url="&patches-root;&xz-upstream-fix-patch;"/></para>
138+@y
139+ <para>&Download;: <ulink url="&patches-root;&xz-upstream-fix-patch;"/></para>
140+@z
141+
130142 @x Zstd Upstream Fixes Patch
131143 <para>Download: <ulink url="&patches-root;&zstd-upstream-fixes-patch;"/></para>
132144 @y
--- a/src/chapter08/perl.ch
+++ b/src/chapter08/perl.ch
@@ -138,14 +138,13 @@
138138 </para>
139139 @z
140140
141-%@x
142-% <note><para>One test fails due to using the most recent version of gdbm.
143-% </para></note>
144-%@y
145-% <note><para>
146-% gdbm の最新バージョンを用いていることから、テストが 1 つ失敗します。
147-% </para></note>
148-%@z
141+@x
142+ <para>Nine tests fail due to using the most recent version of zlib.</para>
143+@y
144+ <para>
145+ zlib の最新バージョンを用いていることから、9 つのテストが失敗します。
146+ </para>
147+@z
149148
150149 @x
151150 <para>Install the package and clean up:</para>
--- a/src/chapter08/procps.ch
+++ b/src/chapter08/procps.ch
@@ -18,23 +18,6 @@
1818 @z
1919
2020 @x
21- <note>
22- <para>This package extracts to the directory
23- <filename class="directory">procps-3.3.17</filename>,
24- not the expected
25- <filename class="directory">procps-ng-3.3.17</filename>.</para>
26- </note>
27-@y
28- <note>
29- <para>
30- 本パッケージのソースは <filename
31- class="directory">procps-3.3.17</filename> ディレクトリへ伸長(解凍)されます。
32- <filename class="directory">procps-ng-3.3.17</filename> ではないので注意してください。
33- </para>
34- </note>
35-@z
36-
37-@x
3821 <title>Installation of Procps-ng</title>
3922 @y
4023 <title>&InstallationOf1;Procps-ng&InstallationOf2;</title>
@@ -124,13 +107,13 @@
124107 @x
125108 <seg>free, pgrep, pidof, pkill, pmap, ps, pwdx, slabtop,
126109 sysctl, tload, top, uptime, vmstat, w, and watch</seg>
127- <seg>libprocps.so</seg>
128- <seg>/usr/include/proc and /usr/share/doc/procps-ng-&procps-ng-version;</seg>
110+ <seg>libproc-2.so</seg>
111+ <seg>/usr/include/procps and /usr/share/doc/procps-ng-&procps-ng-version;</seg>
129112 @y
130113 <seg>free, pgrep, pidof, pkill, pmap, ps, pwdx, slabtop,
131114 sysctl, tload, top, uptime, vmstat, w, watch</seg>
132- <seg>libprocps.so</seg>
133- <seg>/usr/include/proc, /usr/share/doc/procps-ng-&procps-ng-version;</seg>
115+ <seg>libproc-2.so</seg>
116+ <seg>/usr/include/procps, /usr/share/doc/procps-ng-&procps-ng-version;</seg>
134117 @z
135118
136119 @x
@@ -279,7 +262,7 @@
279262 </para>
280263 @z
281264
282-@x libproc
265+@x libproc-2
283266 <para>Contains the functions used by most programs in this
284267 package</para>
285268 @y
--- a/src/chapter08/systemd.ch
+++ b/src/chapter08/systemd.ch
@@ -34,6 +34,15 @@
3434 @z
3535
3636 @x
37+ <para>Now, apply a patch to fix a problem with the linux kernel's headers in
38+ version 5.17 and later:</para>
39+@y
40+ <para>
41+ また linux カーネルヘッダー、バージョン 5.17 以降に対する問題の修正のため、以下のパッチを適用します。
42+ version 5.17 and later:</para>
43+@z
44+
45+@x
3746 <para>Remove two unneeded groups,
3847 <systemitem class="groupname">render</systemitem> and
3948 <systemitem class="groupname">sgx</systemitem>, from the default udev
--- a/src/chapter08/util-linux.ch
+++ b/src/chapter08/util-linux.ch
@@ -75,9 +75,9 @@
7575 @z
7676
7777 @x
78- <note><para>There is one test that fails in the chroot envronment and
78+ <note><para>There is one test that fails in the chroot environment and
7979 causes the tests to hang forever. The problem does not occur outside
80- of the chroot envronment.
80+ of the chroot environment.
8181 To work around the problem, delete the test:</para>
8282 @y
8383 <note><para>
--- a/src/chapter08/xz.ch
+++ b/src/chapter08/xz.ch
@@ -30,6 +30,14 @@
3030 @z
3131
3232 @x
33+ <para>Apply a patch to fix an issue in xzgrep:</para>
34+@y
35+ <para>
36+ xzgrep における問題を修正するためのパッチを適用します。
37+ </para>
38+@z
39+
40+@x
3341 <para>Prepare Xz for compilation with:</para>
3442 @y
3543 <para>&PreparePackage1;Xz&PreparePackage2;</para>
--- a/src/general.ch
+++ b/src/general.ch
@@ -47,9 +47,9 @@
4747 <!ENTITY copyrightdate "%crdate;">
4848 ]]>
4949
50-<!ENTITY jversion "20220331">
51-<!ENTITY jversiond "20220331">
52-<!ENTITY jcorrespondSHA "676f0fdce"> <!-- lfs-git SHA 値; 本箇所での記載のみ -->
50+<!ENTITY jversion "20220416">
51+<!ENTITY jversiond "20220416">
52+<!ENTITY jcorrespondSHA "1d694184b"> <!-- lfs-git SHA 値; 本箇所での記載のみ -->
5353 <!ENTITY dir-jversion "git-ja">
5454 <!ENTITY dir-jversiond "git-sysdja">
5555 @z
--- a/version.ac
+++ b/version.ac
@@ -2,4 +2,4 @@ dnl
22 dnl This is part of LFSbookja package.
33 dnl
44 dnl m4-include this file to define the current LFS version
5-m4_define([lfs_version], [r11.1-69])
5+m4_define([lfs_version], [r11.1-76])
Show on old repository browser