From 288d394da3c2a99e2be1417224c1acd7c5366eb2 Mon Sep 17 00:00:00 2001
From: Karel Zak <karel.zak.007@gmail.com>
Date: Mon, 13 Jun 2016 12:50:49 +0200
Subject: [PATCH] 2.28-2: fix #1234317

---
 2.23-libblkid-cdrom.patch | 34 ++++++++++++++++++++++++++++++++++
 util-linux.spec           |  8 +++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 2.23-libblkid-cdrom.patch

diff --git a/2.23-libblkid-cdrom.patch b/2.23-libblkid-cdrom.patch
new file mode 100644
index 0000000..2dddbc2
--- /dev/null
+++ b/2.23-libblkid-cdrom.patch
@@ -0,0 +1,34 @@
+From 55ad13c26fe5d0e606be5a83937f31b8cf576588 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 28 Apr 2016 13:54:01 +0200
+Subject: [PATCH] libblkid: make I/O errors on CDROMs non-fatal
+
+It seems too tricky to get a real size of the data track on hybrid
+disks with audio+data. It seems overkill to analyze all header in
+libblkid and on some disks it's probably possible to get I/O error
+almost everywhere due to crazy copy protection etc.
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ libblkid/src/probe.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
+index 63baed3..5d9f701 100644
+--- a/libblkid/src/probe.c
++++ b/libblkid/src/probe.c
+@@ -615,7 +615,10 @@ static struct blkid_bufinfo *read_buffer(blkid_probe pr, uint64_t real_off, uint
+ 	if (ret != (ssize_t) len) {
+ 		DBG(LOWPROBE, ul_debug("\tread failed: %m"));
+ 		free(bf);
+-		if (ret >= 0)
++
++		/* I/O errors on CDROMs are non-fatal to work with hybrid
++		 * audio+data disks */
++		if (ret >= 0 || blkid_probe_is_cdrom(pr))
+ 			errno = 0;
+ 		return NULL;
+ 	}
+-- 
+2.4.11
+
diff --git a/util-linux.spec b/util-linux.spec
index 5865246..d4e4437 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux
 Version: 2.28
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: http://en.wikipedia.org/wiki/Util-linux
@@ -89,6 +89,9 @@ Requires: libfdisk = %{version}-%{release}
 # 151635 - makeing /var/log/lastlog
 Patch0: 2.23-login-lastlog-create.patch
 
+# upstream patch - #1234317 - CD / DVD are rarely automounted
+Patch1: 2.23-libblkid-cdrom.patch
+
 %description
 The util-linux package contains a large variety of low-level system
 utilities that are necessary for a Linux system to function. Among
@@ -904,6 +907,9 @@ exit 0
 %{_libdir}/python*/site-packages/libmount/*
 
 %changelog
+* Mon Jun 13 2016 Karel Zak <kzak@redhat.com> - 2.28-2
+- fix #1234317 - CD / DVD are rarely automounted
+
 * Tue Apr 12 2016 Karel Zak <kzak@redhat.com> - 2.28-1
 - upgrade to stable v2.28
   http://ftp.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28-ReleaseNotes