rpms/udev/devel udev-rules.patch,1.17,1.18 udev.spec,1.177,1.178

[fedora-cvs-commits at redhat.com]

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31464

Modified Files:
	udev-rules.patch udev.spec 
Log Message:
- fixed CAPI device nodes (bug #139321)
- fixed bug #201422


udev-rules.patch:
 05-udev-early.rules |    1 +
 50-udev.rules       |   12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- udev-rules.patch	12 Jul 2006 09:26:05 -0000	1.17
+++ udev-rules.patch	7 Aug 2006 12:59:00 -0000	1.18
@@ -1,6 +1,16 @@
---- udev-095/etc/udev/redhat/50-udev.rules.rhrules	2006-07-12 11:20:05.000000000 +0200
-+++ udev-095/etc/udev/redhat/50-udev.rules	2006-07-12 11:19:47.000000000 +0200
-@@ -217,8 +217,11 @@
+--- udev-095/etc/udev/redhat/50-udev.rules.rhrules	2006-07-04 12:34:55.000000000 +0200
++++ udev-095/etc/udev/redhat/50-udev.rules	2006-08-07 14:53:56.000000000 +0200
+@@ -28,7 +28,8 @@
+ KERNEL=="ippp*",		NAME="%k", MODE="0660"
+ KERNEL=="isdn*",		NAME="%k", MODE="0660"
+ KERNEL=="isdnctrl*",		NAME="%k", MODE="0660"
+-KERNEL=="capi*",		NAME="%k", MODE="0660"
++KERNEL=="capi",                 NAME="capi20", GROUP="uucp", MODE="0660"
++KERNEL=="capi*",                NAME="capi/%n", GROUP="uucp", MODE="0660"
+ KERNEL=="dcbri*",		NAME="%k", MODE="0660"
+ KERNEL=="ircomm*",		NAME="%k", GROUP="uucp", MODE="0660"
+ KERNEL=="tts/[0-9]*",		NAME="%k", GROUP="uucp", MODE="0660"
+@@ -217,8 +218,11 @@
  KERNEL=="nst[0-9]", BUS=="scsi", 	SYMLINK+="tape-%k", MODE="0660"
  KERNEL=="nosst[0-9]", BUS=="scsi", 	SYMLINK+="tape-%k", MODE="0660"
  
@@ -14,7 +24,7 @@
  
  # Section for zaptel device
  KERNEL=="zapctl",     		NAME="zap/ctl"
-@@ -229,8 +232,6 @@
+@@ -229,8 +233,6 @@
  
  KERNEL=="pktcdvd", NAME="%k/control"
  
@@ -23,3 +33,13 @@
  KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
  	SYSFS{device/media}=="floppy", \
  	SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions"
+--- udev-095/etc/udev/redhat/05-udev-early.rules.rhrules	2006-08-07 14:58:23.000000000 +0200
++++ udev-095/etc/udev/redhat/05-udev-early.rules	2006-08-07 14:50:58.000000000 +0200
+@@ -1,6 +1,7 @@
+ # sysfs is populated after the event is sent
+ ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
+ ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
++ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"                    
+ 
+ # ignore these events until someone needs them
+ SUBSYSTEM=="drivers",		OPTIONS="ignore_device"


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- udev.spec	12 Jul 2006 09:27:01 -0000	1.177
+++ udev.spec	7 Aug 2006 12:59:00 -0000	1.178
@@ -3,7 +3,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 095
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -325,6 +325,10 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Mon Aug  7 2006 Harald Hoyer <harald at redhat.com> - 095-4
+- fixed CAPI device nodes (bug #139321)
+- fixed bug #201422
+
 * Wed Jul 12 2006 Harald Hoyer <harald at redhat.com> - 095-3
 - more infiniband rules (bug #198501)