From 0c82dc9a20c5c1e7850b02870fe80f7474c32830 Mon Sep 17 00:00:00 2001
From: matsuand <30614168+matsuand@users.noreply.github.com>
Date: Fri, 22 Apr 2022 19:39:42 +0900
Subject: [PATCH] =?utf8?q?[lfsja-git]=20r11.1-92=20=E5=AF=BE=E5=BF=9C?=
=?utf8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
---
configure | 2 +-
src/chapter01/jchangelog.ch | 11 ++++++++++
src/chapter02/stages.ch | 5 ++---
src/chapter03/packages.ch | 47 +++++++++++++++++++++++++++++--------------
src/chapter04/addinguser.ch | 6 +++---
src/chapter07/cleanup.ch | 6 +++---
src/chapter07/introduction.ch | 4 ++--
src/chapter08/bash.ch | 4 ++--
src/chapter08/coreutils.ch | 6 +++---
src/chapter08/python.ch | 28 ++++++++++++++++++++++++++
src/chapter08/util-linux.ch | 4 ++--
src/chapter10/kernel.ch | 6 +++---
src/chapter11/reboot.ch | 6 +++---
version.ac | 2 +-
14 files changed, 96 insertions(+), 41 deletions(-)
diff --git a/configure b/configure
index c7926053..6af959db 100755
--- a/configure
+++ b/configure
@@ -4737,7 +4737,7 @@ fi
-TARGETVER=r11.1-84
+TARGETVER=r11.1-92
if test "x$revspec" = "xsystemd"; then
TARGETVER="$TARGETVER-systemd"
fi
diff --git a/src/chapter01/jchangelog.ch b/src/chapter01/jchangelog.ch
index e37c408a..0c830eb3 100644
--- a/src/chapter01/jchangelog.ch
+++ b/src/chapter01/jchangelog.ch
@@ -50,6 +50,17 @@
-->
+ 2022-04-22
+
+
+ [matsuand] -
+ r11.1-92 (93db1e614) ã¾ã§ã®å¯¾å¿ã
+
+
+
+
+
+
2022-04-19
diff --git a/src/chapter02/stages.ch b/src/chapter02/stages.ch
index 72a62b65..6ee0b809 100644
--- a/src/chapter02/stages.ch
+++ b/src/chapter02/stages.ch
@@ -118,12 +118,11 @@
A few operations, from Changing Ownership
to
Entering the Chroot Environment
must be done as the
root user, with the LFS
- environment variable set for the
- rootuser.
+ environment variable set for the &root; user.
@y
ææè
ã®å¤æ´
ããChroot ç°å¢ã¸ã®ç§»è¡
ã¾ã§ã®æä½ã¯ãroot ã¦ã¼ã¶ã¼ã§è¡ãã¾ãã
- LFS ç°å¢å¤æ°ã root ã¦ã¼ã¶ã¼ã«ããã¦è¨å®ããã¦ããå¿
è¦ãããã¾ãã
+ LFS ç°å¢å¤æ°ã &root; ã¦ã¼ã¶ã¼ã«ããã¦è¨å®ããã¦ããå¿
è¦ãããã¾ãã
@z
diff --git a/src/chapter03/packages.ch b/src/chapter03/packages.ch
index 67393bf8..1e58d2f8 100644
--- a/src/chapter03/packages.ch
+++ b/src/chapter03/packages.ch
@@ -16,6 +16,38 @@
@z
@x
+ Read the security advisories
+ before downloading packages to figure out if a newer version of any
+ package should be used to avoid security vulnerabilities.
+@y
+
+ ããã±ã¼ã¸ããã¦ã³ãã¼ãããåã«ã¯ ã»ãã¥ãªãã£ã¢ããã¤ã¹ï¼security advisoriesï¼ãèªãã§ãã ããã
+ ã»ãã¥ãªãã£ããå¼±æ§ãåé¿ããããã«ããã±ã¼ã¸ã®ææ°ãã¼ã¸ã§ã³ããªããã©ããã確èªãã¦ãã ããã
+
+@z
+
+@x
+ The upstreams may remove old releases, especially when these
+ releases contain a security vulnerability. If one URL below is not
+ reachable, you should read the security advisories first to figure out
+ if a newer version (with the vulnerability fixed) should be used. If
+ not, try to download the removed package from a mirror. Although it's
+ possible to download an old release from a mirror even if this release
+ has been removed because of a vulnerability, it's not recommended to
+ use a release known to be vulnerable for building your system.
+@y
+
+ ã¢ããã¹ããªã¼ã ã§ã¯ãå¤ããªãªã¼ã¹ãåé¤ãã¦ãããã¨ãããã¾ãã
+ ç¹ã«ãã®ãªãªã¼ã¹ã«ã»ãã¥ãªãã£ããå¼±æ§ãå«ãã§ããå ´åã§ãã
+ 以ä¸ã«ç¤ºã URL ãç¡å¹ã«ãªã£ã¦ããããã¾ãåãã«ã»ãã¥ãªãã£ã¢ããã¤ã¹ãèªãã§ãã ããã
+ ããã¦æ°ããªãã¼ã¸ã§ã³ãï¼ããå¼±æ§ã解æ¶ãã¦ï¼å
¥æã§ãããã©ããã確èªãã¦ãã ããã
+ ããã§ãããã±ã¼ã¸ãåé¤ããã¦ãã¾ã£ã¦ããå ´åã¯ããã©ã¼ãµã¤ãããã®ãã¦ã³ãã¼ãã試ãã¦ã¿ã¦ãã ããã
+ ããå¼±æ§ãåå ã§åé¤ããã¦ããå¤ããã¼ã¸ã§ã³ã®ããã±ã¼ã¸ããã¦ã³ãã¼ãã§ããã¨ãã¦ããããå¼±æ§ã«åé¡ãããã®ã§ããã°ãã·ã¹ãã ãã«ãã«ç¨ãããã¨ã¯ãå§ããã¾ããã
+
+@z
+
+@x
Download or otherwise obtain the following packages:
@y
@@ -164,21 +196,6 @@
&Homepage;:
&Download;:
@z
-@x
- The upstream may remove tarballs of the specific releases of
- Expat when these releases contain a
- security vulnerability. You should refer to
- LFS security advisories
- to figure out which version (with the vulnerability fixed) should
- be used. You may download the vulnerable version from a mirror,
- but it's not recommended.
-@y
-
- Expat ã®ã¢ããã¹ããªã¼ã ã§ã¯ããªãªã¼ã¹ã«ããã£ã¦ã»ãã¥ãªãã£ããå¼±æ§ãå«ã¾ãã¦ããå ´åã«ã¯ããã®ãªãªã¼ã¹ tarball ãåé¤ãããã¨ãããã¾ãã
- ãããã£ã¦ LFS ã»ãã¥ãªãã£ã¢ããã¤ã¶ãªã¼ ãåç
§ãã¦ãã©ã®ãã¼ã¸ã§ã³ãï¼ããå¼±æ§ãä¿®æ£ãã¦ï¼å©ç¨ã§ãããã確èªãã¦ãã ããã
- ããå¼±æ§ãå«ããã®ã§ãã£ã¦ããã©ã¼ãµã¤ãããå
¥æã§ããããããã¾ããããããã¯ãã¾ããå§ããã¾ããã
-
-@z
@x expect
Home page:
diff --git a/src/chapter04/addinguser.ch b/src/chapter04/addinguser.ch
index 555ef653..027590a1 100644
--- a/src/chapter04/addinguser.ch
+++ b/src/chapter04/addinguser.ch
@@ -118,12 +118,12 @@
@x
In some host systems, the following command does not complete
- properly and suspends the login to the lfs user to the background. If the
- prompt "lfs:~$" does not appear immediately, entering the
+ properly and suspends the login to the &lfs-user; user to the background.
+ If the prompt "lfs:~$" does not appear immediately, entering the
fg command will fix the issue.
@y
- ãã¹ãã·ã¹ãã ã«ãã£ã¦ã¯ã以ä¸ã®ã³ãã³ããå®è¡ãã¦ãæ£å¸¸ã«å¦çããããlfs ã¦ã¼ã¶ã¼ã¸ã®ãã°ã¤ã³ãããã¯ã°ã©ã¦ã³ãã§å¦çä¸ã®ã¾ã¾ã¨ãªã£ã¦ãã¾ããã¨ãããã¾ãã
+ ãã¹ãã·ã¹ãã ã«ãã£ã¦ã¯ã以ä¸ã®ã³ãã³ããå®è¡ãã¦ãæ£å¸¸ã«å¦çãããã&lfs-user; ã¦ã¼ã¶ã¼ã¸ã®ãã°ã¤ã³ãããã¯ã°ã©ã¦ã³ãã§å¦çä¸ã®ã¾ã¾ã¨ãªã£ã¦ãã¾ããã¨ãããã¾ãã
ããã³ããã« "lfs:~$" ã¨ãã表示ãããã«ç¾ããªãã£ãå ´åã¯ãfg ã³ãã³ããå
¥åãããã¨ã§è§£æ±ºããããããã¾ããã
@z
diff --git a/src/chapter07/cleanup.ch b/src/chapter07/cleanup.ch
index 3ab19582..9755305e 100644
--- a/src/chapter07/cleanup.ch
+++ b/src/chapter07/cleanup.ch
@@ -224,14 +224,14 @@
@x
The following commands are extremely dangerous. If
- you run rm -rf ./* as the root user and you
+ you run rm -rf ./* as the &root; user and you
do not change to the $LFS directory or the LFS
- environment variable is not set for the root user, it will destroy
+ environment variable is not set for the &root; user, it will destroy
your entire host system. YOU ARE WARNED.
@y
以ä¸ã«ç¤ºãã³ãã³ãã¯ç¸å½ã«å±éºã§ãã
- root ã¦ã¼ã¶ã¼ã«ãªã£ã¦ rm -rf ./* ãå®è¡ããéã«ã$LFS ãã£ã¬ã¯ããªã«ç§»åãã¦ããªãããããã¯ç°å¢å¤æ° LFS ãè¨å®ãã¦ããªãã¨ããããã·ã¹ãã å
¨ä½ãç ´å£ãããã¨ã«ãªãã¾ãã
+ &root; ã¦ã¼ã¶ã¼ã«ãªã£ã¦ rm -rf ./* ãå®è¡ããéã«ã$LFS ãã£ã¬ã¯ããªã«ç§»åãã¦ããªãããããã¯ç°å¢å¤æ° LFS ãè¨å®ãã¦ããªãã¨ããããã·ã¹ãã å
¨ä½ãç ´å£ãããã¨ã«ãªãã¾ãã
å³ã«è¦åãã¦ããã¾ãã
@z
diff --git a/src/chapter07/introduction.ch b/src/chapter07/introduction.ch
index aca58507..d71a22a1 100644
--- a/src/chapter07/introduction.ch
+++ b/src/chapter07/introduction.ch
@@ -48,14 +48,14 @@
Until , the commands must be
run as root, with the
LFS variable set. After entering chroot, all commands
- are run as root, fortunately without access to the OS of the computer
+ are run as &root;, fortunately without access to the OS of the computer
you built LFS on. Be careful anyway, as it is easy to destroy the whole
LFS system with badly formed commands.
@y
ã¾ã§ãã³ãã³ãã®å®è¡ã¯ LFS ãè¨å®ããä¸ã§ãroot ã¦ã¼ã¶ã¼ã«ããè¡ãå¿
è¦ãããã¾ãã
- chroot ç°å¢ã«å
¥ã£ã¦ããã³ãã³ãã¯ãã¹ã¦ root å®è¡ã§ãããããå®å¿ã§ãã
+ chroot ç°å¢ã«å
¥ã£ã¦ããã³ãã³ãã¯ãã¹ã¦ &root; å®è¡ã§ãããããå®å¿ã§ãã
LFS ãæ§ç¯ãã¦ããã³ã³ãã¥ã¼ã¿ã¼ä¸ã® OS ã«ã¯ããã¢ã¯ã»ã¹ããªãããã§ãã
ãã¨è¨ã£ã¦ã³ãã³ãå®è¡ã誤ãã°ãç°¡åã« LFS ã·ã¹ãã ãå£ãã¦ãã¾ããã¨ã«ãªãã¾ããããååã«æ³¨æãã¦ãã ããã
diff --git a/src/chapter08/bash.ch b/src/chapter08/bash.ch
index d7a33ae0..05c64083 100644
--- a/src/chapter08/bash.ch
+++ b/src/chapter08/bash.ch
@@ -71,14 +71,14 @@
@z
@x
- The testsuite of the package is designed to be run as a non-root
+ The testsuite of the package is designed to be run as a non-&root;
user that owns the terminal connected to standard input. To satisfy the
requirement, spawn a new pseudo terminal using
Expect and run the tests as the tester user:
@y
- æ¬ããã±ã¼ã¸ã®ãã¹ãã¹ã¤ã¼ãã¯ãéã«ã¼ãã¦ã¼ã¶ã¼ãå®è¡ãããã®ã¨ããã¦ãã¦ãå©ç¨ãã端æ«ãæ¨æºå
¥åã«æ¥ç¶ã§ãã¦ãããã®ã¨ãã¦ãã¾ãã
+ æ¬ããã±ã¼ã¸ã®ãã¹ãã¹ã¤ã¼ãã¯ãé &root; ã¦ã¼ã¶ã¼ãå®è¡ãããã®ã¨ããã¦ãã¦ãå©ç¨ãã端æ«ãæ¨æºå
¥åã«æ¥ç¶ã§ãã¦ãããã®ã¨ãã¦ãã¾ãã
ãã®ä»æ§ãæºããããã«ã¯ãExpect ã使ã£ã¦æ°ããªç似端æ«ãèµ·åãã¾ãã
ãã㦠tester ã¦ã¼ã¶ã¼ã¨ãã¦ãã¹ããå®è¡ãã¾ãã
diff --git a/src/chapter08/coreutils.ch b/src/chapter08/coreutils.ch
index ffbe529a..d4aa96ab 100644
--- a/src/chapter08/coreutils.ch
+++ b/src/chapter08/coreutils.ch
@@ -145,11 +145,11 @@ autoconf-2.70 ã«å«ã¾ãã¦ãã gnulib .m4 ãã¡ã¤ã«ã®åé¡ãä¿®æ£ã
@z
@x
- Fix some of the permissions so that the non-root user can compile and
- run the tests:
+ Fix some of the permissions so that the non-&root; user can
+ compile and run the tests:
@y
- ç¹å®ã®ãã¡ã¤ã«ã®ãã¼ããã·ã§ã³ãå¤æ´ã㦠root ã¦ã¼ã¶ã¼ä»¥å¤ã§ãã³ã³ãã¤ã«ã¨ãã¹ããã§ããããã«ãã¾ãã
+ ç¹å®ã®ãã¡ã¤ã«ã®ãã¼ããã·ã§ã³ãå¤æ´ã㦠&root; ã¦ã¼ã¶ã¼ä»¥å¤ã§ãã³ã³ãã¤ã«ã¨ãã¹ããã§ããããã«ãã¾ãã
@z
diff --git a/src/chapter08/python.ch b/src/chapter08/python.ch
index 3778eeb7..fce6af3e 100644
--- a/src/chapter08/python.ch
+++ b/src/chapter08/python.ch
@@ -118,6 +118,34 @@
@z
@x
+ In LFS and BLFS we normally build and install Python modules with the
+ pip3 command. Please take care that the
+ pip3 install commands in both the books should be
+ run as the &root; user unless it's for a Python virtual environment.
+ Running a pip3 install as a non-&root; user may seem
+ to work fine, but it will cause the installed module to be inaccessible
+ by other users.
+@y
+ LFS ã BLFS ã«ããã¦ã¯é常ãPython ã¢ã¸ã¥ã¼ã«ã®ãã«ãã¨ã¤ã³ã¹ãã¼ã«ã«ã¯ pip3 ã³ãã³ããç¨ãã¦ãã¾ãã
+ ãã®ä¸¡ããã¯ã«ããã¦å®è¡ãã pip3 install ã³ãã³ãã¯ãPython ä»®æ³ç°å¢å
ã§ãªãå ´åã«ã¯ &root; ã¦ã¼ã¶ã¼ã§å®è¡ããããã«ãã¦ãã ããã
+ &root; ã¦ã¼ã¶ã¼ä»¥å¤ã«ãã£ã¦ pip3 install ãå®è¡ãã¦ãåé¡ãªãåä½ããããã«è¦ããããããã¾ããããã¤ã³ã¹ãã¼ã«ããã¢ã¸ã¥ã¼ã«ãå¥ã®ã¦ã¼ã¶ã¼ããã¯ã¢ã¯ã»ã¹ã§ããªãäºæ
ãä½ãåºãã¦ãã¾ãã¾ãã
+@z
+
+@x
+ pip3 install will not reinstall an already installed
+ module by default. For using the pip3 install
+ command to upgrade a module (for example, from meson-0.61.3 to
+ meson-0.62.0), insert the option --upgrade into
+ the command line. If it's really necessary to downgrade a module or
+ reinstall the same version for some reason, insert
+ --force-reinstall into the command line.
+@y
+ pip3 install ã¯ããã©ã«ãã§ã¯ããã§ã«ã¤ã³ã¹ãã¼ã«ããã¦ããã¢ã¸ã¥ã¼ã«ãåã¤ã³ã¹ãã¼ã«ãããã¨ã¯è¡ãã¾ããã
+ pip3 install ã³ãã³ãã使ã£ã¦ã¢ã¸ã¥ã¼ã«ã®ã¢ããã°ã¬ã¼ããè¡ãï¼ãã¨ãã° meson-0.61.3 ãã meson-0.62.0 ã«ãããããªå ´åï¼ã«ã¯ãã³ãã³ãã©ã¤ã³ã« --upgrade ãªãã·ã§ã³ãå«ãã¦ãã ããã
+ ã¾ãã¢ã¸ã¥ã¼ã«ã®ãã¦ã³ã°ã¬ã¼ããåã¤ã³ã¹ãã¼ã«ãå¿
è¦ã¨ãªãçç±ã確å®ã«ããã®ã§ããã°ãã³ãã³ãã©ã¤ã³ã« --force-reinstall ãå«ãã¦å®è¡ãã¦ãã ããã
+@z
+
+@x
If desired, install the preformatted documentation:
@y
diff --git a/src/chapter08/util-linux.ch b/src/chapter08/util-linux.ch
index 9d92b672..0018d60d 100644
--- a/src/chapter08/util-linux.ch
+++ b/src/chapter08/util-linux.ch
@@ -49,10 +49,10 @@
@z
@x
- If desired, run the test suite as a non-root user:
+ If desired, run the test suite as a non-&root; user:
@y
- å¿
è¦ãªã root ã¦ã¼ã¶ã¼ä»¥å¤ã«ã¦ã以ä¸ã®ããã«ãã¹ãã¹ã¤ã¼ããå®è¡ãã¾ãã
+ å¿
è¦ãªã &root; ã¦ã¼ã¶ã¼ä»¥å¤ã«ã¦ã以ä¸ã®ããã«ãã¹ãã¹ã¤ã¼ããå®è¡ãã¾ãã
@z
diff --git a/src/chapter10/kernel.ch b/src/chapter10/kernel.ch
index 4112423a..589dd969 100644
--- a/src/chapter10/kernel.ch
+++ b/src/chapter10/kernel.ch
@@ -305,13 +305,13 @@
@x
If the host system has a separate /boot partition, the files copied
below should go there. The easiest way to do that is to bind /boot on the
- host (outside chroot) to /mnt/lfs/boot before proceeding. As the root
- user in the host system:
+ host (outside chroot) to /mnt/lfs/boot before proceeding. As the
+ &root; user in the host system:
@y
ãã¹ãã·ã¹ãã ãç¬ç«ãã /boot ãã¼ãã£ã·ã§ã³ãç¨ãã¦ããå ´åã¯ãã¡ã¤ã«ãããã«ã³ãã¼ãã¾ãã
ãããç°¡åã«è¡ãããã«ãä½æ¥åã«ï¼chroot åã®ï¼/boot ããã¹ãã® /mnt/lfs/boot ã«ãã¤ã³ããã¦ããæ¹æ³ãããã¾ãã
- ãã¹ãã·ã¹ãã ã® root ã¦ã¼ã¶ã¼ã¨ãªã£ã¦ä»¥ä¸ãå®è¡ãã¾ãã
+ ãã¹ãã·ã¹ãã ã® &root; ã¦ã¼ã¶ã¼ã¨ãªã£ã¦ä»¥ä¸ãå®è¡ãã¾ãã
@z
diff --git a/src/chapter11/reboot.ch b/src/chapter11/reboot.ch
index d2f67aa3..3738d5b9 100644
--- a/src/chapter11/reboot.ch
+++ b/src/chapter11/reboot.ch
@@ -92,11 +92,11 @@
@x
Installing sudo may be useful for
- building packages as a non-root user and easily installing the resulting
- packages in your new system.
+ building packages as a non-&root; user and easily installing the
+ resulting packages in your new system.
@y
sudo ãã¤ã³ã¹ãã¼ã«ããã°ãã«ã¼ãã¦ã¼ã¶ã¼ä»¥å¤ã§ãã£ã¦ããããã±ã¼ã¸ãã«ãã¨ã¤ã³ã¹ãã¼ã«ã容æã«è¡ããã¨ãã§ãã¾ãã
+ url='&blfs-book;postlfs/sudo.html'>sudo ãã¤ã³ã¹ãã¼ã«ããã°ã&root; ã¦ã¼ã¶ã¼ä»¥å¤ã§ãã£ã¦ããããã±ã¼ã¸ãã«ãã¨ã¤ã³ã¹ãã¼ã«ã容æã«è¡ããã¨ãã§ãã¾ãã
@z
diff --git a/version.ac b/version.ac
index 8ede22c5..498bd52a 100644
--- 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-84])
+m4_define([lfs_version], [r11.1-92])
--
2.11.0