merge of 87274db5332eba6f472a3332129b88b8282ccda2

     and 3b6a0bff32c9c79ebeb059cd1559d7731542af03

7 files changed, 1242 insertions, 0 deletions

diff --git a/packages/udev/udev-084/.mtn2git_empty b/packages/udev/udev-084/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/udev-084/.mtn2git_empty
diff --git a/packages/udev/udev-084/flags.patch b/packages/udev/udev-084/flags.patch
new file mode 100644
index 0000000000..f144a5f622
--- /dev/null
+++ b/packages/udev/udev-084/flags.patch
@@ -0,0 +1,52 @@
+--- udev-081/Makefile.orig	2006-01-29 12:36:33.000000000 +0100
++++ udev-081/Makefile	2006-01-29 12:36:58.000000000 +0100
+@@ -123,29 +123,29 @@
+ STRIP = $(CROSS)strip
+ STRIPCMD = $(STRIP) -s
+ 
+-CFLAGS		= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
++override CFLAGS		= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+ WARNINGS	= -Wstrict-prototypes -Wsign-compare -Wshadow \
+ 		  -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
+ 		  -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
+-CFLAGS		+= $(WARNINGS)
++override CFLAGS		+= $(WARNINGS)
+ 
+ LDFLAGS = -Wl,-warn-common
+ 
+ OPTFLAGS = -Os
+-CFLAGS += $(OPTFLAGS)
++override CFLAGS += $(OPTFLAGS)
+ 
+ ifeq ($(strip $(USE_LOG)),true)
+-	CFLAGS += -DUSE_LOG
++	override CFLAGS += -DUSE_LOG
+ endif
+ 
+ # if DEBUG is enabled, then we do not strip
+ ifeq ($(strip $(DEBUG)),true)
+-	CFLAGS  += -DDEBUG
++	override CFLAGS  += -DDEBUG
+ 	STRIPCMD =
+ endif
+ 
+ ifeq ($(strip $(USE_GCOV)),true)
+-	CFLAGS += -fprofile-arcs -ftest-coverage
++	override CFLAGS += -fprofile-arcs -ftest-coverage
+ 	LDFLAGS += -fprofile-arcs
+ endif
+ 
+@@ -160,11 +160,11 @@
+ ifeq ($(strip $(USE_SELINUX)),true)
+ 	UDEV_OBJS += udev_selinux.o
+ 	LIB_OBJS += -lselinux -lsepol
+-	CFLAGS += -DUSE_SELINUX
++	override CFLAGS += -DUSE_SELINUX
+ endif
+ 
+ ifeq ($(strip $(USE_STATIC)),true)
+-	CFLAGS += -DUSE_STATIC
++	override CFLAGS += -DUSE_STATIC
+ 	LDFLAGS += -static
+ endif
+ 
diff --git a/packages/udev/udev-084/init b/packages/udev/udev-084/init
new file mode 100644
index 0000000000..d3983df6bc
--- /dev/null
+++ b/packages/udev/udev-084/init
@@ -0,0 +1,227 @@
+#!/bin/sh -e
+### BEGIN INIT INFO
+# Provides:          udev
+# Required-Start:    mountvirtfs 
+# Required-Stop:     
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Start udevd, populate /dev and load drivers.
+### END INIT INFO
+
+# we need to unmount /dev/pts/ and remount it later over the tmpfs
+unmount_devpts() {
+  if mountpoint -q /dev/pts/; then
+    umount -l /dev/pts/
+  fi
+
+  if mountpoint -q /dev/shm/; then
+    umount -l /dev/shm/
+  fi
+}
+
+# mount a tmpfs over /dev, if somebody did not already do it
+mount_tmpfs() {
+  if grep -E -q "^[^[:space:]]+ /dev tmpfs" /proc/mounts; then
+    return
+  fi
+
+  # /dev/.static/dev/ is used by MAKEDEV to access the real /dev/ directory.
+  # /etc/udev/ is recycled as a temporary mount point because it's the only
+  # directory which is guaranteed to be available.
+  mount -n -o bind /dev /etc/udev
+
+  if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then
+    umount /etc/udev
+    echo "udev requires tmpfs support, not started."
+    exit 1
+  fi
+
+  mkdir -p /dev/.static/dev
+  chmod 700 /dev/.static/
+  # The mount options in busybox are non-standard...
+  if test -x /bin/mount.util-linux
+  then
+    /bin/mount.util-linux --move /etc/udev /dev/.static/dev
+  elif test -x /bin/busybox
+  then
+    busybox mount -n -o move /etc/udev /dev/.static/dev
+  else
+    echo "udev requires an identifiable mount command, not started."
+    umount /etc/udev
+    umount /dev
+    exit 1
+  fi
+}
+
+# I hate this hack.  -- Md
+make_extra_nodes() {
+  if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then
+    cp --preserve=all --recursive --update /lib/udev/devices/* /dev/
+  fi
+
+  [ -e /etc/udev/links.conf ] || return 0
+  grep '^[^#]' /etc/udev/links.conf | \
+  while read type name arg1; do
+    [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue
+    case "$type" in
+      L) ln -s $arg1 /dev/$name ;;
+      D) mkdir -p /dev/$name ;;
+      M) mknod -m 600 /dev/$name $arg1 ;;
+      *) echo "links.conf: unparseable line ($type $name $arg1)" ;;
+    esac
+  done
+}
+
+supported_kernel() {
+  case "$(uname -r)" in
+    2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;;
+    2.6.1[01]|2.6.1[01][!0-9]*) return 1 ;;
+  esac
+  return 0
+}
+
+set_hotplug_handler() {
+  case "$(uname -r)" in
+    2.6.1[0-4]|2.6.1[0-4][!0-9]*) HANDLER='/sbin/udevsend' ;;
+  esac
+  echo $HANDLER > /proc/sys/kernel/hotplug
+}
+
+# shell version of /usr/bin/tty
+my_tty() {
+  [ -x /bin/readlink ] || return 0
+  [ -e /proc/self/fd/0 ] || return 0
+  readlink --silent /proc/self/fd/0 || true
+}
+
+warn_if_interactive() {
+  if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then
+    return
+  fi
+
+  TTY=$(my_tty)
+  if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then
+    return
+  fi
+
+  printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n"
+  printf "has been run from an interactive shell.\n"
+  printf "It will probably not do what you expect, so this script will wait\n"
+  printf "60 seconds before continuing. Press ^C to stop it.\n"
+  printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n"
+  sleep 60
+}
+
+##############################################################################
+
+PATH="/sbin:/bin:/usr/bin"
+
+[ -x /sbin/udevd ] || exit 0
+
+# defaults
+tmpfs_size="10M"
+udev_root="/dev"
+udevd_timeout=30
+
+. /etc/udev/udev.conf
+
+if ! supported_kernel; then
+  echo "udev requires a kernel >= 2.6.12, not started."
+  exit 1
+fi
+
+if [ ! -e /proc/filesystems ]; then
+  echo "udev requires a mounted procfs, not started."
+  exit 1
+fi
+
+if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then
+  echo "udev requires tmpfs support, not started."
+  exit 1
+fi
+
+if [ ! -d /sys/class/ ]; then
+  echo "udev requires a mounted sysfs, not started."
+  exit 1
+fi
+
+if [ ! -e /proc/sys/kernel/hotplug ]; then
+  echo "udev requires hotplug support, not started."
+  exit 1
+fi
+
+##############################################################################
+
+# When modifying this script, do not forget that between the time that
+# the new /dev has been mounted and udevsynthesize has been run there will be
+# no /dev/null. This also means that you cannot use the "&" shell command.
+
+case "$1" in
+    start)
+    if [ -e "$udev_root/.udev/" ]; then
+	if mountpoint -q /dev/; then
+	    TMPFS_MOUNTED=1
+	else
+	    echo ".udev/ already exists on the static $udev_root!"
+	fi
+    else
+	warn_if_interactive
+    fi
+
+    echo "Starting the hotplug events dispatcher" "udevd"
+    udevd --daemon
+
+    set_hotplug_handler
+
+    if [ -z "$TMPFS_MOUNTED" ]; then
+	unmount_devpts
+	mount_tmpfs
+	[ -d /proc/1 ] || mount -n /proc
+    fi
+
+    # if this directory is not present /dev will not be updated by udev
+    mkdir -p /dev/.udev/ /dev/.udev/db/ /dev/.udev/queue/ /dev/.udevdb/
+    # /dev/null must be created before udevd is started
+    make_extra_nodes
+
+    echo "Synthesizing the initial hotplug events"
+    udevsynthesize
+
+    # wait for the udevd childs to finish
+    echo "Waiting for /dev to be fully populated"
+    while [ -d /dev/.udev/queue/ ]; do
+	sleep 1
+	udevd_timeout=$(($udevd_timeout - 1))
+	if [ $udevd_timeout -eq 0 ]; then
+	    # ps axf
+	    break
+	fi
+    done
+    if [ $udevd_timeout -eq 0 ]; then
+	echo 'timeout'
+    fi
+    ;;
+
+    stop)
+    echo "Stopping the hotplug events dispatcher" "udevd"
+    start-stop-daemon --stop --name udevd --quiet --oknodo --retry 5
+    ;;
+
+    restart|force-reload)
+    echo "Stopping the hotplug events dispatcher" "udevd"
+    if start-stop-daemon --stop --name udevd --quiet --oknodo --retry 5; then
+	exit 1
+    fi
+
+    echo "Starting the hotplug events dispatcher" "udevd"
+    udevd --daemon
+    ;;
+
+    *)
+    echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
+
diff --git a/packages/udev/udev-084/noasmlinkage.patch b/packages/udev/udev-084/noasmlinkage.patch
new file mode 100644
index 0000000000..0d8e854c0e
--- /dev/null
+++ b/packages/udev/udev-084/noasmlinkage.patch
@@ -0,0 +1,38 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- udev-062/udev.c~noasmlinkage.patch
++++ udev-062/udev.c
+@@ -54,7 +54,7 @@
+ }
+ #endif
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+ 	switch (signum) {
+ 		case SIGALRM:
+--- udev-062/udevd.c~noasmlinkage.patch
++++ udev-062/udevd.c
+@@ -639,7 +639,7 @@
+ 	return msg;
+ }
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+ 	int rc;
+ 
+--- udev-062/udevstart.c~noasmlinkage.patch
++++ udev-062/udevstart.c
+@@ -323,7 +323,7 @@
+ 	exec_list(&device_list);
+ }
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+ 	switch (signum) {
+ 		case SIGALRM:
diff --git a/packages/udev/udev-084/udev.rules b/packages/udev/udev-084/udev.rules
new file mode 100644
index 0000000000..b3a19cefc8
--- /dev/null
+++ b/packages/udev/udev-084/udev.rules
@@ -0,0 +1,98 @@
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+#
+# %n the "kernel number" of the device.
+#    For example, 'sda3' has a "kernel number" of '3'
+# %e the smallest number for that name which does not matches an existing node
+# %k the kernel name for the device
+# %M the kernel major number for the device
+# %m the kernel minor number for the device
+# %b the bus id for the device
+# %c the string returned by the PROGRAM
+# %s{filename} the content of a sysfs attribute
+# %% the '%' char itself
+#
+
+# SCSI devices
+BUS=="scsi", KERNEL=="sr[0-9]*",	NAME="scd%n", SYMLINK+="sr%n"
+
+# USB devices
+BUS=="usb", KERNEL=="auer[0-9]*",	NAME="usb/%k"
+BUS=="usb", KERNEL=="cpad[0-9]*",	NAME="usb/%k"
+BUS=="usb", KERNEL=="dabusb*",		NAME="usb/%k"
+BUS=="usb", KERNEL=="hiddev*",		NAME="usb/%k"
+BUS=="usb", KERNEL=="legousbtower*",	NAME="usb/%k"
+BUS=="usb", KERNEL=="lp[0-9]*",		NAME="usb/%k"
+BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \
+					SYMLINK+="pilot"
+
+# usbfs-like devices
+SUBSYSTEM=="usb_device", \
+	PROGRAM="/bin/sh -c 'X=%k X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c"
+
+# serial devices
+KERNEL=="capi",			NAME="capi20", SYMLINK+="isdn/capi20"
+KERNEL=="capi[0-9]*",		NAME="capi/%n"
+
+# video devices
+KERNEL=="card[0-9]*",		NAME="dri/%k"
+
+# misc devices
+KERNEL=="hw_random",		NAME="hwrng"
+KERNEL=="tun",			NAME="net/%k"
+
+KERNEL=="cdemu[0-9]*",		NAME="cdemu/%n"
+KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/%n"
+KERNEL=="pktcdvd",		NAME="pktcdvd/control"
+
+KERNEL=="cpu[0-9]*",		NAME="cpu/%n/cpuid"
+KERNEL=="msr[0-9]*",		NAME="cpu/%n/msr"
+KERNEL=="microcode",		NAME="cpu/microcode"
+
+KERNEL=="umad*",		NAME="infiniband/%k"
+KERNEL=="issm*",		NAME="infiniband/%k"
+KERNEL=="uverbs*",		NAME="infiniband/%k"
+KERNEL=="ucm",			NAME="infiniband/%k"
+
+KERNEL=="buzzer",		NAME="misc/buzzer"
+
+# ALSA devices
+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"
+
+# ieee1394 devices       
+KERNEL=="dv1394*",		NAME="dv1394/%n"
+KERNEL=="video1394*",		NAME="video1394/%n"
+
+# input devices
+KERNEL=="mice",			NAME="input/%k"
+KERNEL=="mouse[0-9]*",		NAME="input/%k"
+KERNEL=="event[0-9]*",		NAME="input/%k"
+KERNEL=="js[0-9]*",		NAME="input/%k"
+KERNEL=="ts[0-9]*",		NAME="input/%k"
+KERNEL=="uinput",		NAME="input/%k"
+
+# Zaptel
+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"
+
+# AOE character devices
+SUBSYSTEM=="aoe", KERNEL=="discover",	NAME="etherd/%k"
+SUBSYSTEM=="aoe", KERNEL=="err",	NAME="etherd/%k"
+SUBSYSTEM=="aoe", KERNEL=="interfaces",	NAME="etherd/%k"
+
+# device mapper creates its own device nodes, so ignore these
+KERNEL=="dm-[0-9]*",		OPTIONS+="ignore_device"
+KERNEL=="device-mapper",	NAME="mapper/control"
+
+KERNEL="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660"
+
+# Firmware Helper
+ACTION=="add", SUBSYSTEM=="firmware", RUN+="/usr/lib/udev/firmware_helper"
diff --git a/packages/udev/udev-084/udevsynthesize.patch b/packages/udev/udev-084/udevsynthesize.patch
new file mode 100644
index 0000000000..7811188485
--- /dev/null
+++ b/packages/udev/udev-084/udevsynthesize.patch
@@ -0,0 +1,776 @@
+--- udev-081/udevsynthesize.c.orig	2006-01-29 12:22:45.000000000 +0100
++++ udev-081/udevsynthesize.c	2006-01-29 12:22:40.000000000 +0100
+@@ -0,0 +1,763 @@
++/*
++ * udevcoldplug.c
++ *
++ * Copyright (C) 2005 SUSE Linux Products GmbH
++ *
++ * Author:
++ *   Kay Sievers <kay.sievers@vrfy.org>
++ *
++ * Synthesize kernel events from sysfs information and pass them
++ * to the udevd daemon.
++ *
++ *	This program is free software; you can redistribute it and/or modify it
++ *	under the terms of the GNU General Public License as published by the
++ *	Free Software Foundation version 2 of the License.
++ * 
++ *	This program is distributed in the hope that it will be useful, but
++ *	WITHOUT ANY WARRANTY; without even the implied warranty of
++ *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *	General Public License for more details.
++ * 
++ *	You should have received a copy of the GNU General Public License along
++ *	with this program; if not, write to the Free Software Foundation, Inc.,
++ *	675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ */
++
++#include <stdlib.h>
++#include <stddef.h>
++#include <string.h>
++#include <stdio.h>
++#include <unistd.h>
++#include <errno.h>
++#include <ctype.h>
++#include <fcntl.h>
++#include <dirent.h>
++#include <signal.h>
++#include <syslog.h>
++#include <sys/socket.h>
++#include <sys/un.h>
++#include <sys/wait.h>
++#include <sys/stat.h>
++#include <sys/types.h>
++
++#include "udev_libc_wrapper.h"
++#include "udev.h"
++#include "udevd.h"
++#include "udev_version.h"
++#include "logging.h"
++
++#include "list.h"
++
++#ifndef DT_DIR
++#define DT_DIR			4
++#endif
++
++static const char *udev_log_str;
++static int udevd_sock = -1;
++
++#ifdef USE_LOG
++void log_message(int priority, const char *format, ...)
++{
++	va_list args;
++
++	if (priority > udev_log_priority)
++		return;
++
++	va_start(args, format);
++	vsyslog(priority, format, args);
++	va_end(args);
++}
++#endif
++
++struct device {
++	struct list_head node;
++	struct udevd_msg msg;
++	size_t bufpos;
++	char *path;
++};
++
++static dev_t read_devt(const char *path)
++{
++	char filename[PATH_SIZE];
++	char majorminor[64];
++	unsigned int major, minor;
++	ssize_t count;
++	int fd;
++
++	snprintf(filename, sizeof(filename), "%s/%s", path, "dev");
++	filename[sizeof(filename)-1] = '\0';
++
++	fd = open(filename, O_RDONLY);
++	if (fd < 0)
++		return 0;
++
++	count = read(fd, majorminor, sizeof(majorminor));
++	close(fd);
++	majorminor[count] = '\0';
++	if (sscanf(majorminor, "%u:%u", &major, &minor) != 2)
++		return 0;
++	dbg("found major=%d, minor=%d", major, minor);
++
++	return makedev(major, minor);
++}
++
++static ssize_t read_file(const char *directory, const char *file, char *str, size_t len)
++{
++	char filename[PATH_SIZE];
++	ssize_t count;
++	int fd;
++
++	memset(filename, 0, sizeof(filename));
++	snprintf(filename, sizeof(filename), "%s/%s", directory, file);
++	filename[sizeof(filename)-1] = '\0';
++
++	fd = open(filename, O_RDONLY);
++	if (fd < 0)
++		return -1;
++
++	count = read(fd, str, len-1);
++	close(fd);
++
++	if (count > (ssize_t)len)
++		count = len;
++	str[count-1] = '\0';
++
++	return count;
++}
++
++static ssize_t read_link(const char *directory, const char *file, char *str, size_t size)
++{
++	char filename[PATH_SIZE];
++	char target[PATH_SIZE];
++	int len;
++	char *back;
++	char *strip;
++	int level = 1;
++
++	snprintf(filename, sizeof(filename), "%s/%s", directory, file);
++	filename[sizeof(filename)-1] = '\0';
++
++	len = readlink(filename, target, sizeof(target)-1);
++	if (len < 0)
++		return -1;
++	target[len] = '\0';
++
++	back = target;
++	while (strncmp(back, "../", 3) == 0) {
++		back += 3;
++		level++;
++	}
++	while(level--) {
++		strip = strrchr(filename, '/');
++		if (!strip)
++			return -1;
++		strip[0] = '\0';
++	}
++
++	snprintf(str, size, "%s/%s", filename, back);
++	str[size-1] = '\0';
++
++	return len;
++}
++
++static char *add_env_key(struct device *device, const char *key, const char *value)
++{
++	size_t pos = device->bufpos;
++	device->bufpos += sprintf(&device->msg.envbuf[device->bufpos], "%s=%s", key, value)+1;
++	return &device->msg.envbuf[pos];
++}
++
++static struct device *device_create(const char *path, const char *subsystem, dev_t devt)
++{
++	struct device *device;
++	const char *devpath = &path[strlen(sysfs_path)];
++	char target[PATH_SIZE];
++
++	device = malloc(sizeof(struct device));
++	if (device == NULL) {
++		dbg("error malloc");
++		return NULL;
++	}
++	memset(device, 0x00, sizeof(struct device));
++
++	device->path = add_env_key(device, "DEVPATH", devpath);
++	device->path += strlen("DEVPATH=");
++	add_env_key(device, "SUBSYSTEM", subsystem);
++	add_env_key(device, "ACTION", "add");
++	add_env_key(device, "UDEV_COLDPLUG", "1");
++
++	if (major(devt)) {
++		char number[32];
++		sprintf(number, "%u", major(devt));
++		add_env_key(device, "MAJOR", number);
++		sprintf(number, "%u", minor(devt));
++		add_env_key(device, "MINOR", number);
++	}
++
++	if (strncmp(devpath, "/block/", strlen("/block/")) == 0 ||
++	    strncmp(devpath, "/class/", strlen("/class/")) == 0) {
++		char physpath[PATH_SIZE];
++
++		if (read_link(path, "device", physpath, sizeof(physpath)) > (ssize_t)strlen(sysfs_path)) {
++			add_env_key(device, "PHYSDEVPATH", &physpath[strlen(sysfs_path)]);
++			if (read_link(physpath, "driver", target, sizeof(target)) > (ssize_t)strlen(sysfs_path)) {
++				char *pos = strrchr(target, '/');
++				if (pos)
++					add_env_key(device, "PHYSDEVDRIVER", &pos[1]);
++			}
++			if (read_link(physpath, "bus", target, sizeof(target)) > (ssize_t)strlen(sysfs_path)) {
++				char *pos = strrchr(target, '/');
++				if (pos)
++					add_env_key(device, "PHYSDEVBUS", &pos[1]);
++			}
++		}
++	} else if (strncmp(devpath, "/devices/", strlen("/devices/")) == 0) {
++		if (read_link(path, "driver", target, sizeof(target)) > (ssize_t)strlen(sysfs_path)) {
++			char *pos = strrchr(target, '/');
++			if (pos)
++				add_env_key(device, "PHYSDEVDRIVER", &pos[1]);
++		}
++		if (read_link(path, "bus", target, sizeof(target)) > (ssize_t)strlen(sysfs_path)) {
++			char *pos = strrchr(target, '/');
++			if (pos)
++				add_env_key(device, "PHYSDEVBUS", &pos[1]);
++		}
++	}
++
++	return device;
++}
++
++static int device_list_insert(struct list_head *device_list, struct device *device)
++{
++	struct device *loop_device;
++
++	dbg("insert: '%s'", device->path);
++
++	/* sort files in lexical order */
++	list_for_each_entry(loop_device, device_list, node)
++		if (strcmp(loop_device->path, device->path) > 0)
++			break;
++
++	list_add_tail(&device->node, &loop_device->node);
++
++	return 0;
++}
++
++static int add_device_udevd(struct device *device)
++{
++	size_t msg_len;
++	struct sockaddr_un saddr;
++	socklen_t addrlen;
++	int retval;
++
++	memset(&saddr, 0x00, sizeof(struct sockaddr_un));
++	saddr.sun_family = AF_LOCAL;
++	/* use abstract namespace for socket path */
++	strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
++	addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
++
++	strcpy(device->msg.magic, UDEV_MAGIC);
++	device->msg.type = UDEVD_UEVENT_UDEVSEND;
++
++	msg_len = offsetof(struct udevd_msg, envbuf) + device->bufpos;
++	dbg("msg_len=%i", msg_len);
++
++	retval = sendto(udevd_sock, &device->msg, msg_len, 0, (struct sockaddr *)&saddr, addrlen);
++	if (retval < 0)
++		return -1;
++
++	return 0;
++}
++
++static void exec_list(struct list_head *device_list, const char *first[], const char *last[])
++{
++	struct device *loop_device;
++	struct device *tmp_device;
++	int i;
++
++	/* handle the "first" type devices first */
++	if (first)
++		list_for_each_entry_safe(loop_device, tmp_device, device_list, node) {
++			for (i = 0; first[i] != NULL; i++) {
++				if (strncmp(loop_device->path, first[i], strlen(first[i])) == 0) {
++					add_device_udevd(loop_device);
++					list_del(&loop_device->node);
++					free(loop_device);
++					break;
++				}
++			}
++		}
++
++	/* handle the devices we are allowed to, excluding the "last" type devices */
++	if (last)
++		list_for_each_entry_safe(loop_device, tmp_device, device_list, node) {
++			int found = 0;
++			for (i = 0; last[i] != NULL; i++) {
++				if (strncmp(loop_device->path, last[i], strlen(last[i])) == 0) {
++					found = 1;
++					break;
++				}
++			}
++			if (found)
++				continue;
++
++		add_device_udevd(loop_device);
++		list_del(&loop_device->node);
++		free(loop_device);
++	}
++
++	/* handle the rest of the devices */
++	list_for_each_entry_safe(loop_device, tmp_device, device_list, node) {
++		add_device_udevd(loop_device);
++		list_del(&loop_device->node);
++		free(loop_device);
++	}
++}
++
++static int udev_scan_class(void)
++{
++	char base[PATH_SIZE];
++	DIR *dir;
++	struct dirent *dent;
++	LIST_HEAD(device_list);
++
++	/* we want /dev/null and /dev/console first */
++	const char *first[] = {
++		"/class/mem",
++		"/class/tty",
++		NULL,
++	};
++
++	snprintf(base, sizeof(base), "%s/class", sysfs_path);
++	base[sizeof(base)-1] = '\0';
++
++	dir = opendir(base);
++	if (!dir)
++		return -1;
++
++	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
++		char dirname[PATH_SIZE];
++		DIR *dir2;
++		struct dirent *dent2;
++
++		if (dent->d_name[0] == '.')
++			continue;
++
++		snprintf(dirname, sizeof(dirname), "%s/%s", base, dent->d_name);
++		dirname[sizeof(dirname)-1] = '\0';
++
++		dir2 = opendir(dirname);
++		if (!dir2)
++			continue;
++		for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) {
++			char dirname2[PATH_SIZE];
++			struct device *device;
++			dev_t devt;
++
++			if (dent2->d_name[0] == '.')
++				continue;
++			if (dent2->d_type != DT_DIR)
++				continue;
++
++			snprintf(dirname2, sizeof(dirname2), "%s/%s", dirname, dent2->d_name);
++			dirname2[sizeof(dirname2)-1] = '\0';
++			devt = read_devt(dirname2);
++			device = device_create(dirname2, dent->d_name, devt);
++
++			if (strcmp(dent->d_name, "net") == 0 ||
++			    strcmp(dent->d_name, "bluetooth") == 0) {
++				add_env_key(device, "INTERFACE", dent2->d_name);
++			} else if (strcmp(dent->d_name, "pcmcia_socket") == 0 &&
++				   strlen(dent->d_name) > 14) {
++				add_env_key(device, "SOCKET_NO",
++					dent2->d_name + 14);
++			}
++
++			device_list_insert(&device_list, device);
++		}
++		closedir(dir2);
++	}
++	closedir(dir);
++	exec_list(&device_list, first, NULL);
++
++	return 0;
++}
++
++static int udev_scan_block(void)
++{
++	char base[PATH_SIZE];
++	DIR *dir;
++	struct dirent *dent;
++	LIST_HEAD(device_list);
++
++	/* dm wants to have the block devices around before it */
++	const char *last[] = {
++		"/block/dm",
++		NULL,
++	};
++
++	snprintf(base, sizeof(base), "%s/block", sysfs_path);
++	base[sizeof(base)-1] = '\0';
++
++	dir = opendir(base);
++	if (!dir)
++		return -1;
++
++	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
++		char dirname[PATH_SIZE];
++		struct device *device;
++		struct dirent *dent2;
++		DIR *dir2;
++		dev_t devt;
++
++		if (dent->d_name[0] == '.')
++			continue;
++		if (dent->d_type != DT_DIR)
++			continue;
++
++		snprintf(dirname, sizeof(dirname), "%s/%s", base, dent->d_name);
++		dirname[sizeof(dirname)-1] = '\0';
++		devt = read_devt(dirname);
++		if (major(devt)) {
++			device = device_create(dirname, "block", devt);
++			device_list_insert(&device_list, device);
++		}
++
++		/* look for partitions */
++		dir2 = opendir(dirname);
++		if (!dir2)
++			continue;
++		for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) {
++			char dirname2[PATH_SIZE];
++
++			if (dent2->d_name[0] == '.')
++				continue;
++			if (dent2->d_type != DT_DIR)
++				continue;
++
++			snprintf(dirname2, sizeof(dirname2), "%s/%s", dirname, dent2->d_name);
++			dirname2[sizeof(dirname2)-1] = '\0';
++			devt = read_devt(dirname2);
++			if (major(devt)) {
++				device = device_create(dirname2, "block", devt);
++				device_list_insert(&device_list, device);
++				continue;
++			}
++		}
++		closedir(dir2);
++	}
++	closedir(dir);
++	exec_list(&device_list, NULL, last);
++
++	return 0;
++}
++
++static int pci_handler(struct device *device)
++{
++	char path[PATH_SIZE];
++	char value[PATH_SIZE];
++	char vendor[PATH_SIZE];
++	char product[PATH_SIZE];
++	const char *name;
++
++	snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path);
++	path[sizeof(path)-1] = '\0';
++
++	if (read_file(path, "modalias", value, sizeof(value)) > 0)
++		add_env_key(device, "MODALIAS", value);
++
++	name = strrchr(device->path, '/');
++	if (name)
++		add_env_key(device, "PCI_SLOT_NAME", &name[1]);
++
++	if (read_file(path, "class", value, sizeof(value)) > 0)
++		add_env_key(device, "PCI_CLASS", &value[2]);
++
++	if (read_file(path, "vendor", vendor, sizeof(vendor)) > 0 &&
++	    read_file(path, "device", product, sizeof(product)) > 0) {
++		snprintf(value, sizeof(value), "%s:%s", &vendor[2], &product[2]);
++		path[sizeof(value)-1] = '\0';
++		add_env_key(device, "PCI_ID", value);
++	}
++
++	if (read_file(path, "subsystem_vendor", vendor, sizeof(vendor)) > 0 &&
++	    read_file(path, "subsystem_device", product, sizeof(product)) > 0) {
++		snprintf(value, sizeof(value), "%s:%s", &vendor[2], &product[2]);
++		path[sizeof(value)-1] = '\0';
++		add_env_key(device, "PCI_SUBSYS_ID", value);
++	}
++
++	return 0;
++}
++
++static int usb_handler(struct device *device)
++{
++	char path[PATH_SIZE];
++	char value[PATH_SIZE];
++	char str1[PATH_SIZE];
++	char str2[PATH_SIZE];
++	char str3[PATH_SIZE];
++	unsigned int int1;
++	unsigned int int2;
++	unsigned int int3;
++	char *pos;
++
++	snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path);
++	path[sizeof(path)-1] = '\0';
++
++	/* device events have : in their directory name */
++	pos = strrchr(path, '/');
++	if (!strchr(pos, ':'))
++		return 0;	/* and do not have other variables */
++
++	if (read_file(path, "modalias", value, sizeof(value)) > 0)
++		add_env_key(device, "MODALIAS", value);
++
++	if (read_file(path, "bInterfaceClass", str1, sizeof(str1)) > 0 &&
++	    read_file(path, "bInterfaceSubClass", str2, sizeof(str2)) > 0 &&
++	    read_file(path, "bInterfaceProtocol", str3, sizeof(str3)) > 0) {
++		int1 = (int) strtol(str1, NULL, 16);
++		int2 = (int) strtol(str2, NULL, 16);
++		int3 = (int) strtol(str3, NULL, 16);
++		snprintf(value, sizeof(value), "%u/%u/%u", int1, int2, int3);
++		path[sizeof(value)-1] = '\0';
++		add_env_key(device, "INTERFACE", value);
++	}
++
++	/* move to the parent directory */
++	pos[0] = '\0';
++
++	if (read_file(path, "idVendor", str1, sizeof(str1)) > 0 &&
++	    read_file(path, "idProduct", str2, sizeof(str2)) > 0 &&
++	    read_file(path, "bcdDevice", str3, sizeof(str3)) > 0) {
++		int1 = (int) strtol(str1, NULL, 16);
++		int2 = (int) strtol(str2, NULL, 16);
++		int3 = (int) strtol(str3, NULL, 16);
++		snprintf(value, sizeof(value), "%x/%x/%x", int1, int2, int3);
++		path[sizeof(value)-1] = '\0';
++		add_env_key(device, "PRODUCT", value);
++	}
++
++	if (read_file(path, "bDeviceClass", str1, sizeof(str1)) > 0 &&
++	    read_file(path, "bDeviceSubClass", str2, sizeof(str2)) > 0 &&
++	    read_file(path, "bDeviceProtocol", str3, sizeof(str3)) > 0) {
++		int1 = (int) strtol(str1, NULL, 16);
++		int2 = (int) strtol(str2, NULL, 16);
++		int3 = (int) strtol(str3, NULL, 16);
++		snprintf(value, sizeof(value), "%u/%u/%u", int1, int2, int3);
++		path[sizeof(value)-1] = '\0';
++		add_env_key(device, "TYPE", value);
++	}
++
++	if (read_file(path, "devnum", str2, sizeof(str2)) > 0) {
++		pos = strrchr(path, 'b');
++		int1 = (int) strtol(pos + 1, NULL, 16);
++		int2 = (int) strtol(str2, NULL, 16);
++		snprintf(value, sizeof(value),
++			"/proc/bus/usb/%03d/%03d", int1, int2);
++		path[sizeof(value)-1] = '\0';
++		add_env_key(device, "DEVICE", value);
++	}
++
++	return 0;
++}
++
++static int serio_handler(struct device *device)
++{
++	char path[PATH_SIZE];
++	char value[PATH_SIZE];
++
++	snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path);
++	path[sizeof(path)-1] = '\0';
++
++	if (read_file(path, "modalias", value, sizeof(value)) > 0)
++		add_env_key(device, "MODALIAS", value);
++
++	if (read_file(path, "id/type", value, sizeof(value)) > 0)
++		add_env_key(device, "SERIO_TYPE", value);
++
++	if (read_file(path, "id/proto", value, sizeof(value)) > 0)
++		add_env_key(device, "SERIO_PROTO", value);
++
++	if (read_file(path, "id/id", value, sizeof(value)) > 0)
++		add_env_key(device, "SERIO_ID", value);
++
++	if (read_file(path, "id/extra", value, sizeof(value)) > 0)
++		add_env_key(device, "SERIO_EXTRA", value);
++
++	return 0;
++}
++
++static int ccw_handler(struct device *device)
++{
++	char path[PATH_SIZE];
++	char value[PATH_SIZE], *tmp;
++
++	snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path);
++	path[sizeof(path)-1] = '\0';
++
++	if (read_file(path, "modalias", value, sizeof(value)) > 0)
++		add_env_key(device, "MODALIAS", value);
++
++	if (read_file(path, "cutype", value, sizeof(value)) > 0) {
++		value[4] = 0;
++		tmp = &value[5];
++		add_env_key(device, "CU_TYPE", value);
++		add_env_key(device, "CU_MODEL", tmp);
++	}
++
++	if (read_file(path, "devtype", value, sizeof(value)) > 0) {
++		if (value[0] == 'n') {
++			add_env_key(device, "DEV_TYPE", "0000");
++			add_env_key(device, "DEV_MODEL", "00");
++		}
++		else {
++			value[4] = 0;
++			tmp = &value[5];
++			add_env_key(device, "DEV_TYPE", value);
++			add_env_key(device, "DEV_MODEL", tmp);
++		}
++	}
++
++	return 0;
++}
++
++static int modalias_handler(struct device *device)
++{
++	char path[PATH_SIZE];
++	char value[PATH_SIZE];
++
++	snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path);
++	path[sizeof(path)-1] = '\0';
++
++	if (read_file(path, "modalias", value, sizeof(value)) > 0)
++		add_env_key(device, "MODALIAS", value);
++
++	return 0;
++}
++
++static int udev_scan_bus(const char *bus, int bus_handler(struct device *device))
++{
++	char base[PATH_SIZE];
++	DIR *dir;
++	struct dirent *dent;
++	LIST_HEAD(device_list);
++
++	snprintf(base, sizeof(base), "%s/bus/%s/devices", sysfs_path, bus);
++	base[sizeof(base)-1] = '\0';
++
++	dir = opendir(base);
++	if (!dir)
++		return -1;
++	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
++		char devpath[PATH_SIZE];
++		struct device *device;
++
++		if (dent->d_name[0] == '.')
++			continue;
++
++		if (read_link(base, dent->d_name, devpath, sizeof(devpath)) < 0)
++			continue;
++
++		device = device_create(devpath, bus, makedev(0, 0));
++		if (bus_handler) {
++			if (bus_handler(device) < 0) {
++				dbg("'%s' bus handler skipped event", devpath);
++				free(device);
++				continue;
++			}
++		}
++
++		device_list_insert(&device_list, device);
++	}
++	closedir(dir);
++	exec_list(&device_list, NULL, NULL);
++
++	return 0;
++}
++
++static int udev_scan_devices(void)
++{
++	char base[PATH_SIZE];
++	DIR *dir;
++	struct dirent *dent;
++
++	snprintf(base, sizeof(base), "%s/bus", sysfs_path);
++	base[sizeof(base)-1] = '\0';
++
++	dir = opendir(base);
++	if (!dir)
++		return -1;
++
++	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
++		if (dent->d_name[0] == '.')
++			continue;
++		if (dent->d_type != DT_DIR)
++			continue;
++
++		/* add bus specific env values */
++		if (strcmp(dent->d_name, "pci") == 0)
++			udev_scan_bus("pci", pci_handler);
++		else if (strcmp(dent->d_name, "usb") == 0)
++			udev_scan_bus("usb", usb_handler);
++		else if (strcmp(dent->d_name, "serio") == 0)
++			udev_scan_bus("serio", serio_handler);
++		else if (strcmp(dent->d_name, "ccw") == 0)
++			udev_scan_bus("ccw", ccw_handler);
++		else
++			udev_scan_bus(dent->d_name, modalias_handler);
++	}
++	closedir(dir);
++
++	return 0;
++}
++
++int main(int argc, char *argv[], char *envp[])
++{
++	LIST_HEAD(device_list);
++	int i;
++
++	logging_init("udevcoldplug");
++	udev_config_init(); sysfs_init();
++	dbg("version %s", UDEV_VERSION);
++
++	udev_log_str = getenv("UDEV_LOG");
++
++	/* disable all logging if not explicitely requested */
++	if (udev_log_str == NULL)
++		udev_log_priority = 0;
++
++	for (i = 1 ; i < argc; i++) {
++		char *arg = argv[i];
++
++		if (strcmp(arg, "help") == 0  || strcmp(arg, "--help") == 0  || strcmp(arg, "-h") == 0) {
++			printf("Usage: udevcoldplug \n"
++				"  --help                   print this help text\n\n");
++			exit(0);
++		} else {
++			fprintf(stderr, "unknown option\n\n");
++			exit(1);
++		}
++	}
++
++	udevd_sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
++	if (udevd_sock < 0) {
++		err("error getting socket");
++		return 1;
++	}
++
++	/* create nodes for already available devices */
++	udev_scan_class();
++	udev_scan_block();
++
++	/* synthesize events for bus devices
++	 * may load modules or configure the device */
++	udev_scan_devices();
++
++	if (udevd_sock >= 0)
++		close(udevd_sock);
++	logging_close();
++
++	return 0;
++}
+--- udev-081/Makefile
++++ udev-081/Makefile
+@@ -58,6 +58,7 @@ PROGRAMS = \
+ 	udevmonitor			\
+ 	udevinfo			\
+ 	udevtest			\
++	udevsynthesize			\
+ 	udevstart
+ 
+ HEADERS = \
diff --git a/packages/udev/udev-084/udevsynthesize.sh b/packages/udev/udev-084/udevsynthesize.sh
new file mode 100644
index 0000000000..d58217c144
--- /dev/null
+++ b/packages/udev/udev-084/udevsynthesize.sh
@@ -0,0 +1,51 @@
+#!/bin/sh -e
+
+load_input_modules() {
+  for module in mousedev evdev joydev; do
+    modprobe -q $module || true
+  done
+}
+
+if [ ! -e /sys/class/mem/null/uevent ]; then # <= 2.6.14
+  /lib/udev/udevsynthesize
+  load_input_modules
+  exit 0
+fi
+
+# replace $IFS with something which is not likely to appear in a sysfs path,
+# because some buggy drivers have spaces in their names
+oldifs="$IFS"
+IFS="|"
+
+for file in /sys/bus/*/devices/*/uevent /sys/class/*/*/uevent \
+		/sys/block/*/uevent /sys/block/*/*/uevent; do
+  case "$file" in
+    */device/uevent) ;;		# skip followed device symlinks
+    */\*/*) ;;
+
+    */class/mem/*)		# for /dev/null
+    first="$first${IFS}$file" ;;
+
+    */block/md[0-9]*)
+    last="$last${IFS}$file" ;;
+
+    *)
+    default="$default${IFS}$file" ;;
+  esac
+done
+
+for file in $first${IFS}$default${IFS}$last; do
+  [ "$file" ] || continue
+  echo 'add' > "$file" || true
+done
+
+IFS="$oldifs"
+
+case "$(uname -r)" in
+  2.6.1[0-5]|2.6.1[0-5][!0-9]*) # <= 2.6.15
+  load_input_modules
+  ;;
+esac
+
+exit 0
+