From 0954a1f65aefcf6907b45559f2f48cc0bfb56d78 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Mon, 13 Sep 2004 20:56:45 +0000
Subject: [PATCH] auto-import util-linux-2.11f-17.7.2 from
 util-linux-2.11f-17.7.2.src.rpm

---
 util-linux-2.11f-rawman.patch | 14 --------------
 util-linux.spec               | 13 ++++++-------
 2 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 util-linux-2.11f-rawman.patch

diff --git a/util-linux-2.11f-rawman.patch b/util-linux-2.11f-rawman.patch
deleted file mode 100644
index c891c2b..0000000
--- a/util-linux-2.11f-rawman.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- util-linux-2.11f/disk-utils/raw.8.sopwith	Tue Feb 26 13:15:34 2002
-+++ util-linux-2.11f/disk-utils/raw.8	Tue Feb 26 13:16:28 2002
-@@ -58,6 +58,11 @@
- disk, they must be an exact number of sectors long, and the data buffer
- in virtual memory must also be aligned to a multiple of the sector
- size.  The sector size is 512 bytes for most devices.
-+.PP
-+Use the /etc/sysconfig/rawdevices file to define the set of raw device
-+mappings automatically created during the system startup sequence. The
-+format of the file is the same used in the command line with the exception
-+that the "raw" command itself is omitted.
- .SH OPTIONS
- .TP
- .B -q
diff --git a/util-linux.spec b/util-linux.spec
index c2d5b7e..235dce5 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -3,7 +3,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.11f
-Release: 17.1
+Release: 17.7.2
 License: distributable
 Group: System Environment/Base
 Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux/util-linux-%{version}.tar.bz2
@@ -52,11 +52,12 @@ Patch75: util-linux-2.11f-logingrp-revert.patch
 
 Patch76: util-linux-2.11f-loginctty.patch
 Patch77: util-linux-2.11f-loginctty2.patch
-Patch78: util-linux-2.11f-rawman.patch
 
 Patch100: mkcramfs.patch
 Patch101: mkcramfs-quiet.patch
 
+Patch116: util-linux-2.11n-setpwrace.patch
+
 Obsoletes: fdisk tunelp
 %ifarch alpha sparc sparc64 sparcv9 s390
 Obsoletes: clock
@@ -117,7 +118,7 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch37 -p1 -b .pwent2
 #%patch38 -p1 -b .ctty2
 
-%patch78 -p1 -b .rawman
+%patch116 -p1 -b .setpwrace
 
 %build
 unset LINGUAS || :
@@ -173,7 +174,6 @@ if [ "%{_mandir}" != "%{_prefix}/man" -a -d ${RPM_BUILD_ROOT}%{_prefix}/man ]; t
    ( cd ${RPM_BUILD_ROOT}%{_mandir}; tar xf - )
    ( cd ${RPM_BUILD_ROOT}%{_prefix}; rm -rf ./man )
 fi
-echo '.so man8/raw.8' > ${RPM_BUILD_ROOT}%{_mandir}/man8/rawdevices.8
 
 # Correct mail spool path.
 perl -pi -e 's,/usr/spool/mail,/var/spool/mail,' ${RPM_BUILD_ROOT}%{_mandir}/man1/login.1
@@ -408,7 +408,6 @@ fi
 %{_mandir}/man8/mkswap.8*
 %{_mandir}/man8/pivot_root.8*
 %{_mandir}/man8/raw.8*
-%{_mandir}/man8/rawdevices.8*
 %{_mandir}/man8/renice.8*
 %{_mandir}/man8/setfdprm.8*
 %{_mandir}/man8/setsid.8*
@@ -422,8 +421,8 @@ fi
 %{_datadir}/misc/more.help
 
 %changelog
-* Tue Feb 26 2002 Elliot Lee <sopwith@redhat.com> 2.11f-17.1
-- Incorporate man page changes from jrfuller (bug 60363).
+* Mon Jun 24 2002 Elliot Lee <sopwith@redhat.com> 2.11f-17.7.2
+- Fix setpwnam race (patch116)
 
 * Tue Dec 04 2001 Elliot Lee <sopwith@redhat.com> 2.11f-17
 - Add patch38 (util-linux-2.11f-ctty2.patch) to ignore SIGINT/SIGTERM/SIGQUIT in the parent, so that ^\ won't break things.