OSDN > ソフトウェアを探す > システム > OS配布 > LFSブック日本語版 > SCM > git > lfsja-git > コミット

LFSブック日本語版
Fork

R/O
HTTP
SSH
HTTPS

lfsja-git: コミット

lfsja-git

コミットメタ情報

リビジョン	5dd513e9ade9eb5ff893377459ae0a8a3a94da74 (tree)
日時	2021-07-12 20:17:53
作者	matsuand <30614168+matsuand@user...>
コミッター	matsuand

ログメッセージ

[lfsja-git] r10.1-120 対応。

変更サマリ

modified: configure (diff)
modified: src/appendices/dependencies.ch (diff)
modified: src/chapter01/jchangelog.ch (diff)
modified: src/chapter08/grub.ch (diff)
modified: src/chapter08/util-linux.ch (diff)
modified: src/general.ch (diff)
modified: version.ac (diff)

差分

--- a/configure

+++ b/configure

		@@ -4720,7 +4720,7 @@ fi
4720	4720
4721	4721
4722	4722
4723		-TARGETVER=r10.1-106
	4723	+TARGETVER=r10.1-120
4724	4724
4725	4725	(cd ${bookdir} && sh git-version.sh)
4726	4726	if test -f ${bookdir}/version.ent; then

--- a/src/appendices/dependencies.ch

+++ b/src/appendices/dependencies.ch

		@@ -43,23 +43,25 @@
43	43	@z
44	44
45	45	@x
46		- <para>For each package we build, we have listed three, and sometimes four,
47		- types of dependencies. The first lists what other packages need to be
48		- available in order to compile and install the package in question. The second
49		- lists what packages, in addition to those on the first list, need to be
50		- available in order to run the test suites. The third list of dependencies are
51		- packages that require this package to be built and installed in its final
52		- location before they are built and installed. In most cases, this is because
53		- these packages will hard code paths to binaries within their scripts. If not
54		- built in a certain order, this could result in paths of /tools/bin/[binary]
55		- being placed inside scripts installed to the final system. This is obviously
56		- not desirable.</para>
	46	+ <para>For each package that is built, there are three, and sometimes up to
	47	+ five types of dependencies listed below. The first lists what other packages
	48	+ need to be available in order to compile and install the package in question.
	49	+ The second lists the packages that must be available when any programs or
	50	+ libraries from the package are used at runtime. The third lists what packages,
	51	+ in addition to those on the first list, need to be available in order to run
	52	+ the test suites. The fourth list of dependencies are packages that require
	53	+ this package to be built and installed in its final location before they are
	54	+ built and installed. In most cases, this is because these packages will hard
	55	+ code paths to binaries within their scripts. If not built in a certain order,
	56	+ this could result in paths of /tools/bin/[binary] being placed inside scripts
	57	+ installed to the final system. This is obviously not desirable.</para>
57	58	@y
58	59	<para>
59		- ビルドするパッケージの個々には、3種類あるいは4種類の依存関係を示しています。
60		- 1つめは対象パッケージをコンパイルしてビルドするために必要となるパッケージです。
61		- 2つめは一つめのものに加えて、テストスイートを実行するために必要となるパッケージです。
62		- 3つめは対象パッケージをビルドし、最終的にインストールするために必要となるパッケージです。
	60	+ ビルドするパッケージの個々には、3 種類あるいは、最大で 5 種類の依存関係を示しています。
	61	+ 1 つめは、対象パッケージをコンパイルしてビルドするために必要となるパッケージです。
	62	+ 2 つめは、対象パッケージのプログラムやライブラリが、実行時にその利用を必要とするパッケージです。
	63	+ 3 つめは、1 つめのものに加えて、テストスイートを実行するために必要となるパッケージです。
	64	+ 4 つめ以降は、対象パッケージをビルドし、最終的にインストールするために必要となるパッケージです。
63	65	たいていの場合、それらのパッケージに含まれているスクリプトが、実行モジュールへのパスを固定的に取り扱っています。
64	66	所定の順番どおりにパッケージのビルドを行わないと、最終的にインストールされるシステムにおいて、スクリプトの中に /tools/bin/[実行モジュール] といったパスが含まれてしまうことになりかねません。
65	67	これは明らかに不適切なことです。

		@@ -68,10 +70,10 @@
68	70
69	71	@x
70	72	<para>The last list of dependencies are optional packages that are not
71		- addressed in LFS, but could be useful to the user. These packages may have
72		- additional mandatory or optional dependencies of their own. For these
	73	+ addressed in LFS, but could be useful to the user. These packages may have
	74	+ additional mandatory or optional dependencies of their own. For these
73	75	dependencies, the recommended practice is to install them after completion of
74		- the LFS book and then go back and rebuild the LFS package. In several cases,
	76	+ the LFS book and then go back and rebuild the LFS package. In several cases,
75	77	re-installation is addressed in BLFS.</para>
76	78	@y
77	79	<para>

		@@ -85,16 +87,23 @@
85	87
86	88	%----------------------------------------------------------------------
87	89	@x acl
88		- <seg>Attr, Bash, Binutils, Coreutils, GCC, Gettext, Grep, M4, Make,
	90	+ <seg>Attr, Bash, Binutils, Coreutils, GCC, Gettext, Grep, M4, Make,
89	91	Perl, Sed, and Texinfo</seg>
90	92	@y
91		- <seg>Attr, Bash, Binutils, Coreutils, GCC, Gettext, Grep, M4, Make,
	93	+ <seg>Attr, Bash, Binutils, Coreutils, GCC, Gettext, Grep, M4, Make,
92	94	Perl, Sed, Texinfo</seg>
93	95	@z
94	96	@x
95		- <seg>Automake, Diffutils, Findutils, and Libtool</seg>
	97	+ <seg>Attr and Glibc</seg>
96	98	@y
97		- <seg>Automake, Diffutils, Findutils, Libtool</seg>
	99	+ <seg>Attr, Glibc</seg>
	100	+@z
	101	+@x
	102	+ <seg>Automake, Diffutils, Findutils, and
	103	+ Libtool</seg>
	104	+@y
	105	+ <seg>Automake, Diffutils, Findutils,
	106	+ Libtool</seg>
98	107	@z
99	108	@x
100	109	<seg>Coreutils, Sed, Tar, and Vim</seg>

		@@ -109,13 +118,18 @@
109	118
110	119	%----------------------------------------------------------------------
111	120	@x attr
112		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Grep, M4, Make,
	121	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, M4, Make,
113	122	Perl, Sed, and Texinfo</seg>
114	123	@y
115		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Grep, M4, Make,
	124	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, M4, Make,
116	125	Perl, Sed, Texinfo</seg>
117	126	@z
118	127	@x
	128	+ <seg>Glibc</seg>
	129	+@y
	130	+ <seg>Glibc</seg>
	131	+@z
	132	+@x
119	133	<seg>Automake, Diffutils, Findutils, and Libtool</seg>
120	134	@y
121	135	<seg>Automake, Diffutils, Findutils, Libtool</seg>

		@@ -138,18 +152,38 @@
138	152	<seg>Bash, Coreutils, Grep, M4, Make, Perl, Sed, Texinfo</seg>
139	153	@z
140	154	@x
	155	+ <seg>Bash, Coreutils, Grep, M4, Make, Sed, and Texinfo</seg>
	156	+@y
	157	+ <seg>Bash, Coreutils, Grep, M4, Make, Sed, Texinfo</seg>
	158	+@z
	159	+@x
141	160	<seg>Automake, Diffutils, Findutils, GCC, and Libtool</seg>
142	161	@y
143	162	<seg>Automake, Diffutils, Findutils, GCC, Libtool</seg>
144	163	@z
	164	+@x
	165	+ <seg>Automake</seg>
	166	+@y
	167	+ <seg>Automake</seg>
	168	+@z
	169	+@x
	170	+ <ulink url="&blfs-book;postlfs/emacs.html">Emacs</ulink>
	171	+@y
	172	+ <ulink url="&blfs-book;postlfs/emacs.html">Emacs</ulink>
	173	+@z
145	174
146	175	%----------------------------------------------------------------------
147	176	@x automake
148		- <seg>Autoconf, Bash, Coreutils, Gettext, Grep, M4, Make, Perl,
149		- Sed, and Texinfo</seg>
	177	+ <seg>Autoconf, Bash, Coreutils, Gettext, Grep, M4, Make, Perl, Sed,
	178	+ and Texinfo</seg>
150	179	@y
151		- <seg>Autoconf, Bash, Coreutils, Gettext, Grep, M4, Make, Perl,
152		- Sed, Texinfo</seg>
	180	+ <seg>Autoconf, Bash, Coreutils, Gettext, Grep, M4, Make, Perl, Sed,
	181	+ Texinfo</seg>
	182	+@z
	183	+@x
	184	+ <seg>Bash, Coreutils, Grep, M4, Sed, and Texinfo</seg>
	185	+@y
	186	+ <seg>Bash, Coreutils, Grep, M4, Sed, Texinfo</seg>
153	187	@z
154	188	@x
155	189	<seg>Binutils, Bison, Bzip2, DejaGNU, Diffutils, Expect, Findutils,

		@@ -178,18 +212,36 @@
178	212	Grep, Make, Ncurses, Patch, Readline, Sed, Texinfo</seg>
179	213	@z
180	214	@x
	215	+ <seg>Glibc, Ncurses, and Readline</seg>
	216	+@y
	217	+ <seg>Glibc, Ncurses, Readline</seg>
	218	+@z
	219	+@x
	220	+ <seg>Shadow</seg>
	221	+@y
	222	+ <seg>Shadow</seg>
	223	+@z
	224	+@x
181	225	<seg>None</seg>
182	226	@y
183	227	<seg>なし</seg>
184	228	@z
	229	+@x
	230	+ <ulink url="&blfs-book;x/installing.html">Xorg</ulink>
	231	+@y
	232	+ <ulink url="&blfs-book;x/installing.html">Xorg</ulink>
	233	+@z
185	234
186	235	%----------------------------------------------------------------------
187	236	@x bc
188		- <seg>Bash, Binutils, Coreutils, GCC, Glibc,
189		- Grep, and Make</seg>
	237	+ <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, and Make</seg>
190	238	@y
191		- <seg>Bash, Binutils, Coreutils, GCC, Glibc,
192		- Grep, Make</seg>
	239	+ <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make</seg>
	240	+@z
	241	+@x
	242	+ <seg>Glibc, Ncurses, and Readline</seg>
	243	+@y
	244	+ <seg>Glibc, Ncurses, Readline</seg>
193	245	@z
194	246	@x
195	247	<seg>Gawk</seg>

		@@ -197,9 +249,9 @@
197	249	<seg>Gawk</seg>
198	250	@z
199	251	@x
200		- <seg>Linux Kernel</seg>
	252	+ <seg>Linux</seg>
201	253	@y
202		- <seg>Linux カーネル</seg>
	254	+ <seg>Linux</seg>
203	255	@z
204	256	@x
205	257	<seg>None</seg>

		@@ -209,11 +261,16 @@
209	261
210	262	%----------------------------------------------------------------------
211	263	@x binutils
212		- <seg>Bash, Binutils, Coreutils, Diffutils, File, Flex, Gawk, GCC, Glibc,
213		- Grep, Make, Perl, Sed, Texinfo, and Zlib</seg>
	264	+ <seg>Bash, Binutils, Coreutils, Diffutils, File, Flex, Gawk, GCC,
	265	+ Glibc, Grep, Make, Perl, Sed, Texinfo, and Zlib</seg>
	266	+@y
	267	+ <seg>Bash, Binutils, Coreutils, Diffutils, File, Flex, Gawk, GCC,
	268	+ Glibc, Grep, Make, Perl, Sed, Texinfo, Zlib</seg>
	269	+@z
	270	+@x
	271	+ <seg>Glibc and Zlib</seg>
214	272	@y
215		- <seg>Bash, Binutils, Coreutils, Diffutils, File, Flex, Gawk, GCC, Glibc,
216		- Grep, Make, Perl, Sed, Texinfo, Zlib</seg>
	273	+ <seg>Glibc, Zlib</seg>
217	274	@z
218	275	@x
219	276	<seg>DejaGNU and Expect</seg>

		@@ -226,18 +283,23 @@
226	283	<seg>なし</seg>
227	284	@z
228	285	@x
229		- <seg>Debuginfod</seg>
	286	+ <ulink url="https://sourceware.org/elfutils/">Elfutils</ulink>
230	287	@y
231		- <seg>Debuginfod</seg>
	288	+ <ulink url="https://sourceware.org/elfutils/">Elfutils</ulink>
232	289	@z
233	290
234	291	%----------------------------------------------------------------------
235	292	@x bison
236		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc,
237		- Grep, M4, Make, Perl, and Sed</seg>
	293	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, M4, Make,
	294	+ Perl, and Sed</seg>
238	295	@y
239		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc,
240		- Grep, M4, Make, Perl, Sed</seg>
	296	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, M4, Make,
	297	+ Perl, Sed</seg>
	298	+@z
	299	+@x
	300	+ <seg>Glibc</seg>
	301	+@y
	302	+ <seg>Glibc</seg>
241	303	@z
242	304	@x
243	305	<seg>Diffutils, Findutils, and Flex</seg>

		@@ -250,18 +312,23 @@
250	312	<seg>Kbd, Tar</seg>
251	313	@z
252	314	@x
253		- <seg>Doxygen (test suite)</seg>
	315	+ <ulink url="&blfs-book;general/doxygen.html">Doxygen</ulink>
254	316	@y
255		- <seg>Doxygen (テストスイート用)</seg>
	317	+ <ulink url="&blfs-book;general/doxygen.html">Doxygen</ulink>
256	318	@z
257	319
258	320	%----------------------------------------------------------------------
259	321	@x bzip2
260		- <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Make,
261		- and Patch</seg>
	322	+ <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Make, and
	323	+ Patch</seg>
	324	+@y
	325	+ <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Make,
	326	+ Patch</seg>
	327	+@z
	328	+@x
	329	+ <seg>Glibc</seg>
262	330	@y
263		- <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Make,
264		- Patch</seg>
	331	+ <seg>Glibc</seg>
265	332	@z
266	333	@x
267	334	<seg>None</seg>

		@@ -281,9 +348,14 @@
281	348
282	349	%----------------------------------------------------------------------
283	350	@x Check
284		- <seg>GCC, Grep, Make, Sed, and Texinfo</seg>
	351	+ <seg>Gawk, GCC, Grep, Make, Sed, and Texinfo</seg>
285	352	@y
286		- <seg>GCC, Grep, Make, Sed, Texinfo</seg>
	353	+ <seg>Gawk, GCC, Grep, Make, Sed, Texinfo</seg>
	354	+@z
	355	+@x
	356	+ <seg>Bash and Gawk</seg>
	357	+@y
	358	+ <seg>Bash, Gawk</seg>
287	359	@z
288	360	@x
289	361	<seg>None</seg>

		@@ -303,14 +375,19 @@
303	375
304	376	%----------------------------------------------------------------------
305	377	@x coreutils
306		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Libcap,
307		- Make, Patch, Perl, Sed, and Texinfo</seg>
	378	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep,
	379	+ Libcap, Make, Patch, Perl, Sed, and Texinfo</seg>
308	380	@y
309		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Libcap,
310		- Make, Patch, Perl, Sed, Texinfo</seg>
	381	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep,
	382	+ Libcap, Make, Patch, Perl, Sed, Texinfo</seg>
311	383	@z
312	384	@x
313		- <seg>Diffutils, E2fsprogs, Findutils, Shadow, and Util-linux</seg>
	385	+ <seg>Glibc</seg>
	386	+@y
	387	+ <seg>Glibc</seg>
	388	+@z
	389	+@x
	390	+ <seg>Diffutils, E2fsprogs, Findutils, Shadow, and Util-linux</seg>
314	391	@y
315	392	<seg>Diffutils, E2fsprogs, Findutils, Shadow, Util-linux</seg>
316	393	@z

		@@ -320,16 +397,37 @@
320	397	<seg>Bash, Diffutils, Eudev, Findutils, Man-DB</seg>
321	398	@z
322	399	@x
323		- <seg>Perl Expect and IO:Tty modules (for test suite)</seg>
	400	+ <seg>
	401	+ <ulink url="https://metacpan.org/pod/Expect">Expect.pm</ulink>
	402	+ and
	403	+ <ulink url="https://metacpan.org/pod/IO::Tty">IO::Tty</ulink>
	404	+ </seg>
	405	+@y
	406	+ <seg>
	407	+ <ulink url="https://metacpan.org/pod/Expect">Expect.pm</ulink>,
	408	+ <ulink url="https://metacpan.org/pod/IO::Tty">IO::Tty</ulink>
	409	+ </seg>
	410	+@z
	411	+@x
	412	+ <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
	413	+ Make, Sed, and Util-linux</seg>
324	414	@y
325		- <seg>Perl Expect と IO:Tty モジュール (テストスイート用)</seg>
	415	+ <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
	416	+ Make, Sed, Util-linux</seg>
326	417	@z
327	418
328	419	%----------------------------------------------------------------------
329	420	@x DejaGNU
330		- <seg>Bash, Coreutils, Diffutils, GCC, Grep, Make, Sed, and Texinfo</seg>
	421	+ <seg>Bash, Coreutils, Diffutils, Expect, GCC, Grep, Make, Sed, and
	422	+ Texinfo</seg>
	423	+@y
	424	+ <seg>Bash, Coreutils, Diffutils, Expect, GCC, Grep, Make, Sed,
	425	+ Texinfo</seg>
	426	+@z
	427	+@x
	428	+ <seg>Expect and Bash</seg>
331	429	@y
332		- <seg>Bash, Coreutils, Diffutils, GCC, Grep, Make, Sed, Texinfo</seg>
	430	+ <seg>Expect, Bash</seg>
333	431	@z
334	432	@x
335	433	<seg>None</seg>

		@@ -356,6 +454,11 @@
356	454	Make, Sed, Texinfo</seg>
357	455	@z
358	456	@x
	457	+ <seg>Glibc</seg>
	458	+@y
	459	+ <seg>Glibc</seg>
	460	+@z
	461	+@x
359	462	<seg>Perl</seg>
360	463	@y
361	464	<seg>Perl</seg>

		@@ -373,11 +476,16 @@
373	476
374	477	%----------------------------------------------------------------------
375	478	@x E2fsprogs
376		- <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
377		- Gzip, Make, Sed, Texinfo, and Util-linux</seg>
	479	+ <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
	480	+ Gzip, Make, Sed, Texinfo, and Util-linux</seg>
	481	+@y
	482	+ <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
	483	+ Gzip, Make, Sed, Texinfo, Util-linux</seg>
	484	+@z
	485	+@x
	486	+ <seg>Glibc and Util-linux</seg>
378	487	@y
379		- <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
380		- Gzip, Make, Sed, Texinfo, Util-linux</seg>
	488	+ <seg>Glibc, Util-linux</seg>
381	489	@z
382	490	@x
383	491	<seg>Procps-ng and Psmisc</seg>

		@@ -397,11 +505,16 @@
397	505
398	506	%----------------------------------------------------------------------
399	507	@x Eudev
400		- <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Gperf,
401		- Make, Sed, and Util-linux</seg>
	508	+ <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Gperf, Make,
	509	+ Sed, and Util-linux</seg>
402	510	@y
403		- <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Gperf,
404		- Make, Sed, Util-linux</seg>
	511	+ <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Gperf, Make,
	512	+ Sed, Util-linux</seg>
	513	+@z
	514	+@x
	515	+ <seg>Glibc, Kmod, Xz, Util-linux, and Zlib.</seg>
	516	+@y
	517	+ <seg>Glibc, Kmod, Xz, Util-linux, Zlib</seg>
405	518	@z
406	519	@x
407	520	<seg>None</seg>

		@@ -421,11 +534,16 @@
421	534
422	535	%----------------------------------------------------------------------
423	536	@x Expat
424		- <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep,
425		- Make, and Sed</seg>
	537	+ <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, and
	538	+ Sed</seg>
	539	+@y
	540	+ <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make,
	541	+ Sed</seg>
	542	+@z
	543	+@x
	544	+ <seg>Glibc</seg>
426	545	@y
427		- <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep,
428		- Make, Sed</seg>
	546	+ <seg>Glibc</seg>
429	547	@z
430	548	@x
431	549	<seg>None</seg>

		@@ -450,11 +568,16 @@
450	568	<!-- Begin Expect dependency info -->
451	569	@z
452	570	@x
453		- <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
454		- Patch, Sed, and Tcl</seg>
	571	+ <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
	572	+ Patch, Sed, and Tcl</seg>
455	573	@y
456		- <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
457		- Patch, Sed, Tcl</seg>
	574	+ <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
	575	+ Patch, Sed, Tcl</seg>
	576	+@z
	577	+@x
	578	+ <seg>Glibc and Tcl</seg>
	579	+@y
	580	+ <seg>Glibc, Tcl</seg>
458	581	@z
459	582	@x
460	583	<seg>None</seg>

		@@ -468,11 +591,11 @@
468	591	@z
469	592	@x
470	593	<seg>
471		- <ulink url="&blfs-root;view/stable/general/tk.html">tk</ulink>
	594	+ <ulink url="&blfs-book;general/tk.html">Tk</ulink>
472	595	</seg>
473	596	@y
474	597	<seg>
475		- <ulink url="&blfs-root;view/stable/general/tk.html">tk</ulink>
	598	+ <ulink url="&blfs-book;general/tk.html">Tk</ulink>
476	599	</seg>
477	600	@z
478	601

		@@ -490,6 +613,11 @@
490	613	Grep, Make, Sed, Xz, Zlib</seg>
491	614	@z
492	615	@x
	616	+ <seg>Glibc, Bzip2, Xz, and Zlib</seg>
	617	+@y
	618	+ <seg>Glibc, Bzip2, Xz, Zlib</seg>
	619	+@z
	620	+@x
493	621	<seg>None</seg>
494	622	@y
495	623	<seg>なし</seg>

		@@ -500,18 +628,23 @@
500	628	<seg>なし</seg>
501	629	@z
502	630	@x
503		- <ulink url="&blfs-root;/view/stable/general/libseccomp.html">Libseccomp</ulink>
	631	+ <ulink url="&blfs-book;general/libseccomp.html">libseccomp</ulink>
504	632	@y
505		- <ulink url="&blfs-root;/view/stable/general/libseccomp.html">Libseccomp</ulink>
	633	+ <ulink url="&blfs-book;general/libseccomp.html">libseccomp</ulink>
506	634	@z
507	635
508	636	%----------------------------------------------------------------------
509	637	@x Findutils
510		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
511		- Sed, and Texinfo</seg>
	638	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make, Sed,
	639	+ and Texinfo</seg>
512	640	@y
513		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
514		- Sed, Texinfo</seg>
	641	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make, Sed,
	642	+ Texinfo</seg>
	643	+@z
	644	+@x
	645	+ <seg>Bash and Glibc</seg>
	646	+@y
	647	+ <seg>Bash, Glibc</seg>
515	648	@z
516	649	@x
517	650	<seg>DejaGNU, Diffutils, and Expect</seg>

		@@ -531,11 +664,16 @@
531	664
532	665	%----------------------------------------------------------------------
533	666	@x Flex
534		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, M4, Make,
535		- Patch, Sed, and Texinfo</seg>
	667	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, M4, Make,
	668	+ Patch, Sed, and Texinfo</seg>
	669	+@y
	670	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, M4, Make,
	671	+ Patch, Sed, Texinfo</seg>
	672	+@z
	673	+@x
	674	+ <seg>Bash, Glibc, and M4</seg>
536	675	@y
537		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, M4, Make,
538		- Patch, Sed, Texinfo</seg>
	676	+ <seg>Bash, Glibc, M4</seg>
539	677	@z
540	678	@x
541	679	<seg>Bison and Gawk</seg>

		@@ -555,11 +693,16 @@
555	693
556	694	%----------------------------------------------------------------------
557	695	@x Gawk
558		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Make,
559		- MPFR, Patch, Readline, Sed, and Texinfo</seg>
	696	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Make,
	697	+ MPFR, Patch, Readline, Sed, and Texinfo</seg>
560	698	@y
561		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Make,
562		- MPFR, Patch, Readline, Sed, Texinfo</seg>
	699	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Make,
	700	+ MPFR, Patch, Readline, Sed, Texinfo</seg>
	701	+@z
	702	+@x
	703	+ <seg>Bash, Glibc, and Mpfr</seg>
	704	+@y
	705	+ <seg>Bash, Glibc, Mpfr</seg>
563	706	@z
564	707	@x
565	708	<seg>Diffutils</seg>

		@@ -572,20 +715,25 @@
572	715	<seg>なし</seg>
573	716	@z
574	717	@x
575		- <seg>libsigsegv</seg>
	718	+ <ulink url="&blfs-book;general/libsigsegv.html">libsigsegv</ulink>
576	719	@y
577		- <seg>libsigsegv</seg>
	720	+ <ulink url="&blfs-book;general/libsigsegv.html">libsigsegv</ulink>
578	721	@z
579	722
580	723	%----------------------------------------------------------------------
581	724	@x Gcc
582		- <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
583		- Gettext, Glibc, GMP, Grep, M4, Make, MPC, MPFR, Patch, Perl, Sed, Tar,
584		- Texinfo, and Zstd</seg>
	725	+ <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
	726	+ Gettext, Glibc, GMP, Grep, M4, Make, MPC, MPFR, Patch, Perl, Sed,
	727	+ Tar, Texinfo, and Zstd</seg>
	728	+@y
	729	+ <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
	730	+ Gettext, Glibc, GMP, Grep, M4, Make, MPC, MPFR, Patch, Perl, Sed,
	731	+ Tar, Texinfo, Zstd</seg>
	732	+@z
	733	+@x
	734	+ <seg>Bash, Binutils, Glibc, Mpc, and Python</seg>
585	735	@y
586		- <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
587		- Gettext, Glibc, GMP, Grep, M4, Make, MPC, MPFR, Patch, Perl, Sed, Tar,
588		- Texinfo, Zstd</seg>
	736	+ <seg>Bash, Binutils, Glibc, Mpc, Python</seg>
589	737	@z
590	738	@x
591	739	<seg>DejaGNU, Expect, and Shadow</seg>

		@@ -598,20 +746,28 @@
598	746	<seg>なし</seg>
599	747	@z
600	748	@x
601		- <seg><ulink url="http://gcc.gnu.org/wiki/GNAT">GNAT</ulink> and
602		- <ulink url="https://repo.or.cz/isl.git">ISL</ulink>
	749	+ <seg>
	750	+ <ulink url="http://gcc.gnu.org/wiki/GNAT">GNAT</ulink>
	751	+ and
	752	+ <ulink url="https://repo.or.cz/isl.git">ISL</ulink>
603	753	@y
604		- <seg><ulink url="http://gcc.gnu.org/wiki/GNAT">GNAT</ulink>,
605		- <ulink url="https://repo.or.cz/isl.git">ISL</ulink>
	754	+ <seg>
	755	+ <ulink url="http://gcc.gnu.org/wiki/GNAT">GNAT</ulink>,
	756	+ <ulink url="https://repo.or.cz/isl.git">ISL</ulink>
606	757	@z
607	758
608	759	%----------------------------------------------------------------------
609	760	@x GDBM
610		- <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Grep, Make,
611		- and Sed</seg>
	761	+ <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Grep, Make, and
	762	+ Sed</seg>
612	763	@y
613		- <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Grep, Make,
614		- Sed</seg>
	764	+ <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Grep, Make,
	765	+ Sed</seg>
	766	+@z
	767	+@x
	768	+ <seg>Bash, Glibc, and Readline</seg>
	769	+@y
	770	+ <seg>Bash, Glibc, Readline</seg>
615	771	@z
616	772	@x
617	773	<seg>None</seg>

		@@ -631,11 +787,16 @@
631	787
632	788	%----------------------------------------------------------------------
633	789	@x Gettext
634		- <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make,
635		- Ncurses, Sed, and Texinfo</seg>
	790	+ <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, Ncurses,
	791	+ Sed, and Texinfo</seg>
	792	+@y
	793	+ <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, Ncurses,
	794	+ Sed, Texinfo</seg>
	795	+@z
	796	+@x
	797	+ <seg>Acl, Bash, Gcc, and Glibc</seg>
636	798	@y
637		- <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make,
638		- Ncurses, Sed, Texinfo</seg>
	799	+ <seg>Acl, Bash, Gcc, Glibc</seg>
639	800	@z
640	801	@x
641	802	<seg>Diffutils, Perl, and Tcl</seg>

		@@ -660,11 +821,18 @@
660	821	<!-- Begin Glibc dependency info -->
661	822	@z
662	823	@x
663		- <seg>Bash, Binutils, Bison, Coreutils, Diffutils, Gawk, GCC, Gettext,
664		- Grep, Gzip, Linux API Headers, Make, Perl, Python, Sed, and Texinfo</seg>
	824	+ <seg>Bash, Binutils, Bison, Coreutils, Diffutils, Gawk, GCC, Gettext,
	825	+ Grep, Gzip, Linux API Headers, Make, Perl, Python, Sed, and
	826	+ Texinfo</seg>
665	827	@y
666		- <seg>Bash, Binutils, Bison, Coreutils, Diffutils, Gawk, GCC, Gettext,
667		- Grep, Gzip, Linux API ヘッダー, Make, Perl, Python, Sed, Texinfo</seg>
	828	+ <seg>Bash, Binutils, Bison, Coreutils, Diffutils, Gawk, GCC, Gettext,
	829	+ Grep, Gzip, Linux API ヘッダー, Make, Perl, Python, Sed,
	830	+ Texinfo</seg>
	831	+@z
	832	+@x
	833	+ <seg>None</seg>
	834	+@y
	835	+ <seg>なし</seg>
668	836	@z
669	837	@x
670	838	<seg>File</seg>

		@@ -684,11 +852,16 @@
684	852
685	853	%----------------------------------------------------------------------
686	854	@x GMP
687		- <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
688		- M4, Make, Sed, and Texinfo</seg>
	855	+ <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, M4,
	856	+ Make, Sed, and Texinfo</seg>
689	857	@y
690		- <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
691		- M4, Make, Sed, Texinfo</seg>
	858	+ <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, M4,
	859	+ Make, Sed, Texinfo</seg>
	860	+@z
	861	+@x
	862	+ <seg>GCC and Glibc</seg>
	863	+@y
	864	+ <seg>GCC, Glibc</seg>
692	865	@z
693	866	@x
694	867	<seg>None</seg>

		@@ -713,6 +886,11 @@
713	886	<seg>Bash, Binutils, Coreutils, GCC, Glibc, Make</seg>
714	887	@z
715	888	@x
	889	+ <seg>GCC and Glibc</seg>
	890	+@y
	891	+ <seg>GCC, Glibc</seg>
	892	+@z
	893	+@x
716	894	<seg>Diffutils and Expect</seg>
717	895	@y
718	896	<seg>Diffutils, Expect</seg>

		@@ -730,11 +908,16 @@
730	908
731	909	%----------------------------------------------------------------------
732	910	@x Grep
733		- <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, Grep,
734		- Make, Patch, Sed, and Texinfo</seg>
	911	+ <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, Grep,
	912	+ Make, Patch, Sed, and Texinfo</seg>
	913	+@y
	914	+ <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, Grep,
	915	+ Make, Patch, Sed, Texinfo</seg>
	916	+@z
	917	+@x
	918	+ <seg>Glibc</seg>
735	919	@y
736		- <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, Grep,
737		- Make, Patch, Sed, Texinfo</seg>
	920	+ <seg>Glibc</seg>
738	921	@z
739	922	@x
740	923	<seg>Gawk</seg>

		@@ -747,18 +930,30 @@
747	930	<seg>Man-DB</seg>
748	931	@z
749	932	@x
750		- <seg>Pcre and libsigsegv</seg>
	933	+ <seg>
	934	+ <ulink url="&blfs-book;general/pcre.html">PCRE</ulink>
	935	+ and
	936	+ <ulink url="&blfs-book;general/libsigsegv.html">libsigsegv</ulink>
	937	+ </seg>
751	938	@y
752		- <seg>Pcre, libsigsegv</seg>
	939	+ <seg>
	940	+ <ulink url="&blfs-book;general/pcre.html">PCRE</ulink>,
	941	+ <ulink url="&blfs-book;general/libsigsegv.html">libsigsegv</ulink>
	942	+ </seg>
753	943	@z
754	944
755	945	%----------------------------------------------------------------------
756	946	@x Groff
757		- <seg>Bash, Binutils, Bison, Coreutils, Gawk, GCC, Glibc, Grep, Make,
758		- Patch, Sed, and Texinfo</seg>
	947	+ <seg>Bash, Binutils, Bison, Coreutils, Gawk, GCC, Glibc, Grep, Make,
	948	+ Patch, Sed, and Texinfo</seg>
	949	+@y
	950	+ <seg>Bash, Binutils, Bison, Coreutils, Gawk, GCC, Glibc, Grep, Make,
	951	+ Patch, Sed, Texinfo</seg>
	952	+@z
	953	+@x
	954	+ <seg>GCC, Glibc, and Perl</seg>
759	955	@y
760		- <seg>Bash, Binutils, Bison, Coreutils, Gawk, GCC, Glibc, Grep, Make,
761		- Patch, Sed, Texinfo</seg>
	956	+ <seg>GCC, Glibc, Perl</seg>
762	957	@z
763	958	@x
764	959	<seg>No test suite available</seg>

		@@ -771,18 +966,30 @@
771	966	<seg>Man-DB, Perl</seg>
772	967	@z
773	968	@x
774		- <seg>Ghostscript and uchardet</seg>
	969	+ <seg>
	970	+ <ulink url="&blfs-book;pst/gs.html">ghostscript</ulink>
	971	+ and
	972	+ <ulink url="&blfs-book;general/uchardet.html">Uchardet</ulink>
	973	+ </seg>
775	974	@y
776		- <seg>Ghostscript, uchardet</seg>
	975	+ <seg>
	976	+ <ulink url="&blfs-book;pst/gs.html">ghostscript</ulink>,
	977	+ <ulink url="&blfs-book;general/uchardet.html">Uchardet</ulink>
	978	+ </seg>
777	979	@z
778	980
779	981	%----------------------------------------------------------------------
780	982	@x GRUB
781		- <seg>Bash, Binutils, Bison, Coreutils, Diffutils, GCC, Gettext, Glibc,
782		- Grep, Make, Ncurses, Sed, Texinfo, and Xz</seg>
	983	+ <seg>Bash, Binutils, Bison, Coreutils, Diffutils, GCC, Gettext, Glibc,
	984	+ Grep, Make, Ncurses, Sed, Texinfo, and Xz</seg>
	985	+@y
	986	+ <seg>Bash, Binutils, Bison, Coreutils, Diffutils, GCC, Gettext, Glibc,
	987	+ Grep, Make, Ncurses, Sed, Texinfo, Xz</seg>
	988	+@z
	989	+@x
	990	+ <seg>Bash, GCC, Gettext, Glibc, Xz, and Sed.</seg>
783	991	@y
784		- <seg>Bash, Binutils, Bison, Coreutils, Diffutils, GCC, Gettext, Glibc,
785		- Grep, Make, Ncurses, Sed, Texinfo, Xz</seg>
	992	+ <seg>Bash, GCC, Gettext, Glibc, Xz, Sed</seg>
786	993	@z
787	994	@x
788	995	<seg>None</seg>

		@@ -802,11 +1009,16 @@
802	1009
803	1010	%----------------------------------------------------------------------
804	1011	@x Gzip
805		- <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make,
806		- Sed, and Texinfo</seg>
	1012	+ <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Sed, and
	1013	+ Texinfo</seg>
807	1014	@y
808		- <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make,
809		- Sed, Texinfo</seg>
	1015	+ <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Sed,
	1016	+ Texinfo</seg>
	1017	+@z
	1018	+@x
	1019	+ <seg>Bash and Glibc</seg>
	1020	+@y
	1021	+ <seg>Bash, Glibc</seg>
810	1022	@z
811	1023	@x
812	1024	<seg>Diffutils and Less</seg>

		@@ -826,9 +1038,14 @@
826	1038
827	1039	%----------------------------------------------------------------------
828	1040	@x Iana-Etc
829		- <seg>Coreutils, Gawk, and Make</seg>
	1041	+ <seg>Coreutils</seg>
	1042	+@y
	1043	+ <seg>Coreutils</seg>
	1044	+@z
	1045	+@x
	1046	+ <seg>None</seg>
830	1047	@y
831		- <seg>Coreutils, Gawk, Make</seg>
	1048	+ <seg>なし</seg>
832	1049	@z
833	1050	@x
834	1051	<seg>No test suite available</seg>

		@@ -853,11 +1070,16 @@
853	1070	<!-- Begin Inetutils dependency info -->
854	1071	@z
855	1072	@x
856		- <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Ncurses,
857		- Patch, Sed, Texinfo, and Zlib</seg>
	1073	+ <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Ncurses,
	1074	+ Patch, Sed, Texinfo, and Zlib</seg>
	1075	+@y
	1076	+ <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Ncurses,
	1077	+ Patch, Sed, Texinfo, Zlib</seg>
	1078	+@z
	1079	+@x
	1080	+ <seg>GCC, Glibc, Ncurses, and Readline</seg>
858	1081	@y
859		- <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Ncurses,
860		- Patch, Sed, Texinfo, Zlib</seg>
	1082	+ <seg>GCC, Glibc, Ncurses, Readline</seg>
861	1083	@z
862	1084	@x
863	1085	<seg>None</seg>

		@@ -877,9 +1099,16 @@
877	1099
878	1100	%----------------------------------------------------------------------
879	1101	@x Intltool
880		- <seg>Bash, Gawk, Glibc, Make, Perl, Sed, and XML::Parser</seg>
	1102	+ <seg>Bash, Gawk, Glibc, Make, Perl, Sed, and XML::Parser</seg>
	1103	+@y
	1104	+ <seg>Bash, Gawk, Glibc, Make, Perl, Sed, XML::Parser</seg>
	1105	+@z
	1106	+@x
	1107	+ <seg>Autoconf, Automake, Bash, Glibc, Grep, Perl, and
	1108	+ Sed</seg>
881	1109	@y
882		- <seg>Bash, Gawk, Glibc, Make, Perl, Sed, XML::Parser</seg>
	1110	+ <seg>Autoconf, Automake, Bash, Glibc, Grep, Perl,
	1111	+ Sed</seg>
883	1112	@z
884	1113	@x
885	1114	<seg>None</seg>

		@@ -894,11 +1123,16 @@
894	1123
895	1124	%----------------------------------------------------------------------
896	1125	@x IProute2
897		- <seg>Bash, Bison, Coreutils, Flex, GCC, Glibc, Make, Libcap,
898		- Libelf, and Linux API Headers</seg>
	1126	+ <seg>Bash, Bison, Coreutils, Flex, GCC, Glibc, Make, Libcap, Libelf,
	1127	+ Linux API Headers, and Zlib</seg>
	1128	+@y
	1129	+ <seg>Bash, Bison, Coreutils, Flex, GCC, Glibc, Make, Libcap, Libelf,
	1130	+ Linux API ヘッダー, Zlib</seg>
	1131	+@z
	1132	+@x
	1133	+ <seg>Bash, Coreutils, Glibc, Libcap, Libelf, and Zlib</seg>
899	1134	@y
900		- <seg>Bash, Bison, Coreutils, Flex, GCC, Glibc, Make, Libcap,
901		- Libelf, Linux API ヘッダー</seg>
	1135	+ <seg>Bash, Coreutils, Glibc, Libcap, Libelf, Zlib</seg>
902	1136	@z
903	1137	@x
904	1138	<seg>No test suite available</seg>

		@@ -911,9 +1145,16 @@
911	1145	<seg>なし</seg>
912	1146	@z
913	1147	@x
914		- <seg>Berkeley DB and Iptables</seg>
	1148	+ <seg>
	1149	+ <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>
	1150	+ and
	1151	+ <ulink url="&blfs-book;postlfs/iptables.html">iptables</ulink>
	1152	+ </seg>
915	1153	@y
916		- <seg>Berkeley DB, Iptables</seg>
	1154	+ <seg>
	1155	+ <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>,
	1156	+ <ulink url="&blfs-book;postlfs/iptables.html">iptables</ulink>
	1157	+ </seg>
917	1158	@z
918	1159
919	1160	%----------------------------------------------------------------------

		@@ -923,9 +1164,14 @@
923	1164	<!-- Begin Jinja2 dependency info -->
924	1165	@z
925	1166	@x
926		- <seg>MarkupSafe and Python</seg>
	1167	+ <seg>MarkupSafe and Python</seg>
	1168	+@y
	1169	+ <seg>MarkupSafe, Python</seg>
	1170	+@z
	1171	+@x
	1172	+ <seg>MarkupSafe and Python</seg>
927	1173	@y
928		- <seg>MarkupSafe, Python</seg>
	1174	+ <seg>MarkupSafe, Python</seg>
929	1175	@z
930	1176	@x
931	1177	<seg>No test suite available</seg>

		@@ -952,6 +1198,11 @@
952	1198	Glibc, Gzip, Make, Patch, Sed</seg>
953	1199	@z
954	1200	@x
	1201	+ <seg>Bash, Coreutils, and Glibc</seg>
	1202	+@y
	1203	+ <seg>Bash, Coreutils, Glibc</seg>
	1204	+@z
	1205	+@x
955	1206	<seg>None</seg>
956	1207	@y
957	1208	<seg>なし</seg>

		@@ -974,11 +1225,16 @@
974	1225	<!-- Begin Kmod dependency info -->
975	1226	@z
976	1227	@x
977		- <seg>Bash, Binutils, Bison, Coreutils, Flex, GCC, Gettext, Glibc,
978		- Gzip, Make, Pkg-config, Sed, Xz-Utils, and Zlib</seg>
	1228	+ <seg>Bash, Binutils, Bison, Coreutils, Flex, GCC, Gettext, Glibc,
	1229	+ Gzip, Make, Pkg-config, Sed, Xz, and Zlib</seg>
	1230	+@y
	1231	+ <seg>Bash, Binutils, Bison, Coreutils, Flex, GCC, Gettext, Glibc,
	1232	+ Gzip, Make, Pkg-config, Sed, Xz, Zlib</seg>
	1233	+@z
	1234	+@x
	1235	+ <seg>Glibc, Xz, and Zlib</seg>
979	1236	@y
980		- <seg>Bash, Binutils, Bison, Coreutils, Flex, GCC, Gettext, Glibc,
981		- Gzip, Make, Pkg-config, Sed, Xz-Utils, Zlib</seg>
	1237	+ <seg>Glibc, Xz, Zlib</seg>
982	1238	@z
983	1239	@x
984	1240	<seg>No test suite available</seg>

		@@ -1003,11 +1259,16 @@
1003	1259	<!-- Begin Less dependency info -->
1004	1260	@z
1005	1261	@x
1006		- <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
1007		- Ncurses, and Sed</seg>
	1262	+ <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
	1263	+ Ncurses, and Sed</seg>
1008	1264	@y
1009		- <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
1010		- Ncurses, Sed</seg>
	1265	+ <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
	1266	+ Ncurses, Sed</seg>
	1267	+@z
	1268	+@x
	1269	+ <seg>Glibc and Ncurses</seg>
	1270	+@y
	1271	+ <seg>Glibc, Ncurses</seg>
1011	1272	@z
1012	1273	@x
1013	1274	<seg>No test suite available</seg>

		@@ -1020,9 +1281,9 @@
1020	1281	<seg>Gzip</seg>
1021	1282	@z
1022	1283	@x
1023		- <seg>Pcre</seg>
	1284	+ <ulink url="&blfs-book;general/pcre.html">PCRE</ulink>
1024	1285	@y
1025		- <seg>Pcre</seg>
	1286	+ <ulink url="&blfs-book;general/pcre.html">PCRE</ulink>
1026	1287	@z
1027	1288
1028	1289	%----------------------------------------------------------------------

		@@ -1032,11 +1293,16 @@
1032	1293	<!-- Begin Libcap dependency info -->
1033	1294	@z
1034	1295	@x
1035		- <seg>Attr, Bash, Binutils, Coreutils, GCC, Glibc, Perl, Make,
1036		- and Sed</seg>
	1296	+ <seg>Attr, Bash, Binutils, Coreutils, GCC, Glibc, Perl, Make, and
	1297	+ Sed</seg>
1037	1298	@y
1038		- <seg>Attr, Bash, Binutils, Coreutils, GCC, Glibc, Perl, Make,
1039		- Sed</seg>
	1299	+ <seg>Attr, Bash, Binutils, Coreutils, GCC, Glibc, Perl, Make,
	1300	+ Sed</seg>
	1301	+@z
	1302	+@x
	1303	+ <seg>Glibc</seg>
	1304	+@y
	1305	+ <seg>Glibc</seg>
1040	1306	@z
1041	1307	@x
1042	1308	<seg>None</seg>

		@@ -1048,6 +1314,15 @@
1048	1314	@y
1049	1315	<seg>IProute2, Shadow</seg>
1050	1316	@z
	1317	+@x
	1318	+ <seg>
	1319	+ <ulink url="&blfs-book;postlfs/linux-pam.html">Linux-PAM</ulink>
	1320	+ </seg>
	1321	+@y
	1322	+ <seg>
	1323	+ <ulink url="&blfs-book;postlfs/linux-pam.html">Linux-PAM</ulink>
	1324	+ </seg>
	1325	+@z
1051	1326
1052	1327	%----------------------------------------------------------------------
1053	1328	@x

		@@ -1056,9 +1331,14 @@
1056	1331	<!-- Begin Libelf dependency info -->
1057	1332	@z
1058	1333	@x
1059		- <seg>Bash, Binutils, Coreutils, GCC, Glibc, and Make</seg>
	1334	+ <seg>Bash, Binutils, Coreutils, GCC, Glibc, and Make</seg>
1060	1335	@y
1061		- <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make</seg>
	1336	+ <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make</seg>
	1337	+@z
	1338	+@x
	1339	+ <seg>Glibc and Zlib</seg>
	1340	+@y
	1341	+ <seg>Glibc, Zlib</seg>
1062	1342	@z
1063	1343	@x
1064	1344	<seg>None</seg>

		@@ -1066,9 +1346,9 @@
1066	1346	<seg>なし</seg>
1067	1347	@z
1068	1348	@x
1069		- <seg>IProute2 and Linux Kernel</seg>
	1349	+ <seg>IProute2 and Linux</seg>
1070	1350	@y
1071		- <seg>IProute2, Linux カーネル</seg>
	1351	+ <seg>IProute2, Linux</seg>
1072	1352	@z
1073	1353	@x
1074	1354	<seg>None</seg>

		@@ -1083,9 +1363,16 @@
1083	1363	<!-- Begin Libffi dependency info -->
1084	1364	@z
1085	1365	@x
1086		- <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make, and Sed</seg>
	1366	+ <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make,
	1367	+ and Sed</seg>
	1368	+@y
	1369	+ <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make,
	1370	+ Sed</seg>
	1371	+@z
	1372	+@x
	1373	+ <seg>Glibc</seg>
1087	1374	@y
1088		- <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make, Sed</seg>
	1375	+ <seg>Glibc</seg>
1089	1376	@z
1090	1377	@x
1091	1378	<seg>None</seg>

		@@ -1095,11 +1382,16 @@
1095	1382
1096	1383	%----------------------------------------------------------------------
1097	1384	@x Libpipeline
1098		- <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
1099		- Make, Sed, and Texinfo</seg>
	1385	+ <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
	1386	+ Make, Sed, and Texinfo</seg>
	1387	+@y
	1388	+ <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
	1389	+ Make, Sed, Texinfo</seg>
	1390	+@z
	1391	+@x
	1392	+ <seg>Glibc</seg>
1100	1393	@y
1101		- <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
1102		- Make, Sed, Texinfo</seg>
	1394	+ <seg>Glibc</seg>
1103	1395	@z
1104	1396	@x
1105	1397	<seg>Check</seg>

		@@ -1119,11 +1411,18 @@
1119	1411
1120	1412	%----------------------------------------------------------------------
1121	1413	@x Libtool
1122		- <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
1123		- Make, Sed, and Texinfo</seg>
	1414	+ <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
	1415	+ Make, Sed, and Texinfo</seg>
	1416	+@y
	1417	+ <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
	1418	+ Make, Sed, Texinfo</seg>
	1419	+@z
	1420	+@x
	1421	+ <seg>Autoconf, Automake, Bash, Binutils, Coreutils, File, GCC, Glibc,
	1422	+ Grep, Make, and Sed</seg>
1124	1423	@y
1125		- <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
1126		- Make, Sed, Texinfo</seg>
	1424	+ <seg>Autoconf, Automake, Bash, Binutils, Coreutils, File, GCC, Glibc,
	1425	+ Grep, Make, Sed</seg>
1127	1426	@z
1128	1427	@x
1129	1428	<seg>Autoconf, Automake, and Findutils</seg>

		@@ -1142,12 +1441,46 @@
1142	1441	@z
1143	1442
1144	1443	%----------------------------------------------------------------------
1145		-@x Linux Kernel
1146		- <seg>Bash, Bc, Binutils, Coreutils, Diffutils, Findutils, GCC, Glibc,
1147		- Grep, Gzip, Kmod, Libelf, Make, Ncurses, OpenSSL, Perl, and Sed</seg>
	1444	+@x Linux
	1445	+ <seg>Bash, Bc, Binutils, Coreutils, Diffutils, Findutils, GCC, Glibc,
	1446	+ Grep, Gzip, Kmod, Libelf, Make, Ncurses, OpenSSL, Perl, and Sed</seg>
	1447	+@y
	1448	+ <seg>Bash, Bc, Binutils, Coreutils, Diffutils, Findutils, GCC, Glibc,
	1449	+ Grep, Gzip, Kmod, Libelf, Make, Ncurses, OpenSSL, Perl, Sed</seg>
	1450	+@z
	1451	+@x
	1452	+ <seg>None</seg>
	1453	+@y
	1454	+ <seg>なし</seg>
	1455	+@z
	1456	+@x
	1457	+ <seg>No test suite available</seg>
	1458	+@y
	1459	+ <seg>テストスイートはありません</seg>
	1460	+@z
	1461	+@x
	1462	+ <seg>None</seg>
	1463	+@y
	1464	+ <seg>なし</seg>
	1465	+@z
	1466	+@x
	1467	+ <seg>None</seg>
	1468	+@y
	1469	+ <seg>なし</seg>
	1470	+@z
	1471	+
	1472	+%----------------------------------------------------------------------
	1473	+@x Linux API headers
	1474	+ <seg>Bash, Binutils, Coreutils, Findutils, GCC, Glibc, Grep, Gzip,
	1475	+ Make, Perl, and Sed</seg>
	1476	+@y
	1477	+ <seg>Bash, Binutils, Coreutils, Findutils, GCC, Glibc, Grep, Gzip,
	1478	+ Make, Perl, Sed</seg>
	1479	+@z
	1480	+@x
	1481	+ <seg>None</seg>
1148	1482	@y
1149		- <seg>Bash, Bc, Binutils, Coreutils, Diffutils, Findutils, GCC, Glibc,
1150		- Grep, Gzip, Kmod, Libelf, Make, Ncurses, OpenSSL, Perl, Sed</seg>
	1483	+ <seg>なし</seg>
1151	1484	@z
1152	1485	@x
1153	1486	<seg>No test suite available</seg>

		@@ -1167,11 +1500,16 @@
1167	1500
1168	1501	%----------------------------------------------------------------------
1169	1502	@x M4
1170		- <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Sed, and
1171		- Texinfo</seg>
	1503	+ <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Sed, and
	1504	+ Texinfo</seg>
	1505	+@y
	1506	+ <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Sed,
	1507	+ Texinfo</seg>
	1508	+@z
	1509	+@x
	1510	+ <seg>Bash and Glibc</seg>
1172	1511	@y
1173		- <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Sed,
1174		- Texinfo</seg>
	1512	+ <seg>Bash, Glibc</seg>
1175	1513	@z
1176	1514	@x
1177	1515	<seg>Diffutils</seg>

		@@ -1184,18 +1522,27 @@
1184	1522	<seg>Autoconf, Bison</seg>
1185	1523	@z
1186	1524	@x
1187		- <seg>libsigsegv</seg>
	1525	+ <seg>
	1526	+ <ulink url="&blfs-book;general/libsigsegv.html">libsigsegv</ulink>
	1527	+ </seg>
1188	1528	@y
1189		- <seg>libsigsegv</seg>
	1529	+ <seg>
	1530	+ <ulink url="&blfs-book;general/libsigsegv.html">libsigsegv</ulink>
	1531	+ </seg>
1190	1532	@z
1191	1533
1192	1534	%----------------------------------------------------------------------
1193	1535	@x Make
1194		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep,
1195		- Make, Sed, and Texinfo</seg>
	1536	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make, Sed,
	1537	+ and Texinfo</seg>
	1538	+@y
	1539	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make, Sed,
	1540	+ Texinfo</seg>
	1541	+@z
	1542	+@x
	1543	+ <seg>Glibc</seg>
1196	1544	@y
1197		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep,
1198		- Make, Sed, Texinfo</seg>
	1545	+ <seg>Glibc</seg>
1199	1546	@z
1200	1547	@x
1201	1548	<seg>Perl and Procps-ng</seg>

		@@ -1208,18 +1555,27 @@
1208	1555	<seg>なし</seg>
1209	1556	@z
1210	1557	@x
1211		- <seg>None</seg>
	1558	+ <seg>
	1559	+ <ulink url="&blfs-book;general/guile.html">Guile</ulink>
	1560	+ </seg>
1212	1561	@y
1213		- <seg>なし</seg>
	1562	+ <seg>
	1563	+ <ulink url="&blfs-book;general/guile.html">Guile</ulink>
	1564	+ </seg>
1214	1565	@z
1215	1566
1216	1567	%----------------------------------------------------------------------
1217	1568	@x Man-DB
1218		- <seg>Bash, Binutils, Bzip2, Coreutils, Flex, GCC, GDBM, Gettext,
1219		- Glibc, Grep, Groff, Gzip, Less, Libpipeline, Make, Sed, and Xz</seg>
	1569	+ <seg>Bash, Binutils, Bzip2, Coreutils, Flex, GCC, GDBM, Gettext,
	1570	+ Glibc, Grep, Groff, Gzip, Less, Libpipeline, Make, Sed, and Xz</seg>
	1571	+@y
	1572	+ <seg>Bash, Binutils, Bzip2, Coreutils, Flex, GCC, GDBM, Gettext,
	1573	+ Glibc, Grep, Groff, Gzip, Less, Libpipeline, Make, Sed, Xz</seg>
	1574	+@z
	1575	+@x
	1576	+ <seg>Bash, GDBM, Groff, Glibc, Gzip, Less, Libpipeline, and Zlib</seg>
1220	1577	@y
1221		- <seg>Bash, Binutils, Bzip2, Coreutils, Flex, GCC, GDBM, Gettext,
1222		- Glibc, Grep, Groff, Gzip, Less, Libpipeline, Make, Sed, Xz</seg>
	1578	+ <seg>Bash, GDBM, Groff, Glibc, Gzip, Less, Libpipeline, Zlib</seg>
1223	1579	@z
1224	1580	@x
1225	1581	<seg>Util-linux</seg>

		@@ -1232,9 +1588,13 @@
1232	1588	<seg>なし</seg>
1233	1589	@z
1234	1590	@x
1235		- <seg>None</seg>
	1591	+ <seg>
	1592	+ <ulink url="&blfs-book;general/libseccomp.html">libseccomp</ulink>
	1593	+ </seg>
1236	1594	@y
1237		- <seg>なし</seg>
	1595	+ <seg>
	1596	+ <ulink url="&blfs-book;general/libseccomp.html">libseccomp</ulink>
	1597	+ </seg>
1238	1598	@z
1239	1599
1240	1600	%----------------------------------------------------------------------

		@@ -1244,6 +1604,11 @@
1244	1604	<seg>Bash, Coreutils, Make</seg>
1245	1605	@z
1246	1606	@x
	1607	+ <seg>None</seg>
	1608	+@y
	1609	+ <seg>なし</seg>
	1610	+@z
	1611	+@x
1247	1612	<seg>No test suite available</seg>
1248	1613	@y
1249	1614	<seg>テストスイートはありません</seg>

		@@ -1266,9 +1631,14 @@
1266	1631	<!-- Begin MarkupSafe dependency info -->
1267	1632	@z
1268	1633	@x
1269		- <seg>Python</seg>
	1634	+ <seg>Python</seg>
	1635	+@y
	1636	+ <seg>Python</seg>
	1637	+@z
	1638	+@x
	1639	+ <seg>Python</seg>
1270	1640	@y
1271		- <seg>Python</seg>
	1641	+ <seg>Python</seg>
1272	1642	@z
1273	1643	@x
1274	1644	<seg>No test suite available</seg>

		@@ -1293,9 +1663,14 @@
1293	1663	<!-- Begin Meson dependency info -->
1294	1664	@z
1295	1665	@x
1296		- <seg>Ninja and Python</seg>
	1666	+ <seg>Ninja and Python</seg>
	1667	+@y
	1668	+ <seg>Ninja, Python</seg>
	1669	+@z
	1670	+@x
	1671	+ <seg>Python</seg>
1297	1672	@y
1298		- <seg>Ninja, Python</seg>
	1673	+ <seg>Python</seg>
1299	1674	@z
1300	1675	@x
1301	1676	<seg>No test suite available</seg>

		@@ -1314,11 +1689,16 @@
1314	1689	@z
1315	1690	%----------------------------------------------------------------------
1316	1691	@x MPC
1317		- <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, GMP,
1318		- Make, MPFR, Sed, and Texinfo</seg>
	1692	+ <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
	1693	+ GMP, Make, MPFR, Sed, and Texinfo</seg>
	1694	+@y
	1695	+ <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
	1696	+ GMP, Make, MPFR, Sed, Texinfo</seg>
	1697	+@z
	1698	+@x
	1699	+ <seg>Glibc, GMP, and MPFR</seg>
1319	1700	@y
1320		- <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, GMP,
1321		- Make, MPFR, Sed, Texinfo</seg>
	1701	+ <seg>Glibc, GMP, MPFR</seg>
1322	1702	@z
1323	1703	@x
1324	1704	<seg>None</seg>

		@@ -1338,11 +1718,16 @@
1338	1718
1339	1719	%----------------------------------------------------------------------
1340	1720	@x MPFR
1341		- <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, GMP,
1342		- Make, Sed, and Texinfo</seg>
	1721	+ <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
	1722	+ GMP, Make, Sed, and Texinfo</seg>
	1723	+@y
	1724	+ <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
	1725	+ GMP, Make, Sed, Texinfo</seg>
	1726	+@z
	1727	+@x
	1728	+ <seg>Glibc and GMP</seg>
1343	1729	@y
1344		- <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, GMP,
1345		- Make, Sed, Texinfo</seg>
	1730	+ <seg>Glibc, GMP</seg>
1346	1731	@z
1347	1732	@x
1348	1733	<seg>None</seg>

		@@ -1362,11 +1747,16 @@
1362	1747
1363	1748	%----------------------------------------------------------------------
1364	1749	@x Ncurses
1365		- <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
1366		- Make, Patch, and Sed</seg>
	1750	+ <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
	1751	+ Make, Patch, and Sed</seg>
	1752	+@y
	1753	+ <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
	1754	+ Make, Patch, Sed</seg>
	1755	+@z
	1756	+@x
	1757	+ <seg>Glibc</seg>
1367	1758	@y
1368		- <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
1369		- Make, Patch, Sed</seg>
	1759	+ <seg>Glibc</seg>
1370	1760	@z
1371	1761	@x
1372	1762	<seg>No test suite available</seg>

		@@ -1393,9 +1783,14 @@
1393	1783	<!-- Begin Ninja dependency info -->
1394	1784	@z
1395	1785	@x
1396		- <seg>Binutils, Coreutils, GCC, and Python</seg>
	1786	+ <seg>Binutils, Coreutils, GCC, and Python</seg>
	1787	+@y
	1788	+ <seg>Binutils, Coreutils, GCC, Python</seg>
	1789	+@z
	1790	+@x
	1791	+ <seg>GCC and Glibc</seg>
1397	1792	@y
1398		- <seg>Binutils, Coreutils, GCC, Python</seg>
	1793	+ <seg>GCC, Glibc</seg>
1399	1794	@z
1400	1795	@x
1401	1796	<seg>None</seg>

		@@ -1408,9 +1803,19 @@
1408	1803	<seg>Meson</seg>
1409	1804	@z
1410	1805	@x
1411		- <seg>Asciidoc, Doxygen, Emacs, and re2c</seg>
	1806	+ <seg>
	1807	+ <ulink url="&blfs-book;general/asciidoc.html">Asciidoc</ulink>,
	1808	+ <ulink url="&blfs-book;general/doxygen.html">Doxygen</ulink>,
	1809	+ <ulink url="&blfs-book;postlfs/emacs.html">Emacs</ulink>, and
	1810	+ <ulink url="https://re2c.org/">re2c</ulink>
	1811	+ </seg>
1412	1812	@y
1413		- <seg>Asciidoc, Doxygen, Emacs, re2c</seg>
	1813	+ <seg>
	1814	+ <ulink url="&blfs-book;general/asciidoc.html">Asciidoc</ulink>,
	1815	+ <ulink url="&blfs-book;general/doxygen.html">Doxygen</ulink>,
	1816	+ <ulink url="&blfs-book;postlfs/emacs.html">Emacs</ulink>,
	1817	+ <ulink url="https://re2c.org/">re2c</ulink>
	1818	+ </seg>
1414	1819	@z
1415	1820	%----------------------------------------------------------------------
1416	1821	@x

		@@ -1419,9 +1824,14 @@
1419	1824	<!-- Begin Openssl dependency info -->
1420	1825	@z
1421	1826	@x
1422		- <seg>Binutils, Coreutils, GCC, Make, and Perl</seg>
	1827	+ <seg>Binutils, Coreutils, GCC, Make, and Perl</seg>
	1828	+@y
	1829	+ <seg>Binutils, Coreutils, GCC, Make, Perl</seg>
	1830	+@z
	1831	+@x
	1832	+ <seg>Glibc and Perl</seg>
1423	1833	@y
1424		- <seg>Binutils, Coreutils, GCC, Make, Perl</seg>
	1834	+ <seg>Glibc, Perl</seg>
1425	1835	@z
1426	1836	@x
1427	1837	<seg>None</seg>

		@@ -1435,9 +1845,14 @@
1435	1845	@z
1436	1846	%----------------------------------------------------------------------
1437	1847	@x Patch
1438		- <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, and Sed</seg>
	1848	+ <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, and Sed</seg>
	1849	+@y
	1850	+ <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Sed</seg>
	1851	+@z
	1852	+@x
	1853	+ <seg>Glibc and Patch</seg>
1439	1854	@y
1440		- <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Sed</seg>
	1855	+ <seg>Glibc, Patch</seg>
1441	1856	@z
1442	1857	@x
1443	1858	<seg>Diffutils</seg>

		@@ -1450,18 +1865,27 @@
1450	1865	<seg>なし</seg>
1451	1866	@z
1452	1867	@x
1453		- <seg>Ed</seg>
	1868	+ <seg>
	1869	+ <ulink url="&blfs-book;postlfs/ed.html">Ed</ulink>
	1870	+ </seg>
1454	1871	@y
1455		- <seg>Ed</seg>
	1872	+ <seg>
	1873	+ <ulink url="&blfs-book;postlfs/ed.html">Ed</ulink>
	1874	+ </seg>
1456	1875	@z
1457	1876
1458	1877	%----------------------------------------------------------------------
1459	1878	@x Perl
1460		- <seg>Bash, Binutils, Coreutils, Gawk, GCC, GDBM, Glibc, Grep,
1461		- Groff, Make, Sed, and Zlib</seg>
	1879	+ <seg>Bash, Binutils, Coreutils, Gawk, GCC, GDBM, Glibc, Grep, Groff,
	1880	+ Make, Sed, and Zlib</seg>
1462	1881	@y
1463		- <seg>Bash, Binutils, Coreutils, Gawk, GCC, GDBM, Glibc, Grep,
1464		- Groff, Make, Sed, Zlib</seg>
	1882	+ <seg>Bash, Binutils, Coreutils, Gawk, GCC, GDBM, Glibc, Grep, Groff,
	1883	+ Make, Sed, Zlib</seg>
	1884	+@z
	1885	+@x
	1886	+ <seg>GDBM and Glibc</seg>
	1887	+@y
	1888	+ <seg>GDBM, Glibc</seg>
1465	1889	@z
1466	1890	@x
1467	1891	<seg>Iana-Etc and Procps-ng</seg>

		@@ -1474,18 +1898,27 @@
1474	1898	<seg>Autoconf</seg>
1475	1899	@z
1476	1900	@x
1477		- <seg>None</seg>
	1901	+ <seg>
	1902	+ <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>
	1903	+ </seg>
1478	1904	@y
1479		- <seg>なし</seg>
	1905	+ <seg>
	1906	+ <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>
	1907	+ </seg>
1480	1908	@z
1481	1909
1482	1910	%----------------------------------------------------------------------
1483	1911	@x Pkg-config
1484		- <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make,
1485		- Popt, and Sed</seg>
	1912	+ <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, Popt,
	1913	+ and Sed</seg>
	1914	+@y
	1915	+ <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, Popt,
	1916	+ Sed</seg>
	1917	+@z
	1918	+@x
	1919	+ <seg>Glibc</seg>
1486	1920	@y
1487		- <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make,
1488		- Popt, Sed</seg>
	1921	+ <seg>Glibc</seg>
1489	1922	@z
1490	1923	@x
1491	1924	<seg>None</seg>

		@@ -1505,9 +1938,14 @@
1505	1938
1506	1939	%----------------------------------------------------------------------
1507	1940	@x Procps-ng
1508		- <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make, and Ncurses</seg>
	1941	+ <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make, and Ncurses</seg>
1509	1942	@y
1510		- <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make, Ncurses</seg>
	1943	+ <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make, Ncurses</seg>
	1944	+@z
	1945	+@x
	1946	+ <seg>Glibc</seg>
	1947	+@y
	1948	+ <seg>Glibc</seg>
1511	1949	@z
1512	1950	@x
1513	1951	<seg>None</seg>

		@@ -1522,11 +1960,16 @@
1522	1960
1523	1961	%----------------------------------------------------------------------
1524	1962	@x Psmisc
1525		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
1526		- Ncurses, and Sed</seg>
	1963	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
	1964	+ Ncurses, and Sed</seg>
	1965	+@y
	1966	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
	1967	+ Ncurses, Sed</seg>
	1968	+@z
	1969	+@x
	1970	+ <seg>Glibc and Ncurses</seg>
1527	1971	@y
1528		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
1529		- Ncurses, Sed</seg>
	1972	+ <seg>Glibc, Ncurses</seg>
1530	1973	@z
1531	1974	@x
1532	1975	<seg>No test suite available</seg>

		@@ -1551,11 +1994,18 @@
1551	1994	<!-- Begin Python dependency info -->
1552	1995	@z
1553	1996	@x
1554		- <seg>Bash, Binutils, Coreutils, Expat, GCC, Gdbm, Gettext, Glibc, Grep,
1555		- Libffi, Make, Ncurses, Sed, and Util-linux</seg>
	1997	+ <seg>Bash, Binutils, Coreutils, Expat, GCC, Gdbm, Gettext, Glibc,
	1998	+ Grep, Libffi, Make, Ncurses, OpenSSL, Sed, and Util-linux</seg>
1556	1999	@y
1557		- <seg>Bash, Binutils, Coreutils, Expat, GCC, Gdbm, Gettext, Glibc, Grep,
1558		- Libffi, Make, Ncurses, Sed, Util-linux</seg>
	2000	+ <seg>Bash, Binutils, Coreutils, Expat, GCC, Gdbm, Gettext, Glibc,
	2001	+ Grep, Libffi, Make, Ncurses, OpenSSL, Sed, Util-linux</seg>
	2002	+@z
	2003	+@x
	2004	+ <seg>Bzip2, Expat, Gdbm, Glibc, Libffi, Ncurses, OpenSSL, and
	2005	+ Zlib</seg>
	2006	+@y
	2007	+ <seg>Bzip2, Expat, Gdbm, Glibc, Libffi, Ncurses, OpenSSL,
	2008	+ Zlib</seg>
1559	2009	@z
1560	2010	@x
1561	2011	<seg>GDB and Valgrind</seg>

		@@ -1568,18 +2018,31 @@
1568	2018	<seg>Ninja</seg>
1569	2019	@z
1570	2020	@x
1571		- <seg>Berkeley DB, OpenSSL, SQLite, and Tk</seg>
	2021	+ <seg>
	2022	+ <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>,
	2023	+ <ulink url="&blfs-book;server/sqlite.html"> SQLite</ulink>, and
	2024	+ <ulink url="&blfs-book;general/tk.html">Tk</ulink>
	2025	+ </seg>
1572	2026	@y
1573		- <seg>Berkeley DB, OpenSSL, SQLite, Tk</seg>
	2027	+ <seg>
	2028	+ <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>,
	2029	+ <ulink url="&blfs-book;server/sqlite.html"> SQLite</ulink>,
	2030	+ <ulink url="&blfs-book;general/tk.html">Tk</ulink>
	2031	+ </seg>
1574	2032	@z
1575	2033
1576	2034	%----------------------------------------------------------------------
1577	2035	@x Readline
1578		- <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, Ncurses,
1579		- Patch, Sed, and Texinfo</seg>
	2036	+ <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, Ncurses,
	2037	+ Patch, Sed, and Texinfo</seg>
	2038	+@y
	2039	+ <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, Ncurses,
	2040	+ Patch, Sed, Texinfo</seg>
	2041	+@z
	2042	+@x
	2043	+ <seg>Glibc and Ncurses</seg>
1580	2044	@y
1581		- <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, Ncurses,
1582		- Patch, Sed, Texinfo</seg>
	2045	+ <seg>Glibc, Ncurses</seg>
1583	2046	@z
1584	2047	@x
1585	2048	<seg>No test suite available</seg>

		@@ -1599,11 +2062,16 @@
1599	2062
1600	2063	%----------------------------------------------------------------------
1601	2064	@x Sed
1602		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
1603		- Sed, and Texinfo</seg>
	2065	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make, Sed,
	2066	+ and Texinfo</seg>
	2067	+@y
	2068	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make, Sed,
	2069	+ Texinfo</seg>
	2070	+@z
	2071	+@x
	2072	+ <seg>Acl, Attr, and Glibc</seg>
1604	2073	@y
1605		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
1606		- Sed, Texinfo</seg>
	2074	+ <seg>Acl, Attr, Glibc</seg>
1607	2075	@z
1608	2076	@x
1609	2077	<seg>Diffutils and Gawk</seg>

		@@ -1623,11 +2091,16 @@
1623	2091
1624	2092	%----------------------------------------------------------------------
1625	2093	@x Shadow
1626		- <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
1627		- Gettext, Glibc, Grep, Libcap, Make, and Sed</seg>
	2094	+ <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk,
	2095	+ GCC, Gettext, Glibc, Grep, Libcap, Make, and Sed</seg>
	2096	+@y
	2097	+ <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk,
	2098	+ GCC, Gettext, Glibc, Grep, Libcap, Make, Sed</seg>
	2099	+@z
	2100	+@x
	2101	+ <seg>Glibc</seg>
1628	2102	@y
1629		- <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
1630		- Gettext, Glibc, Grep, Libcap, Make, Sed</seg>
	2103	+ <seg>Glibc</seg>
1631	2104	@z
1632	2105	@x
1633	2106	<seg>No test suite available</seg>

		@@ -1640,16 +2113,28 @@
1640	2113	<seg>Coreutils</seg>
1641	2114	@z
1642	2115	@x
1643		- <seg>Cracklib and PAM</seg>
	2116	+ <seg>
	2117	+ <ulink url="&blfs-book;postlfs/cracklib.html">CrackLib</ulink>
	2118	+ and
	2119	+ <ulink url="&blfs-book;postlfs/linux-pam.html">Linux-PAM</ulink>
	2120	+ </seg>
1644	2121	@y
1645		- <seg>Cracklib, PAM</seg>
	2122	+ <seg>
	2123	+ <ulink url="&blfs-book;postlfs/cracklib.html">CrackLib</ulink>,
	2124	+ <ulink url="&blfs-book;postlfs/linux-pam.html">Linux-PAM</ulink>
	2125	+ </seg>
1646	2126	@z
1647	2127
1648	2128	%----------------------------------------------------------------------
1649	2129	@x Sysklogd
1650		- <seg>Binutils, Coreutils, GCC, Glibc, Make, and Patch</seg>
	2130	+ <seg>Binutils, Coreutils, GCC, Glibc, Make, and Patch</seg>
	2131	+@y
	2132	+ <seg>Binutils, Coreutils, GCC, Glibc, Make, Patch</seg>
	2133	+@z
	2134	+@x
	2135	+ <seg>Glibc</seg>
1651	2136	@y
1652		- <seg>Binutils, Coreutils, GCC, Glibc, Make, Patch</seg>
	2137	+ <seg>Glibc</seg>
1653	2138	@z
1654	2139	@x
1655	2140	<seg>No test suite available</seg>

		@@ -1670,12 +2155,17 @@
1670	2155	%----------------------------------------------------------------------
1671	2156	@x Systemd
1672	2157	<seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Expat, Gawk,
1673		- GCC, Glibc, Gperf, Grep, Intltool, Jinja2, Libcap,
1674		- Meson, Sed, and Util-linux</seg>
	2158	+ GCC, Glibc, Gperf, Grep, Intltool, Jinja2, Libcap, Meson, Sed, and
	2159	+ Util-linux</seg>
1675	2160	@y
1676	2161	<seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Expat, Gawk,
1677		- GCC, Glibc, Gperf, Grep, Intltool, Jinja2, Libcap,
1678		- Meson, Sed, Util-linux</seg>
	2162	+ GCC, Glibc, Gperf, Grep, Intltool, Jinja2, Libcap, Meson, Sed,
	2163	+ Util-linux</seg>
	2164	+@z
	2165	+@x
	2166	+ <seg>Acl, Attr, Glibc, Libcap, and Util-linux</seg>
	2167	+@y
	2168	+ <seg>Acl, Attr, Glibc, Libcap, Util-linux</seg>
1679	2169	@z
1680	2170	@x
1681	2171	<seg>None</seg>

		@@ -1687,23 +2177,26 @@
1687	2177	@y
1688	2178	<seg>なし</seg>
1689	2179	@z
	2180	+% リンク部分、大半省略
1690	2181	@x
1691		- <seg>Many, see
1692		- <ulink url="&blfs-root;view/systemd/general/systemd.html">BLFS
1693		- systemd page</ulink>
1694		- </seg>
	2182	+ <ulink url="&blfs-book;general/valgrind.html">Valgrind</ulink>,
	2183	+ and
	2184	+ <ulink url="&blfs-book;postlfs/zsh.html">zsh</ulink>
1695	2185	@y
1696		- <seg>
1697		- 多数。
1698		- BLFS の <ulink url="&blfs-root;view/systemd/general/systemd.html">systemd</ulink> ページを参照。
1699		- </seg>
	2186	+ <ulink url="&blfs-book;general/valgrind.html">Valgrind</ulink>,
	2187	+ <ulink url="&blfs-book;postlfs/zsh.html">zsh</ulink>
1700	2188	@z
1701	2189
1702	2190	%----------------------------------------------------------------------
1703	2191	@x Sysvinit
1704		- <seg>Binutils, Coreutils, GCC, Glibc, Make, and Sed</seg>
	2192	+ <seg>Binutils, Coreutils, GCC, Glibc, Make, and Sed</seg>
	2193	+@y
	2194	+ <seg>Binutils, Coreutils, GCC, Glibc, Make, and Sed</seg>
	2195	+@z
	2196	+@x
	2197	+ <seg>Glibc</seg>
1705	2198	@y
1706		- <seg>Binutils, Coreutils, GCC, Glibc, Make, Sed</seg>
	2199	+ <seg>Glibc</seg>
1707	2200	@z
1708	2201	@x
1709	2202	<seg>No test suite available</seg>

		@@ -1723,16 +2216,23 @@
1723	2216
1724	2217	%----------------------------------------------------------------------
1725	2218	@x Tar
1726		- <seg>Acl, Attr, Bash, Binutils, Bison, Coreutils, GCC, Gettext, Glibc,
1727		- Grep, Inetutils, Make, Sed, and Texinfo</seg>
	2219	+ <seg>Acl, Attr, Bash, Binutils, Bison, Coreutils, GCC, Gettext, Glibc,
	2220	+ Grep, Inetutils, Make, Sed, and Texinfo</seg>
	2221	+@y
	2222	+ <seg>Acl, Attr, Bash, Binutils, Bison, Coreutils, GCC, Gettext, Glibc,
	2223	+ Grep, Inetutils, Make, Sed, Texinfo</seg>
	2224	+@z
	2225	+@x
	2226	+ <seg>Acl, Attr, Bzip2, Glibc, Gzip, and Xz</seg>
1728	2227	@y
1729		- <seg>Acl, Attr, Bash, Binutils, Bison, Coreutils, GCC, Gettext, Glibc,
1730		- Grep, Inetutils, Make, Sed, Texinfo</seg>
	2228	+ <seg>Acl, Attr, Bzip2, Glibc, Gzip, Xz</seg>
1731	2229	@z
1732	2230	@x
1733		- <seg>Autoconf, Diffutils, Findutils, Gawk, and Gzip</seg>
	2231	+ <seg>Autoconf, Diffutils, Findutils, Gawk, and
	2232	+ Gzip</seg>
1734	2233	@y
1735		- <seg>Autoconf, Diffutils, Findutils, Gawk, Gzip</seg>
	2234	+ <seg>Autoconf, Diffutils, Findutils, Gawk,
	2235	+ Gzip</seg>
1736	2236	@z
1737	2237	@x
1738	2238	<seg>None</seg>

		@@ -1747,11 +2247,16 @@
1747	2247
1748	2248	%----------------------------------------------------------------------
1749	2249	@x Tcl
1750		- <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep,
1751		- Make, and Sed</seg>
	2250	+ <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make, and
	2251	+ Sed</seg>
	2252	+@y
	2253	+ <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
	2254	+ Sed</seg>
	2255	+@z
	2256	+@x
	2257	+ <seg>Glibc and Zlib</seg>
1752	2258	@y
1753		- <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep,
1754		- Make, Sed</seg>
	2259	+ <seg>Glibc, Zlib</seg>
1755	2260	@z
1756	2261	@x
1757	2262	<seg>None</seg>

		@@ -1771,11 +2276,16 @@
1771	2276
1772	2277	%----------------------------------------------------------------------
1773	2278	@x Texinfo
1774		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
1775		- Ncurses, Patch, and Sed</seg>
	2279	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
	2280	+ Ncurses, Patch, and Sed</seg>
	2281	+@y
	2282	+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
	2283	+ Ncurses, Patch, Sed</seg>
	2284	+@z
	2285	+@x
	2286	+ <seg>Glibc and Ncurses</seg>
1776	2287	@y
1777		- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
1778		- Ncurses, Patch, Sed</seg>
	2288	+ <seg>Glibc, Ncurses</seg>
1779	2289	@z
1780	2290	@x
1781	2291	<seg>None</seg>

		@@ -1795,11 +2305,16 @@
1795	2305
1796	2306	%----------------------------------------------------------------------
1797	2307	@x Util-linux
1798		- <seg>Bash, Binutils, Coreutils, Diffutils, Eudev, Findutils, Gawk, GCC,
1799		- Gettext, Glibc, Grep, Make, Ncurses, Sed, and Zlib</seg>
	2308	+ <seg>Bash, Binutils, Coreutils, Diffutils, Eudev, Findutils, Gawk,
	2309	+ GCC, Gettext, Glibc, Grep, Libcap, Make, Ncurses, Sed, and Zlib</seg>
	2310	+@y
	2311	+ <seg>Bash, Binutils, Coreutils, Diffutils, Eudev, Findutils, Gawk,
	2312	+ GCC, Gettext, Glibc, Grep, Libcap, Make, Ncurses, Sed, Zlib</seg>
	2313	+@z
	2314	+@x
	2315	+ <seg>Glibc, Libcap, Ncurses, Readline, and Zlib</seg>
1800	2316	@y
1801		- <seg>Bash, Binutils, Coreutils, Diffutils, Eudev, Findutils, Gawk, GCC,
1802		- Gettext, Glibc, Grep, Make, Ncurses, Sed, Zlib</seg>
	2317	+ <seg>Glibc, Libcap, Ncurses, Readline, Zlib</seg>
1803	2318	@z
1804	2319	@x
1805	2320	<seg>None</seg>

		@@ -1812,18 +2327,29 @@
1812	2327	<seg>なし</seg>
1813	2328	@z
1814	2329	@x
1815		- <seg><ulink url="https://people.redhat.com/sgrubb/libcap-ng/">Libcap-ng</ulink></seg>
	2330	+ <seg>
	2331	+ <ulink
	2332	+ url="&blfs-book;postlfs/smartmontools.html">smartmontools</ulink>
	2333	+ </seg>
1816	2334	@y
1817		- <seg><ulink url="https://people.redhat.com/sgrubb/libcap-ng/">Libcap-ng</ulink></seg>
	2335	+ <seg>
	2336	+ <ulink
	2337	+ url="&blfs-book;postlfs/smartmontools.html">smartmontools</ulink>
	2338	+ </seg>
1818	2339	@z
1819	2340
1820	2341	%----------------------------------------------------------------------
1821	2342	@x Vim
1822		- <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, GCC, Glibc,
1823		- Grep, Make, Ncurses, and Sed</seg>
	2343	+ <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, GCC, Glibc,
	2344	+ Grep, Make, Ncurses, and Sed</seg>
1824	2345	@y
1825		- <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, GCC, Glibc,
1826		- Grep, Make, Ncurses, Sed</seg>
	2346	+ <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, GCC, Glibc,
	2347	+ Grep, Make, Ncurses, Sed</seg>
	2348	+@z
	2349	+@x
	2350	+ <seg>Acl, Attr, Glibc, Python, Ncurses, and Tcl</seg>
	2351	+@y
	2352	+ <seg>Acl, Attr, Glibc, Python, Ncurses, Tcl</seg>
1827	2353	@z
1828	2354	@x
1829	2355	<seg>None</seg>

		@@ -1836,16 +2362,45 @@
1836	2362	<seg>なし</seg>
1837	2363	@z
1838	2364	@x
1839		- <seg>Xorg, GTK+2, LessTif, Python, Tcl, Ruby, and GPM</seg>
	2365	+ <seg>
	2366	+ <ulink url="&blfs-book;x/installing.html">Xorg</ulink>,
	2367	+ <ulink url="&blfs-book;x/gtk2.html">GTK+2</ulink>,
	2368	+ <ulink url="http://lesstif.sourceforge.net/">LessTif</ulink>,
	2369	+ <ulink url="&blfs-book;general/ruby.html">Ruby</ulink>, and
	2370	+ <ulink url="&blfs-book;general/gpm.html">GPM</ulink>
	2371	+ </seg>
1840	2372	@y
1841		- <seg>Xorg, GTK+2, LessTif, Python, Tcl, Ruby, GPM</seg>
	2373	+ <seg>
	2374	+ <ulink url="&blfs-book;x/installing.html">Xorg</ulink>,
	2375	+ <ulink url="&blfs-book;x/gtk2.html">GTK+2</ulink>,
	2376	+ <ulink url="http://lesstif.sourceforge.net/">LessTif</ulink>,
	2377	+ <ulink url="&blfs-book;general/ruby.html">Ruby</ulink>,
	2378	+ <ulink url="&blfs-book;general/gpm.html">GPM</ulink>
	2379	+ </seg>
1842	2380	@z
1843	2381
1844	2382	%----------------------------------------------------------------------
1845	2383	@x XML Parser
1846		- <seg>Bash, Binutils, Coreutils, Expat, GCC, Glibc, Make, and Perl</seg>
	2384	+ <seg>Bash, Binutils, Coreutils, Expat, GCC, Glibc, Make, and
	2385	+ Perl</seg>
	2386	+@y
	2387	+ <seg>Bash, Binutils, Coreutils, Expat, GCC, Glibc, Make,
	2388	+ Perl</seg>
	2389	+@z
	2390	+@x
	2391	+ <seg>Expat, Glibc, and Perl</seg>
	2392	+@y
	2393	+ <seg>Expat, Glibc, Perl</seg>
	2394	+@z
	2395	+@x
	2396	+ <seg>Perl</seg>
	2397	+@y
	2398	+ <seg>Perl</seg>
	2399	+@z
	2400	+@x
	2401	+ <seg>Intltool</seg>
1847	2402	@y
1848		- <seg>Bash, Binutils, Coreutils, Expat, GCC, Glibc, Make, Perl</seg>
	2403	+ <seg>Intltool</seg>
1849	2404	@z
1850	2405	@x
1851	2406	<seg>None</seg>

		@@ -1855,9 +2410,14 @@
1855	2410
1856	2411	%----------------------------------------------------------------------
1857	2412	@x Xz-utils
1858		- <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, and Make</seg>
	2413	+ <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, and Make</seg>
1859	2414	@y
1860		- <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Make</seg>
	2415	+ <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Make</seg>
	2416	+@z
	2417	+@x
	2418	+ <seg>Glibc</seg>
	2419	+@y
	2420	+ <seg>Glibc</seg>
1861	2421	@z
1862	2422	@x
1863	2423	<seg>None</seg>

		@@ -1877,9 +2437,14 @@
1877	2437
1878	2438	%----------------------------------------------------------------------
1879	2439	@x Zlib
1880		- <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make, and Sed</seg>
	2440	+ <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make, and Sed</seg>
	2441	+@y
	2442	+ <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make, Sed</seg>
	2443	+@z
	2444	+@x
	2445	+ <seg>Glibc</seg>
1881	2446	@y
1882		- <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make, Sed</seg>
	2447	+ <seg>Glibc</seg>
1883	2448	@z
1884	2449	@x
1885	2450	<seg>None</seg>

		@@ -1899,23 +2464,25 @@
1899	2464
1900	2465	%----------------------------------------------------------------------
1901	2466	@x Zstd
1902		- <seg>Binutils, Coreutils, GCC, Glibc, Gzip, Make, and Xz</seg>
	2467	+ <seg>Binutils, Coreutils, GCC, Glibc, Gzip, Make, and Xz</seg>
1903	2468	@y
1904		- <seg>Binutils, Coreutils, GCC, Glibc, Gzip, Make, Xz</seg>
	2469	+ <seg>Binutils, Coreutils, GCC, Glibc, Gzip, Make, Xz</seg>
	2470	+@z
	2471	+@x
	2472	+ <seg>Glibc</seg>
	2473	+@y
	2474	+ <seg>Glibc</seg>
1905	2475	@z
1906		-
1907	2476	@x
1908	2477	<seg>None</seg>
1909	2478	@y
1910	2479	<seg>なし</seg>
1911	2480	@z
1912		-
1913	2481	@x
1914	2482	<seg>GCC</seg>
1915	2483	@y
1916	2484	<seg>GCC</seg>
1917	2485	@z
1918		-
1919	2486	@x
1920	2487	<seg>None</seg>
1921	2488	@y

--- a/src/chapter01/jchangelog.ch

+++ b/src/chapter01/jchangelog.ch

		@@ -60,6 +60,17 @@
60	60	-->
61	61
62	62	<listitem>
	63	+ <para>2021-07-12</para>
	64	+ <itemizedlist>
	65	+ <listitem>
	66	+ <para>[matsuand] -
	67	+ r10.1-120 (<ulink url="&lfs-changeset;176404f5e">176404f5e</ulink>) までの対応。
	68	+ </para>
	69	+ </listitem>
	70	+ </itemizedlist>
	71	+ </listitem>
	72	+
	73	+ <listitem>
63	74	<para>2021-07-09</para>
64	75	<itemizedlist>
65	76	<listitem>

--- a/src/chapter08/grub.ch

+++ b/src/chapter08/grub.ch

		@@ -3,10 +3,6 @@
3	3	%
4	4	% This is a CTIE change file for the original XML source of the LFSbook.
5	5	%
6		-% $Author$
7		-% $Rev$
8		-% $Date:: $
9		-%
10	6	@x
11	7	<?xml version="1.0" encoding="ISO-8859-1"?>
12	8	@y

		@@ -26,6 +22,19 @@
26	22	@z
27	23
28	24	@x
	25	+ If your system has UEFI support and you wish to boot LFS with UEFI,
	26	+ you can skip this package in LFS,
	27	+ and install GRUB with UEFI support (and its dependencies) following
	28	+ <ulink url="&blfs-book;postlfs/grub-efi.html">the BLFS page</ulink>
	29	+ at the end of this chapter.
	30	+@y
	31	+ システムが UEFI をサポートしていて、これを使って LFS を起動しようとする場合は、LFS における本パッケージは省略することができます。
	32	+ その場合は本章の終わりに、<ulink
	33	+ url="&blfs-book;postlfs/grub-efi.html">BLFS ページ</ulink> に従って UEFI 対応の GRUB
	34	+ (およびその依存パッケージ) をインストールしてください。
	35	+@z
	36	+
	37	+@x
29	38	<para>Prepare GRUB for compilation:</para>
30	39	@y
31	40	<para>&PreparePackage1;GRUB&PreparePackage2;</para>

		@@ -197,6 +206,12 @@
197	206	</para>
198	207	@z
199	208
	209	+@x grub-macbless
	210	+ <para>Mac-style bless on HFS or HFS+ files</para>
	211	+@y
	212	+ <para>HFS または HFS+ ファイルに対する Mac 風の bless</para>
	213	+@z
	214	+
200	215	@x grub-menulst2cfg
201	216	<para>Converts a GRUB Legacy <filename>menu.lst</filename>
202	217	into a <filename>grub.cfg</filename> for use with GRUB 2</para>

--- a/src/chapter08/util-linux.ch

+++ b/src/chapter08/util-linux.ch

		@@ -75,6 +75,18 @@
75	75	@z
76	76
77	77	@x
	78	+ <note><para>There is one test that depends on the configuration of the kernel.
	79	+ If CONFIG_USER_NS or CONFIG_PID_NS are not set, the tests will hang forever.
	80	+ To work around the problem, delete one test:</para>
	81	+@y
	82	+ <note><para>
	83	+ カーネルの設定に依存するテストが 1 つあります。
	84	+ CONFIG_USER_NS または CONFIG_PID_NS が設定されていないと、そのテストはハングし続けます。
	85	+ これを回避するには、テストを 1 つ削除します。
	86	+ </para>
	87	+@z
	88	+
	89	+@x
78	90	<para>Install the package:</para>
79	91	@y
80	92	<para>&InstallThePackage;</para>

--- a/src/general.ch

+++ b/src/general.ch

		@@ -24,9 +24,9 @@
24	24	<!ENTITY releasedate "August 26th, 2021">
25	25	<!ENTITY copyrightdate "1999-2021">
26	26	-->
27		-<!ENTITY jversion "20210709">
28		-<!ENTITY jversiond "20210709">
29		-<!ENTITY jcorrespondSHA "e182fa353"> <!-- lfs-git SHA 値；本箇所での記載のみ -->
	27	+<!ENTITY jversion "20210712">
	28	+<!ENTITY jversiond "20210712">
	29	+<!ENTITY jcorrespondSHA "176404f5e"> <!-- lfs-git SHA 値；本箇所での記載のみ -->
30	30	<!ENTITY dir-jversion "git-ja">
31	31	<!ENTITY dir-jversiond "git-sysdja">
32	32	@z

		@@ -66,6 +66,7 @@
66	66	<!ENTITY buildtime "Approximate build time">
67	67	<!ENTITY diskspace "Required disk space">
68	68	<!ENTITY dependencies "Installation depends on">
	69	+<!ENTITY runtime "Required at runtime">
69	70	<!ENTITY testsuites "Test suite depends on">
70	71	<!ENTITY before "Must be installed before">
71	72	<!ENTITY external "Optional dependencies">

		@@ -73,6 +74,7 @@
73	74	<!ENTITY buildtime "概算ビルド時間">
74	75	<!ENTITY diskspace "必要ディスク容量">
75	76	<!ENTITY dependencies "インストール依存パッケージ">
	77	+<!ENTITY runtime "実行時依存パッケージ">
76	78	<!ENTITY testsuites "テストスイート依存パッケージ">
77	79	<!ENTITY before "事前インストールパッケージ">
78	80	<!ENTITY external "任意依存パッケージ">

--- a/version.ac

+++ b/version.ac

		@@ -2,5 +2,5 @@ dnl
2	2	dnl This is part of LFSbookja package.
3	3	dnl
4	4	dnl m4-include this file to define the current LFS version
5		-m4_define([lfs_version], [r10.1-106])
6		-m4_define([lfsd_version], [r10.1-105-systemd])
	5	+m4_define([lfs_version], [r10.1-120])
	6	+m4_define([lfsd_version], [r10.1-120-systemd])

旧リポジトリブラウザで表示

LFSブック日本語版 Fork

lfsja-git: コミット

コミットメタ情報

ログメッセージ

変更サマリ

差分

LFSブック日本語版
Fork