From b457a1d5d0f0ba61e8b4e1197fe127f219d59a29 Mon Sep 17 00:00:00 2001
From: Jeremy Utley <jeremy@linuxfromscratch.org>
Date: Sun, 17 Oct 2004 08:04:34 +0000
Subject: [PATCH] Added the util-linux patch back, because upstream goofed up
 on the fix

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

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ba828c196..5966fdde0 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -71,6 +71,7 @@ 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>
@@ -92,6 +93,9 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>October 17th, 2004 [jeremy]: Added back in the Util-linux
+patch, as the fix that went into the code was incorrect.</para></listitem>
+
 <listitem><para>October 14th, 2004 [jeremy]: Upgraded Glibc to 20041011
 snapshot, added Bash patch to fix execution problems with the new glibc,
 upgraded to Util-linux-2.12h, removed the sfdisk patch which has been
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 402cdaab3..ba9eec067 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -145,6 +145,12 @@ 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>
+
 <varlistentry>
 <term>Zlib Security Patch - 1KB:</term> <listitem>
 <para><ulink url="&patches-root;zlib-&zlib-version;-security-1.patch"/></para>
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 37ca200d9..47f056f65 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -43,6 +43,11 @@ mkdir -p /var/lib/hwclock</userinput></screen>
 <sect2 role="installation">
 <title>Installation of Util-linux</title>
 
+<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 70a6f93b0..9344f0b85 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20041014">
-<!ENTITY releasedate "October 14, 2004">
+<!ENTITY version "SVN-20041017">
+<!ENTITY releasedate "October 17, 2004">
 <!ENTITY milestone "6.1">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">