From d0e13a81ace3055e50cef4d4460a9feedc9ae34a Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sun, 7 Dec 2008 11:42:15 +0000
Subject: [PATCH] Upgrade to Ncurses-5.7. Fixes #2276.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8765 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 3 +++
 chapter01/whatsnew.xml  | 7 +++++--
 chapter03/patches.xml   | 8 --------
 chapter06/ncurses.xml   | 5 -----
 packages.ent            | 6 +++---
 patches.ent             | 5 -----
 6 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d4b39fed2..4cf01632d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,9 @@
     <listitem>
       <para>2008-12-06</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgraded to Ncurses-5.7. Fixes #2276.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgraded to Module-Init-Tools-3.5. Fixes #2245.
           </para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 7f0b91517..a5b51300f 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -140,9 +140,9 @@
     <!-- <listitem>
       <para>MPFR &mpfr-version;</para>
     </listitem> -->
-    <!--<listitem>
+    <listitem>
       <para>Ncurses &ncurses-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Patch &patch-version;</para>
     </listitem>-->
@@ -236,6 +236,9 @@
     <listitem>
       <para>module-init-tools-3.4.1-manpages-1.patch</para>
     </listitem>
+    <listitem>
+      <para>ncurses-5.6-coverity_fixes-1.patch</para>
+    </listitem>
 
   </itemizedlist>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 11c9a7d10..011b5c83b 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -170,14 +170,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Ncurses Coverity Patch - <token>&ncurses-coverity-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&ncurses-coverity-patch;"/></para>
-        <para>MD5 sum: <literal>&ncurses-coverity-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <!-- <varlistentry>
       <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 0deef544c..16874b5d6 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -51,11 +51,6 @@
 <screen><userinput>bzcat ../&ncurses-rollup-patch; | patch -Np1</userinput></screen>
     -->
 
-    <para>Apply the following patch to fix a number of issues uncovered by the
-    static code analysis tool, Coverity:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&ncurses-coverity-patch;</userinput></screen>
-
     <para>Prepare Ncurses for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --with-shared --without-debug --enable-widec</userinput></screen>
diff --git a/packages.ent b/packages.ent
index 77b1d089e..ed9a728f4 100644
--- a/packages.ent
+++ b/packages.ent
@@ -388,11 +388,11 @@
 <!ENTITY mpfr-ch6-du "39.4 MB testsuite included">
 <!ENTITY mpfr-ch6-sbu "1.2 SBU testsuite included">
 
-<!ENTITY ncurses-version "5.6">
+<!ENTITY ncurses-version "5.7">
 <!-- <!ENTITY ncurses-date "20050319"> -->
-<!ENTITY ncurses-size "2,346 KB">
+<!ENTITY ncurses-size "2,388 KB">
 <!ENTITY ncurses-url "ftp://ftp.gnu.org/gnu/ncurses/ncurses-&ncurses-version;.tar.gz">
-<!ENTITY ncurses-md5 "b6593abe1089d6aab1551c105c9300e3">
+<!ENTITY ncurses-md5 "cce05daf61a64501ef6cd8da1f727ec6">
 <!ENTITY ncurses-home "http://www.gnu.org/software/ncurses/">
 <!ENTITY ncurses-ch5-du "30 MB">
 <!ENTITY ncurses-ch5-sbu "0.7 SBU">
diff --git a/patches.ent b/patches.ent
index ddcf605e2..dd6d0b86c 100644
--- a/patches.ent
+++ b/patches.ent
@@ -93,11 +93,6 @@
 <!ENTITY mktemp-tempfile-patch-size "3.5 KB"> -->
 
 
-<!ENTITY ncurses-coverity-patch "ncurses-&ncurses-version;-coverity_fixes-1.patch">
-<!ENTITY ncurses-coverity-patch-md5 "aa2fa9d0e89bbfdb4ce7e0e6b4b46670">
-<!ENTITY ncurses-coverity-patch-size "16.8 KB">
-
-
 <!ENTITY perl-consolidated-patch "perl-&perl-version;-consolidated-1.patch">
 <!ENTITY perl-consolidated-patch-md5 "d1bcffb5d671bd659f7ca5c451a0c752">
 <!ENTITY perl-consolidated-patch-size "7.1 KB">