Update to make-4.2.1

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11090 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

8 files changed, 16 insertions, 28 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4e78c70bb..47dabb33e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,16 @@
     appropriate for the entry or if needed the entire day's listitem.
 -->
    <listitem>
+      <para>2016-06-11</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to make-4.2.1. Fixes
+          <ulink url="&lfs-ticket-root;3944">#3944</ulink>.</para>
+        </listitem>
+     </itemizedlist>
+    </listitem>
+
+   <listitem>
       <para>2016-06-10</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 0f4fc503c..e34d5fb15 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -259,10 +259,6 @@
       <para>&glibc-upstream-patch;</para>
     </listitem>
 
-    <listitem>
-      <para>&make-upstream-patch;</para>
-    </listitem>
-
   </itemizedlist>
 
   <itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index e3a891f68..2228819aa 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -83,14 +83,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Make Upstream Patch - <token>&make-upstream-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&make-upstream-patch;"/></para>
-        <para>MD5 sum: <literal>&make-upstream-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&readline-fixes-patch;"/></para>
diff --git a/chapter05/make.xml b/chapter05/make.xml
index f03c55c6d..22b5afb4e 100644
--- a/chapter05/make.xml
+++ b/chapter05/make.xml
@@ -42,9 +42,6 @@
   <sect2 role="installation">
     <title>Installation of Make</title>
 
-    <para>Fix some problems identified upstream:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&make-upstream-patch;</userinput></screen>
     <para>Prepare Make for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools --without-guile</userinput></screen>
diff --git a/chapter06/make.xml b/chapter06/make.xml
index 86fe7e19b..791908683 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -40,9 +40,6 @@
   <sect2 role="installation">
     <title>Installation of Make</title>
 
-    <para>Fix some problems identified upstream:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&make-upstream-patch;</userinput></screen>
     <para>Prepare Make for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/general.ent b/general.ent
index ebcfbec72..ecf35034c 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20160527">
+<!ENTITY version         "SVN-20160611">
 <!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        "20160527-systemd">
+<!ENTITY versiond        "20160611-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "May 16, 2016">
+<!ENTITY releasedate     "June 11, 2016">
 <!ENTITY copyrightdate   "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.10">
 
diff --git a/packages.ent b/packages.ent
index a12baa8a3..01880a49b 100644
--- a/packages.ent
+++ b/packages.ent
@@ -419,10 +419,10 @@
 <!ENTITY m4-ch6-du "30 MB">
 <!ENTITY m4-ch6-sbu "0.4 SBU">
 
-<!ENTITY make-version "4.2">
-<!ENTITY make-size "1,368 KB">
+<!ENTITY make-version "4.2.1">
+<!ENTITY make-size "1,375 KB">
 <!ENTITY make-url "&gnu;make/make-&make-version;.tar.bz2">
-<!ENTITY make-md5 "85ad14d08766201ffe71efa866f4fb91">
+<!ENTITY make-md5 "15b012617e7c44c0ed482721629577ac">
 <!ENTITY make-home "&gnu-software;make/">
 <!ENTITY make-ch5-du "12.1 MB">
 <!ENTITY make-ch5-sbu "0.1 SBU">
diff --git a/patches.ent b/patches.ent
index c4f40384f..b150d8c67 100644
--- a/patches.ent
+++ b/patches.ent
@@ -34,10 +34,6 @@
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
-<!ENTITY make-upstream-patch "make-&make-version;-upstream_fixes-1.patch">
-<!ENTITY make-upstream-patch-md5 "992c1719864ec6d75f14de07844c82ec">
-<!ENTITY make-upstream-patch-size "6.9 KB">
-
 <!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fixes-3.patch">
 <!ENTITY readline-fixes-patch-md5 "6b0d9f4e79319d56a7fee9b35e5cfd1b">
 <!ENTITY readline-fixes-patch-size "8 KB">