Update to flex-2.6.4

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

7 files changed, 24 insertions, 16 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d72f5bdb8..4a72226af 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>2017-05-07</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to flex-2.6.4. Fixes
+          <ulink url="&lfs-ticket-root;4084">#4084</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2017-05-05</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 935f66c06..64e8f28ee 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -86,9 +86,9 @@
     <!--<listitem>
       <para>Findutils &findutils-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Flex &flex-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Gawk &gawk-version;</para>
     </listitem>-->
@@ -259,9 +259,6 @@
       <para>gcc-6.1.0-asan-1.patch</para>
     </listitem>
 -->
-    <listitem>
-      <para>flex-2.6.3-upstream_fixes-3.patch</para>
-    </listitem>
   </itemizedlist>
 
   <itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 662afd611..2ce1beb2c 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -49,7 +49,7 @@
         <para>MD5 sum: <literal>&coreutils-i18n-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+<!--
     <varlistentry>
       <term>Flex Fixes Patch - <token>&flex-fixes-patch-size;</token>:</term>
       <listitem>
@@ -57,6 +57,7 @@
         <para>MD5 sum: <literal>&flex-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
+-->
 <!--
     <varlistentry>
       <term>Gccc ASAN Patch - <token>&gcc-asan-patch-size;</token>:</term>
diff --git a/chapter05/flex.xml b/chapter05/flex.xml
index 730fd735c..2033db549 100644
--- a/chapter05/flex.xml
+++ b/chapter05/flex.xml
@@ -42,7 +42,7 @@
 
   <sect2 role="installation">
     <title>Installation of Flex</title>
-
+<!--
     <para>Flex contains several known bugs. These can be fixed with the
     following patch:</para>
 
@@ -54,8 +54,8 @@
     fine, so make sure it does not get regenerated:</para>
 
 <screen><userinput remap="pre">touch doc/flex.1</userinput></screen>
-
-    <para>Now prepare Flex for compilation:</para>
+-->
+    <para>Prepare Flex for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
 
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 1c586076d..64e000287 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -40,11 +40,11 @@
 
   <sect2 role="installation">
     <title>Installation of Flex</title>
-
+<!--
     <para>First, fix a problem with the latest version:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&flex-fixes-patch;</userinput></screen>
-
+-->
     <para>The build procedure assumes the <application>help2man</application>
     program is available to create a man page from the executable --help option.
     This is not present, so we use an environment variable to skip this process.
diff --git a/packages.ent b/packages.ent
index 7d62d3028..a582cd2e0 100644
--- a/packages.ent
+++ b/packages.ent
@@ -189,10 +189,10 @@
 <!ENTITY findutils-ch6-du "48 MB">
 <!ENTITY findutils-ch6-sbu "0.9 SBU">
 
-<!ENTITY flex-version "2.6.3">
-<!ENTITY flex-size "1,373 KB">
+<!ENTITY flex-version "2.6.4">
+<!ENTITY flex-size "1,386 KB">
 <!ENTITY flex-url "https://github.com/westes/flex/releases/download/v&flex-version;/flex-&flex-version;.tar.gz">
-<!ENTITY flex-md5 "a5f65570cd9107ec8a8ec88f17b31bb1">
+<!ENTITY flex-md5 "2882e3179748cc9f9c23ec593d6adc8d">
 <!ENTITY flex-home "http://flex.sourceforge.net">
 <!ENTITY flex-ch6-du "32 MB">
 <!ENTITY flex-ch6-sbu "0.4 SBU">
diff --git a/patches.ent b/patches.ent
index 6fdd4bbcf..87bbe5111 100644
--- a/patches.ent
+++ b/patches.ent
@@ -19,11 +19,11 @@
 <!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
 <!ENTITY coreutils-i18n-patch-md5 "a9404fb575dfd5514f3c8f4120f9ca7d">
 <!ENTITY coreutils-i18n-patch-size "168 KB">
-
+<!--
 <!ENTITY flex-fixes-patch "flex-&flex-version;-upstream_fixes-3.patch">
 <!ENTITY flex-fixes-patch-md5 "b46f6b0380e502a3dfb8b503227cd680">
 <!ENTITY flex-fixes-patch-size "3.4 KB">
-
+-->
 <!--
 <!ENTITY gcc-asan-patch "gcc-&gcc-version;-asan-1.patch">
 <!ENTITY gcc-asan-patch-md5 "c12ab2e323010fda83bfccc27f58f0b5">