From 6eb73f0a9c74b4ac8d25b625cf6792766c77b916 Mon Sep 17 00:00:00 2001
From: Greg Schafer <greg@linuxfromscratch.org>
Date: Sat, 15 Nov 2003 03:38:52 +0000
Subject: [PATCH] Removed unnecessary Ncurses Vsscanf Patch. Closes Bug 704.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3101 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 appendixa/ncurses-down.xml |  4 +---
 chapter01/changelog.xml    |  4 ++++
 chapter04/chapter04.xml    |  3 ---
 chapter05/ncurses.xml      | 10 +++-------
 chapter06/ncurses.xml      | 10 +++-------
 entities/ncurses.ent       |  2 --
 6 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/appendixa/ncurses-down.xml b/appendixa/ncurses-down.xml
index 5c268677d..64de82dad 100644
--- a/appendixa/ncurses-down.xml
+++ b/appendixa/ncurses-down.xml
@@ -5,8 +5,6 @@
 <ulink url="ftp://ftp.gnu.org/gnu/ncurses/"/>
 
 Ncurses Etip Patch:
-<ulink url="&patches-root;&ncurses-etip-patch;"/>
+<ulink url="&patches-root;&ncurses-etip-patch;"/></literallayout>
 
-Ncurses Vsscanf Patch:
-<ulink url="&patches-root;&ncurses-vsscanf-patch;"/></literallayout>
 </sect2>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4ab481504..34ed1827c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -30,10 +30,14 @@
 <listitem><para>Removed:</para>
 <itemizedlist>
 <listitem><para>gcc-3.3.1-no_fixincludes-2.patch</para></listitem>
+<listitem><para>ncurses-5.3-vsscanf.patch</para></listitem>
 <listitem><para>procps-3.1.11-locale-fix.patch</para></listitem>
 </itemizedlist>
 </listitem>
 
+<listitem><para>November 14th, 2003 [greg]: Removed unnecessary Ncurses
+Vsscanf Patch. Closes Bug 704.</para></listitem>
+
 <listitem><para>November 14th, 2003 [gerard]: Adjusted libexecdir location
 for these packages: Glibc - /usr/bin to /usr/lib, Findutils - /usr/bin to 
 /usr/lib/locate, Gawk - /usr/bin to /usr/lib/gawk, Tar - /usr/bin to
diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml
index b5b886dbb..c4d685839 100644
--- a/chapter04/chapter04.xml
+++ b/chapter04/chapter04.xml
@@ -317,9 +317,6 @@ Man Pager Patch - &man-pager-patch-size;:
 Ncurses Etip Patch - &ncurses-etip-patch-size;:
 <ulink url="&patches-root;&ncurses-etip-patch;"/>
 
-Ncurses Vsscanf Patch - &ncurses-vsscanf-patch-size;:
-<ulink url="&patches-root;&ncurses-vsscanf-patch;"/>
-
 Net-tools Mii-Tool-Gcc33 Patch - &net-tools-mii-patch-size;:
 <ulink url="&patches-root;&net-tools-mii-patch;"/>
 
diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml
index 658adc0e3..045bd3412 100644
--- a/chapter05/ncurses.xml
+++ b/chapter05/ncurses.xml
@@ -13,14 +13,10 @@ Estimated required disk space:  &ncurses-compsize-tools;</screen>
 <sect2>
 <title>Installation of Ncurses</title>
 
-<para>Fix two minor things:</para>
+<para>Fix a minor problem related to the <filename>etip.h</filename> header
+file:</para>
 
-<screen><userinput>patch -Np1 -i ../&ncurses-etip-patch;
-patch -Np1 -i ../&ncurses-vsscanf-patch;</userinput></screen>
-
-<para>The first patch corrects the <filename>etip.h</filename> header file, and
-the second patch prevents some compiler warnings being issued on the use of
-deprecated headers.</para>
+<screen><userinput>patch -Np1 -i ../&ncurses-etip-patch;</userinput></screen>
 
 <para>Now prepare Ncurses for compilation:</para>
 
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 8cc9008d1..9c194834b 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -13,14 +13,10 @@ Estimated required disk space:  &ncurses-compsize;</screen>
 <sect2>
 <title>Installation of Ncurses</title>
 
-<para>First fix two tiny bugs:</para>
+<para>Fix a minor problem related to the <filename>etip.h</filename> header
+file:</para>
 
-<screen><userinput>patch -Np1 -i ../&ncurses-etip-patch;
-patch -Np1 -i ../&ncurses-vsscanf-patch;</userinput></screen>
-
-<para>The first patch corrects the <filename>etip.h</filename> header file, and
-the second patch prevents some compiler warnings on the use of deprecated
-headers.</para>
+<screen><userinput>patch -Np1 -i ../&ncurses-etip-patch;</userinput></screen>
 
 <para>Now prepare Ncurses for compilation:</para>
 
diff --git a/entities/ncurses.ent b/entities/ncurses.ent
index 03a35f21b..e4acf8165 100644
--- a/entities/ncurses.ent
+++ b/entities/ncurses.ent
@@ -17,8 +17,6 @@
 
 <!ENTITY ncurses-etip-patch "ncurses-&ncurses-version;-etip-2.patch">
 <!ENTITY ncurses-etip-patch-size "1 KB">
-<!ENTITY ncurses-vsscanf-patch "ncurses-&ncurses-version;-vsscanf.patch">
-<!ENTITY ncurses-vsscanf-patch-size "1 KB">
 
 <!ENTITY ncurses-compsize-tools "26 MB">
 <!ENTITY ncurses-time-tools "0.7 SBU">