2.28-2: fix #1234317

.gitignore

@@ -45,3 +45,6 @@
 /util-linux-2.27-rc2.tar.xz
 /util-linux-2.27.tar.xz
 /util-linux-2.27.1.tar.xz
+/util-linux-2.28-rc1.tar.xz
+/util-linux-2.28-rc2.tar.xz
+/util-linux-2.28.tar.xz

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
+

sources

@@ -1 +1 @@
-3cd2698d1363a2c64091c2dadc974647  util-linux-2.27.1.tar.xz
+e534e6ccc49107e5d31c329af798ef7d  util-linux-2.28.tar.xz

util-linux.spec

@@ -1,8 +1,8 @@
 ### Header
 Summary: A collection of basic system utilities
 Name: util-linux
-Version: 2.27.1
-Release: 1%{?dist}
+Version: 2.28
+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
@@ -253,7 +256,6 @@ written in the Python programming language to use the interface
 supplied by the libmount library to work with mount tables (fstab,
 mountinfo, etc) and mount filesystems.
 
-
 %prep
 %autosetup -p1 -n %{name}-%{upstream_version}
 
@@ -389,6 +391,9 @@ ln -sf /proc/mounts %{buildroot}/etc/mtab
 # remove static libs
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib{uuid,blkid,mount,smartcols,fdisk}.a
 
+# temporary remove to avoid conflicts with bash-completion pkg
+rm -f $RPM_BUILD_ROOT%{compldir}/{mount,umount}
+
 # find MO files
 %find_lang %name
 
@@ -529,6 +534,7 @@ exit 0
 %{_bindir}/lsipc
 %{_bindir}/lslocks
 %{_bindir}/lslogins
+%{_bindir}/lsns
 %{_bindir}/mcookie
 %{_bindir}/mesg
 %{_bindir}/more
@@ -630,7 +636,8 @@ exit 0
 %{_mandir}/man8/ldattach.8*
 %{_mandir}/man8/losetup.8*
 %{_mandir}/man8/lsblk.8*
-%{_mandir}/man8/lslocks.8.gz
+%{_mandir}/man8/lslocks.8*
+%{_mandir}/man8/lsns.8*
 %{_mandir}/man8/mkfs.8*
 %{_mandir}/man8/mkfs.cramfs.8*
 %{_mandir}/man8/mkfs.minix.8*
@@ -719,6 +726,7 @@ exit 0
 %{compldir}/getopt
 %{compldir}/hexdump
 %{compldir}/ionice
+%{compldir}/ipcmk
 %{compldir}/ipcrm
 %{compldir}/ipcs
 %{compldir}/isosize
@@ -731,6 +739,8 @@ exit 0
 %{compldir}/lscpu
 %{compldir}/lsipc
 %{compldir}/lslocks
+%{compldir}/lslogins
+%{compldir}/lsns
 %{compldir}/mcookie
 %{compldir}/mesg
 %{compldir}/mkfs
@@ -738,6 +748,7 @@ exit 0
 %{compldir}/mkfs.minix
 %{compldir}/mkswap
 %{compldir}/more
+#%{compldir}/mount
 %{compldir}/mountpoint
 %{compldir}/namei
 %{compldir}/nsenter
@@ -760,10 +771,12 @@ exit 0
 %{compldir}/setterm
 %{compldir}/su
 %{compldir}/swaplabel
+%{compldir}/swapoff
 %{compldir}/swapon
 %{compldir}/tailf
 %{compldir}/taskset
 %{compldir}/ul
+#%{compldir}/umount
 %{compldir}/unshare
 %{compldir}/utmpdump
 %{compldir}/uuidgen
@@ -894,6 +907,17 @@ 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
+- add missing completion scripts
+
+* Wed Nov 18 2015 Karel Zak <kzak@redhat.com> - 2.27.1-2
+- fix #1259745 - Can't start installation in Rawhide or F23 recent development images
+
 * Mon Nov  2 2015 Karel Zak <kzak@redhat.com> - 2.27.1
 - upgrade to v2.27.1
   http://ftp.kernel.org/pub/linux/utils/util-linux/v2.27/v2.27.1-ReleaseNotes