浏览代码

Update man-pages, linux, iproute2, gettext, file, e2fsprogs

Update to man-pages-5.01.
Update to linux-5.1.3.
Update to iproute2-5.1.0.
Update to gettext-0.20.1.
Update to file-5.37.
Update to e2fsprogs-1.45.1.

was r11607.
Bruce Dubbs 6 年之前
父节点
当前提交
78115ba647
共有 7 个文件被更改,包括 83 次插入52 次删除
  1. 31 1
      chapter01/changelog.xml
  2. 4 4
      chapter01/whatsnew.xml
  3. 13 23
      chapter05/gettext.xml
  4. 8 0
      chapter06/e2fsprogs.xml
  5. 5 2
      chapter06/gettext.xml
  6. 3 3
      general-orig.ent
  7. 19 19
      packages.ent

+ 31 - 1
chapter01/changelog.xml

@@ -43,6 +43,36 @@
     appropriate for the entry or if needed the entire day's listitem.
     appropriate for the entry or if needed the entire day's listitem.
     -->
     -->
 
 
+    <listitem>
+      <para>2019-05-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - 更新到 man-pages-5.01。修复
+          <ulink url="&lfs-ticket-root;4467">#4467</ulink>。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - 更新到 linux-5.1.3。修复
+          <ulink url="&lfs-ticket-root;4464">#4464</ulink>。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - 更新到 iproute2-5.1.0。修复
+          <ulink url="&lfs-ticket-root;4467">#4467</ulink>。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - 更新到 gettext-0.20.1。修复
+          <ulink url="&lfs-ticket-root;4465">#4465</ulink>。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - 更新到 file-5.37。修复
+          <ulink url="&lfs-ticket-root;4469">#4469</ulink>。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - 更新到 e2fsprogs-1.45.1。修复
+          <ulink url="&lfs-ticket-root;4468">#4468</ulink>。</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem revision="systemd">
     <listitem revision="systemd">
       <para>2019-05-11</para>
       <para>2019-05-11</para>
       <itemizedlist>
       <itemizedlist>
@@ -62,7 +92,7 @@
         </listitem>
         </listitem>
         <listitem>
         <listitem>
           <para>[bdubbs] - 更新到 linux-5.0.11。修复
           <para>[bdubbs] - 更新到 linux-5.0.11。修复
-          <ulink url="&lfs-ticket-root;4459">#4461</ulink>。</para>
+          <ulink url="&lfs-ticket-root;4461">#4461</ulink>。</para>
         </listitem>
         </listitem>
       </itemizedlist>
       </itemizedlist>
     </listitem>
     </listitem>

+ 4 - 4
chapter01/whatsnew.xml

@@ -81,9 +81,9 @@
    <!-- <listitem>
    <!-- <listitem>
       <para>Expect-&expect-version;</para>
       <para>Expect-&expect-version;</para>
    </listitem>-->
    </listitem>-->
-   <!--<listitem>
+   <listitem>
       <para>File-&file-version;</para>
       <para>File-&file-version;</para>
-   </listitem>-->
+   </listitem>
     <!--<listitem>
     <!--<listitem>
       <para>Findutils-&findutils-version;</para>
       <para>Findutils-&findutils-version;</para>
     </listitem>-->
     </listitem>-->
@@ -99,9 +99,9 @@
    <!--<listitem>
    <!--<listitem>
       <para>GDBM-&gdbm-version;</para>
       <para>GDBM-&gdbm-version;</para>
    </listitem>-->
    </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Gettext-&gettext-version;</para>
       <para>Gettext-&gettext-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
     <!--<listitem>
       <para>Glibc-&glibc-version;</para>
       <para>Glibc-&glibc-version;</para>
     </listitem>-->
     </listitem>-->

+ 13 - 23
chapter05/gettext.xml

@@ -43,30 +43,29 @@
   <sect2 role="installation">
   <sect2 role="installation">
     <title>安装 Gettext</title>
     <title>安装 Gettext</title>
 
 
-    <!--para>For our temporary set of tools, we only need to build and install
+    <!--para>For our temporary set of tools, we only need to install
     three programs from Gettext.</para-->
     three programs from Gettext.</para-->
-    <para>对于我们的临时工具,只要构建和安装 Gettext 中的三个程序即可。
+    <para>对于我们的临时工具,只要安装 Gettext 中的三个程序即可。
     </para>
     </para>
 
 
     <para>准备编译 Gettext:</para>
     <para>准备编译 Gettext:</para>
 
 
-<screen><userinput remap="configure">cd gettext-tools
-EMACS="no" ./configure --prefix=/tools --disable-shared</userinput></screen>
+<screen><userinput remap="configure">./configure --disable-shared</userinput></screen>
 
 
     <variablelist>
     <variablelist>
       <title>配置选项的含义:</title>
       <title>配置选项的含义:</title>
-
+<!--
       <varlistentry>
       <varlistentry>
         <term><parameter>EMACS="no"</parameter></term>
         <term><parameter>EMACS="no"</parameter></term>
         <listitem>
         <listitem>
-          <!--para>This prevents the configure script from determining where to
+          <!- -para>This prevents the configure script from determining where to
           install Emacs Lisp files as the test is known to hang on some hosts.
           install Emacs Lisp files as the test is known to hang on some hosts.
-          </para-->
+          </para- ->
 		  <para>该选项阻止 configure 脚本寻找 Emacs Lisp 文件的安装位置,
 		  <para>该选项阻止 configure 脚本寻找 Emacs Lisp 文件的安装位置,
 			  因为在某些宿主环境中进行这项查找时会挂起。</para>
 			  因为在某些宿主环境中进行这项查找时会挂起。</para>
         </listitem>
         </listitem>
       </varlistentry>
       </varlistentry>
-
+-->
       <varlistentry>
       <varlistentry>
         <term><parameter>--disable-shared</parameter></term>
         <term><parameter>--disable-shared</parameter></term>
         <listitem>
         <listitem>
@@ -81,25 +80,16 @@ EMACS="no" ./configure --prefix=/tools --disable-shared</userinput></screen>
 
 
     <para>编译该软件包:</para>
     <para>编译该软件包:</para>
 
 
-<screen><userinput remap="make">make -C gnulib-lib
-make -C intl pluralx.c
-make -C src msgfmt
-make -C src msgmerge
-make -C src xgettext</userinput></screen>
-
-    <!--para>As only three programs have been compiled, it is not possible to run the
-    test suite without compiling additional support libraries from the Gettext
-    package. It is therefore not recommended to attempt to run the test suite at
-    this stage.</para-->
-    <para>由于只编译了三个程序,在不构建 Gettext 包中的附加支持库的情况下,
-		不可能运行测试套件。因此,在这个阶段,不推荐尝试运行 Gettext
-		的测试套件。
-	</para>
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>
+    由于环境的限制,不建议在这里运行该软件包的测试套件。
+    </para>
 
 
     <para>安装 <command>msgfmt</command>, <command>msgmerge</command> and
     <para>安装 <command>msgfmt</command>, <command>msgmerge</command> and
     <command>xgettext</command> 这三个程序:</para>
     <command>xgettext</command> 这三个程序:</para>
 
 
-<screen><userinput remap="install">cp -v src/{msgfmt,msgmerge,xgettext} /tools/bin</userinput></screen>
+<screen><userinput remap="install">cp -v gettext-tools/src/{msgfmt,msgmerge,xgettext} /tools/bin</userinput></screen>
 
 
   </sect2>
   </sect2>
 
 

+ 8 - 0
chapter06/e2fsprogs.xml

@@ -62,6 +62,7 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
              --disable-libblkid      \
              --disable-libblkid      \
              --disable-libuuid       \
              --disable-libuuid       \
              --disable-uuidd         \
              --disable-uuidd         \
+             --with-crond-dir=no     \
              --disable-fsck</userinput></screen>
              --disable-fsck</userinput></screen>
 
 
     <variablelist>
     <variablelist>
@@ -97,6 +98,13 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
         </listitem>
         </listitem>
       </varlistentry>
       </varlistentry>
 
 
+      <varlistentry>
+        <term><parameter>--with-crond-dir=no</parameter></term>
+        <listitem>
+          <para>This disables the installation of an unneded file.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
       <varlistentry>
         <term><parameter>--disable-*</parameter></term>
         <term><parameter>--disable-*</parameter></term>
         <listitem>
         <listitem>

+ 5 - 2
chapter06/gettext.xml

@@ -55,19 +55,22 @@
 
 
    There is no reference to 'test' or TEST in  gettext-tools/gnulib-tests/Makefile.am
    There is no reference to 'test' or TEST in  gettext-tools/gnulib-tests/Makefile.am
    -->
    -->
+   <!--
    <para>首先,取消 test-lock 的两次执行,因为它在某些机器上会死循环:
    <para>首先,取消 test-lock 的两次执行,因为它在某些机器上会死循环:
    </para>
    </para>
 
 
 <screen><userinput remap="pre">sed -i '/^TESTS =/d' gettext-runtime/tests/Makefile.in &amp;&amp;
 <screen><userinput remap="pre">sed -i '/^TESTS =/d' gettext-runtime/tests/Makefile.in &amp;&amp;
-sed -i 's/test-lock..EXEEXT.//' gettext-tools/gnulib-tests/Makefile.in</userinput></screen>
+sed -i 's/test-lock..EXEEXT.//' gettext-tools/gnulib-tests/Makefile.in</userinput></screen>-->
 
 
    <!-- As of April 11, 2018 appdata.* is NOT in git master, but appears
    <!-- As of April 11, 2018 appdata.* is NOT in git master, but appears
    to be in metainfo.{its,loc},  When updating, check BLFS gnome-screenshot. -->
    to be in metainfo.{its,loc},  When updating, check BLFS gnome-screenshot. -->
+
+<!--
    <para>现在修复一个配置文件:</para>
    <para>现在修复一个配置文件:</para>
 
 
 <screen><userinput remap="pre">sed -e '/AppData/{N;N;p;s/\.appdata\./.metainfo./}' \
 <screen><userinput remap="pre">sed -e '/AppData/{N;N;p;s/\.appdata\./.metainfo./}' \
     -i gettext-tools/its/appdata.loc</userinput></screen>
     -i gettext-tools/its/appdata.loc</userinput></screen>
-
+-->
     <para>准备编译 Gettext:</para>
     <para>准备编译 Gettext:</para>
 
 
 <screen><userinput remap="configure">./configure --prefix=/usr    \
 <screen><userinput remap="configure">./configure --prefix=/usr    \

+ 3 - 3
general-orig.ent

@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20190511">
+<!ENTITY version         "SVN-20190519">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
 
-<!ENTITY versiond        "20190511-systemd">
+<!ENTITY versiond        "20190519-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 <!ENTITY generic-versiond "systemd"> 
 
 
-<!ENTITY releasedate     "May 11, 2019">
+<!ENTITY releasedate     "May 19, 2019">
 
 
 <!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.5">
 <!ENTITY milestone       "8.5">

+ 19 - 19
packages.ent

@@ -144,10 +144,10 @@
 <!ENTITY diffutils-ch6-du "36 MB">
 <!ENTITY diffutils-ch6-du "36 MB">
 <!ENTITY diffutils-ch6-sbu "0.3 SBU">
 <!ENTITY diffutils-ch6-sbu "0.3 SBU">
 
 
-<!ENTITY e2fsprogs-version "1.45.0">
-<!ENTITY e2fsprogs-size "7,637 KB">
+<!ENTITY e2fsprogs-version "1.45.1">
+<!ENTITY e2fsprogs-size "7,619 KB">
 <!ENTITY e2fsprogs-url "https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
 <!ENTITY e2fsprogs-url "https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "641e1371dbdd118eade96bb963104f16">
+<!ENTITY e2fsprogs-md5 "cdc40d50750356afef929c7922ecb4ae">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-ch6-du "96 MB">
 <!ENTITY e2fsprogs-ch6-du "96 MB">
 <!ENTITY e2fsprogs-ch6-sbu "1.6 SBU">
 <!ENTITY e2fsprogs-ch6-sbu "1.6 SBU">
@@ -184,10 +184,10 @@
 <!ENTITY expect-ch5-du "3.9 MB">
 <!ENTITY expect-ch5-du "3.9 MB">
 <!ENTITY expect-ch5-sbu "0.1 SBU">
 <!ENTITY expect-ch5-sbu "0.1 SBU">
 
 
-<!ENTITY file-version "5.36">
-<!ENTITY file-size "856 KB">
+<!ENTITY file-version "5.37">
+<!ENTITY file-size "867 KB">
 <!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
 <!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
-<!ENTITY file-md5 "9af0eb3f5db4ae00fffc37f7b861575c">
+<!ENTITY file-md5 "80c29aca745466c6c24d11f059329075">
 <!ENTITY file-home "https://www.darwinsys.com/file/">
 <!ENTITY file-home "https://www.darwinsys.com/file/">
 <!ENTITY file-ch5-du "18 MB">
 <!ENTITY file-ch5-du "18 MB">
 <!ENTITY file-ch5-sbu "0.1 SBU">
 <!ENTITY file-ch5-sbu "0.1 SBU">
@@ -252,10 +252,10 @@
 <!ENTITY gdbm-ch6-du "11 MB">
 <!ENTITY gdbm-ch6-du "11 MB">
 <!ENTITY gdbm-ch6-sbu "0.1 SBU">
 <!ENTITY gdbm-ch6-sbu "0.1 SBU">
 
 
-<!ENTITY gettext-version "0.19.8.1">
-<!ENTITY gettext-size "7,041 KB">
+<!ENTITY gettext-version "0.20.1">
+<!ENTITY gettext-size "9,128 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
-<!ENTITY gettext-md5 "df3f5690eaa30fd228537b00cb7b7590">
+<!ENTITY gettext-md5 "9ed9e26ab613b668e0026222a9c23639">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-ch5-du "173 MB">
 <!ENTITY gettext-ch5-du "173 MB">
 <!ENTITY gettext-ch5-sbu "0.9 SBU">
 <!ENTITY gettext-ch5-sbu "0.9 SBU">
@@ -349,10 +349,10 @@
 <!ENTITY intltool-ch6-du "1.5 MB">
 <!ENTITY intltool-ch6-du "1.5 MB">
 <!ENTITY intltool-ch6-sbu "less than 0.1 SBU">
 <!ENTITY intltool-ch6-sbu "less than 0.1 SBU">
 
 
-<!ENTITY iproute2-version "5.0.0">
-<!ENTITY iproute2-size "694 KB">
+<!ENTITY iproute2-version "5.1.0">
+<!ENTITY iproute2-size "706 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "d22107b4d7cfb999eeb8ad8a0aec1124">
+<!ENTITY iproute2-md5 "a2b8349abf4ae00e92155fda22de4d5e">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-ch6-du "13 MB">
 <!ENTITY iproute2-ch6-du "13 MB">
 <!ENTITY iproute2-ch6-sbu "0.2 SBU">
 <!ENTITY iproute2-ch6-sbu "0.2 SBU">
@@ -422,13 +422,13 @@
 <!ENTITY libtool-ch6-sbu "1.5 SBU">
 <!ENTITY libtool-ch6-sbu "1.5 SBU">
 
 
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-major-version "5">
-<!ENTITY linux-minor-version "0">
-<!ENTITY linux-patch-version "11">
+<!ENTITY linux-minor-version "1">
+<!ENTITY linux-patch-version "3">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "102,789 KB">
+<!ENTITY linux-size "103,754 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "77321c26a2c338f44ef0a3ed8736149b">
+<!ENTITY linux-md5 "3f730ddd144d8ff83a10291e8c8cf0b4">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
 <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
  allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -469,10 +469,10 @@
 <!ENTITY man-db-ch6-du "36 MB">
 <!ENTITY man-db-ch6-du "36 MB">
 <!ENTITY man-db-ch6-sbu "0.3 SBU">
 <!ENTITY man-db-ch6-sbu "0.3 SBU">
 
 
-<!ENTITY man-pages-version "5.00">
-<!ENTITY man-pages-size "1,621 KB">
+<!ENTITY man-pages-version "5.01">
+<!ENTITY man-pages-size "1,624 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "d3be22b49e52d93734343c0df52dad01">
+<!ENTITY man-pages-md5 "5f75f72efcbe5cd245c4d9f36005d070">
 <!ENTITY man-pages-home "https://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-home "https://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-ch6-du "28 MB">
 <!ENTITY man-pages-ch6-du "28 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">