New version.

6 files changed, 335 insertions, 3 deletions

diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 99f393ab6908..645338e10811 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,7 +1,6 @@
-MD5 bd15a0c808246ed7abc675a96a143ba4 ChangeLog 1201
-MD5 ef022c10f82c825bfdc44f2a54940fc8 .udev-004.ebuild.swp 12288
+MD5 bab319416af88a7b7fa8367280a8e6f2 ChangeLog 1422
 MD5 7bcfbb3f4f8989b4124402541419d845 udev-003.ebuild 1454
-MD5 ccc66869ca4a610fb1c4e1b2c5b9be09 udev-004.ebuild 1535
+MD5 85e3f37acd01752bdb603e593852b74f udev-004.ebuild 1554
 MD5 75eb84a1c3c02f826c30771549a520ce files/udev-004-label-fixes.patch 1895
 MD5 6a2ddd6bc79a92b74b4da57f442504d4 files/digest-udev-003 61
 MD5 058742a5d4f67c3b083f702abdeb5558 files/digest-udev-004 61
diff --git a/sys-fs/udev/files/digest-udev-004 b/sys-fs/udev/files/digest-udev-004
new file mode 100644
index 000000000000..adea615e4e21
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-004
@@ -0,0 +1 @@
+MD5 1f3cd6ba984ed947aa004be29ca362cf udev-004.tar.bz2 117693
diff --git a/sys-fs/udev/files/udev-004-disk-loop-fix.patch b/sys-fs/udev/files/udev-004-disk-loop-fix.patch
new file mode 100644
index 000000000000..ef179e85bbe0
--- /dev/null
+++ b/sys-fs/udev/files/udev-004-disk-loop-fix.patch
@@ -0,0 +1,29 @@
+Thanks for the new release, Greg.  I just tried it out on a system with
+some disks, but a bunch of udev processes ended up hanging.  Is there
+something I'm missing or do you need a patch like this?
+
+Thanks,
+Jesse
+
+--- udev-004/udev-add.c	Mon Oct 20 14:39:08 2003
++++ udev-004-working/udev-add.c	Tue Oct 21 14:42:27 2003
+@@ -141,7 +141,7 @@
+ 	strcat(filename, path);
+ 	strcat(filename, "/dev");
+ 
+-	while (loop < SECONDS_TO_WAIT_FOR_DEV) {
++	while (loop++ < SECONDS_TO_WAIT_FOR_DEV) {
+ 		dbg("looking for %s", filename);
+ 		retval = stat(filename, &buf);
+ 		if (retval == 0) {
+
+
+-------------------------------------------------------
+This SF.net email is sponsored by OSDN developer relations
+Here's your chance to show off your extensive product knowledge
+We want to know what you know. Tell us and you have a chance to win $100
+http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
+_______________________________________________
+Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
+Linux-hotplug-devel@lists.sourceforge.net
+https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
\ No newline at end of file
diff --git a/sys-fs/udev/files/udev-004-label-fixes.patch b/sys-fs/udev/files/udev-004-label-fixes.patch
new file mode 100644
index 000000000000..793052cc7d9d
--- /dev/null
+++ b/sys-fs/udev/files/udev-004-label-fixes.patch
@@ -0,0 +1,53 @@
+On Tue, Oct 21, 2003 at 03:13:38PM -0700, Greg KH wrote:
+> On Tue, Oct 21, 2003 at 02:45:55PM -0700, Jesse Barnes wrote:
+> > Thanks for the new release, Greg.  I just tried it out on a system with
+> > some disks, but a bunch of udev processes ended up hanging.  Is there
+> > something I'm missing or do you need a patch like this?
+> 
+> Yeah, sorry, this kind of fix is required :(
+> 
+> It's fixed in my bk tree now.
+> 
+> Oh, and it looks like the LABEL rule is also broken due to the libsysfs
+> changes...  I'm working on adding regression tests right now to prevent
+> things like this from slipping through.
+
+Here's a patch for this.  It fixes the problem of LABEL rules on the
+device, not the class device.  LABEL rules on the class device seem to
+work just fine.
+
+Thanks to Dan Stekloff for help in finding this bug.
+
+thanks,
+
+greg k-h
+
+
+# fix LABEL bug for device files (not class files.)
+
+diff -Nru a/namedev.c b/namedev.c
+--- a/namedev.c	Tue Oct 21 18:44:59 2003
++++ b/namedev.c	Tue Oct 21 18:44:59 2003
+@@ -566,7 +566,7 @@
+ 
+ 			/* look in the class device directory if present */
+ 			if (class_dev->sysdevice) {
+-				tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file);
++				tmpattr = sysfs_get_device_attr(class_dev->sysdevice, dev->sysfs_file);
+ 				if (tmpattr)
+ 					goto label_found;
+ 			}
+@@ -599,7 +599,7 @@
+ 
+ 					/* look in the class device directory if present */
+ 					if (class_dev_parent->sysdevice) {
+-						tmpattr = sysfs_get_classdev_attr(class_dev_parent, dev->sysfs_file);
++						tmpattr = sysfs_get_device_attr(class_dev_parent->sysdevice, dev->sysfs_file);
+ 						if (tmpattr) 
+ 							goto label_found;
+ 					}
+-
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at  http://www.tux.org/lkml/
\ No newline at end of file
diff --git a/sys-fs/udev/files/udev-004-manpage-update.patch b/sys-fs/udev/files/udev-004-manpage-update.patch
new file mode 100644
index 000000000000..2bfdeb621ca5
--- /dev/null
+++ b/sys-fs/udev/files/udev-004-manpage-update.patch
@@ -0,0 +1,190 @@
+
+--EeQfGwPcQSOJBaQU
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+
+On Tue, Oct 21, 2003 at 09:28:56AM -0700, Greg KH wrote:
+> Hi,
+> 
+> I've released the 004 version of udev.  It can be found at:
+> 	kernel.org/pub/linux/utils/kernel/hotplug/udev-004.tar.gz
+
+Hi Greg,
+
+here a new patch for the man page:
+o namdev.permissions added
+o corrected a few typos
+o corrected text for config line format.
+  owner, group mode are only in namedev.permissions
+  (don't know what i was dreaming, while i wrote this :))
+
+
+and a patch for namdev.c comments + debug
+o correct 'device device'
+o correct permission file to config file
+
+
+I was looking how to set permissions on the created node.
+What is the future of struct device_attr?
+Same values are in struct udevice now?
+
+
+thanks,
+Kay
+
+
+--EeQfGwPcQSOJBaQU
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline; filename="udev.8.diff"
+
+--- /usr/src/udev/udev.8	2003-10-21 15:27:00.000000000 +0200
++++ udev.8	2003-10-21 22:07:25.000000000 +0200
+@@ -2,28 +2,30 @@
+ .SH NAME
+ udev \- Linux configurable dynamic device naming support
+ .SH SYNOPSIS
+-.B udev
++.BI udev " hotplug-subsystem"
+ .SH "DESCRIPTION"
+ .B udev
+ creates or removes device node files usually located in the /dev directory.
++Its goal is to provide a dynamic device directory that contains only the files
++for devices that are actually present.
++.P
+ As part of the
+ .B hotplug
+ subsystem,
+ .B udev
+-is exectuted if a kernel device is added or removed from the system.
+-.P
++is executed if a kernel device is added or removed from the system.
+ On device creation,
+ .B udev
+-reads the sysfs directory of the given device, to collect device attributes
++reads the sysfs directory of the given device to collect device attributes
+ like label, serial number or bus device number.
+ These attributes are passed as a key to the namedev subsystem
+ to receive a unique name for device file creation.
+ namedev maintains a database for devices present on the system.
+-.P
++.br
+ On device removal,
+ .B udev
+-queries the namedev database for the name of the device file to delete.
+-.P
++queries the namedev database for the name of the device file to be deleted.
++.SH "CONFIGURATION"
+ namedev expects its configuration at
+ .I /etc/udev/namedev.config.
+ The file consists of a set of lines. All empty lines and
+@@ -31,11 +33,16 @@
+ .br
+ Every line defines the mapping between device attributes and the device file
+ name. It starts with a keyword defining the method used to match, followed by
+-one ore more keys to compare, optional ownwership and permission settings and
+-the filename for the device. If no matching configuration is found,
+-the default kernel device name is used.
++one ore more keys to compare and the filename for the device. If no matching
++configuration is found, the default kernel device name is used.
+ .P
+-.I method, key,[key,...] [owner,] [group,] [mode,] name
++The line format is:
++.RS
++.sp
++.I method, key,[key,...] name
++.sp
++.RE
++where valid methods with corresponding keys are:
+ .TP
+ .B LABEL
+ device label or serial number, like USB serial number, SCSI UUID or
+@@ -62,7 +69,9 @@
+ calling external program, that returns a string to match
+ .br
+ keys: \fBBUS\fP, \fBPROGRAM\fP, \fBID\fP
+-.SH "EXAMPLE"
++.P
++A sample \fInamedev.conf\fP might look like this:
++.sp
+ .nf
+ # USB printer to be called lp_color
+ LABEL, BUS="usb", serial="W09090207101241330", NAME="lp_color"
+@@ -79,6 +88,22 @@
+ # if /sbin/dev_id returns "V0815" device will be called dev0815
+ CALLOUT, PROGRAM="/sbin/dev_id", BUS="pci", ID="V0815", NAME="dev0815"
+ .fi
++.P
++Permissions and ownership for the created device files may specified at
++.I /etc/udev/namedev.permissions.
++The file consists of a set of lines. All empty lines and
++lines beginning with a '#' will be ignored.
++.br
++Every line lists a device name followed by owner, group and permission mode. All values are separated by colons.
++.sp
++A sample \fInamedev.permissions\fP might look like this:
++.sp
++.nf
++#name:user:group:mode
++ttyUSB1:root:uucp:0666
++dsp1:::0666
++.fi
++
+ .SH "FILES"
+ .nf
+ .ft B
+@@ -89,7 +114,7 @@
+ .fi
+ .LP
+ .SH "SEE ALSO"
+-.B hotplug (8)
++.BR hotplug (8)
+ .PP
+ The
+ .I http://linux-hotplug.sourceforge.net/
+
+--EeQfGwPcQSOJBaQU
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline; filename="namedev-comments.diff"
+
+--- namedev.c	2003-10-21 15:27:53.000000000 +0200
++++ namedev.c.1	2003-10-21 21:55:43.000000000 +0200
+@@ -207,7 +207,7 @@
+ 	struct config_device dev;
+ 
+ 	strcpy(filename, UDEV_CONFIG_DIR NAMEDEV_CONFIG_FILE);
+-	dbg("opening %s to read as permissions config", filename);
++	dbg("opening %s to read as config", filename);
+ 	fd = fopen(filename, "r");
+ 	if (fd == NULL) {
+ 		dbg("Can't open %s", filename);
+@@ -568,7 +568,7 @@
+ 			if (tmpattr)
+ 				goto label_found;
+ 
+-			/* look in the class device device directory if present */
++			/* look in the class device directory if present */
+ 			if (class_dev->sysdevice) {
+ 				tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file);
+ 				if (tmpattr)
+@@ -601,7 +601,7 @@
+ 					if (tmpattr) 
+ 						goto label_found;
+ 
+-					/* look in the class device device directory if present */
++					/* look in the class device directory if present */
+ 					if (class_dev_parent->sysdevice) {
+ 						tmpattr = sysfs_get_classdev_attr(class_dev_parent, dev->sysfs_file);
+ 						if (tmpattr) 
+
+--EeQfGwPcQSOJBaQU--
+
+
+-------------------------------------------------------
+This SF.net email is sponsored by OSDN developer relations
+Here's your chance to show off your extensive product knowledge
+We want to know what you know. Tell us and you have a chance to win $100
+http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
+_______________________________________________
+Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
+Linux-hotplug-devel@lists.sourceforge.net
+https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
\ No newline at end of file
diff --git a/sys-fs/udev/udev-004.ebuild b/sys-fs/udev/udev-004.ebuild
new file mode 100644
index 000000000000..ffd520c2095f
--- /dev/null
+++ b/sys-fs/udev/udev-004.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-004.ebuild,v 1.1 2003/10/22 04:27:34 azarah Exp $
+
+DESCRIPTION="udev - Linux dynamic device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.kernel.org/"
+SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND="virtual/glibc
+	>=sys-apps/hotplug-20030805-r1
+	sys-fs/sysfsutils"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# No need to clutter the logs ...
+	sed -ie '/^DEBUG/ c\DEBUG = false' Makefile
+	# Do not use optimization flags from the package
+	sed -ie 's|$(OPTIMIZATION)||g' Makefile
+	# Also use our own CFLAGS for libsysfs
+	sed -ie "/^CFLAGS/ c\CFLAGS = ${CFLAGS}" libsysfs/Makefile
+
+	# Make sure we do not build libsysfs
+	# For now we use included libsysfs, as udev do not work with
+	# latest libsysfs from sysfsutils yet ...
+#	echo 'all:' > libsysfs/Makefile
+
+	epatch ${FILESDIR}/${P}-disk-loop-fix.patch
+	epatch ${FILESDIR}/${P}-label-fixes.patch
+	epatch ${FILESDIR}/${P}-manpage-update.patch
+}
+
+src_compile() {
+	# Do not work with emake
+	make udevdir="/dev/" || die
+}
+
+src_install() {
+	into /
+	dosbin udev
+
+	insinto /etc/udev
+	doins namedev.config
+#	doins ${FILESDIR}/namedev.permissions
+	doins namedev.permissions
+
+	dodir /etc/hotplug.d/default
+	dosym ../../../sbin/udev /etc/hotplug.d/default/udev.hotplug
+
+	doman udev.8
+
+	dodoc COPYING ChangeLog FAQ README TODO
+	dodoc docs/{overview,udev-OLS2003.pdf}
+}
+