rpms/udev/devel udev-127-volid-raid.patch, NONE, 1.1 udev-127-volume_id-include-config.h.patch, NONE, 1.1 udev.spec, 1.251, 1.252

[Harald Hoyer]

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14895

Modified Files:
	udev.spec 
Added Files:
	udev-127-volid-raid.patch 
	udev-127-volume_id-include-config.h.patch 
Log Message:
* Thu Oct 16 2008 Harald Hoyer <harald at redhat.com> 127-2
- added 2 patches for md raid vol_id 


udev-127-volid-raid.patch:

--- NEW FILE udev-127-volid-raid.patch ---
commit 7643819062985d9fc6c7664072576e71d3822b10
Author: Kay Sievers <kay.sievers at vrfy.org>
Date:   Sat Sep 6 16:23:21 2008 +0200

    volume_id: linux_raid - fix logic for volumes with size == 0

diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c
index 5d95b50..c40f3e3 100644
--- a/extras/volume_id/lib/linux_raid.c
+++ b/extras/volume_id/lib/linux_raid.c
@@ -149,26 +149,31 @@ int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size
 {
 	uint64_t sboff;
 
-	/* version 0 at the end of the device */
-	sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES;
-	if (volume_id_probe_linux_raid0(id, off + sboff, size) == 0)
-		return 0;
-
-	/* version 1.0 at the end of the device */
-	sboff = (size & ~(0x1000 - 1)) - 0x2000;
-	if (volume_id_probe_linux_raid1(id, off + sboff, size) == 0)
-		strcpy(id->type_version, "1.0");
+	if (size > MD_RESERVED_BYTES) {
+		/* version 0 at the end of the device */
+		sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES;
+		if (volume_id_probe_linux_raid0(id, off + sboff, size) == 0)
+			return 0;
+
+		/* version 1.0 at the end of the device */
+		sboff = (size & ~(0x1000 - 1)) - 0x2000;
+		if (volume_id_probe_linux_raid1(id, off + sboff, size) == 0) {
+			strcpy(id->type_version, "1.0");
+			return 0;
+		}
+	}
 
 	/* version 1.1 at the start of the device */
-	else if (volume_id_probe_linux_raid1(id, off, size) == 0)
+	if (volume_id_probe_linux_raid1(id, off, size) == 0) {
 		strcpy(id->type_version, "1.1");
+		return 0;
+	}
 
 	/* version 1.2 at 4k offset from the start */
-	else if (volume_id_probe_linux_raid1(id, off + 0x1000, size) == 0)
+	if (volume_id_probe_linux_raid1(id, off + 0x1000, size) == 0) {
 		strcpy(id->type_version, "1.2");
+		return 0;
+	}
 
-	else
-		return -1;
-
-	return 0;
+	return -1;
 }

udev-127-volume_id-include-config.h.patch:

--- NEW FILE udev-127-volume_id-include-config.h.patch ---
diff --git a/extras/volume_id/lib/util.c b/extras/volume_id/lib/util.c
index 0fb8937..4d118a4 100644
--- a/extras/volume_id/lib/util.c
+++ b/extras/volume_id/lib/util.c
@@ -21,6 +21,8 @@
 #define _GNU_SOURCE 1
 #endif
 
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- udev.spec	2 Sep 2008 13:29:10 -0000	1.251
+++ udev.spec	16 Oct 2008 12:13:41 -0000	1.252
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 127
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -19,6 +19,9 @@
 Source4: fw_unit_symlinks.sh
 Source5: udev.sysconfig
 
+Patch1: udev-127-volid-raid.patch
+Patch2: udev-127-volume_id-include-config.h.patch
+
 Patch102: udev-118-sysconf.patch
 
 ExclusiveOS: Linux
@@ -91,6 +94,8 @@
 
 %prep
 %setup -q  
+%patch1 -p1 
+%patch2 -p1
 %patch102 -p1 -b .sysconf
 
 %build
@@ -363,6 +368,9 @@
 
 
 %changelog
+* Thu Oct 16 2008 Harald Hoyer <harald at redhat.com> 127-2
+- added 2 patches for md raid vol_id 
+
 * Mon Sep 01 2008 Harald Hoyer <harald at redhat.com> 127-1
 - version 127