rpms/udev/devel udev-137-vol_id1.patch, NONE, 1.1 udev-137-vol_id2.patch, NONE, 1.1 udev-137.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.56, 1.57 sources, 1.56, 1.57 udev.spec, 1.260, 1.261 upstream, 1.9, 1.10 udev-135.tar.bz2.sign, 1.1, NONE

[Harald Hoyer]

Author: harald

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

Modified Files:
	.cvsignore sources udev.spec upstream 
Added Files:
	udev-137-vol_id1.patch udev-137-vol_id2.patch 
	udev-137.tar.bz2.sign 
Removed Files:
	udev-135.tar.bz2.sign 
Log Message:
* Thu Jan 29 2009 Harald Hoyer <harald at redhat.com> 137-1
- version 137
- add vol_id patches from kzak
- dialout group has gid 18 now


udev-137-vol_id1.patch:

--- NEW FILE udev-137-vol_id1.patch ---
commit 7e5861ff70994fdc2e383e227ff24225ac5f7ce5
Author: Karel Zak <kzak at redhat.com>
Date:   Sat Jan 24 00:37:23 2009 +0100

    vol_id: add missing id->type to swap0
    
    Signed-off-by: Karel Zak <kzak at redhat.com>

diff --git a/extras/volume_id/lib/linux_swap.c b/extras/volume_id/lib/linux_swap.c
index 1698e9d..53649bd 100644
--- a/extras/volume_id/lib/linux_swap.c
+++ b/extras/volume_id/lib/linux_swap.c
@@ -57,6 +57,7 @@ int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off, uint64_t size
 				return -1;
 
 			if (memcmp(buf, "SWAP-SPACE", 10) == 0) {
+				id->type = "swap";
 				strcpy(id->type_version, "1");
 				goto found;
 			}

udev-137-vol_id2.patch:

--- NEW FILE udev-137-vol_id2.patch ---
commit 3e2084614b4d8308d5c0ceb34ec3634eb3353c00
Author: Karel Zak <kzak at redhat.com>
Date:   Sat Jan 24 00:37:22 2009 +0100

    vol_id: fix ddf version string
    
    The version string in DDF suberblock does not include the null terminator
    and the snprintf() function writes at most "size" bytes *including* the
    null byte.
    
    old version:
    	ID_FS_VERSION=02.00.0
    new version:
    	ID_FS_VERSION=02.00.00
    
    Signed-off-by: Karel Zak <kzak at redhat.com>

diff --git a/extras/volume_id/lib/ddf_raid.c b/extras/volume_id/lib/ddf_raid.c
index 58bdae9..32f20ce 100644
--- a/extras/volume_id/lib/ddf_raid.c
+++ b/extras/volume_id/lib/ddf_raid.c
@@ -87,7 +87,7 @@ int volume_id_probe_ddf_raid(struct volume_id *id, uint64_t off, uint64_t size)
 	return -1;
 found:
 	volume_id_set_uuid(id, ddf->guid, DDF_GUID_LENGTH, UUID_STRING);
-	snprintf(id->type_version, DDF_REV_LENGTH, "%s", ddf->ddf_rev);
+	snprintf(id->type_version, DDF_REV_LENGTH + 1, "%s", ddf->ddf_rev);
 	volume_id_set_usage(id, VOLUME_ID_RAID);
 	id->type = "ddf_raid_member";
 	return 0;


--- NEW FILE udev-137.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJeTdlyGugalF9Dw4RAolBAJ9sKq3V9mpanhvpOMkYXky7DwF7sACgg0N4
SsPqKyBV4nkSMxxLQwxJEdw=
=PEri
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	20 Jan 2009 11:58:53 -0000	1.56
+++ .cvsignore	29 Jan 2009 11:49:39 -0000	1.57
@@ -1 +1 @@
-udev-136.tar.bz2
+udev-137.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	20 Jan 2009 11:58:53 -0000	1.56
+++ sources	29 Jan 2009 11:49:39 -0000	1.57
@@ -1 +1 @@
-9a27ccd96cf8d529c4e424520547b72a  udev-136.tar.bz2
+9d5960024da9c80b54c8273ee05b31e1  udev-137.tar.bz2


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- udev.spec	20 Jan 2009 12:17:14 -0000	1.260
+++ udev.spec	29 Jan 2009 11:49:39 -0000	1.261
@@ -5,8 +5,8 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 136
-Release: 2%{?dist}
+Version: 137
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -18,10 +18,8 @@
 Source4: fw_unit_symlinks.sh
 Source5: udev.sysconfig
 
-Patch1: udev-136-tape.patch
-Patch2: udev-136-cdrom.patch
-Patch3: udev-136-video.patch
-
+Patch1: udev-137-vol_id1.patch
+Patch2: udev-137-vol_id2.patch
 Patch102: udev-118-sysconf.patch
 
 ExclusiveOS: Linux
@@ -94,10 +92,9 @@
 
 %prep
 %setup -q  
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
+%patch1 -p1 
+%patch2 -p1
 %patch102 -p1 -b .sysconf
 rm rules/redhat/95-pam-console.rules
 
@@ -242,7 +239,7 @@
 # to be kept
 getent group cdrom >/dev/null || /usr/sbin/groupadd -g 11 cdrom || :
 getent group tape >/dev/null || /usr/sbin/groupadd -g 33 tape || :
-getent group dialout >/dev/null || /usr/sbin/groupadd -g 87 dialout || :
+getent group dialout >/dev/null || /usr/sbin/groupadd -g 18 dialout || :
 
 exit 0
 
@@ -386,6 +383,11 @@
 
 
 %changelog
+* Thu Jan 29 2009 Harald Hoyer <harald at redhat.com> 137-1
+- version 137
+- add vol_id patches from kzak
+- dialout group has gid 18 now
+
 * Tue Jan 20 2009 Harald Hoyer <harald at redhat.com> 136-2
 - added some rule fixes, which will be in udev-137
 


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/upstream,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- upstream	2 Dec 2008 10:22:49 -0000	1.9
+++ upstream	29 Jan 2009 11:49:39 -0000	1.10
@@ -1 +1 @@
-udev-135.tar.bz2
+udev-137.tar.bz2


--- udev-135.tar.bz2.sign DELETED ---