Fri Oct 12 11:53:48 UTC 2007

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26128

Modified Files:
	0001-set-buffer-size-if-strlcpy-strlcat-indicate-truncati.patch 
	0002-rules-fix-two-trivial-typos.patch 
	0003-rules-random-and-urandom-are-0666.patch 
	0004-rules-add-REMOVE_CMD-rule.patch 
	0005-track-move-events-to-rename-database-and-failed-fi.patch 
	0006-rules-Gentoo-update.patch 
	0007-rules-add-i2o-driver-rule.patch 
	0008-man-recreate-man-pages.patch 
	0009-volume_id-fix-linux_raid-metadata-version-1.0-detec.patch 
	0010-rules-Gentoo-update.patch 
	0011-add-name-substitution.patch 
	0012-do-not-delete-the-device-node-with-ignore_remove-bu.patch 
	0013-print-warning-for-invalid-TEST-operations.patch 
	0014-rules-do-not-delete-lib-udev-devices-nodes-on-re.patch 
	0015-rules-remove-broken-nvram-group-assignment-without.patch 
	0016-add-dev-rtc-symlink-if-new-rtc-drivers-are-used.patch 
	0017-increase-WAIT_FOR_SYSFS-timeout-to-10-seconds.patch 
	0018-correct-includes-in-udev_selinux.c.patch 
	0019-rules-put-bsd-nodes-in-dev-bsd-directory.patch 
	0020-path_id-fix-for-stacked-class-devices.patch 
	0021-check-line-length-after-comment-check-and-whitespace.patch 
	0022-only-install-.rules.patch 
	0023-ignore-device-node-names-while-restoring-symlinks-fr.patch 
	0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch 
	0025-rules-add-memstick-module-loading.patch 
	0026-remove-extra-space-from-udevinfo-symlink-output.patch 
	0027-udevinfo-simplify-symlink-printing-logic.patch 
	0028-prevent-wrong-symlink-creation-if-database-disagress.patch 
	0029-fix-wrong-variable-used-in-logged-string.patch 
	0030-update-README.patch 
	0031-rule_generator-move-all-policy-from-write_net_rules.patch 
	udev.spec 
Added Files:
	0032-rules-Gentoo-update.patch 
	0033-rules-call-usb_id-only-for-SUBSYSTEMS-usb.patch 
	0034-rules-split-out-and-fix-persistent-tape-rules.patch 
	0035-fix-debug-output-string.patch 
	0036-rule_generator-always-match-netif-type-in-generated.patch 
	0037-rules-Gentoo-update.patch 
Log Message:
* Fri Oct 12 2007 Harald Hoyer <harald at redhat.com> 115-5.20071012git
- added upstream patch for rhbz#328691
- moved floppy module loading to pnp-alias in /etc/modprobe.d/floppy-pnp


0032-rules-Gentoo-update.patch:

--- NEW FILE 0032-rules-Gentoo-update.patch ---
>From fdec9861b9ee473c98229f3f4d9178e2c85b5dc5 Mon Sep 17 00:00:00 2001
From: Matthias Schwarzott <zzam at gentoo.org>
Date: Mon, 24 Sep 2007 02:59:22 +0200
Subject: [PATCH] rules: Gentoo update

---
 etc/udev/gentoo/30-kernel-compat.rules |   10 +-
 etc/udev/gentoo/40-audio.rules         |   23 +++
 etc/udev/gentoo/40-video.rules         |   24 +++
 etc/udev/gentoo/50-udev.rules          |  255 --------------------------------
 etc/udev/gentoo/65-permissions.rules   |   20 +++
 5 files changed, 72 insertions(+), 260 deletions(-)
 create mode 100644 etc/udev/gentoo/40-audio.rules
 create mode 100644 etc/udev/gentoo/40-video.rules
 delete mode 100644 etc/udev/gentoo/50-udev.rules
 create mode 100644 etc/udev/gentoo/65-permissions.rules

diff --git a/etc/udev/gentoo/30-kernel-compat.rules b/etc/udev/gentoo/30-kernel-compat.rules
index 7bc55c6..1f767df 100644
--- a/etc/udev/gentoo/30-kernel-compat.rules
+++ b/etc/udev/gentoo/30-kernel-compat.rules
@@ -34,13 +34,13 @@ SUBSYSTEM!="scsi_device", GOTO="kernel_compat_end"
 	# sr:           4 TYPE_WORM, 5 TYPE_ROM
 	# st/osst:      1 TYPE_TAPE
 
-	ATTRS{type}=="0|7|14",	RUN+="modprobe.sh sd_mod"
-	ATTRS{type}=="4|5",	RUN+="modprobe.sh sr_mod"
-	ATTRS{type}=="8",	RUN+="modprobe.sh ch"
+	ATTRS{type}=="0|7|14",	RUN+="/sbin/modprobe sd_mod"
+	ATTRS{type}=="4|5",	RUN+="/sbin/modprobe sr_mod"
+	ATTRS{type}=="8",	RUN+="/sbin/modprobe ch"
 
 	ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
-		ATTRS{model}!="ADR*", RUN+="modprobe.sh osst", GOTO="kernel_compat_end"
-	ATTRS{type}=="1", RUN+="modprobe.sh st"
+		ATTRS{model}!="ADR*", RUN+="/sbin/modprobe osst", GOTO="kernel_compat_end"
+	ATTRS{type}=="1", RUN+="/sbin/modprobe st"
 
 LABEL="kernel_compat_end"
 
diff --git a/etc/udev/gentoo/40-audio.rules b/etc/udev/gentoo/40-audio.rules
new file mode 100644
index 0000000..8dfcb28
--- /dev/null
+++ b/etc/udev/gentoo/40-audio.rules
@@ -0,0 +1,23 @@
+# do not edit this file, it will be overwritten on update
+
+# alsa devices
+SUBSYSTEM=="sound", GROUP="audio"
+KERNEL=="controlC[0-9]*",	NAME="snd/%k"
+KERNEL=="hwC[D0-9]*",		NAME="snd/%k"
+KERNEL=="pcmC[D0-9cp]*",	NAME="snd/%k"
+KERNEL=="midiC[D0-9]*",		NAME="snd/%k"
+KERNEL=="timer",		NAME="snd/%k"
+KERNEL=="seq",			NAME="snd/%k"
+
+# Do we need these? upstream has this in 40-alsa.rules, but we never had these
+#KERNEL=="mixer0",		SYMLINK+="mixer"
+#KERNEL=="dsp0",			SYMLINK+="dsp"
+#KERNEL=="audio0",		SYMLINK+="audio"
+
+# sound devices
+KERNEL=="adsp|adsp[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="audio|audio[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="dsp|dsp[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="mixer|mixer[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="sequencer|sequencer[0-9]*",	NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+
diff --git a/etc/udev/gentoo/40-video.rules b/etc/udev/gentoo/40-video.rules
new file mode 100644
index 0000000..aafcb2d
--- /dev/null
+++ b/etc/udev/gentoo/40-video.rules
@@ -0,0 +1,24 @@
+# do not edit this file, it will be overwritten on update
+
+# video4linux
+KERNEL=="video[0-9]*",	NAME="v4l/video%n", SYMLINK+="%k", GROUP="video"
+KERNEL=="radio[0-9]*",	NAME="v4l/radio%n", SYMLINK+="%k", GROUP="video"
+KERNEL=="vbi[0-9]*",	NAME="v4l/vbi%n", SYMLINK+="%k", GROUP="video"
+KERNEL=="vtx[0-9]*",	NAME="v4l/vtx%n", GROUP="video"
+
+SUBSYSTEM=="dvb", GROUP="video"
+
+# device node will be /dev/dri/card?
+KERNEL=="card*",	GROUP="video"
+KERNEL=="nvidia*",	GROUP="video"
+KERNEL=="3dfx*",	GROUP="video"
+
+# Framebuffer
+# do we need /dev/fb/0 really?
+# it conflicts with symlink /dev/fb -> /dev/fb0 upstream rules create
+#KERNEL=="fb[0-9]*",	NAME="fb/%n", SYMLINK+="%k", GROUP="video"
+KERNEL=="fb[0-9]*", GROUP="video"
+
+# IEEE1394 (firewire) devices
+KERNEL=="dv1394*|video1394*|raw1394*",	GROUP="video"
+
diff --git a/etc/udev/gentoo/50-udev.rules b/etc/udev/gentoo/50-udev.rules
deleted file mode 100644
index 7c2ac81..0000000
--- a/etc/udev/gentoo/50-udev.rules
+++ /dev/null
@@ -1,255 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-# /etc/udev/rules/50-udev.rules:  device naming rules for udev
-#
-# Gentoo specific rules
-#
-
-# Net devices can have arbitrary names, even
-# ones set by the user. Not try to match normal
-# rules on net devices (Bug #166652)
-SUBSYSTEM=="net", GOTO="gentoo_device_rules_end"
-
-# console
-KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty",	OPTIONS="last_rule"
-KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty",	OPTIONS="last_rule"
-KERNEL=="vcs*",                 NAME="%k", GROUP="tty",			OPTIONS="last_rule"
-KERNEL=="vcsa*",                NAME="%k", GROUP="tty",			OPTIONS="last_rule"
-KERNEL=="tty",                  NAME="%k", GROUP="tty", MODE="0666",	OPTIONS="last_rule"
-KERNEL=="tty[0-9]",             NAME="%k", GROUP="tty",			OPTIONS="last_rule"
-KERNEL=="tty[0-9][0-9]",        NAME="%k", GROUP="tty",			OPTIONS="last_rule"
-KERNEL=="console",		NAME="%k", GROUP="tty", MODE="0600"
-KERNEL=="ptmx",			NAME="%k", GROUP="tty", MODE="0666"
-
-# tty devices
-KERNEL=="ttyS[0-9]*",	NAME="%k", SYMLINK="tts/%n", GROUP="uucp", MODE="0660"
-KERNEL=="ttyUSB[0-9]*",	NAME="%k", SYMLINK="tts/USB%n", GROUP="uucp", MODE="0660"
-KERNEL=="ippp0",	NAME="%k", GROUP="uucp", MODE="0660"
-KERNEL=="isdn*"		NAME="%k", GROUP="uucp", MODE="0660"
-KERNEL=="dcbri*",	NAME="%k", GROUP="uucp", MODE="0660"
-KERNEL=="ircomm*",	NAME="%k", GROUP="uucp", MODE="0660"
-
-# all block devices
-SUBSYSTEM=="block", GROUP="disk"
-
-# cdrom symlinks and other good cdrom naming
-KERNEL=="sr[0-9]*|hd[a-z]|pcd[0-9]*", ACTION=="add", IMPORT{program}="cdrom_id --export $tempnode"
-ENV{ID_CDROM}=="?*", GROUP="cdrom"
-SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n"
-
-# assign cdrom-permission also to associated generic device (for cd-burning ...)
-KERNEL=="sg[0-9]*", ACTION=="add", ATTRS{type}=="4|5", GROUP="cdrom"
-
-# disk devices
-KERNEL=="sd*",		NAME="%k", GROUP="disk"
-KERNEL=="dasd*",	NAME="%k", GROUP="disk"
-KERNEL=="ataraid*",	NAME="%k", GROUP="disk"
-
-# compaq smart array
-KERNEL=="cciss*",	NAME="%k"
-KERNEL=="ida*",		NAME="%k"
-
-# mylex
-KERNEL=="rd*",		NAME="%k"
-
-# dri devices
-KERNEL=="card*",	NAME="dri/card%n", GROUP="video"
-KERNEL=="nvidia*",	NAME="%k", GROUP="video"
-KERNEL=="3dfx*",	NAME="%k", GROUP="video"
-
-# alsa devices
-SUBSYSTEM=="sound", GROUP="audio"
-KERNEL=="controlC[0-9]*",	NAME="snd/%k"
-KERNEL=="hw[CD0-9]*",		NAME="snd/%k"
-KERNEL=="pcm[CD0-9cp]*",	NAME="snd/%k"
-KERNEL=="midiC[D0-9]*",		NAME="snd/%k"
-KERNEL=="timer",		NAME="snd/%k"
-KERNEL=="seq",			NAME="snd/%k"
-
-# capi devices
-KERNEL=="capi",		NAME="capi20", SYMLINK+="isdn/capi20", GROUP="uucp", MODE="0660"
-KERNEL=="capi*",	NAME="capi/%n", GROUP="uucp", MODE="0660"
-
-# cpu devices
-KERNEL=="cpu[0-9]*",	NAME="cpu/%n/cpuid"
-KERNEL=="msr[0-9]*",	NAME="cpu/%n/msr"
-KERNEL=="microcode",	NAME="cpu/microcode"
-
-# fb devices
-KERNEL=="fb[0-9]*",	NAME="fb/%n", SYMLINK+="%k", GROUP="video"
-
-# floppy devices
-KERNEL=="fd[0-9]*",	NAME="floppy/%k", SYMLINK+="%k", GROUP="floppy"
-KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0660 -G floppy $root/floppy/%k"
-KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/sh -c 'rm -f $root/floppy/%k?*'"
-
-# i2c devices
-KERNEL=="i2c-[0-9]*",	NAME="i2c/%n", SYMLINK+="%k"
-
-# input devices
-KERNEL=="mice",		NAME="input/%k", MODE="0644"
-KERNEL=="mouse*",	NAME="input/%k", MODE="0644"
-KERNEL=="event*",	NAME="input/%k", MODE="0600"
-KERNEL=="js*",		NAME="input/%k", MODE="0664"
-KERNEL=="ts*",		NAME="input/%k", MODE="0600"
-
-# loop devices
-KERNEL=="loop[0-9]*",	NAME="loop/%n", SYMLINK+="%k", GROUP="disk"
-
-# md block devices
-KERNEL=="md[0-9]*",	NAME="md/%n", SYMLINK+="%k", GROUP="disk"
-
-# aoe char devices,
-SUBSYSTEM=="aoe", KERNEL=="discover",	NAME="etherd/%k", GROUP="disk", MODE="0220"
-SUBSYSTEM=="aoe", KERNEL=="err",	NAME="etherd/%k", GROUP="disk", MODE="0440"
-SUBSYSTEM=="aoe", KERNEL=="interfaces",	NAME="etherd/%k", GROUP="disk", MODE="0220"
-
-# misc devices
-KERNEL=="agpgart",	NAME="misc/%k", SYMLINK+="%k"
-KERNEL=="psaux",	NAME="misc/%k", SYMLINK+="%k"
-KERNEL=="rtc",		NAME="misc/%k", SYMLINK+="%k", MODE="0664"
-KERNEL=="uinput",	NAME="misc/%k", SYMLINK+="%k"
-KERNEL=="inotify",	NAME="misc/%k", SYMLINK+="%k", MODE="0666"
-
-# netlink devices
-KERNEL=="route",	NAME="netlink/%k"
-KERNEL=="skip",		NAME="netlink/%k"
-KERNEL=="usersock",	NAME="netlink/%k"
-KERNEL=="fwmonitor",	NAME="netlink/%k"
-KERNEL=="tcpdiag",	NAME="netlink/%k"
-KERNEL=="nflog",	NAME="netlink/%k"
-KERNEL=="xfrm",		NAME="netlink/%k"
-KERNEL=="arpd",		NAME="netlink/%k"
-KERNEL=="route6",	NAME="netlink/%k"
-KERNEL=="ip6_fw",	NAME="netlink/%k"
-KERNEL=="dnrtmsg",	NAME="netlink/%k"
-KERNEL=="tap*",		NAME="netlink/%k"
-
-# network devices
-KERNEL=="tun",		NAME="net/%k",	MODE="0660", OPTIONS+="ignore_remove"
-KERNEL=="ppp",		MODE="0600", OPTIONS+="ignore_remove"
-
-# ramdisk devices
-KERNEL=="ram[0-9]*",	NAME="rd/%n", SYMLINK+="%k"
-
-# IEEE1394 (firewire) devices (must be before raw devices below)
-KERNEL=="raw1394",	NAME="%k",		GROUP="video"
-KERNEL=="dv1394*",	NAME="dv1394/%n",	GROUP="video"
-KERNEL=="video1394*",	NAME="video1394/%n",	GROUP="video"
-
-# raw devices
-SUBSYSTEM=="raw",	KERNEL=="raw[0-9]*",	NAME="raw/%k", GROUP="disk"
-KERNEL=="ram*",		NAME="%k", GROUP="disk"
-
-# sound devices
-KERNEL=="adsp",			NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="adsp[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="audio",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="audio[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="dsp",			NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="dsp[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="mixer",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="mixer[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="sequencer",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="sequencer[0-9]*",	NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-
-# memory devices
-KERNEL=="random",	NAME="%k", MODE="0666"
-KERNEL=="urandom",	NAME="%k", MODE="0444"
-KERNEL=="mem",		NAME="%k", MODE="0640"
-KERNEL=="kmem",		NAME="%k", MODE="0640"
-KERNEL=="port",		NAME="%k", MODE="0640"
-KERNEL=="full",		NAME="%k", MODE="0666"
-KERNEL=="null",		NAME="%k", MODE="0666"
-KERNEL=="zero",		NAME="%k", MODE="0666"
-
-# usb devices
-KERNEL=="hiddev*",		NAME="usb/%k"
-KERNEL=="auer*",		NAME="usb/%k"
-KERNEL=="legousbtower*",	NAME="usb/%k", GROUP="usb"
-KERNEL=="dabusb*",		NAME="usb/%k"
-KERNEL=="lp[0-9]*",	SUBSYSTEM=="usb",	NAME="usb/%k", GROUP="lp"
-
-# v4l devices
-KERNEL=="video[0-9]*",	NAME="v4l/video%n", SYMLINK+="video%n", GROUP="video"
-KERNEL=="radio[0-9]*",	NAME="v4l/radio%n", SYMLINK+="radio%n", GROUP="video"
-KERNEL=="vbi[0-9]*",	NAME="v4l/vbi%n", SYMLINK+="vbi%n", GROUP="video"
-KERNEL=="vtx[0-9]*",	NAME="v4l/vtx%n", GROUP="video"
-
-# dvb devices
-SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
-
-# Asterisk Zaptel devices
-KERNEL=="zapctl",	NAME="zap/ctl"
-KERNEL=="zaptimer",	NAME="zap/timer"
-KERNEL=="zapchannel",	NAME="zap/channel"
-KERNEL=="zappseudo",	NAME="zap/pseudo"
-KERNEL=="zap[0-9]*",	NAME="zap/%n"
-
-# pilot/palm devices
-KERNEL=="pilot",	NAME="%k", GROUP="uucp"
-
-# jaz devices
-KERNEL=="jaz*",		NAME="%k", GROUP="disk"
-
-# zip devices
-KERNEL=="pocketzip*",	NAME="%k", GROUP="disk"
-KERNEL=="zip*",		NAME="%k", GROUP="disk"
-
-# ls120 devices
-KERNEL=="ls120",	NAME="%k", GROUP="disk"
-
-# lp devices
-KERNEL=="lp*",		NAME="%k", GROUP="lp"
-KERNEL=="irlpt",	NAME="%k", GROUP="lp"
-KERNEL=="usblp",	NAME="%k", GROUP="lp"
-KERNEL=="lp*",		NAME="%k", GROUP="lp"
-KERNEL=="parport*",	NAME="%k", GROUP="lp"
-
-# tape devices
-KERNEL=="ht*",		NAME="%k", GROUP="tape"
-KERNEL=="nht*",		NAME="%k", GROUP="tape"
-KERNEL=="pt*",		NAME="%k", GROUP="tape"
-KERNEL=="npt*",		NAME="%k", GROUP="tape"
-KERNEL=="st*",		NAME="%k", GROUP="tape"
-KERNEL=="nst*",		NAME="%k", GROUP="tape"
-KERNEL=="osst*",	NAME="%k", GROUP="tape"
-KERNEL=="nosst*",	NAME="%k", GROUP="tape"
-
-# diskonkey devices
-KERNEL=="diskonkey*",	NAME="%k", GROUP="disk"
-
-# rem_ide devices
-KERNEL=="microdrive*",	NAME="%k", GROUP="disk"
-
-# kbd devices
-KERNEL=="kbd",		NAME="%k", MODE="0664"
-
-# Sony Vaio Jogdial sonypi device
-KERNEL=="sonypi",	NAME="%k", MODE="0666"
-
-# packet devices
-KERNEL=="pktcdvd",		NAME="pktcdvd/control", GROUP="cdrw", MODE="0660"
-KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/pktcdvd%n", GROUP="cdrw", MODE="0660"
-
-# infiniband devices
-KERNEL=="umad*",	NAME="infiniband/%k"
-KERNEL=="issm*",	NAME="infiniband/%k"
-
-
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", \
-	NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", GROUP="usb", MODE="0664" 
-
-# Timeouts for scsi devices
-# Setting timeout for tape-devices (type 1) to 900 seconds
-# and 60 seconds for device types 0, 7 and 14
-# if you need timeouts for other devices add a similar rule
-# with correct type-value, or open a bug on bugs.gentoo.org.
-SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="0|7|14", ATTR{timeout}="60"
-SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="1", ATTR{timeout}="900"
-
-
-# Load firmware
-SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh"
-
-LABEL="gentoo_device_rules_end"
diff --git a/etc/udev/gentoo/65-permissions.rules b/etc/udev/gentoo/65-permissions.rules
new file mode 100644
index 0000000..1cc31af
--- /dev/null
+++ b/etc/udev/gentoo/65-permissions.rules
@@ -0,0 +1,20 @@
+# do not edit this file, it will be overwritten on update
+
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb", MODE="664"
+
+# cdrom devices
+ENV{ID_CDROM}=="?*", GROUP="cdrom", MODE="660"
+KERNEL=="pktcdvd|pktcdvd[0-9]*", GROUP="cdrom", MODE="660"
+# assign cdrom-permission also to associated generic device (for cd-burning ...)
+SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="[45]", GROUP="cdrom", MODE="660"
+
+
+# tape devices
+KERNEL=="st[0-9]*|nst[0-9]*|ht[0-9]*|nht[0-9]*|pt[0-9]*|npt[0-9]*", \
+	GROUP="tape", MODE="660"
+SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="[18]", GROUP="tape", MODE="660"
+
+# dialout devices
+KERNEL=="ippp*|isdn*|dcbri*", GROUP="uucp"
+KERNEL=="pilot",	GROUP="uucp"
+
-- 
1.5.3.3


0033-rules-call-usb_id-only-for-SUBSYSTEMS-usb.patch:

--- NEW FILE 0033-rules-call-usb_id-only-for-SUBSYSTEMS-usb.patch ---
>From 5d374a84fff74853b872ec3a661fb841a2c51d8d Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Tue, 25 Sep 2007 02:24:29 +0200
Subject: [PATCH] rules: call usb_id only for SUBSYSTEMS=="usb"

---
 etc/udev/rules.d/60-persistent-storage.rules |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/etc/udev/rules.d/60-persistent-storage.rules b/etc/udev/rules.d/60-persistent-storage.rules
index 63e715d..017f0cd 100644
--- a/etc/udev/rules.d/60-persistent-storage.rules
+++ b/etc/udev/rules.d/60-persistent-storage.rules
@@ -35,7 +35,7 @@ KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODE
 KERNEL=="hd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
 
 KERNEL=="sd*[!0-9]|sr*|st*", ATTRS{ieee1394_id}=="?*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_BUS}="ieee1394"
-KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}!="?*", IMPORT{program}="usb_id --export %p"
+KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export %p"
 KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode"
 KERNEL=="cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted --ignore-sysfs -s %p -d $tempnode", ENV{ID_BUS}="cciss"
 KERNEL=="sd*[!0-9]|sr*|cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
-- 
1.5.3.3


0034-rules-split-out-and-fix-persistent-tape-rules.patch:

--- NEW FILE 0034-rules-split-out-and-fix-persistent-tape-rules.patch ---
>From 31150fbbc7ee47260e5446ede5e24c8b87f4412a Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Tue, 25 Sep 2007 12:20:17 +0200
Subject: [PATCH] rules: split out and fix persistent tape rules

Thanks to: Robin H. Johnson <robbat2 at gentoo.org> for the suggestion.
---
 etc/udev/rules.d/60-persistent-storage-tape.rules |   21 +++++++++++++++++++++
 etc/udev/rules.d/60-persistent-storage.rules      |   18 +++++-------------
 2 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 etc/udev/rules.d/60-persistent-storage-tape.rules

diff --git a/etc/udev/rules.d/60-persistent-storage-tape.rules b/etc/udev/rules.d/60-persistent-storage-tape.rules
new file mode 100644
index 0000000..d2dbc71
--- /dev/null
+++ b/etc/udev/rules.d/60-persistent-storage-tape.rules
@@ -0,0 +1,21 @@
+# do not edit this file, it will be overwritten on update
+
+# persistent storage links: /dev/tape/{by-id,by-path}
+
+ACTION!="add", GOTO="persistent_storage_tape_end"
+
+KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}-nst"
+
+# type 8 devices are "Medium Changers"
+KERNEL=="sg[0-9]*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
+
+KERNEL=="st[0-9]*", ATTRS{ieee1394_id}=="?*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_BUS}="ieee1394"
+KERNEL=="st[0-9]*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export %p"
+KERNEL=="st[0-9]*", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode"
+KERNEL=="st[0-9]*", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
+
+# by-path (shortest physical path)
+KERNEL=="st[0-9]*", IMPORT{program}="path_id %p"
+KERNEL=="st[0-9]*", ENV{ID_PATH}=="?*", SYMLINK+="tape/by-path/$env{ID_PATH}"
+
+LABEL="persistent_storage_tape_end"
diff --git a/etc/udev/rules.d/60-persistent-storage.rules b/etc/udev/rules.d/60-persistent-storage.rules
index 017f0cd..68fe59f 100644
--- a/etc/udev/rules.d/60-persistent-storage.rules
+++ b/etc/udev/rules.d/60-persistent-storage.rules
@@ -1,15 +1,9 @@
 # do not edit this file, it will be overwritten on update
 
-# persistent storage links: /dev/{disk,tape}/{by-id,by-uuid,by-label,by-path,by-name}
+# persistent storage 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_storage_end"
-
-KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}-nst"
-
-# type 8 devices are "Medium Changers"
-KERNEL=="sg*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
-
 SUBSYSTEM!="block", GOTO="persistent_storage_end"
 
 # skip rules for inappropriate block devices
@@ -34,13 +28,12 @@ KERNEL=="hd*[!0-9]", IMPORT{program}="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]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
 
-KERNEL=="sd*[!0-9]|sr*|st*", ATTRS{ieee1394_id}=="?*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_BUS}="ieee1394"
-KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export %p"
-KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode"
+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}!="?*", SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export %p"
+KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode"
 KERNEL=="cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted --ignore-sysfs -s %p -d $tempnode", ENV{ID_BUS}="cciss"
 KERNEL=="sd*[!0-9]|sr*|cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
 KERNEL=="sd*[0-9]|cciss*p[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
-KERNEL=="st*", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
 
 # libata compat (links like hd*)
 KERNEL=="sd*[!0-9]|sr*", ENV{ID_VENDOR}=="ATA", PROGRAM="ata_id $tempnode", RESULT=="?*", ENV{ID_ATA_COMPAT}="$result", SYMLINK+="disk/by-id/ata-$env{ID_ATA_COMPAT}"
@@ -53,9 +46,8 @@ KERNEL=="mmcblk[0-9]p[0-9]", ENV{ID_NAME}=="?*", ENV{ID_SERIAL}=="?*", SYMLINK+=
 ENV{DEVTYPE}=="disk", IMPORT{program}="path_id %p"
 ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}"
 ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
-KERNEL=="st*", ENV{ID_PATH}=="?*", SYMLINK+="tape/by-path/$env{ID_PATH}"
 
-KERNEL=="sr*|st*", GOTO="persistent_storage_end"
+KERNEL=="sr*", GOTO="persistent_storage_end"
 KERNEL=="hd*[!0-9]", ATTR{removable}=="1", GOTO="persistent_storage_end"
 
 # by-label/by-uuid (filesystem properties)
-- 
1.5.3.3


0035-fix-debug-output-string.patch:

--- NEW FILE 0035-fix-debug-output-string.patch ---
>From d438c80e57b1cc98540399f817eda7fc2568cc72 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Tue, 25 Sep 2007 13:45:49 +0200
Subject: [PATCH] fix debug output string

---
 udev_sysfs.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/udev_sysfs.c b/udev_sysfs.c
index d5b04c3..e8909f9 100644
--- a/udev_sysfs.c
+++ b/udev_sysfs.c
@@ -415,7 +415,7 @@ char *sysfs_attr_get_value(const char *devpath, const char *attr_name)
 	/* read attribute value */
 	fd = open(path_full, O_RDONLY);
 	if (fd < 0) {
-		dbg("attribute '%s' does not exist", path_full);
+		dbg("attribute '%s' can not be opened", path_full);
 		goto out;
 	}
 	size = read(fd, value, sizeof(value));
-- 
1.5.3.3


0036-rule_generator-always-match-netif-type-in-generated.patch:

--- NEW FILE 0036-rule_generator-always-match-netif-type-in-generated.patch ---
>From 8fe5f78b7e53bcae858824f40e03d60ba19eae73 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Tue, 25 Sep 2007 17:18:49 +0200
Subject: [PATCH] rule_generator: always match netif type in generated rule

---
 .../75-persistent-net-generator.rules              |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extras/rule_generator/75-persistent-net-generator.rules b/extras/rule_generator/75-persistent-net-generator.rules
index d09bc38..726bf27 100644
--- a/extras/rule_generator/75-persistent-net-generator.rules
+++ b/extras/rule_generator/75-persistent-net-generator.rules
@@ -20,15 +20,15 @@ NAME=="?*", GOTO="persistent_net_generator_end"
 # device name whitelist
 KERNEL!="eth*|ath*|wlan*[0-9]|ra*|sta*|ctc*|lcs*|hsi*", GOTO="persistent_net_generator_end"
 
-# add interface type match for some devices
-KERNEL=="wlan*|ath*", ENV{MATCHIFTYPE}="1"
-
 # ignore Xen virtual interfaces
 SUBSYSTEMS=="xen", GOTO="persistent_net_generator_end"
 
 # read MAC address
 ENV{MATCHADDR}="$attr{address}"
 
+# match interface type
+ENV{MATCHIFTYPE}="$attr{type}"
+
 # do not use "locally administered" MAC address
 ENV{MATCHADDR}=="?[2367abef]:*", ENV{MATCHADDR}=""
 
-- 
1.5.3.3


0037-rules-Gentoo-update.patch:

--- NEW FILE 0037-rules-Gentoo-update.patch ---
>From 38e62fef89097ec3604320104197c48ebda0d591 Mon Sep 17 00:00:00 2001
From: Matthias Schwarzott <zzam at gentoo.org>
Date: Tue, 25 Sep 2007 17:52:42 +0200
Subject: [PATCH] rules: Gentoo update

---
 etc/udev/gentoo/40-audio.rules       |   23 -----------------------
 etc/udev/gentoo/65-permissions.rules |    2 ++
 2 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 etc/udev/gentoo/40-audio.rules

diff --git a/etc/udev/gentoo/40-audio.rules b/etc/udev/gentoo/40-audio.rules
deleted file mode 100644
index 8dfcb28..0000000
--- a/etc/udev/gentoo/40-audio.rules
+++ /dev/null
@@ -1,23 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-# alsa devices
-SUBSYSTEM=="sound", GROUP="audio"
-KERNEL=="controlC[0-9]*",	NAME="snd/%k"
-KERNEL=="hwC[D0-9]*",		NAME="snd/%k"
-KERNEL=="pcmC[D0-9cp]*",	NAME="snd/%k"
-KERNEL=="midiC[D0-9]*",		NAME="snd/%k"
-KERNEL=="timer",		NAME="snd/%k"
-KERNEL=="seq",			NAME="snd/%k"
-
-# Do we need these? upstream has this in 40-alsa.rules, but we never had these
-#KERNEL=="mixer0",		SYMLINK+="mixer"
-#KERNEL=="dsp0",			SYMLINK+="dsp"
-#KERNEL=="audio0",		SYMLINK+="audio"
-
-# sound devices
-KERNEL=="adsp|adsp[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="audio|audio[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="dsp|dsp[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="mixer|mixer[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="sequencer|sequencer[0-9]*",	NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-
diff --git a/etc/udev/gentoo/65-permissions.rules b/etc/udev/gentoo/65-permissions.rules
index 1cc31af..523c79d 100644
--- a/etc/udev/gentoo/65-permissions.rules
+++ b/etc/udev/gentoo/65-permissions.rules
@@ -18,3 +18,5 @@ SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="[18]", GROUP="tape", MODE=
 KERNEL=="ippp*|isdn*|dcbri*", GROUP="uucp"
 KERNEL=="pilot",	GROUP="uucp"
 
+# sound devices (sound=alsa, snd=oss)
+SUBSYSTEM=="sound|snd",	GROUP="audio"
-- 
1.5.3.3


0001-set-buffer-size-if-strlcpy-strlcat-indicate-truncati.patch:

Index: 0001-set-buffer-size-if-strlcpy-strlcat-indicate-truncati.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0001-set-buffer-size-if-strlcpy-strlcat-indicate-truncati.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0001-set-buffer-size-if-strlcpy-strlcat-indicate-truncati.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0001-set-buffer-size-if-strlcpy-strlcat-indicate-truncati.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -91,5 +91,5 @@
  			path_decode(&device[start]);
  			device_list_insert(device);
 -- 
-1.5.2.4
+1.5.3.3
 

0002-rules-fix-two-trivial-typos.patch:

Index: 0002-rules-fix-two-trivial-typos.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0002-rules-fix-two-trivial-typos.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0002-rules-fix-two-trivial-typos.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0002-rules-fix-two-trivial-typos.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -31,5 +31,5 @@
  KERNEL=="pt[0-9]*|npt[0-9]*",	GROUP="disk"
  KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"
 -- 
-1.5.2.4
+1.5.3.3
 

0003-rules-random-and-urandom-are-0666.patch:

Index: 0003-rules-random-and-urandom-are-0666.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0003-rules-random-and-urandom-are-0666.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0003-rules-random-and-urandom-are-0666.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0003-rules-random-and-urandom-are-0666.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -34,5 +34,5 @@
  
  # video4linux
 -- 
-1.5.2.4
+1.5.3.3
 

0004-rules-add-REMOVE_CMD-rule.patch:

Index: 0004-rules-add-REMOVE_CMD-rule.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0004-rules-add-REMOVE_CMD-rule.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0004-rules-add-REMOVE_CMD-rule.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0004-rules-add-REMOVE_CMD-rule.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -21,5 +21,5 @@
  RUN+="socket:/org/kernel/udev/monitor"
  
 -- 
-1.5.2.4
+1.5.3.3
 

0005-track-move-events-to-rename-database-and-failed-fi.patch:

Index: 0005-track-move-events-to-rename-database-and-failed-fi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0005-track-move-events-to-rename-database-and-failed-fi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0005-track-move-events-to-rename-database-and-failed-fi.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0005-track-move-events-to-rename-database-and-failed-fi.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -244,5 +244,5 @@
  	unsigned int timeout;
  	char *envp[UEVENT_NUM_ENVP+1];
 -- 
-1.5.2.4
+1.5.3.3
 

0006-rules-Gentoo-update.patch:

Index: 0006-rules-Gentoo-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0006-rules-Gentoo-update.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0006-rules-Gentoo-update.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0006-rules-Gentoo-update.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -202,5 +202,5 @@
 -RUN+="socket:/org/kernel/udev/monitor"
 -
 -- 
-1.5.2.4
+1.5.3.3
 

0007-rules-add-i2o-driver-rule.patch:

Index: 0007-rules-add-i2o-driver-rule.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0007-rules-add-i2o-driver-rule.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0007-rules-add-i2o-driver-rule.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0007-rules-add-i2o-driver-rule.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -20,5 +20,5 @@
  SUBSYSTEM=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg"
  
 -- 
-1.5.2.4
+1.5.3.3
 

0008-man-recreate-man-pages.patch:

Index: 0008-man-recreate-man-pages.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0008-man-recreate-man-pages.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0008-man-recreate-man-pages.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0008-man-recreate-man-pages.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -1090,5 +1090,5 @@
  .PP
  \fBudev\fR(7)
 -- 
-1.5.2.4
+1.5.3.3
 

0009-volume_id-fix-linux_raid-metadata-version-1.0-detec.patch:

Index: 0009-volume_id-fix-linux_raid-metadata-version-1.0-detec.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0009-volume_id-fix-linux_raid-metadata-version-1.0-detec.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0009-volume_id-fix-linux_raid-metadata-version-1.0-detec.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0009-volume_id-fix-linux_raid-metadata-version-1.0-detec.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -31,5 +31,5 @@
  		return 0;
  
 -- 
-1.5.2.4
+1.5.3.3
 

0010-rules-Gentoo-update.patch:

Index: 0010-rules-Gentoo-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0010-rules-Gentoo-update.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0010-rules-Gentoo-update.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0010-rules-Gentoo-update.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -146,5 +146,5 @@
 -LABEL="drivers_end"
 -
 -- 
-1.5.2.4
+1.5.3.3
 

0011-add-name-substitution.patch:

Index: 0011-add-name-substitution.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0011-add-name-substitution.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0011-add-name-substitution.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0011-add-name-substitution.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -108,5 +108,5 @@
  		if (limit && childs_count++ > limit) {
  			dbg("%llu, maximum number (%i) of childs reached", msg->seqnum, childs_count);
 -- 
-1.5.2.4
+1.5.3.3
 

0012-do-not-delete-the-device-node-with-ignore_remove-bu.patch:

Index: 0012-do-not-delete-the-device-node-with-ignore_remove-bu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0012-do-not-delete-the-device-node-with-ignore_remove-bu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0012-do-not-delete-the-device-node-with-ignore_remove-bu.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0012-do-not-delete-the-device-node-with-ignore_remove-bu.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -98,5 +98,5 @@
  			if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
  				struct name_entry *entry;
 -- 
-1.5.2.4
+1.5.3.3
 

0013-print-warning-for-invalid-TEST-operations.patch:

Index: 0013-print-warning-for-invalid-TEST-operations.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0013-print-warning-for-invalid-TEST-operations.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0013-print-warning-for-invalid-TEST-operations.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0013-print-warning-for-invalid-TEST-operations.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -39,5 +39,5 @@
  			if (attr != NULL)
  				rule->test_mode_mask = strtol(attr, NULL, 8);
 -- 
-1.5.2.4
+1.5.3.3
 

0014-rules-do-not-delete-lib-udev-devices-nodes-on-re.patch:

Index: 0014-rules-do-not-delete-lib-udev-devices-nodes-on-re.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0014-rules-do-not-delete-lib-udev-devices-nodes-on-re.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0014-rules-do-not-delete-lib-udev-devices-nodes-on-re.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0014-rules-do-not-delete-lib-udev-devices-nodes-on-re.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -19,5 +19,5 @@
 +ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove"
 +
 -- 
-1.5.2.4
+1.5.3.3
 

0015-rules-remove-broken-nvram-group-assignment-without.patch:

Index: 0015-rules-remove-broken-nvram-group-assignment-without.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0015-rules-remove-broken-nvram-group-assignment-without.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0015-rules-remove-broken-nvram-group-assignment-without.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0015-rules-remove-broken-nvram-group-assignment-without.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -20,5 +20,5 @@
  KERNEL=="ram1",			SYMLINK+="ram"
  
 -- 
-1.5.2.4
+1.5.3.3
 

0016-add-dev-rtc-symlink-if-new-rtc-drivers-are-used.patch:

Index: 0016-add-dev-rtc-symlink-if-new-rtc-drivers-are-used.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0016-add-dev-rtc-symlink-if-new-rtc-drivers-are-used.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0016-add-dev-rtc-symlink-if-new-rtc-drivers-are-used.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0016-add-dev-rtc-symlink-if-new-rtc-drivers-are-used.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -36,5 +36,5 @@
  				}
  			}
 -- 
-1.5.2.4
+1.5.3.3
 

0017-increase-WAIT_FOR_SYSFS-timeout-to-10-seconds.patch:

Index: 0017-increase-WAIT_FOR_SYSFS-timeout-to-10-seconds.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0017-increase-WAIT_FOR_SYSFS-timeout-to-10-seconds.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0017-increase-WAIT_FOR_SYSFS-timeout-to-10-seconds.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0017-increase-WAIT_FOR_SYSFS-timeout-to-10-seconds.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -23,5 +23,5 @@
  			goto nomatch;
  	}
 -- 
-1.5.2.4
+1.5.3.3
 

0018-correct-includes-in-udev_selinux.c.patch:

Index: 0018-correct-includes-in-udev_selinux.c.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0018-correct-includes-in-udev_selinux.c.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0018-correct-includes-in-udev_selinux.c.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0018-correct-includes-in-udev_selinux.c.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -22,5 +22,5 @@
  
  #include "udev.h"
 -- 
-1.5.2.4
+1.5.3.3
 

0019-rules-put-bsd-nodes-in-dev-bsd-directory.patch:

Index: 0019-rules-put-bsd-nodes-in-dev-bsd-directory.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0019-rules-put-bsd-nodes-in-dev-bsd-directory.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0019-rules-put-bsd-nodes-in-dev-bsd-directory.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0019-rules-put-bsd-nodes-in-dev-bsd-directory.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -20,5 +20,5 @@
  # network
  KERNEL=="tun",			NAME="net/%k", MODE="0666", OPTIONS+="ignore_remove"
 -- 
-1.5.2.4
+1.5.3.3
 

0020-path_id-fix-for-stacked-class-devices.patch:

Index: 0020-path_id-fix-for-stacked-class-devices.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0020-path_id-fix-for-stacked-class-devices.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0020-path_id-fix-for-stacked-class-devices.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0020-path_id-fix-for-stacked-class-devices.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -25,5 +25,5 @@
  	esac
  	full_sysfs_device_path="`pwd -P`"
 -- 
-1.5.2.4
+1.5.3.3
 

0021-check-line-length-after-comment-check-and-whitespace.patch:

Index: 0021-check-line-length-after-comment-check-and-whitespace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0021-check-line-length-after-comment-check-and-whitespace.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0021-check-line-length-after-comment-check-and-whitespace.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0021-check-line-length-after-comment-check-and-whitespace.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -65,5 +65,5 @@
  		line[count] = '\0';
  
 -- 
-1.5.2.4
+1.5.3.3
 

0022-only-install-.rules.patch:

Index: 0022-only-install-.rules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0022-only-install-.rules.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0022-only-install-.rules.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0022-only-install-.rules.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -25,5 +25,5 @@
  	done
  	@ extras="$(EXTRAS)"; for target in $$extras; do \
 -- 
-1.5.2.4
+1.5.3.3
 

0023-ignore-device-node-names-while-restoring-symlinks-fr.patch:

Index: 0023-ignore-device-node-names-while-restoring-symlinks-fr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0023-ignore-device-node-names-while-restoring-symlinks-fr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0023-ignore-device-node-names-while-restoring-symlinks-fr.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0023-ignore-device-node-names-while-restoring-symlinks-fr.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -44,5 +44,5 @@
  	}
  
 -- 
-1.5.2.4
+1.5.3.3
 

0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch:

Index: 0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -99,5 +99,5 @@
  	/* run one event after the other in debug mode */
  	if (debug_trace) {
 -- 
-1.5.2.4
+1.5.3.3
 

0025-rules-add-memstick-module-loading.patch:

Index: 0025-rules-add-memstick-module-loading.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0025-rules-add-memstick-module-loading.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0025-rules-add-memstick-module-loading.patch	20 Sep 2007 12:27:11 -0000	1.1
+++ 0025-rules-add-memstick-module-loading.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -20,5 +20,5 @@
  SUBSYSTEM=="i2o", RUN+="/sbin/modprobe i2o_block"
  SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi"
 -- 
-1.5.2.4
+1.5.3.3
 

0026-remove-extra-space-from-udevinfo-symlink-output.patch:

Index: 0026-remove-extra-space-from-udevinfo-symlink-output.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0026-remove-extra-space-from-udevinfo-symlink-output.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0026-remove-extra-space-from-udevinfo-symlink-output.patch	21 Sep 2007 16:32:15 -0000	1.1
+++ 0026-remove-extra-space-from-udevinfo-symlink-output.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -31,5 +31,5 @@
  			break;
  		case QUERY_PATH:
 -- 
-1.5.2.4
+1.5.3.3
 

0027-udevinfo-simplify-symlink-printing-logic.patch:

Index: 0027-udevinfo-simplify-symlink-printing-logic.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0027-udevinfo-simplify-symlink-printing-logic.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0027-udevinfo-simplify-symlink-printing-logic.patch	21 Sep 2007 16:32:15 -0000	1.1
+++ 0027-udevinfo-simplify-symlink-printing-logic.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -42,5 +42,5 @@
  		case QUERY_PATH:
  			printf("%s\n", udev->dev->devpath);
 -- 
-1.5.2.4
+1.5.3.3
 

0028-prevent-wrong-symlink-creation-if-database-disagress.patch:

Index: 0028-prevent-wrong-symlink-creation-if-database-disagress.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0028-prevent-wrong-symlink-creation-if-database-disagress.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0028-prevent-wrong-symlink-creation-if-database-disagress.patch	21 Sep 2007 16:32:15 -0000	1.1
+++ 0028-prevent-wrong-symlink-creation-if-database-disagress.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -31,5 +31,5 @@
  		if (udev_db == NULL)
  			continue;
 -- 
-1.5.2.4
+1.5.3.3
 

0029-fix-wrong-variable-used-in-logged-string.patch:

Index: 0029-fix-wrong-variable-used-in-logged-string.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0029-fix-wrong-variable-used-in-logged-string.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0029-fix-wrong-variable-used-in-logged-string.patch	21 Sep 2007 16:32:15 -0000	1.1
+++ 0029-fix-wrong-variable-used-in-logged-string.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -21,5 +21,5 @@
  	}
  
 -- 
-1.5.2.4
+1.5.3.3
 

0030-update-README.patch:

Index: 0030-update-README.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0030-update-README.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0030-update-README.patch	21 Sep 2007 16:32:15 -0000	1.1
+++ 0030-update-README.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -39,5 +39,5 @@
  
  Operation:
 -- 
-1.5.2.4
+1.5.3.3
 

0031-rule_generator-move-all-policy-from-write_net_rules.patch:

Index: 0031-rule_generator-move-all-policy-from-write_net_rules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/0031-rule_generator-move-all-policy-from-write_net_rules.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0031-rule_generator-move-all-policy-from-write_net_rules.patch	21 Sep 2007 16:32:15 -0000	1.1
+++ 0031-rule_generator-move-all-policy-from-write_net_rules.patch	12 Oct 2007 11:53:35 -0000	1.2
@@ -240,5 +240,5 @@
  exit 0
 -
 -- 
-1.5.2.4
+1.5.3.3
 


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- udev.spec	10 Oct 2007 13:08:00 -0000	1.223
+++ udev.spec	12 Oct 2007 11:53:35 -0000	1.224
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 115
-Release: 5.20070921git%{?dist}
+Release: 5.20071012git%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -49,6 +49,12 @@
 Patch29: 0029-fix-wrong-variable-used-in-logged-string.patch
 Patch30: 0030-update-README.patch
 Patch31: 0031-rule_generator-move-all-policy-from-write_net_rules.patch
+Patch32: 0032-rules-Gentoo-update.patch
+Patch33: 0033-rules-call-usb_id-only-for-SUBSYSTEMS-usb.patch
+Patch34: 0034-rules-split-out-and-fix-persistent-tape-rules.patch
+Patch35: 0035-fix-debug-output-string.patch
+Patch36: 0036-rule_generator-always-match-netif-type-in-generated.patch
+Patch37: 0037-rules-Gentoo-update.patch
 
 Patch100: udev-089-nopie.patch
 Patch101: udev-091-lib64.patch
@@ -128,6 +134,12 @@
 %patch29 -p1 -b .git29
 %patch30 -p1 -b .git30
 %patch31 -p1 -b .git31
+%patch32 -p1 -b .git32
+%patch33 -p1 -b .git33
+%patch34 -p1 -b .git34
+%patch35 -p1 -b .git35
+%patch36 -p1 -b .git36
+%patch37 -p1 -b .git37
 
 %patch100 -p1 -b .nopie
 %patch101 -p1 -b .lib64
@@ -273,15 +285,13 @@
 
 mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwaredir}
 
-# short-term workaround
-mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/modules
-cat >$RPM_BUILD_ROOT/etc/sysconfig/modules/udev-stw.modules <<EOF
-#!/bin/sh
-exec /sbin/modprobe -a nvram floppy >/dev/null 2>&1 &
+mkdir -p -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/floppy-pnp <<EOF
+alias pnp:dPNP0700 floppy
 EOF
 
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/udev-post
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
+install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/udev-post
 
 %preun
 if [ $1 = 0 -a -f %{_initrddir}/udev ]; then
@@ -367,7 +377,7 @@
 #%config(missingok) %{_sysconfdir}/hotplug.d/default/10-udev.hotplug
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/scsi_id.config
 
-%config %attr(0755,root,root)/etc/sysconfig/modules/udev-stw.modules
+%attr(0644,root,root) %{_sysconfdir}/modprobe.d/floppy-pnp
 
 %dir %attr(0755,root,root) %{firmwaredir}
 %attr(0644,root,root) %{_mandir}/man8/udev*.8*
@@ -412,6 +422,10 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Fri Oct 12 2007 Harald Hoyer <harald at redhat.com> 115-5.20071012git
+- added upstream patch for rhbz#328691
+- moved floppy module loading to pnp-alias in /etc/modprobe.d/floppy-pnp
+
 * Wed Oct 10 2007 Harald Hoyer <harald at redhat.com> 115-5.20070921git
 - better modprobe options for the kernel command line 'modprobedebug' option
 


