packages: util-linux/util-linux.spec, util-linux/fix-crash-on-fdisk-l.patch...

[glen]

Author: glen                         Date: Tue Mar  6 10:22:35 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix crash on fdisk -l

---- Files affected:
packages/util-linux:
   util-linux.spec (1.341 -> 1.342) , fix-crash-on-fdisk-l.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/util-linux/util-linux.spec
diff -u packages/util-linux/util-linux.spec:1.341 packages/util-linux/util-linux.spec:1.342
--- packages/util-linux/util-linux.spec:1.341	Mon Mar  5 21:20:00 2012
+++ packages/util-linux/util-linux.spec	Tue Mar  6 11:22:30 2012
@@ -35,7 +35,7 @@
 Summary(uk.UTF-8):	Набір базових системних утиліт для Linux
 Name:		util-linux
 Version:	2.21
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/System
 Source0:	https://www.kernel.org/pub/linux/utils/util-linux/v2.21/%{name}-%{version}.tar.xz
@@ -58,6 +58,7 @@
 Patch11:	no-openat.patch
 Patch12:	https://github.com/karelzak/util-linux/commit/2f595c001b4528b3b9a4aea04d72b6918c434efb.patch
 # Patch12-md5:	6671ea54ea50f49ef56e05a7b3c8bd37
+Patch13:	fix-crash-on-fdisk-l.patch
 URL:		http://userweb.kernel.org/~kzak/util-linux/
 BuildRequires:	audit-libs-devel >= 1.0.6
 BuildRequires:	autoconf >= 2.60
@@ -642,6 +643,7 @@
 %patch11 -p1
 %endif
 %patch12 -p1
+%patch13 -p1
 
 %{__rm} po/stamp-po
 
@@ -1441,6 +1443,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.342  2012/03/06 10:22:30  glen
+- fix crash on fdisk -l
+
 Revision 1.341  2012/03/05 20:20:00  glen
 - pam is no longer opt in/out
 

================================================================
Index: packages/util-linux/fix-crash-on-fdisk-l.patch
diff -u /dev/null packages/util-linux/fix-crash-on-fdisk-l.patch:1.1
--- /dev/null	Tue Mar  6 11:22:35 2012
+++ packages/util-linux/fix-crash-on-fdisk-l.patch	Tue Mar  6 11:22:30 2012
@@ -0,0 +1,34 @@
+From b2cfdbb023ad06afec00ad44761e244d74119034 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen at delfi.ee>
+Date: Tue, 6 Mar 2012 12:19:41 +0200
+Subject: [PATCH] fix crash on fdisk -l
+
+---
+ libblkid/src/topology/sysfs.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libblkid/src/topology/sysfs.c b/libblkid/src/topology/sysfs.c
+index e62b84c..41be036 100644
+--- a/libblkid/src/topology/sysfs.c
++++ b/libblkid/src/topology/sysfs.c
+@@ -76,7 +76,7 @@ static int probe_sysfs_tp(blkid_probe pr,
+ 				}
+ 			}
+ 			if (!ok)
+-				continue;	/* attrinute does not exist */
++				continue;	/* attribute does not exist */
+ 		}
+ 
+ 		if (val->set_ulong) {
+@@ -102,7 +102,7 @@ static int probe_sysfs_tp(blkid_probe pr,
+ 
+ done:
+ 	sysfs_deinit(&sysfs);
+-	if (disk)
++	if (disk && disk != dev)
+ 		sysfs_deinit(&parent);
+ 	if (count)
+ 		return 0;		/* success */
+-- 
+1.7.9.2
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux.spec?r1=1.341&r2=1.342&f=u