[util-linux-ng/f13/master] 2.17.2-9: fix #538551 - Dual-filesystem (ISO9660/HFS) not mounted

[kzak]

commit 6d9addd1538681a8406435424ce9146c91e85245
Author: Karel Zak <kzak at redhat.com>
Date:   Mon Oct 11 10:43:19 2010 +0200

    2.17.2-9: fix #538551 - Dual-filesystem (ISO9660/HFS) not mounted
    
    Signed-off-by: Karel Zak <kzak at redhat.com>

 util-linux-ng-2.18-blkid-HFS.patch |   28 ++++++++++++++++++++++++++++
 util-linux-ng.spec                 |    8 +++++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/util-linux-ng-2.18-blkid-HFS.patch b/util-linux-ng-2.18-blkid-HFS.patch
new file mode 100644
index 0000000..be16e5d
--- /dev/null
+++ b/util-linux-ng-2.18-blkid-HFS.patch
@@ -0,0 +1,28 @@
+From 791a2fd67c118c3f07141e4cc95532fe908015a9 Mon Sep 17 00:00:00 2001
+From: Alexandre Peixoto Ferreira <alexandref75 at gmail.com>
+Date: Mon, 19 Jul 2010 18:04:33 -0500
+Subject: [PATCH] libblkid: set tolerant flag for HFS
+
+An CDROM can contain both HFS and ISO9660 views on the same filesystem.
+This confuses mount/KDE/Gnome.
+
+Signed-off-by: Karel Zak <kzak at redhat.com>
+---
+ shlibs/blkid/src/superblocks/hfs.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/shlibs/blkid/src/superblocks/hfs.c b/shlibs/blkid/src/superblocks/hfs.c
+index 8ebff68..033a65d 100644
+--- a/shlibs/blkid/src/superblocks/hfs.c
++++ b/shlibs/blkid/src/superblocks/hfs.c
+@@ -291,6 +291,7 @@ const struct blkid_idinfo hfs_idinfo =
+ 	.name		= "hfs",
+ 	.usage		= BLKID_USAGE_FILESYSTEM,
+ 	.probefunc	= probe_hfs,
++	.flags		= BLKID_IDINFO_TOLERANT,
+ 	.magics		=
+ 	{
+ 		{ .magic = "BD", .len = 2, .kboff = 1 },
+-- 
+1.7.2.3
+
diff --git a/util-linux-ng.spec b/util-linux-ng.spec
index 0ebf3c9..861faf4 100644
--- a/util-linux-ng.spec
+++ b/util-linux-ng.spec
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.17.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -121,6 +121,8 @@ Patch13: util-linux-ng-2.17-partx.patch
 Patch14: util-linux-ng-2.17-agetty-clocal.patch
 # 618957 - ISO images listed in fstab are mounted twice at boot
 Patch15: util-linux-ng-2.17-mount-loopdev.patch
+# 538551 - Dual-filesystem (ISO9660/HFS) CD-ROMs not mounted automatically
+Patch16: util-linux-ng-2.18-blkid-HFS.patch
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -221,6 +223,7 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 unset LINGUAS || :
@@ -740,6 +743,9 @@ fi
 
 
 %changelog
+* Mon Oct 11 2010 Karel Zak <kzak at redhat.com> 2.17.2-9
+* fix #538551 - Dual-filesystem (ISO9660/HFS) CD-ROMs not mounted automatically
+
 * Thu Aug  5 2010 Karel Zak <kzak at redhat.com> 2.17.2-8
 - fix #620924 - /sbin/mount.tmpfs uses not available /usr/bin/id