From 6b6933d8e7f29d815940b451f4da753808a4a391 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sat, 24 Sep 2005 10:25:16 +0000
Subject: Upgrade to util-linux-2.12r

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

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index eef316927..405618515 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -102,8 +102,6 @@ First a summary, then a detailed log.</para>
 <listitem><para>&mktemp-tempfile-patch;</para></listitem>
 <listitem><para>&perl-libc-patch;</para></listitem>
 <listitem><para>&tar-gcc4_fix-patch;</para></listitem>
-<listitem><para>&util-linux-reiser_crash-patch;</para></listitem>
-<listitem><para>&util-linux-umount-patch;</para></listitem>
 <listitem><para>&vim-security_fix-patch;</para></listitem>
 </itemizedlist>
 </listitem>
@@ -123,6 +121,9 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>September 24, 2005 [matt]: Upgrade to util-linux-2.12r.</para>
+</listitem>
+
 <listitem><para>September 20, 2005 [matt]: Upgrade to bison-2.1.</para>
 </listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 739c96862..557f47e33 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -204,18 +204,6 @@ needed to build an LFS system:</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>Util-linux Reiser Crash Patch - 2 KB:</term> <listitem>
-<para><ulink url="&patches-root;&util-linux-reiser_crash-patch;"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Util-linux Umount Fix Patch - 1 KB:</term> <listitem>
-<para><ulink url="&patches-root;&util-linux-umount-patch;"/></para>
-</listitem>
-</varlistentry>
-
 <varlistentry>
 <term>Vim Security Patch - 9 KB:</term><listitem>
 <para><ulink url="&patches-root;&vim-security_fix-patch;"/></para>
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 2aee89f76..eee00c416 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -53,21 +53,6 @@ The following patch properly fixes this issue:</para>
 
 <screen><userinput>patch -Np1 -i ../&util-linux-cramfs-patch;</userinput></screen>
 
-<para><command>cfdisk</command> segfaults if the disk contains a linux partition
-(type 83) that doesn't have an <systemitem class="filesystem">ext2</systemitem>,
-<systemitem class="filesystem">ext3</systemitem>,
-<systemitem class="filesystem">xfs</systemitem> or
-<systemitem class="filesystem">jfs</systemitem> filesystem on it.  Apply the
-following patch to fix the problem:</para>
-
-<screen><userinput>patch -Np1 -i ../&util-linux-reiser_crash-patch;</userinput></screen>
-
-<para>Util-linux has a security vulnerability that could allow a user to remount
-a volume without the <option>nosuid</option> option. The following patch fixes
-this issue:</para>
-
-<screen><userinput>patch -Np1 -i ../&util-linux-umount-patch;</userinput></screen>
-
 <para>Prepare Util-linux for compilation:</para>
 
 <screen><userinput>./configure</userinput></screen>
diff --git a/general.ent b/general.ent
index 31117fa2e..874adb0c7 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20050920">
-<!ENTITY releasedate "September 20, 2005">
+<!ENTITY version "SVN-20050924">
+<!ENTITY releasedate "September 24, 2005">
 <!ENTITY milestone "6.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
@@ -78,6 +78,6 @@
 <!ENTITY tcl-version "8.4.11">
 <!ENTITY texinfo-version "4.8">
 <!ENTITY udev-version "070">
-<!ENTITY util-linux-version "2.12q">
+<!ENTITY util-linux-version "2.12r">
 <!ENTITY vim-version "6.3">
 <!ENTITY zlib-version "1.2.3">
diff --git a/patches.ent b/patches.ent
index eb8c949ee..2a6b0c776 100644
--- a/patches.ent
+++ b/patches.ent
@@ -43,8 +43,5 @@
 <!ENTITY tar-gcc4_fix-patch "tar-&tar-version;-gcc4_fix_tests-1.patch">
 
 <!ENTITY util-linux-cramfs-patch "util-linux-&util-linux-version;-cramfs-1.patch">
-<!ENTITY util-linux-umount-patch "util-linux-&util-linux-version;-umount_fix-1.patch">
-
-<!ENTITY util-linux-reiser_crash-patch "util-linux-&util-linux-version;-reiser_crash-2.patch">
 
 <!ENTITY vim-security_fix-patch "vim-&vim-version;-security_fix-2.patch">
-- 
cgit v1.2.3-54-g00ecf