Mon Dec 7 08:58:40 UTC 2009

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3149

Modified Files:
	.cvsignore sources util-linux-ng.spec 
Added Files:
	util-linux-ng-2.16-blkid-crypto.path 
Removed Files:
	util-linux-ng-2.14-sfdisk-dump.patch 
	util-linux-ng-2.16-blkid-swsuspend.patch 
	util-linux-ng-2.16-libblkid-compression.patch 
	util-linux-ng-2.16-libblkid-ext2.patch 
	util-linux-ng-2.16-libblkid-joliet.patch 
	util-linux-ng-2.16-libblkid-packed.patch 
	util-linux-ng-2.16-switchroot-tty.patch 
Log Message:
* Mon Dec  7 2009 Karel Zak <kzak at redhat.com> 2.16.2-1
- upgrade to 2.16.2 (removes 7 patches)
  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16.2-ReleaseNotes
- fix #531992 - not prompted for passphrase

--- NEW FILE util-linux-ng-2.16-blkid-crypto.path ---
From: Scott James Remnant <scott at ubuntu.com>
Subject: [PATCH] libblkid: return first detected crypto device

Crypto devices may sometimes have multiple additional prober matches,
however just like RAID, there's no danger of activating the wrong one
since special help is needed to activate the block device before it
can be used.

Thus modify blkid_do_safeprobe() to break out of the loop when a
crypto device is detected, as it does already for RAID.

[kzak at redhar.com: - backport to 2.16.2 for Fedora-12]

Signed-off-by: Scott James Remnant <scott at ubuntu.com>
Signed-off-by: Karel Zak <kzak at redhat.com>

diff -up util-linux-ng-2.16.2/shlibs/blkid/src/probe.c.kzak util-linux-ng-2.16.2/shlibs/blkid/src/probe.c
--- util-linux-ng-2.16.2/shlibs/blkid/src/probe.c.kzak	2009-12-07 09:44:46.000000000 +0100
+++ util-linux-ng-2.16.2/shlibs/blkid/src/probe.c	2009-12-07 09:47:12.000000000 +0100
@@ -538,9 +538,9 @@ int blkid_do_probe(blkid_probe pr)
  * (cannot be used in while()) and checks for ambivalen results (more
  * filesystems on the device) -- in such case returns -2.
  *
- * The function does not check for filesystems when a RAID signature is
- * detected.  The function also does not check for collision between RAIDs. The
- * first detected RAID is returned.
+ * The function does not check for filesystems when a RAID or crypto signature
+ * is detected.  The function also does not check for collision between RAIDs
+ * and crypto devices. The first detected RAID or crypto device is returned.
  */
 int blkid_do_safeprobe(blkid_probe pr)
 {
@@ -558,7 +558,7 @@ int blkid_do_safeprobe(blkid_probe pr)
 		}
 		count++;
 
-		if (idinfos[pr->idx]->usage & BLKID_USAGE_RAID)
+		if (idinfos[pr->idx]->usage & (BLKID_USAGE_RAID | BLKID_USAGE_CRYPTO))
 			break;
 		if (!(idinfos[pr->idx]->flags & BLKID_IDINFO_TOLERANT))
 			intol++;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	25 Jul 2009 20:18:47 -0000	1.19
+++ .cvsignore	7 Dec 2009 08:58:39 -0000	1.20
@@ -1,2 +1,2 @@
-util-linux-ng-2.16.tar.bz2
+util-linux-ng-2.16.2.tar.bz2
 floppy-0.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	25 Jul 2009 20:18:47 -0000	1.19
+++ sources	7 Dec 2009 08:58:40 -0000	1.20
@@ -1,2 +1,2 @@
-9623380641b0c2e0449f5b1ecc567663  util-linux-ng-2.16.tar.bz2
+edd1f7a82fd388cc0e1e3d2d1e7ea55a  util-linux-ng-2.16.2.tar.bz2
 7eeb9a6f7a258174bf0fa80f1370788d  floppy-0.16.tar.bz2


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/F-12/util-linux-ng.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- util-linux-ng.spec	30 Nov 2009 11:19:21 -0000	1.63
+++ util-linux-ng.spec	7 Dec 2009 08:58:40 -0000	1.64
@@ -1,8 +1,8 @@
 ### Header
 Summary: A collection of basic system utilities
 Name: util-linux-ng
-Version: 2.16
-Release: 10.3%{?dist}
+Version: 2.16.2
+Release: 1%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -105,22 +105,8 @@ Patch7: util-linux-ng-2.13-login-lastlog
 Patch8: util-linux-ng-2.15-ipcs-32bit.patch
 
 ### Upstream patches
-###
-# 513104 - blkid returns no fstype for ext2 device when ext2 module not loaded
-Patch9: util-linux-ng-2.16-libblkid-ext2.patch
-# 518572 -  blkid requires ext2.ko to be decompressed on installation media 
-Patch10: util-linux-ng-2.16-libblkid-compression.patch
-# 522718 - sfdisk -d /dev/xxx | sfdisk --force /dev/yyy fails when LANG is set
-Patch11: util-linux-ng-2.14-sfdisk-dump.patch
-# Swsuspend does not work
-Patch12: util-linux-ng-2.16-blkid-swsuspend.patch
-# 514413 -  Extra spaces at the end of CD mount point
-Patch13: util-linux-ng-2.16-libblkid-joliet.patch
-# 519237 - bash: cannot set terminal process group (-1): Inappropriate ioctl for device
-Patch14: util-linux-ng-2.16-switchroot-tty.patch
-# 539325 - fix VIA RAID detection
-# 541708 - libblkid does not recognize ufs partitions
-Patch15: util-linux-ng-2.16-libblkid-packed.patch
+# 531992 -  not prompted for passphrase
+Patch9: util-linux-ng-2.16-blkid-crypto.path
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -216,12 +202,6 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
 
 %build
 unset LINGUAS || :
@@ -732,6 +712,11 @@ fi
 
 
 %changelog
+* Mon Dec  7 2009 Karel Zak <kzak at redhat.com> 2.16.2-1
+- upgrade to 2.16.2 (removes 7 patches)
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16.2-ReleaseNotes
+- fix #531992 - not prompted for passphrase
+
 * Mon Nov 30 2009 Karel Zak <kzak at redhat.com> 2.16-10.3
 - fix #539325 - fix VIA RAID detection
 - fix #541708 - libblkid does not recognize ufs partitions


--- util-linux-ng-2.14-sfdisk-dump.patch DELETED ---


--- util-linux-ng-2.16-blkid-swsuspend.patch DELETED ---


--- util-linux-ng-2.16-libblkid-compression.patch DELETED ---


--- util-linux-ng-2.16-libblkid-ext2.patch DELETED ---


--- util-linux-ng-2.16-libblkid-joliet.patch DELETED ---


--- util-linux-ng-2.16-libblkid-packed.patch DELETED ---


--- util-linux-ng-2.16-switchroot-tty.patch DELETED ---


