From 0cac7b0c306cdb4a188f6f400d008965bd4aa29d Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Tue, 23 Nov 2004 19:36:51 +0000
Subject: [PATCH] * Remove the now unneeded util-linux patch for sfdisk

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4316 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml  | 4 +++-
 chapter03/patches.xml    | 6 ------
 chapter06/util-linux.xml | 2 --
 general.ent              | 4 ++--
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 6f48fc2cb..4910d79e5 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -73,7 +73,6 @@ first a summary, then a detailed log.</para>
 <listitem><para>udev-config-1.permissions</para></listitem>
 <listitem><para>udev-config-1.rules</para></listitem>
 <listitem><para>util-linux-2.12a-kernel_headers-1.patch</para></listitem>
-<listitem><para>util-linux-2.12h-sfdisk-1.patch</para></listitem>
 <listitem><para>vim-6.3 language files</para></listitem>
 <listitem><para>zlib-1.2.1-security-1.patch</para></listitem>
 </itemizedlist>
@@ -95,6 +94,9 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>November 22nd, 2004 [matt]: Remove the now unneccessary
+util-linux patch for sfdisk</para></listitem>
+
 <listitem><para>November 18th, 2004 [jim]: Updated packages - shadow, util-linux, procps.</para></listitem>
 
 <listitem><para>November 18th, 2004 [jim]: Updated packages - udev, glibc, module-init-tools.
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 2bc0ac34f..6d40a79ad 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -139,12 +139,6 @@ following:</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>Util-Linux Sfdisk Patch - 1 KB:</term> <listitem>
-<para><ulink url="&patches-root;util-linux-&util-linux-version;-sfdisk-1.patch"/></para>
-</listitem>
-</varlistentry>
-
 </variablelist>
 
 <para>In addition to the above required patches, there exist a number of
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 47f056f65..44799e17c 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -46,8 +46,6 @@ mkdir -p /var/lib/hwclock</userinput></screen>
 <para>Util-Linux has a coding problem that causes mis-compilation of the sfdisk
 program.  This patch fixes the problem:</para>
 
-<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-sfdisk-1.patch</userinput></screen>
-
 <para>Prepare Util-linux for compilation:</para>
 
 <screen><userinput>./configure</userinput></screen>
diff --git a/general.ent b/general.ent
index dd5b47db7..917e55874 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20041118">
-<!ENTITY releasedate "November 18, 2004">
+<!ENTITY version "SVN-20041123">
+<!ENTITY releasedate "November 23, 2004">
 <!ENTITY milestone "6.1">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">