Cherry-pick r11399

Fix appdata.loc file in gettext.
Update to linux-4.16.1.
Update to procps-ng-3.3.14.

chapter01/changelog.xml

@@ -41,6 +41,23 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+    <listitem>
+      <para>2018-04-11</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] - 修复 gettext 中的 appdata.loc 文件。</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - 更新到 linux-4.16.1。修复 
+           <ulink url="&lfs-ticket-root;4256">#4256</ulink>。</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - 更新到 procps-ng-3.3.14。修复 
+           <ulink url="&lfs-ticket-root;4267">#4257</ulink>。</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2018-04-06</para>
       <itemizedlist>

chapter06/gettext.xml

@@ -46,16 +46,29 @@
   <sect2 role="installation">
     <title>安装 Gettext</title>
 
-   <!-- this has been fixed in upstream gnulib, when a new version of
+   <!-- This has been fixed in upstream gnulib, when a new version of
    gettext is released, please check #4055 to see if the change has been
-   picked up in this package -->
+   picked up in this package 
+   
+   As of April 11, 2018, 'TESTS = test-lock' is in gettext-runtime/tests/Makefile.am
+   Perhaps the test is fixed.
+
+   There is no reference to 'test' or TEST in  gettext-tools/gnulib-tests/Makefile.am
+   -->
    <para>首先，取消 test-lock 的两次执行，因为它在某些机器上会死循环：
    </para>
 
 <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>
 
-    <para>准备安装 Gettext：</para>
+   <!-- 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. -->
+   <para>现在修复一个配置文件：</para>
+
+<screen><userinput remap="pre">sed -e '/AppData/N;N;p;s/\.appdata\./.metainfo./' \
+    -i gettext-tools/its/appdata.loc</userinput></screen>
+
+    <para>准备编译 Gettext：</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr    \
             --disable-static \

chapter06/revisedchroot.xml

@@ -60,12 +60,12 @@ rm -f /usr/lib/libfl.a
 rm -f /usr/lib/libfl_pic.a
 rm -f /usr/lib/libz.a</userinput></screen>
 
-  <para>/usr/lib 目录中还有一些扩展名为 .la 的文件。
+  <para>/usr/lib 和 /usr/libexec 目录中还有一些扩展名为 .la 的文件。
 	  它们是 <quote>libtool 档案</quote> 文件，
 	  在 Linux 系统上一般是不必要的。截至目前，
 	  已经安装的 .la 文件中没有一个是必要的。执行以下命令删除它们：</para>
 
-<screen><userinput>find /usr/lib -name \*.la -delete</userinput></screen>
+<screen><userinput>find /usr/lib /usr/libexec -name \*.la -delete</userinput></screen>
 
    <para>如果希望了解更多关于 libtool 档案文件的信息，参阅 <ulink
    url="&blfs-book;/introduction/la-files.html">BLFS 章节 "About Libtool

general.ent

@@ -1,4 +1,4 @@
-<!ENTITY version         "SVN-20180406">
+<!ENTITY version         "SVN-20180411">
 <!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}]" -->
@@ -7,7 +7,7 @@
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "2018 年 4 月 6 日">
+<!ENTITY releasedate     "2018 年 4 月 11 日">
 
 <!ENTITY copyrightdate   "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.3">

packages.ent

@@ -416,12 +416,12 @@
 
 <!ENTITY linux-major-version "4">
 <!ENTITY linux-minor-version "16">
-<!ENTITY linux-patch-version "0">
-<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> 
-<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> -->
-<!ENTITY linux-size "100,606 KB">
+<!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 "100,610 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "1357fb4ee7c288fdeac5d4e0048f5c18">
+<!ENTITY linux-md5 "16123b843ad2efa394a060d8f72c91c2">
 <!ENTITY linux-home "http://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,
@@ -548,10 +548,10 @@
 <!ENTITY pkgconfig-ch6-du "28 MB">
 <!ENTITY pkgconfig-ch6-sbu "0.3 SBU">
 
-<!ENTITY procps-ng-version "3.3.13">
-<!ENTITY procps-ng-size "881 KB">
+<!ENTITY procps-ng-version "3.3.14">
+<!ENTITY procps-ng-size "906 KB">
 <!ENTITY procps-ng-url "https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz">
-<!ENTITY procps-ng-md5 "ad20fe97b3f45797dd43e2d3e046ff32">
+<!ENTITY procps-ng-md5 "fce371ccc1c15a67af9d85e4057e559d">
 <!ENTITY procps-ng-home "https://sourceforge.net/projects/procps-ng">
 <!ENTITY procps-ng-ch6-du "15 MB">
 <!ENTITY procps-ng-ch6-sbu "0.1 SBU">