rpms/udev/F-7 sources, 1.42, 1.43 udev-089-nopie.patch, 1.6, 1.7 udev-091-lib64.patch, 1.1, 1.2 udev-rules.patch, 1.34, 1.35 udev.spec, 1.204, 1.205 udev-084-floppy.patch, 1.1, NONE udev-084-pg.patch, 1.1, NONE udev-089-last_modalias.patch, 1.2, NONE udev-095-longcomment.patch, 1.1, NONE udev-095-path_id.patch, 1.1, NONE udev-095-path_id2.patch, 1.1, NONE udev-095-selinux.patch, 1.1, NONE udevstart2.patch, 1.6, NONE

Harald Hoyer (harald) fedora-extras-commits at redhat.com
Fri Jul 27 17:58:25 UTC 2007


Author: harald

Update of /cvs/pkgs/rpms/udev/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27988

Modified Files:
	sources udev-089-nopie.patch udev-091-lib64.patch 
	udev-rules.patch udev.spec 
Removed Files:
	udev-084-floppy.patch udev-084-pg.patch 
	udev-089-last_modalias.patch udev-095-longcomment.patch 
	udev-095-path_id.patch udev-095-path_id2.patch 
	udev-095-selinux.patch udevstart2.patch 
Log Message:
new kernels in F-7 need new rules



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-7/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	7 Mar 2007 18:01:25 -0000	1.42
+++ sources	27 Jul 2007 17:57:52 -0000	1.43
@@ -1 +1 @@
-320ccd2d0f4540d10e021bafa14f8985  udev-106.tar.bz2
+cb9a227206b9d85ae8cfc88fc51c1710  udev-113.tar.bz2

udev-089-nopie.patch:

Index: udev-089-nopie.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-7/udev-089-nopie.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- udev-089-nopie.patch	3 May 2006 15:54:21 -0000	1.6
+++ udev-089-nopie.patch	27 Jul 2007 17:57:52 -0000	1.7
@@ -1,17 +1,18 @@
---- udev-091/extras/volume_id/lib/Makefile.nopie	2006-04-25 22:39:59.000000000 +0200
-+++ udev-091/extras/volume_id/lib/Makefile	2006-05-03 16:23:33.000000000 +0200
-@@ -67,7 +67,7 @@
- 
+--- udev-113/extras/volume_id/lib/Makefile.nopie	2007-06-23 17:44:48.000000000 +0200
++++ udev-113/extras/volume_id/lib/Makefile	2007-06-26 16:19:25.000000000 +0200
+@@ -72,7 +72,8 @@
  .shlib/%.o: %.c
  	$(E) "  CC      " $@
+ 	$(Q) mkdir -p $(dir $@)
 -	$(Q) $(CC) -c $(CFLAGS) -fPIC $< -o $@
 +	$(Q) $(subst -fpie,,$(subst -pie,,$(CC) )) -c $(CFLAGS) -fPIC $< -o $@
++#	$(Q) $(CC) -c $(CFLAGS) -fPIC $< -o $@
  
  libvolume_id.a: $(HEADERS) $(OBJS)
  	$(Q) rm -f $@
-@@ -78,7 +78,7 @@
+@@ -83,7 +84,7 @@
  
- $(SHLIB): $(HEADERS) .shlib $(addprefix .shlib/,$(OBJS))
+ $(SHLIB): $(HEADERS) exported_symbols $(addprefix .shlib/,$(OBJS))
  	$(E) "  CC      " $@
 -	$(Q) $(CC) -shared $(CFLAGS) -o $@ \
 +	$(Q) $(subst -fpie,,$(subst -pie,,$(CC) )) -shared $(CFLAGS) -o $@ \

udev-091-lib64.patch:

Index: udev-091-lib64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-7/udev-091-lib64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-091-lib64.patch	3 May 2006 16:19:56 -0000	1.1
+++ udev-091-lib64.patch	27 Jul 2007 17:57:52 -0000	1.2
@@ -1,6 +1,6 @@
---- udev-091/Makefile.lib64	2006-04-25 22:39:59.000000000 +0200
-+++ udev-091/Makefile	2006-05-03 18:16:31.000000000 +0200
-@@ -103,6 +103,8 @@
+--- udev-113/Makefile.lib64	2007-06-23 17:44:48.000000000 +0200
++++ udev-113/Makefile	2007-06-26 16:37:34.000000000 +0200
+@@ -98,6 +98,8 @@
  libudevdir =	${prefix}/lib/udev
  mandir =	${prefix}/usr/share/man
  configdir =	${etcdir}/udev
@@ -9,7 +9,7 @@
  udevdir =	/dev
  DESTDIR =
  
-@@ -179,6 +181,8 @@
+@@ -168,6 +170,8 @@
  			RANLIB="$(RANLIB)" \
  			LIB_OBJS="$(LIB_OBJS)" \
  			LIBUDEV="$(PWD)/$(LIBUDEV)" \
@@ -18,8 +18,8 @@
  			-C $$target $@ || exit 1; \
  	done;
  .PHONY: all
---- udev-091/extras/volume_id/lib/Makefile.lib64	2006-05-03 18:15:28.000000000 +0200
-+++ udev-091/extras/volume_id/lib/Makefile	2006-05-03 18:15:53.000000000 +0200
+--- udev-113/extras/volume_id/lib/Makefile.lib64	2007-06-26 16:37:34.000000000 +0200
++++ udev-113/extras/volume_id/lib/Makefile	2007-06-26 16:37:34.000000000 +0200
 @@ -4,9 +4,9 @@
  #
  # Released under the GNU General Public License, version 2.
@@ -31,10 +31,18 @@
 +libdir ?=	${prefix}/lib
 +usrlibdir ?=	${prefix}/usr/lib
  
- INSTALL = /usr/bin/install -c
+ INSTALL = install -c
  INSTALL_DATA  = ${INSTALL} -m 644
---- udev-091/extras/volume_id/Makefile.lib64	2006-04-25 22:39:59.000000000 +0200
-+++ udev-091/extras/volume_id/Makefile	2006-05-03 18:16:14.000000000 +0200
+@@ -106,6 +106,7 @@
+ 	$(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
+ 	$(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
+ 	mkdir -p $(DESTDIR)$(usrlibdir)/
++	$(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a
+ 	ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
+ 	ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
+ 	$(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
+--- udev-113/extras/volume_id/Makefile.lib64	2007-06-23 17:44:48.000000000 +0200
++++ udev-113/extras/volume_id/Makefile	2007-06-26 16:37:34.000000000 +0200
 @@ -17,6 +17,9 @@
  libudevdir =	${prefix}/lib/udev
  mandir =	${prefix}/usr/share/man
@@ -43,17 +51,18 @@
 +usrlibdir ?=    ${prefix}/usr/lib
 +
  
- INSTALL = /usr/bin/install -c
+ INSTALL = install -c
  INSTALL_PROGRAM = ${INSTALL}
-@@ -32,7 +35,10 @@
+@@ -34,7 +37,11 @@
  	$(Q) $(CC) -c $(CFLAGS) $< -o $@
  
- lib/libvolume_id.a:
--	$(Q) $(MAKE) -C lib
+ lib:
+-	$(Q) $(MAKE) -C $@
 +	$(Q) $(MAKE) \
 +		libdir=$(libdir) \
 +		usrlibdir=$(usrlibdir) \
 +		-C lib
++#	$(Q) $(MAKE) -C $@
+ .PHONY: lib
  
- $(PROG): %: $(HEADERS) %.o lib/libvolume_id.a
- 	$(E) "  LD      " $@
+ lib/libvolume_id.a: lib

udev-rules.patch:

Index: udev-rules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-7/udev-rules.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- udev-rules.patch	2 May 2007 10:18:23 -0000	1.34
+++ udev-rules.patch	27 Jul 2007 17:57:52 -0000	1.35
@@ -1,102 +1,314 @@
---- udev-106/etc/udev/redhat/50-udev.rules.rhrules	2007-03-03 18:42:09.000000000 +0100
-+++ udev-106/etc/udev/redhat/50-udev.rules	2007-05-02 12:15:07.000000000 +0200
-@@ -41,9 +41,6 @@
- KERNEL=="hvc*",                 NAME="%k", GROUP="uucp", MODE="0660"
- KERNEL=="hvsi*",                NAME="%k", GROUP="uucp", MODE="0660"
+--- udev-113/etc/udev/redhat/50-udev.rules.rhrules	2007-06-23 17:44:48.000000000 +0200
++++ udev-113/etc/udev/redhat/50-udev.rules	2007-07-27 18:41:46.000000000 +0200
+@@ -4,25 +4,25 @@
+ # default is OWNER="root" GROUP="root", MODE="0600"
+ #
+ 
+-KERNEL=="*", OWNER="root" GROUP="root", MODE="0600"
++KERNEL=="*", OWNER="root", GROUP="root", MODE="0600"
+ 
+ # all block devices
+ SUBSYSTEM=="block",		GROUP="disk", MODE="0640"
+ KERNEL=="root",			GROUP="disk", MODE="0640"
+ 
+ # console devices
+-KERNEL=="tty",			NAME="%k", GROUP="tty", MODE="0666", OPTIONS="last_rule"
+-KERNEL=="console",              NAME="%k", MODE="0600", OPTIONS="last_rule"
+-KERNEL=="tty[0-9]*",            NAME="%k", GROUP="tty", MODE="0660", OPTIONS="last_rule"
+-KERNEL=="vc/[0-9]*",		NAME="%k", GROUP="tty", MODE="0660", OPTIONS="last_rule"
++KERNEL=="tty",			NAME="%k", GROUP="tty", MODE="0666"
++KERNEL=="console",              NAME="%k", MODE="0600" 
++KERNEL=="tty[0-9]*",            NAME="%k", GROUP="tty", MODE="0660"
++KERNEL=="vc/[0-9]*",		NAME="%k", GROUP="tty", MODE="0660"
+ 
+ # pty devices
+ #  Set this to 0660 if you only want users belonging to tty group
+ #  to be able to allocate PTYs
+-KERNEL=="ptmx",                 NAME="%k", GROUP="tty", MODE="666", OPTIONS="last_rule"
+-KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", MODE="660", OPTIONS="last_rule"
+-KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", MODE="660", OPTIONS="last_rule"
+-KERNEL=="pty/m*",		NAME="%k", GROUP="tty", MODE="0660", OPTIONS="last_rule"
++KERNEL=="ptmx",                 NAME="%k", GROUP="tty", MODE="666"
++KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", MODE="660"
++KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", MODE="660"
++KERNEL=="pty/m*",		NAME="%k", GROUP="tty", MODE="0660"
+ 
+ # serial+dialup devices
+ KERNEL=="ippp*",		NAME="%k", MODE="0660"
+@@ -43,21 +43,21 @@
  KERNEL=="iseries/vtty*",        NAME="%k", GROUP="uucp", MODE="0660"
--KERNEL=="ttyUSB*", ATTRS{product}=="Palm Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
--KERNEL=="ttyUSB*", ATTRS{product}=="palmOne Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
--KERNEL=="ttyUSB*", ATTRS{product}=="Handspring Visor*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
  
  # vc devices
- KERNEL=="vcs",			NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
-@@ -68,9 +65,6 @@
- KERNEL=="nvram",		MODE="0660"
- KERNEL=="rtc",			MODE="0644"
+-KERNEL=="vcs",			NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
+-KERNEL=="vcs[0-9]*",		NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
+-KERNEL=="vcsa",			NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
+-KERNEL=="vcsa[0-9]*",		NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
+-KERNEL=="vcc/*",		NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
++KERNEL=="vcs",			NAME="%k", OWNER="vcsa", GROUP="tty"
++KERNEL=="vcs[0-9]*",		NAME="%k", OWNER="vcsa", GROUP="tty"
++KERNEL=="vcsa",			NAME="%k", OWNER="vcsa", GROUP="tty"
++KERNEL=="vcsa[0-9]*",		NAME="%k", OWNER="vcsa", GROUP="tty"
++KERNEL=="vcc/*",		NAME="%k", OWNER="vcsa", GROUP="tty"
+ 
+ # memory devices
+-KERNEL=="random",		MODE="0666", OPTIONS="last_rule"
+-KERNEL=="urandom",		MODE="0444", OPTIONS="last_rule"
+-KERNEL=="mem",			GROUP="kmem", MODE="0640", OPTIONS="last_rule"
+-KERNEL=="kmem",			GROUP="kmem", MODE="0640", OPTIONS="last_rule"
+-KERNEL=="port",			GROUP="kmem", MODE="0640", OPTIONS="last_rule"
+-KERNEL=="full",			MODE="0666", OPTIONS="last_rule"
+-KERNEL=="null",			MODE="0666", OPTIONS="last_rule"
+-KERNEL=="zero",			MODE="0666", OPTIONS="last_rule"
++KERNEL=="random",		MODE="0666"
++KERNEL=="urandom",		MODE="0444"
++KERNEL=="mem",			GROUP="kmem", MODE="0640"
++KERNEL=="kmem",			GROUP="kmem", MODE="0640"
++KERNEL=="port",			GROUP="kmem", MODE="0640"
++KERNEL=="full",			MODE="0666"
++KERNEL=="null",			MODE="0666"
++KERNEL=="zero",			MODE="0666"
+ # 183 = /dev/hwrng        Generic random number generator
+ KERNEL=="hw_random",            NAME="hwrng", SYMLINK+="%k"
+ 
+@@ -67,12 +67,18 @@
  
--# pnp devices
--ACTION=="add", SUBSYSTEM=="pnp", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe pnp:d$$id; done < /sys/$devpath/id'"
--
  # floppy devices
  KERNEL=="fd[01]*",		GROUP="floppy", MODE="0660"
++
  # fix floppy devices
-@@ -212,7 +206,7 @@
- KERNEL=="vbi0",			SYMLINK+="vbi"
- KERNEL=="null",			SYMLINK+="XOR"
+ KERNEL=="nvram", ACTION=="add", RUN+="load_floppy_module.sh"
+-KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M /dev/%k"
++
++KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="*", \
++	RUN+="create_floppy_devices -c -t $attr{cmos} -m %M /dev/%k"
++
+ KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/sh -c 'rm -f /dev/%k*'"
  
--KERNEL=="tun",			NAME="net/%k"
-+KERNEL=="tun",			NAME="net/%k", MODE="0666"
+-BUS=="usb", KERNEL=="sd*", SYSFS{bInterfaceClass}=="08", SYSFS{bInterfaceSubClass}=="04", GROUP="floppy", MODE="0660", SYMLINK+="floppy floppy-%k"
++BUS=="usb", KERNEL=="sd*", ATTRS{bInterfaceClass}=="08", \
++	ATTRS{bInterfaceSubClass}=="04", GROUP="floppy", MODE="0660", \
++	SYMLINK+="floppy floppy-%k"
+ 
+ # audio devices
+ KERNEL=="dsp*",			MODE="0660"
+@@ -99,8 +105,8 @@
+ KERNEL=="usb/lp*",		GROUP="lp", MODE="0660"
+ 
+ # tape devices
+-SUBSYSTEM=="ide", SYSFS{media}=="tape", ACTION=="add", \
+-		RUN+="modprobe ide-scsi idescsi_nocd=1"
++SUBSYSTEM=="ide", ATTRS{media}=="tape", ACTION=="add", \
++		RUN+="/sbin/modprobe ide-scsi idescsi_nocd=1"
+ KERNEL=="ht*",			GROUP="disk", MODE="0660"
+ KERNEL=="nht*",			GROUP="disk", MODE="0660"
+ KERNEL=="pt[0-9]*",		GROUP="disk", MODE="0660"
+@@ -155,7 +161,8 @@
+ 
+ # DVB
+ KERNEL=="dvb",			MODE="0660"
+-SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", \
++SUBSYSTEM=="dvb", \
++	PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", \
+ 	NAME="%c", MODE="0660"
+ 
+ KERNEL=="dm-[0-9]*", ACTION=="add",           OPTIONS+="ignore_device"
+@@ -181,6 +188,8 @@
+ KERNEL=="dv1394*",      	NAME="dv1394/%n"
+ KERNEL=="video1394*",   	NAME="video1394/%n"
  
- KERNEL=="device-mapper",	NAME="mapper/control"
++KERNEL=="fw*", PROGRAM="fw_unit_symlinks.sh %k %n", SYMLINK+="$result"
++
+ KERNEL=="raw[0-9]*",		NAME="raw/%k"
  
-@@ -233,6 +227,7 @@
+ KERNEL=="lp[0-9]*",		SYMLINK+="par%n"
+@@ -227,89 +236,51 @@
  
  KERNEL=="pktcdvd", NAME="%k/control"
  
-+
+-
  KERNEL=="hd*[!0-9]", ATTR{removable}=="1", \
  	ATTR{media}=="floppy", \
  	SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions"
-@@ -255,6 +250,7 @@
- 	OPTIONS+="ignore_remove"
- 
+-KERNEL=="hd*[0-9]", ATTRS{media}=="floppy", ATTRS{removable}=="1", SYMLINK+="floppy-%k"
  
+-KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", ATTRS{media}=="cdrom", SYMLINK+="cdrom cdrom-%k"
++KERNEL=="hd*[0-9]", ATTRS{media}=="floppy", ATTRS{removable}=="1", \
++	SYMLINK+="floppy-%k"
+ 
+-KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd dvd-%k"
+-KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd dvd-%k"
++KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", ATTRS{media}=="cdrom", \
++	SYMLINK+="cdrom cdrom-%k"
+ 
+-KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k"
+-KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k"
++KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", \
++	PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd dvd-%k"
++KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD", \
++	SYMLINK+="dvd dvd-%k"
++
++KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", \
++	PROGRAM=="check-cdrom.sh %k CD-R", \
++	SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k"
++
++KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k CD-R", \
++	SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k"
 +
- #######################################
- # Persistent block device stuff - begin
- #######################################
-@@ -280,7 +276,6 @@
- KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/usb_id -x"
- KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -s %p -d $tempnode"
- KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -a -s %p -d $tempnode"
--KERNEL=="dasd*[!0-9]", IMPORT{program}="/lib/udev/dasd_id --export $tempnode"
- KERNEL=="sd*[!0-9]|sr*|dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
++KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", \
++	PROGRAM="check-cdrom.sh %k DVD-R", \
++	SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k"
+ 
+-KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", PROGRAM="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k"
+-KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k"
++KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD-R", \
++	SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k"
+ 
+ # rename sr* to scd*
+ KERNEL=="sr[0-9]*", BUS=="scsi", NAME="scd%n"
+ KERNEL=="hd*[0-9]", BUS=="ide", ATTRS{removable}=="1", \
+ 	OPTIONS+="ignore_remove"
  
- # for partitions import parent information
-@@ -315,9 +310,6 @@
+-
+-
+-#######################################
+-# Persistent block device stuff - begin
+-#######################################
+-# persistent disk links: /dev/disk/{by-id,by-uuid,by-label,by-path}
+-# scheme based on "Linux persistent device names", 2004, Hannes Reinecke <hare at suse.de>
+-
+-ACTION!="add", GOTO="persistent_end"
+-SUBSYSTEM!="block", GOTO="persistent_end"
+-
+-# skip rules for inappropriate block devices
+-KERNEL=="ram*|loop*|fd*|nbd*|gnbd*", GOTO="persistent_end"
+-
+-# never access removable ide devices, the drivers are causing event loops on open()
+-KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_end"
+-KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_end"
+-
+-# by-id (hardware serial number)
+-KERNEL=="hd*[!0-9]", IMPORT{program}="/lib/udev/ata_id --export $tempnode"
+-KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}"
+-KERNEL=="hd*[0-9]", IMPORT{parent}=="ID_*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
+-
+-KERNEL=="sd*[!0-9]|sr*", ATTRS{ieee1394_id}=="*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_BUS}="ieee1394"
+-KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/usb_id -x"
+-KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -s %p -d $tempnode"
+-KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -a -s %p -d $tempnode"
+-KERNEL=="sd*[!0-9]|sr*|dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
+-
+-# for partitions import parent information
+-KERNEL=="sd*[0-9]|dasd*[0-9]", IMPORT{parent}=="ID_*"
+-KERNEL=="sd*[0-9]|dasd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
+-
+-# by-path (shortest physical path)
+-KERNEL=="*[!0-9]|sr*", ENV{ID_TYPE}=="?*", IMPORT{program}="/lib/udev/path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}"
+-KERNEL=="sr*", GOTO="persistent_end"
+-KERNEL=="*[0-9]", IMPORT{parent}=="ID_*"
+-KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
+-
+-# by-label/by-uuid (filesystem properties)
+-KERNEL=="*[!0-9]", ATTRS{removable}=="1", GOTO="persistent_end"
+-IMPORT{program}="/lib/udev/vol_id --export $tempnode"
+-ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
+-ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
+-
+-# BIOS Enhanced Disk Device
+-KERNEL=="*[!0-9]", IMPORT{program}="/lib/udev/edd_id --export $tempnode"
+-KERNEL=="*[!0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}"
+-KERNEL=="*[0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}-part%n"
+-
+-LABEL="persistent_end"
+-
+-#####################################
+-# Persistent block device stuff - end
+-#####################################
+-
++SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", \
++	NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0644"
+ 
+ ACTION=="add", SUBSYSTEM=="usb_device", \
  	PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", \
  	NAME="%c", MODE="0644"
  
--ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="modprobe $env{MODALIAS}"
--
--ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", RUN+="/bin/sh -c 'echo 1 > /sys/$DEVPATH/allow_func_id_match'"
++ACTION=="add", SUBSYSTEM=="usb_endpoint", \
++	ATTR{bEndpointAddress}=="?*", ATTRS{devnum}=="?*", ATTRS{busnum}=="?*", \
++	NAME="bus/usb/$attr{busnum}/$attr{devnum}_ep/$attr{bEndpointAddress}", \
++	MODE="0644", SYMLINK+="%k"
  
  # sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
  # sr:           4 TYPE_WORM, 5 TYPE_ROM
-@@ -351,5 +343,6 @@
+@@ -321,11 +292,11 @@
+ 	RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'"
+ 
+ 
+-ACTION=="add", SUBSYSTEM=="scsi_device"	RUN+="modprobe sg"
++ACTION=="add", SUBSYSTEM=="scsi_device"	RUN+="/sbin/modprobe sg"
+ ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="0|7|14", \
+-	RUN+="modprobe sd_mod"
++	RUN+="/sbin/modprobe sd_mod"
+ ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="[45]", \
+-	RUN+="modprobe sr_mod"
++	RUN+="/sbin/modprobe sr_mod"
+ 
+ ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="[36]", \
+ 	SYMLINK+="scanner scanner-%k", MODE="0660"
+@@ -333,15 +304,18 @@
+ ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="8", \
+ 	SYMLINK+="changer changer-%k", MODE="0660", GROUP="disk"
+ 
+-ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
+-	ATTRS{model}!="ADR*", RUN+="modprobe osst"
+-ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
+-	ATTRS{model}=="ADR*", RUN+="modprobe st"
+-ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}!="On[sS]tream", \
+-	RUN+="modprobe st"
++ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", \
++	ATTRS{vendor}=="On[sS]tream", \
++	ATTRS{model}!="ADR*", RUN+="/sbin/modprobe osst"
++ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", \
++	ATTRS{vendor}=="On[sS]tream", \
++	ATTRS{model}=="ADR*", RUN+="/sbin/modprobe st"
++ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", \
++	ATTRS{vendor}!="On[sS]tream", \
++	RUN+="/sbin/modprobe st"
+ 
  # mmc block devices
- ACTION=="add", SUBSYSTEM=="mmc", RUN+="modprobe mmc_block"
+-ACTION=="add", SUBSYSTEM=="mmc", RUN+="modprobe mmc_block"
++ACTION=="add", SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"
  
-+
- RUN+="socket:/org/kernel/udev/monitor"
  
---- udev-106/etc/udev/redhat/95-pam-console.rules.rhrules	2007-03-03 18:42:09.000000000 +0100
-+++ udev-106/etc/udev/redhat/95-pam-console.rules	2007-05-02 12:04:15.000000000 +0200
-@@ -1 +1 @@
--ACTION=="add", SYSFS{dev}=="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}"
-+ENV{STARTUP}!="1", ACTION=="add", SYSFS{dev}=="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}"
---- udev-106/etc/udev/redhat/05-udev-early.rules.rhrules	2007-03-03 18:42:09.000000000 +0100
-+++ udev-106/etc/udev/redhat/05-udev-early.rules	2007-05-02 12:07:55.000000000 +0200
-@@ -1,10 +1,19 @@
- # sysfs is populated after the event is sent
- ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
+ RUN+="socket:/org/kernel/udev/monitor"
+--- udev-113/etc/udev/redhat/05-udev-early.rules.rhrules	2007-06-23 17:44:48.000000000 +0200
++++ udev-113/etc/udev/redhat/05-udev-early.rules	2007-07-27 18:42:09.000000000 +0200
+@@ -1,19 +0,0 @@
+-# sysfs is populated after the event is sent
+-ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
+-# ignore these events until someone needs them
+-SUBSYSTEM=="drivers",		OPTIONS="ignore_device"
+-SUBSYSTEM=="module",		OPTIONS="ignore_device"
+-
+-
+-ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="modprobe $env{MODALIAS}", GOTO="skip_wait"
+-
+-# pnp devices
+-ACTION=="add", SUBSYSTEM=="pnp", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe pnp:d$$id; done < /sys/$devpath/id'"
+-
 -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"
- SUBSYSTEM=="module",		OPTIONS="ignore_device"
- 
-+
-+ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="modprobe $env{MODALIAS}", GOTO="skip_wait"
-+
-+# pnp devices
-+ACTION=="add", SUBSYSTEM=="pnp", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe pnp:d$$id; done < /sys/$devpath/id'"
-+
+-ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
+-
+-LABEL="skip_wait"
+-
+-ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule"
+--- udev-113/etc/udev/redhat/06-udev-rh-early.rules.rhrules	2007-07-27 18:31:33.000000000 +0200
++++ udev-113/etc/udev/redhat/06-udev-rh-early.rules	2007-07-27 18:31:17.000000000 +0200
+@@ -0,0 +1,8 @@
++# 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"
-+
-+LABEL="skip_wait"
-+
- ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule"
++ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
++# pnp devices
++ACTION=="add", SUBSYSTEM=="pnp", ATTR{id}=="?*", RUN+="/sbin/modprobe pnp:d$attr{id}"
++ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule"


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-7/udev.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- udev.spec	26 Jun 2007 12:59:34 -0000	1.204
+++ udev.spec	27 Jul 2007 17:57:52 -0000	1.205
@@ -5,8 +5,8 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 106
-Release: 4.1%{?dist}
+Version: 113
+Release: 7%{?dist}
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -15,8 +15,7 @@
 
 Source1: start_udev
 Source2: udev.nodes
-Source3: modprobe
-
+Source4: fw_unit_symlinks.sh
 Source10: firmware_helper.c
 
 Patch1: udev-permconv.patch
@@ -24,9 +23,7 @@
 Patch5: udev-extras.patch
 Patch7: udev-089-nopie.patch
 Patch9: udev-091-lib64.patch
-Patch10: udev-106-selinuxmedia.patch
 Patch14: udev-095-dbgwait.patch
-Patch15: udev-106-setenv.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -79,9 +76,7 @@
 %patch5 -p1 -b .rhextras
 %patch7 -p1 -b .nopie
 %patch9 -p1 -b .lib64
-%patch10 -p1 -b .selinuxmedia
 %patch14 -p1 -b .dbgwait
-%patch15 -p1 -b .setenv
 
 rm -f etc/udev/redhat/51-hotplug.rules
 %build
@@ -96,13 +91,13 @@
 	STRIP="/bin/true"  \
 	udevdir="/dev" \
 	USE_LOG=false DEBUG=%{debug} \
+	VOLUME_ID_STATIC=true \
 	EXTRAS=" \
 	extras/scsi_id  \
 	extras/ata_id \
 	extras/usb_id \
 	extras/edd_id \
 	extras/volume_id \
-	extras/run_directory \
 	extras/floppy \
 	" all
 
@@ -113,8 +108,7 @@
 	extras/usb_id/usb_id \
 	extras/volume_id/vol_id \
 	extras/floppy/create_floppy_devices \
-	extras/run_directory/udev_run_devd \
-	extras/run_directory/udev_run_hotplugd; do
+	; do
 	mv $i $i.static
 	touch $i
 done
@@ -137,7 +131,6 @@
 	extras/edd_id \
 	extras/path_id \
 	extras/volume_id \
-	extras/run_directory \
 	extras/floppy \
 	" all
 
@@ -158,7 +151,6 @@
 	extras/edd_id \
 	extras/path_id \
 	extras/volume_id \
-	extras/run_directory \
 	extras/floppy \
 	" install
 
@@ -166,8 +158,9 @@
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/udev
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/hotplug.d/default/10-udev.hotplug
 
+# Deprecated, but keep the ownership
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/{rules.d,makedev.d,scripts,devices}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/{default,block}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dev.d
 
 # force relative symlinks
 ln -sf ..%{udev_scriptdir}/scsi_id $RPM_BUILD_ROOT/sbin/scsi_id
@@ -181,8 +174,7 @@
 	extras/usb_id/usb_id \
 	extras/volume_id/vol_id \
 	extras/floppy/create_floppy_devices \
-	extras/run_directory/udev_run_devd \
-	extras/run_directory/udev_run_hotplugd; do
+ 	; do
 	install -m 0755 $i.static $RPM_BUILD_ROOT%{udev_scriptdir}/$(basename $i).static
 done
 
@@ -191,10 +183,15 @@
 done
 %endif
 
-install -m 0644 etc/udev/redhat/05-udev-early.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/05-udev-early.rules
-install -m 0644 etc/udev/redhat/50-udev.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/50-udev.rules
-install -m 0644 etc/udev/redhat/95-pam-console.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/95-pam-console.rules
-
+for i in \
+	etc/udev/redhat/06-udev-rh-early.rules \
+	etc/udev/redhat/50-udev.rules \
+	etc/udev/redhat/95-pam-console.rules \
+	etc/udev/rules.d/*.rules \
+	; do
+	install -m 0644 "$i"  "$RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/${i##*/}"
+done
+	
 install -m 0644 etc/udev/udev.conf $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.conf
 
 mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/{,devices}
@@ -203,14 +200,13 @@
 	install -m 0755 extras/$i $RPM_BUILD_ROOT%{udev_scriptdir}
 done
 
-install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/50-udev.nodes
-install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{udev_scriptdir}/modprobe
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/50-udev.nodes
+install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{udev_scriptdir}/fw_unit_symlinks.sh
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev
+install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev
 install -m 0755 firmware_helper $RPM_BUILD_ROOT/sbin
 #install -m 0755 udevtrigger $RPM_BUILD_ROOT/sbin
-install -m 0644 extras/run_directory/MAKEDEV.dev $RPM_BUILD_ROOT/%{udev_scriptdir}/MAKEDEV.dev
 
 mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwaredir}
 
@@ -218,9 +214,7 @@
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/modules
 cat >$RPM_BUILD_ROOT/etc/sysconfig/modules/udev-stw.modules <<EOF
 #!/bin/sh
-for i in loop nvram floppy parport lp sonypi;do
-	modprobe \$i >/dev/null 2>&1
-done
+exec /sbin/modprobe -a nvram floppy >/dev/null 2>&1 &
 EOF
 
 
@@ -276,8 +270,6 @@
 %attr(0755,root,root) /sbin/udevsettle
 %attr(0755,root,root) /sbin/start_udev
 %attr(0755,root,root) /sbin/scsi_id
-%attr(0755,root,root) %{udev_scriptdir}/udev_run_devd
-%attr(0755,root,root) %{udev_scriptdir}/udev_run_hotplugd
 %attr(0755,root,root) %{udev_scriptdir}/scsi_id
 %attr(0755,root,root) %{udev_scriptdir}/ata_id
 %attr(0755,root,root) %{udev_scriptdir}/edd_id
@@ -285,6 +277,10 @@
 %attr(0755,root,root) %{udev_scriptdir}/vol_id
 %attr(0755,root,root) %{udev_scriptdir}/path_id
 %attr(0755,root,root) %{udev_scriptdir}/create_floppy_devices
+%attr(0755,root,root) %{udev_scriptdir}/check-cdrom.sh
+%attr(0755,root,root) %{udev_scriptdir}/udevpermconv.sh
+%attr(0755,root,root) %{udev_scriptdir}/load_floppy_module.sh
+%attr(0755,root,root) %{udev_scriptdir}/fw_unit_symlinks.sh
 %attr(0755,root,root) /sbin/firmware_helper
 %attr(0755,root,root) %{_bindir}/udevtest
 %attr(0755,root,root) %{_bindir}/udevinfo
@@ -293,21 +289,10 @@
 %attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/
 %attr(0755,root,root) %dir %{udev_scriptdir}/
 %attr(0755,root,root) %dir %{udev_scriptdir}/devices/
-%ghost %dir %{_sysconfdir}/udev/scripts/
-%ghost %dir %{_sysconfdir}/udev/devices/
 %attr(0755,root,root) %dir %{_sysconfdir}/udev/makedev.d/
-%attr(0755,root,root) %dir %{_sysconfdir}/dev.d/default
-%attr(0755,root,root) %dir %{_sysconfdir}/dev.d/
-%attr(0755,root,root) %{udev_scriptdir}/MAKEDEV.dev
-%attr(0755,root,root) %{udev_scriptdir}/check-cdrom.sh
-%attr(0755,root,root) %{udev_scriptdir}/udevpermconv.sh
-%attr(0755,root,root) %{udev_scriptdir}/load_floppy_module.sh
-%attr(0755,root,root) %{udev_scriptdir}/modprobe
 
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/05-udev-early.rules
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/50-udev.rules
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/95-pam-console.rules
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/*.rules
 %config(noreplace) %attr(0644,root,root) %dir %{_sysconfdir}/udev/makedev.d/50-udev.nodes
 
 #%config(missingok) %{_sysconfdir}/hotplug.d/default/10-udev.hotplug
@@ -322,6 +307,13 @@
 %attr(0644,root,root) %{_mandir}/man8/ata_id*.8*
 %attr(0644,root,root) %{_mandir}/man8/edd_id*.8*
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
+%attr(0644,root,root) %{_mandir}/man8/path_id*.8*
+%attr(0644,root,root) %{_mandir}/man8/create_floppy_devices*.8*
+
+# Deprecated, but keep the ownership
+%ghost %dir %{_sysconfdir}/udev/scripts/
+%ghost %dir %{_sysconfdir}/udev/devices/
+%ghost %dir %{_sysconfdir}/dev.d/
 
 %if %{with_static}
 %files static
@@ -329,8 +321,6 @@
 %attr(0755,root,root) /sbin/udevd.static
 %attr(0755,root,root) /sbin/udevtrigger.static
 %attr(0755,root,root) /sbin/udevsettle.static
-%attr(0755,root,root) %{udev_scriptdir}/udev_run_devd.static
-%attr(0755,root,root) %{udev_scriptdir}/udev_run_hotplugd.static
 %attr(755,root,root) %{udev_scriptdir}/scsi_id.static
 %attr(755,root,root) %{udev_scriptdir}/ata_id.static
 %attr(755,root,root) %{udev_scriptdir}/edd_id.static
@@ -352,6 +342,33 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Fri Jul 27 2007 Harald Hoyer <harald at redhat.com> - 113-7
+- major rule cleanup
+- removed persistent rules from 50 and included upstream rules
+- removed skip_wait from modprobe
+
+* Fri Jul 20 2007 Harald Hoyer <harald at redhat.com> - 113-6
+- kernel does not provide usb_device anymore,
+  corrected the rules (#248916)
+
+* Thu Jul 19 2007 Harald Hoyer <harald at redhat.com> - 113-5
+- corrected the rule for usb devices (#248916)
+
+* Sat Jul 14 2007 Harald Hoyer <harald at redhat.com> - 113-4
+- do not collect modprobes (bug #222542), because firmware
+  loading seems to depend on it.
+
+* Mon Jul  9 2007 Harald Hoyer <harald at redhat.com> - 113-3
+- speedup things a little bit
+
+* Wed Jun 27 2007 Harald Hoyer <harald at redhat.com> - 113-2
+- added more firewire symlinks (#240770)
+- minor rule patches
+
+* Tue Jun 26 2007 Harald Hoyer <harald at redhat.com> - 113-1
+- version 113
+- added rule for SD cards in a TI FlashMedia slot (#217070)
+
 * Tue Jun 26 2007 Harald Hoyer <harald at redhat.com> - 106-4.1
 - fixed modprobedebug option
 - removed snd-powermac from the default modules (#200585)


--- udev-084-floppy.patch DELETED ---


--- udev-084-pg.patch DELETED ---


--- udev-089-last_modalias.patch DELETED ---


--- udev-095-longcomment.patch DELETED ---


--- udev-095-path_id.patch DELETED ---


--- udev-095-path_id2.patch DELETED ---


--- udev-095-selinux.patch DELETED ---


--- udevstart2.patch DELETED ---




More information about the fedora-extras-commits mailing list