Cherry pick r11418

Typo fix in xz page.
Change some http references to https in gcc.
Update to iproute2-4.17.0.
Update to bison-3.0.5.
Update to linux-4.17.1.

chapter01/changelog.xml

@@ -41,6 +41,32 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+    <listitem>
+      <para>2018-06-12</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] - 改正 xz 页面中的拼写错误。修复 
+           <ulink url="&lfs-ticket-root;4285">#4285</ulink>。</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - 将 gcc 中引用的 URL 修改为 HTTPS 协议。修复 
+           <ulink url="&lfs-ticket-root;4281">#4281</ulink>。</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - 更新到 iproute2-4.17.0。修复 
+           <ulink url="&lfs-ticket-root;4288">#4288</ulink>。</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - 更新到 bison-3.0.5。修复 
+           <ulink url="&lfs-ticket-root;4284">#4284</ulink>。</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - 更新到 linux-4.17.1。修复 
+           <ulink url="&lfs-ticket-root;4280">#4280</ulink>。</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2018-05-22</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -48,9 +48,9 @@
     <!--<listitem>
       <para>Binutils-&binutils-version;</para>
    </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Bison-&bison-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Bzip2-&bzip2-version;</para>
     </listitem>-->

chapter06/bison.xml

@@ -39,11 +39,7 @@
 
   <sect2 role="installation">
     <title>安装 Bison</title>
-<!-- bison only installs a static library
-    <para>Inhibit static library installation:</para>
 
-<screen><userinput remap="pre">sed -i '/lib_LIBRARIES =/d' Makefile.in</userinput></screen>    
--->
     <para>准备安装 Bison：</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/bison-&bison-version;</userinput></screen>
@@ -60,12 +56,12 @@
 
     <!--para>There is a circular dependency between bison and flex with regard to
     the checks.  If desired, after installing flex in the next section, the
+<<<<<<< HEAD
     bison checks can be run with <command>make check</command>.  Three
     tests related to lalr1.cc fail for unknown reasons.</para-->
     <para>在考虑测试的情况下， bison 和 flex 之间存在循环依赖。
 		如果希望的话，可以在下一节安装 flex 后，
-		返回这里运行 <command>make check</command> 运行测试。
-		三个和 lalr1.cc 相关的测试由于不明原因失败。</para>
+		返回这里运行 <command>make check</command> 运行测试。</para>
 
     <para>安装该软件包：</para>
 

chapter06/gcc.xml

@@ -122,7 +122,7 @@ cd       build</userinput></screen>
 
     <para>可以将结果与 <ulink
     url="&test-results;"/> 和
-    <ulink url="http://gcc.gnu.org/ml/gcc-testresults/"/>
+    <ulink url="https://gcc.gnu.org/ml/gcc-testresults/"/>
     的结果进行比较。</para>
 
     <!--para>A few unexpected failures cannot always be avoided. The GCC developers
@@ -153,7 +153,7 @@ cd       build</userinput></screen>
 <screen><userinput remap="install">make install</userinput></screen>
 
     <para>创建一个 <ulink
-    url="http://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch03s09.html">FHS</ulink>
+    url="https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch03s09.html">FHS</ulink>
     因 <quote>历史原因</quote> 要求的符号链接：</para>
 
 <screen><userinput remap="install">ln -sv ../usr/bin/cpp /lib</userinput></screen>

chapter06/iproute2.xml

@@ -59,10 +59,10 @@
 <screen><userinput remap="pre">sed -i /ARPD/d Makefile
 rm -fv man/man8/arpd.8</userinput></screen>
 
-	<para>还需要禁用一个需要
+	<para>还需要禁用两个需要
 		<ulink url="&blfs-book;postlfs/iptables.html"/> 的模块：</para>
 
-<screen><userinput remap="pre">sed -i 's/m_ipt.o//' tc/Makefile</userinput></screen>
+<screen><userinput remap="pre">sed -i 's/.m_ipt.o//' tc/Makefile</userinput></screen>
 
     <para>编译该软件包：</para>
 

general.ent

@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20180525">
+<!ENTITY version         "SVN-20180612">
 <!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        "20180531-systemd">
+<!ENTITY versiond        "20180612-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "2018 年 5 月 31 日">
+<!ENTITY releasedate     "2018 年 6 月 12 日">
 
 <!ENTITY copyrightdate   "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.3">

packages.ent

@@ -70,10 +70,10 @@
 <!ENTITY binutils-ch6-du "4.2 GB">
 <!ENTITY binutils-ch6-sbu "6.0 SBU">
 
-<!ENTITY bison-version "3.0.4">
-<!ENTITY bison-size "1,928 KB">
+<!ENTITY bison-version "3.0.5">
+<!ENTITY bison-size "1,910 KB">
 <!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.xz">
-<!ENTITY bison-md5 "c342201de104cc9ce0a21e0ad10d4021">
+<!ENTITY bison-md5 "3e54f20988ecd1b62044e25481e5f06b">
 <!ENTITY bison-home "&gnu-software;bison/">
 <!ENTITY bison-ch5-du "32 MB">
 <!ENTITY bison-ch5-sbu "0.3 SBU">
@@ -342,10 +342,10 @@
 <!ENTITY intltool-ch6-du "1.5 MB">
 <!ENTITY intltool-ch6-sbu "不到 0.1 SBU">
 
-<!ENTITY iproute2-version "4.16.0">
-<!ENTITY iproute2-size "646 KB">
+<!ENTITY iproute2-version "4.17.0">
+<!ENTITY iproute2-size "660 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "1f12a70d767ef77ffa2d1a0c4ce48f1a">
+<!ENTITY iproute2-md5 "6f3a87fe2d97c28214fc2faab2c257d6">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-ch6-du "12 MB">
 <!ENTITY iproute2-ch6-sbu "0.2 SBU">
@@ -415,13 +415,13 @@
 <!ENTITY libtool-ch6-sbu "1.8 SBU">
 
 <!ENTITY linux-major-version "4">
-<!ENTITY linux-minor-version "16">
-<!ENTITY linux-patch-version "10">
+<!ENTITY linux-minor-version "17">
+<!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,618 KB">
+<!ENTITY linux-size "99,781 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "10fb5e17709a7cc345bf0ab673b99d7c">
+<!ENTITY linux-md5 "1b25fd66e33f78b5d860898e7910b3d7">
 <!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,