Update version. Add patch to stop udev segfault due to my type-o's that was in

udev.permissions. Move namedev.permissions to udev.permissions and update it
with more nodes.

6 files changed, 161 insertions, 13 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 9a59fbaa9903..1dadfcc24e5b 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-fs/udev
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.9 2003/11/19 20:51:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.10 2003/11/24 18:36:23 azarah Exp $
+
+*udev-007 (24 Nov 2003)
+
+  24 Nov 2003; Martin Schlemmer <azarah@gentoo.org> udev-007.ebuild,
+  files/namedev.permissions, files/udev-007-check-valid-mode.patch,
+  files/udev.permissions:
+  Update version. Add patch to stop udev segfault due to my type-o's that was in
+  udev.permissions. Move namedev.permissions to udev.permissions and update it
+  with more nodes.
 
 *udev-006 (19 Nov 2003)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 298dbb1c479c..278c13656844 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,18 +1,19 @@
 MD5 142756ce2bce094bde709030a54608c5 udev-006.ebuild 2445
-MD5 7e9eef3eaa9571617c29b485715902ce ChangeLog 2016
+MD5 ee754b448cf303c86b4ef6f13f2436b5 ChangeLog 2385
 MD5 bb941a13588f122cda62f71eb5639deb udev-005.ebuild 1732
 MD5 7bcfbb3f4f8989b4124402541419d845 udev-003.ebuild 1454
-MD5 142756ce2bce094bde709030a54608c5 udev-007.ebuild 2445
+MD5 83a432ae3bb1162fe07c5dd0fa3d4fbe udev-007.ebuild 1976
 MD5 80b328009155e14e1423314abb4bd4da udev-005-r1.ebuild 1762
 MD5 85e3f37acd01752bdb603e593852b74f udev-004.ebuild 1554
 MD5 75eb84a1c3c02f826c30771549a520ce files/udev-004-label-fixes.patch 1895
 MD5 6a2ddd6bc79a92b74b4da57f442504d4 files/digest-udev-003 61
 MD5 1e9ce6f1d2c8f186504ebfa883dbcf4a files/digest-udev-005 61
+MD5 fcb45730f317fcad0c3c577fd16243b2 files/udev-007-check-valid-mode.patch 372
 MD5 915a7c2bcdf0cf3e3526ba49753936ec files/digest-udev-007 61
 MD5 058742a5d4f67c3b083f702abdeb5558 files/digest-udev-004 61
 MD5 7c9b568fafa102079bff2e3645a729a7 files/udev-004-disk-loop-fix.patch 1116
 MD5 1e9ce6f1d2c8f186504ebfa883dbcf4a files/digest-udev-005-r1 61
 MD5 21bf830d57de77dd576e9331df8756cf files/udev-004-manpage-update.patch 5926
 MD5 6ee9d9a6ab3cd60c9395d7541ca2e66a files/digest-udev-006 61
+MD5 7fe04ba254346f50d42ffd05a5ff5392 files/udev.permissions 2326
 MD5 2788e369a5b4d4b9377747ad39978a11 files/udev-003-fix-partition-support.patch 5493
-MD5 9a25d0c45b11fe21c8f23748f42c1b39 files/namedev.permissions 1584
diff --git a/sys-fs/udev/files/digest-udev-007 b/sys-fs/udev/files/digest-udev-007
new file mode 100644
index 000000000000..3c44e062aa9f
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-007
@@ -0,0 +1 @@
+MD5 b9fa9f8e163cc4b076c29b9a69e60dcd udev-007.tar.bz2 839202
diff --git a/sys-fs/udev/files/udev-007-check-valid-mode.patch b/sys-fs/udev/files/udev-007-check-valid-mode.patch
new file mode 100644
index 000000000000..96038542ff76
--- /dev/null
+++ b/sys-fs/udev/files/udev-007-check-valid-mode.patch
@@ -0,0 +1,13 @@
+--- udev-007/namedev.c.az	2003-11-24 19:55:17.524041640 +0200
++++ udev-007/namedev.c	2003-11-24 19:55:21.163488360 +0200
+@@ -464,6 +464,10 @@
+ 		}
+ 		strncpy(dev.group, temp2, sizeof(dev.owner));
+ 
++		if (!temp) {
++			dbg("cannot parse line: %s", line);
++			continue;
++		}
+ 		dev.mode = strtol(temp, NULL, 8);
+ 
+ 		dbg_parse("name='%s', owner='%s', group='%s', mode=%#o",
diff --git a/sys-fs/udev/files/namedev.permissions b/sys-fs/udev/files/udev.permissions
index f5740463e132..2a80ff53c5fe 100644
--- a/sys-fs/udev/files/namedev.permissions
+++ b/sys-fs/udev/files/udev.permissions
@@ -1,7 +1,18 @@
-# <serial>
+# /etc/udev/udev.permissions:  permission/ownership map for udev
+
+# <console>
+console:root:root:0600
+tty[0-9][0-9]*:root:root:0600
+# <serial+dialup>
 ttyS*:root:tty:0660
+ippp*:root:tty:0660
+isdn*:root:tty:0660
+isdnctrl*:root:tty:0660
+capi*:root:tty:0660
+dcbri*:root:tty:0660
+ircomm*:root:tty:0660
 # <floppy>
-fd[0-1]*:root:floppy:0660
+fd[01]*:root:floppy:0660
 # <sound>
 dsp*:root:audio:0660
 audio*:root:audio:0660
@@ -19,10 +30,14 @@ dmfm*:root:audio:0660
 dmmidi*:root:audio:0660
 sndstat:root:audio:0660
 # <cdrom>
+sr*:root:cdrom:660
+scd*:root:cdrom:660
+pcd*:root:cdrom:0660
 cdrom*:root:cdrom:0660
+dvd:root:cdrom:0660
 rdvd:root:cdrom:0660
 # <pilot>
-pilot:root:uucp0660
+pilot:root:uucp:0660
 # <jaz>
 jaz*:root:disk:0660
 # <zip>
@@ -31,6 +46,12 @@ zip*:root:disk:0660
 # <ls120>
 ls120:root:disk:0660
 ls120*:root:disk:0660
+# <lp>
+lp*:root:lp:0660
+parport*:root:lp:0660
+irlpt*:root:lp:0660
+usblp*:root:lp:0660
+usb/lp*:root:lp:0660
 # <scanner>
 scanner:root:root:0600
 usb/scanner*:root:root:0600
@@ -38,6 +59,23 @@ usb/scanner*:root:root:0600
 camera*:root:root:0600
 usb/dc2xx*:root:root:0600
 usb/mdc800*:root:root:0600
+# <raw>
+ram*:root:disk:660
+raw/*:root:disk:660
+# <disk>
+hd*:root:disk:660
+sd*:root:disk:660
+dasd*:root:disk:660
+ataraid*:root:disk:660
+loop*:root:disk:660
+md*:root:disk:660
+# <tape>
+ht*:root:tape:0660
+nht*:root:tape:0660
+pt*:root:tape:0660
+npt*:root:tape:0660
+st*:root:tape:0660
+nst*:root:tape:0660
 # <memstick>
 memstick*:root:root:0600
 # <flash>
@@ -62,6 +100,8 @@ vtx*:root:video:0660
 vbi*:root:video:0660
 video/*:root:video:0660
 vttuner:root:video:0660
+# <input>
+input/*:root:root:644
 # <gpm>
 gpmctl:root:root:0700
 # <dri>
@@ -69,12 +109,10 @@ nvidia*:root:video:0660
 3dfx*:root:video:0660
 # <mainboard>
 apm_bios:root:root:0600
-# <burner>
-scd*:root:cdrw:0660
-sg*:root:cdrw:0660
-pcd*:root:cdrw:0660
-pg*:root:cdrw:0660
-cdwriter:root:cdrw:0660
+# <scsi>
+sg*:root:disk:0660
+pg*:root:disk:0660
+cdwriter:root:disk:0660
 # <usb>
 usb/dabusb*:root:usb:0660
 usb/mdc800*:root:usb:0660
diff --git a/sys-fs/udev/udev-007.ebuild b/sys-fs/udev/udev-007.ebuild
new file mode 100644
index 000000000000..91d1f1ae4c77
--- /dev/null
+++ b/sys-fs/udev/udev-007.ebuild
@@ -0,0 +1,86 @@
+# 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-007.ebuild,v 1.1 2003/11/24 18:36:23 azarah Exp $
+
+# Note: Cannot use external libsysfs with klibc ..
+USE_KLIBC="no"
+USE_EXT_LIBSYSFS="no"
+
+inherit eutils
+
+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-0.3.0"
+
+pkg_setup() {
+	[ "${USE_KLIBC}" = "yes" ] && check_KV
+
+	return 0
+}
+
+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
+
+	# Make sure we do not build included libsysfs, but link to
+	# one in sysfsutils ...
+	if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ]
+	then
+		rm -rf ${S}/libsysfs
+		cp -Rd ${ROOT}/usr/include/sysfs ${S}/libsysfs
+	fi
+
+	# Setup things for klibc
+	if [ "${USE_KLIBC}" = "yes" ]
+	then
+		ln -snf ${ROOT}/usr/src/linux ${S}/klibc/linux
+	fi
+
+	# Do not sefault if we forget to put a ':' between group and permissions
+	epatch ${FILESDIR}/${P}-check-valid-mode.patch
+}
+
+src_compile() {
+	# Do not work with emake
+	if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ]
+	then
+		make udevdir="/dev/" \
+			ARCH_LIB_OBJS="-lsysfs" \
+			SYSFS="" || die
+	else
+		make udevdir="/dev/" || die
+	fi
+}
+
+src_install() {
+	into /
+	dosbin udev
+
+	insinto /etc/udev
+	doins udev.config
+	# Our own custom udev.permissions
+	doins ${FILESDIR}/udev.permissions
+#	doins udev.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}
+}
+