From e6b6261f915d3ce8a0cea8c30befe06f358ff6e2 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 24 Nov 2014 03:43:54 +0000
Subject: [PATCH] Update to linux-3.17.4 Update to kmod-19 Update to grep-2.21

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10795 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 bootscripts/lfs/init.d/rc |  5 ++---
 chapter01/changelog.xml   | 18 ++++++++++++++++++
 chapter01/whatsnew.xml    |  8 ++++----
 general.ent               |  4 ++--
 packages.ent              | 18 +++++++++---------
 5 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/bootscripts/lfs/init.d/rc b/bootscripts/lfs/init.d/rc
index 93d6ea942..3e928a8f5 100644
--- a/bootscripts/lfs/init.d/rc
+++ b/bootscripts/lfs/init.d/rc
@@ -24,9 +24,8 @@ print_error_msg()
    MSG="${MSG}which exited with a return value of ${error_value}.\n"
   
    MSG="${MSG}If you're able to track this error down to a bug in one of\n"
-   MSG="${MSG}the files provided by the files provided by\n"
-   MSG="${MSG}the ${DISTRO_MINI} book, please be so kind to inform us at\n"
-   MSG="${MSG}${DISTRO_CONTACT}.\n"
+   MSG="${MSG}the files provided by the ${DISTRO_MINI} book,\n"
+   MSG="${MSG}please be so kind to inform us at ${DISTRO_CONTACT}.\n"
    log_failure_msg "${MSG}"
 
    log_info_msg "Press Enter to continue..."
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index db8fee52c..3ebe58a13 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,24 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2014-11-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.17.4. Fixes 
+          <ulink url="&lfs-ticket-root;3712">#3712</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to kmod-19. Fixes 
+          <ulink url="&lfs-ticket-root;3713">#3713</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to grep-2.21. Fixes 
+          <ulink url="&lfs-ticket-root;3714">#3714</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2014-11-13</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 8fc33d641..0b3bba7c3 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -104,9 +104,9 @@
     <!--<listitem>
       <para>Gperf-&gperf-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Grep &grep-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Groff &groff-version;</para>
     </listitem>
@@ -131,9 +131,9 @@
     <!--<listitem>
       <para>Kbd &kbd-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Kmod &kmod-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Less &less-version;</para>
     </listitem>-->
diff --git a/general.ent b/general.ent
index 31bf0ca6a..8e55b69eb 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version         "SVN-20141113">
+<!ENTITY version         "SVN-20141124">
 <!ENTITY short-version   "svn">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "November 13, 2014">
+<!ENTITY releasedate     "November 24, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.7">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index f91429cc3..b813de63d 100644
--- a/packages.ent
+++ b/packages.ent
@@ -260,10 +260,10 @@
 <!ENTITY gperf-ch6-du "5.5 MB">
 <!ENTITY gperf-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY grep-version "2.20">
-<!ENTITY grep-size "1,209 KB">
+<!ENTITY grep-version "2.21">
+<!ENTITY grep-size "1,232 KB">
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
-<!ENTITY grep-md5 "2cbea44a4f1548aee20b9ff2d3076908">
+<!ENTITY grep-md5 "43c48064d6409862b8a850db83c8038a">
 <!ENTITY grep-home "&gnu-software;grep/">
 <!ENTITY grep-ch5-du "18 MB">
 <!ENTITY grep-ch5-sbu "0.2 SBU">
@@ -336,10 +336,10 @@
 <!ENTITY kbd-ch6-du "28 MB">
 <!ENTITY kbd-ch6-sbu "0.1 SBU">
 
-<!ENTITY kmod-version "18">
+<!ENTITY kmod-version "19">
 <!ENTITY kmod-size "1,440 KB">
 <!ENTITY kmod-url "&kernel;linux/utils/kernel/kmod/kmod-&kmod-version;.tar.xz">
-<!ENTITY kmod-md5 "82835c7f01983634e06ca72b4ee30cc6">
+<!ENTITY kmod-md5 "a08643f814aa4efc12211c6e5909f4d9">
 <!ENTITY kmod-home " ">
 <!ENTITY kmod-ch6-du "36 MB">
 <!ENTITY kmod-ch6-sbu "0.1 SBU">
@@ -352,7 +352,7 @@
 <!ENTITY less-ch6-du "3.6 MB">
 <!ENTITY less-ch6-sbu "0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20141110">              <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20141113">              <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->
@@ -386,12 +386,12 @@
 
 <!ENTITY linux-major-version "3">
 <!ENTITY linux-minor-version "17">
-<!ENTITY linux-patch-version "2">
+<!ENTITY linux-patch-version "4">
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
-<!ENTITY linux-size "78,449 KB">
+<!ENTITY linux-size "78,455 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "87444e6f0906e2ec783cf0ed6aab1a56">
+<!ENTITY linux-md5 "ce49828adecf8908eb3a9ffc5b860d44">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,