Update tzdata, python3, meson, iproute, grub, linux, bc, and bzip2

Fix testing of binutils-2.32 gold linker.
Update to tzdata-2019b.
Update to python3-3.7.4.
Update to meson-0.51.1.
Update to iproute2-5.2.0.
Update to grub-2.04.
Update to linux-5.2.1.
Update to bc-2.1.0.
Update to bzip2-1.0.8.

was r11639.

chapter01/changelog.xml

@@ -43,6 +43,48 @@
     appropriate for the entry or if needed the entire day's listitem.
        -->
 
+    <listitem>
+      <para>2019-07-14</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Fix testing of binutils-2.32 gold linker. Fixes
+          <ulink url="&lfs-ticket-root;4498">#4498</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to tzdata-2019b. Fixes
+          <ulink url="&lfs-ticket-root;4492">#4492</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to python3-3.7.4. Fixes
+          <ulink url="&lfs-ticket-root;4496">#4496</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to meson-0.51.1. Fixes
+          <ulink url="&lfs-ticket-root;4497">#4497</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iproute2-5.2.0. Fixes
+          <ulink url="&lfs-ticket-root;4495">#4495</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to grub-2.04. Fixes
+          <ulink url="&lfs-ticket-root;4494">#4494</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.2.1. Fixes
+          <ulink url="&lfs-ticket-root;4493">#4493</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bc-2.1.0. Fixes
+          <ulink url="&lfs-ticket-root;4436">#4436</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bzip2-1.0.8. Fixes
+          <ulink url="&lfs-ticket-root;4499">#4499</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem revision="systemd">
       <para>2019-07-12</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -42,9 +42,9 @@
     <!--<listitem>
       <para>Bash &bash-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Bc &bc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Binutils-&binutils-version;</para>
     </listitem>-->
@@ -117,9 +117,9 @@
     <!--<listitem>
       <para>Groff-&groff-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>GRUB-&grub-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Gzip-&gzip-version;</para>
    </listitem>-->

chapter06/bc.xml

@@ -39,7 +39,7 @@
 
   <sect2 role="installation">
     <title>安装 Bc</title>
-
+<!--
     <para>首先修改一个内部脚本，使它使用 <command>sed</command>，
     而不是 <command>ed</command>：</para>
 
@@ -55,11 +55,11 @@ sed -e '$ s/$/0}/' \
     -i libmath.h
 EOF</userinput></screen> 
 
-    <!--para>Create temporary symbolic links so the package can find
+    <!- -para>Create temporary symbolic links so the package can find
     the readline library and confirm that its required libncurses
     library is available. Even though the libraries are in /tools/lib
     at this point, the system will use /usr/lib at the end of
-    this chapter.</para-->
+    this chapter.</para- ->
 	<para> 创建一个临时的符号链接，使该软件包可以找到 readline 库，
 		并确认它需要的 libncurses 库可用。虽然目前它还在 /tools/lib
 		中，但在本章结束时系统会使用 /usr/lib 中的最后版本。 </para>
@@ -72,45 +72,70 @@ ln -sfv libncursesw.so.6 /usr/lib/libncurses.so</userinput></screen>
 
 <screen><userinput remap="pre">sed -i -e '/flex/s/as_fn_error/: ;; # &amp;/' configure</userinput></screen>
 
-    <para>准备安装 Bc：</para>
+-->
 
-<screen><userinput remap="configure">./configure --prefix=/usr           \
-            --with-readline         \
-            --mandir=/usr/share/man \
-            --infodir=/usr/share/info</userinput></screen>
+    <para>准备安装 Bc：</para>
+<!--
+<screen><userinput remap="configure">./configure - -prefix=/usr           \
+            - -with-readline         \
+            - -mandir=/usr/share/man \
+            - -infodir=/usr/share/info</userinput></screen>
+-->
+<screen><userinput remap="configure">PREFIX=/usr CC=gcc CFLAGS="-std=c99" ./configure.sh -G -O3</userinput></screen>
 
     <variablelist>
       <title>配置选项的含义：</title>
 
+<!--
       <varlistentry>
-        <term><parameter>--with-readline</parameter></term>
+        <term><parameter>- -with-readline</parameter></term>
         <listitem>
-          <!--para>This option tells Bc to use the <filename
+          <!- -para>This option tells Bc to use the <filename
           class="libraryfile">readline</filename> library that is already
           installed on the system rather than using its own readline
-          version.</para-->
+          version.</para- ->
           <para>该选项告诉 Bc 使用系统中已经安装好的
 			  <filename class="libraryfile">readline</filename>
 			  库，而不是它自己附带的 readline 。</para>
         </listitem>
       </varlistentry>
+-->
+      <varlistentry>
+        <term><parameter>CC=gcc CFLAGS="-std=c99"</parameter></term>
+        <listitem>
+          <para>该选项指定编译时使用的 C 编译器和标准。</para>
+        </listitem>
+      </varlistentry>
 
+      <varlistentry>
+        <term><parameter>-G -O3</parameter></term>
+        <listitem>
+          <para>该选项指定编译优化，并保留调试符号。</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
     <para>编译该软件包：</para>
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <!--para>To test bc, run the commands below. There is quite a bit of output,
+<!--
+    <!- -para>To test bc, run the commands below. There is quite a bit of output,
     so you may want to redirect it to a file. There are a very small percentage
     of tests (10 of 12,144) that will indicate a round off error at the last
-    digit.</para-->
+    digit.</para- ->
     <para>为了测试 bc，执行以下命令。它会输出很多内容，
 		因此您可能希望把输出重定向到文件。
 		少量测试 （12144 个测试中有 10 个）会在最后一位出现舍入误差。
 	</para>
 
 <screen><userinput remap="test">echo "quit" | ./bc/bc -l Test/checklib.b</userinput></screen>
+-->
+
+    <para>为了测试 bc，运行：</para>
+
+<screen><userinput remap="test">make test</userinput></screen>
+
 
     <para>安装该软件包：</para>
 

chapter06/binutils.xml

@@ -58,6 +58,10 @@
 <screen><computeroutput>The system has no more ptys.
 Ask your system administrator to create more.</computeroutput></screen>
 
+    <para>删除一项导致测试套件无法完成的测试：</para>
+
+<screen><userinput remap="pre">sed -i '/@\tincremental_copy/d' gold/testsuite/Makefile.in</userinput></screen>
+
     <para>Binutils 文档推荐在一个专用的构建目录中构建 Binutils：</para>
 
 <screen><userinput remap="pre">mkdir -v build
@@ -165,7 +169,8 @@ cd       build</userinput></screen>
 
 <screen><userinput remap="test">make -k check</userinput></screen>
 
-    <para>已知名为 debug_msg.sh 的一个测试可能失败。</para>
+    <para>已知 PC-relative offset 测试，
+    以及名为 debug_msg.sh 的一个测试可能失败。</para>
 
     <para>安装该软件包：</para>
 

general-orig.ent

@@ -1,16 +1,16 @@
-<!ENTITY version         "SVN-20190712">
+<!ENTITY version         "SVN-20190714">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20190712-systemd">
+<!ENTITY versiond        "20190714-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "July 12th, 2019">
+<!ENTITY releasedate     "July 14th, 2019">
 
 <!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
-<!ENTITY milestone       "8.5">
+<!ENTITY milestone       "9.0">
 
 <!ENTITY lfs-root        "http://www.linuxfromscratch.org/">
 <!ENTITY blfs-root       "&lfs-root;blfs/">

packages.ent

@@ -50,10 +50,10 @@
 <!ENTITY bash-ch6-du "62 MB">
 <!ENTITY bash-ch6-sbu "1.7 SBU">
 
-<!ENTITY bc-version "1.07.1">
-<!ENTITY bc-size "411 KB">
-<!ENTITY bc-url "&gnu;bc/bc-&bc-version;.tar.gz">
-<!ENTITY bc-md5 "cda93857418655ea43590736fc3ca9fc">
+<!ENTITY bc-version "2.1.0">
+<!ENTITY bc-size "151 KB">
+<!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
+<!ENTITY bc-md5 "40e5f6e6d9231c80d4be19d820c5b649">
 <!ENTITY bc-home "&gnu-software;bc/">
 <!ENTITY bc-ch6-du "4.1 MB">
 <!ENTITY bc-ch6-sbu "0.1 SBU">
@@ -80,10 +80,10 @@
 <!ENTITY bison-ch6-du "37 MB">
 <!ENTITY bison-ch6-sbu "0.3 SBU">
 
-<!ENTITY bzip2-version "1.0.7">
-<!ENTITY bzip2-size "791 KB">
+<!ENTITY bzip2-version "1.0.8">
+<!ENTITY bzip2-size "792 KB">
 <!ENTITY bzip2-url "https://www.sourceware.org/pub/bzip2/bzip2-&bzip2-version;.tar.gz">
-<!ENTITY bzip2-md5 "1a6a61cc867be4f3d6549037a09bf13e">
+<!ENTITY bzip2-md5 "67e051268d0c475ea773822f7500d0e5">
 <!--<!ENTITY bzip2-home "http://www.bzip.org/">-->
 <!ENTITY bzip2-ch5-du "5.5 MB">
 <!ENTITY bzip2-ch5-sbu "less than 0.1 SBU">
@@ -307,10 +307,10 @@
 <!ENTITY groff-ch6-du "94 MB">
 <!ENTITY groff-ch6-sbu "0.4 SBU">
 
-<!ENTITY grub-version "2.02">
-<!ENTITY grub-size "5,970 KB">
+<!ENTITY grub-version "2.04">
+<!ENTITY grub-size "6,245 KB">
 <!ENTITY grub-url "https://ftp.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">
-<!ENTITY grub-md5 "8a4a2a95aac551fb0fba860ceabfa1d3">
+<!ENTITY grub-md5 "5aaca6713b47ca2456d8324a58755ac7">
 <!ENTITY grub-home "&gnu-software;grub/">
 <!ENTITY grub-ch6-du "147 MB">
 <!ENTITY grub-ch6-sbu "0.6 SBU">
@@ -349,10 +349,10 @@
 <!ENTITY intltool-ch6-du "1.5 MB">
 <!ENTITY intltool-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY iproute2-version "5.1.0">
-<!ENTITY iproute2-size "706 KB">
+<!ENTITY iproute2-version "5.2.0">
+<!ENTITY iproute2-size "713 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "a2b8349abf4ae00e92155fda22de4d5e">
+<!ENTITY iproute2-md5 "0cb2736e7bc2f56254a363d3d23703b7">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-ch6-du "13 MB">
 <!ENTITY iproute2-ch6-sbu "0.2 SBU">
@@ -422,13 +422,13 @@
 <!ENTITY libtool-ch6-sbu "1.5 SBU">
 
 <!ENTITY linux-major-version "5">
-<!ENTITY linux-minor-version "1">
-<!ENTITY linux-patch-version "15">
+<!ENTITY linux-minor-version "2">
+<!ENTITY linux-patch-version "1">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "103,784 KB">
+<!ENTITY linux-size "104,521 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "373a50ac09f662469fe1c699b2cb2520">
+<!ENTITY linux-md5 "e839936920f433c394bb23e6c9312c68">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -477,10 +477,10 @@
 <!ENTITY man-pages-ch6-du "28 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "0.51.0">
-<!ENTITY meson-size "1,416 KB">
+<!ENTITY meson-version "0.51.1">
+<!ENTITY meson-size "1,418 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "a091995861e0bc23e3c856b0c8d1ef90">
+<!ENTITY meson-md5 "48787e391ec5c052799a3dd491f73909">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-ch6-du "24 MB">
 <!ENTITY meson-ch6-sbu "less than 0.1 SBU">
@@ -574,19 +574,19 @@
 <!-- If python minor version changes, updates in python and 
      meson pages will be needed: python3.6 and python3.6m -->
 
-<!ENTITY python-version "3.7.3">
+<!ENTITY python-version "3.7.4">
 <!ENTITY python-minor "3.7">
-<!ENTITY python-size "16,708 KB">
+<!ENTITY python-size "16,730 KB">
 <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
-<!ENTITY python-md5 "93df27aec0cd18d6d42173e601ffbbfd">
+<!ENTITY python-md5 "d33e4aae66097051c2eca45ee3604803">
 <!ENTITY python-home "https://www.python.org/">
 <!ENTITY python-ch5-du "371 MB">
 <!ENTITY python-ch5-sbu "1.5 SBU">
 <!ENTITY python-ch6-du "392 MB">
 <!ENTITY python-ch6-sbu "1.0 SBU">
 <!ENTITY python-docs-url "https://docs.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
-<!ENTITY python-docs-md5 "48ed2b9e97e83f4d0966f305b8e04aa4">
-<!ENTITY python-docs-size "6,079 KB">
+<!ENTITY python-docs-md5 "c410337e954dbba2d04fe169c355a6a2">
+<!ENTITY python-docs-size "6,068 KB">
 
 <!ENTITY readline-version "8.0">
 <!ENTITY readline-size "2,907 KB">
@@ -675,10 +675,10 @@
 <!ENTITY texinfo-ch6-du "129 MB">
 <!ENTITY texinfo-ch6-sbu "0.9 SBU">
 
-<!ENTITY tzdata-version "2019a">
-<!ENTITY tzdata-size "371 KB">
+<!ENTITY tzdata-version "2019b">
+<!ENTITY tzdata-size "376 KB">
 <!ENTITY tzdata-url "https://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "288f7b1e43018c633da108f13b27cf91">
+<!ENTITY tzdata-md5 "b26b5d7d844cb96c73ed2fb6d588daaf">
 <!ENTITY tzdata-home "https://www.iana.org/time-zones">
 
 <!ENTITY udev-lfs-version "udev-lfs-20171102">

prologue/bookinfo.xml

@@ -7,8 +7,9 @@
 
 <bookinfo>
   <title>Linux From Scratch</title>
-  <subtitle revision='sysv'   > &version; 中文翻译版</subtitle>
-  <subtitle revision='systemd'> &versiond; 中文翻译版</subtitle>
+  <subtitle revision='sysv'   >版本 &version; ，中文翻译版</subtitle>
+  <subtitle revision='systemd'>版本 &versiond; ，中文翻译版</subtitle>
+  <subtitle>发布于 &releasedate;</subtitle>
 
   <authorgroup>
     <author>

translate-date.sh

@@ -2,7 +2,7 @@
 
 # usage: translate-general-ent.sh general.ent general-cn.ent
 
-sed -e '/releasedate/s@"\([A-Za-z]*\) \([0-9]*\), \([0-9]*\)"@"\3 年 \1 月 \2 日"@' \
+sed -e '/releasedate/s@"\([A-Za-z]*\) \([0-9]*\)[a-z]*, \([0-9]*\)"@"\3 年 \1 月 \2 日"@' \
 	-e '/releasedate/s@Jan[a-z]*@1@' \
 	-e '/releasedate/s@Feb[a-z]*@2@' \
 	-e '/releasedate/s@Mar[a-z]*@3@' \