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

Harald Hoyer harald at fedoraproject.org
Thu Oct 16 12:25:25 UTC 2008


Author: harald

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

Modified Files:
	udev-127-volid-raid.patch 
	udev-127-volume_id-include-config.h.patch udev.spec 
Log Message:
fixed patch fuzz

udev-127-volid-raid.patch:

Index: udev-127-volid-raid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-127-volid-raid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-127-volid-raid.patch	16 Oct 2008 12:13:41 -0000	1.1
+++ udev-127-volid-raid.patch	16 Oct 2008 12:25:25 -0000	1.2
@@ -1,14 +1,7 @@
-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
+diff -up udev-127/extras/volume_id/lib/linux_raid.c.p1 udev-127/extras/volume_id/lib/linux_raid.c
+--- udev-127/extras/volume_id/lib/linux_raid.c.p1	2008-08-28 23:20:07.000000000 +0200
++++ udev-127/extras/volume_id/lib/linux_raid.c	2008-10-16 14:23:54.000000000 +0200
+@@ -149,26 +149,31 @@ int volume_id_probe_linux_raid(struct vo
  {
  	uint64_t sboff;
  

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

Index: udev-127-volume_id-include-config.h.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-127-volume_id-include-config.h.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-127-volume_id-include-config.h.patch	16 Oct 2008 12:13:41 -0000	1.1
+++ udev-127-volume_id-include-config.h.patch	16 Oct 2008 12:25:25 -0000	1.2
@@ -1,9 +1,8 @@
-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
+diff -up udev-127/extras/volume_id/lib/util.c.p2 udev-127/extras/volume_id/lib/util.c
+--- udev-127/extras/volume_id/lib/util.c.p2	2008-08-28 23:22:03.000000000 +0200
++++ udev-127/extras/volume_id/lib/util.c	2008-10-16 14:24:17.000000000 +0200
+@@ -16,6 +16,8 @@
+ #  include <config.h>
  #endif
  
 +#include <config.h>


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- udev.spec	16 Oct 2008 12:13:41 -0000	1.252
+++ udev.spec	16 Oct 2008 12:25:25 -0000	1.253
@@ -94,8 +94,8 @@
 
 %prep
 %setup -q  
-%patch1 -p1 
-%patch2 -p1
+%patch1 -p1 -b .p1
+%patch2 -p1 -b .p2
 %patch102 -p1 -b .sysconf
 
 %build




More information about the scm-commits mailing list