Update version. Update udev.permissions (According to changes to Debian config

file). Closes bug #36925.

4 files changed, 161 insertions, 6 deletions

diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 77020ab128e5..edaa08c3784c 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,7 +1,7 @@
 MD5 45b0f8041be46a9e278397cd99ad9076 udev-009.ebuild 2411
-MD5 d66ba0e54a2b8fb6f251ccd8bf1a74ef ChangeLog 4031
+MD5 1889d5306893bd37b2606dcdf561ee7c ChangeLog 4261
 MD5 bb2f3caf9ec4cb1394ae3c94f2ee7a8c udev-008.ebuild 2063
-MD5 1db16c64ca71efbb0b4b02ae14c95abd udev-012.ebuild 3349
+MD5 170d9ec90f30103e57be60eb9bba7033 udev-012.ebuild 3322
 MD5 1db16c64ca71efbb0b4b02ae14c95abd udev-011.ebuild 3349
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 83a432ae3bb1162fe07c5dd0fa3d4fbe udev-007.ebuild 1976
@@ -16,7 +16,7 @@ MD5 fcb45730f317fcad0c3c577fd16243b2 files/udev-007-check-valid-mode.patch 372
 MD5 478505fe4446f893adbfc4d8db0b2038 files/udev-011-namedev_c-gcc295-compat.patch 529
 MD5 915a7c2bcdf0cf3e3526ba49753936ec files/digest-udev-007 61
 MD5 a4c9abce9b6a2c2beeeacff0a604e2e1 files/udev-009-scsi_id-new-sysfs.patch 4357
-MD5 9f644f3f81dc2e5dfe46a169fcb9d659 files/udev.permissions 3253
+MD5 aba24cfb26a8f0b604a44a0d9ca7f830 files/udev.permissions 3550
 MD5 2e5ce093bf8390e3f212149706ed97eb files/udev-011-unlink-before-symlink.patch 772
 MD5 7bbe5e5911d5c569e85a389f4c489e01 files/udev-011-ide-devfs.patch 2565
 MD5 4c26691abc7f47b0329203056cbcbebc files/udev.rules 3554
diff --git a/sys-fs/udev/files/digest-udev-012 b/sys-fs/udev/files/digest-udev-012
new file mode 100644
index 000000000000..5a8eaf9fa669
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-012
@@ -0,0 +1 @@
+MD5 67868d5f8166b51cc63976b7f509f01f udev-012.tar.bz2 1047316
diff --git a/sys-fs/udev/files/udev.permissions b/sys-fs/udev/files/udev.permissions
index 7cb42223fb32..8b17d20797b4 100644
--- a/sys-fs/udev/files/udev.permissions
+++ b/sys-fs/udev/files/udev.permissions
@@ -1,5 +1,5 @@
 # /etc/udev/udev.permissions:  permission/ownership map for udev
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.permissions,v 1.2 2003/12/26 23:32:44 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.permissions,v 1.3 2004/01/01 03:41:24 azarah Exp $
 
 # console devices
 console:root:tty:0600
@@ -34,6 +34,20 @@ vcsa:root:root:0600
 vcsa[0-9]*:root:root:0600
 vcc/*:root:root:0600
 
+# memory devices
+random:root:root:0666
+urandom:root:root:0444
+mem:root:kmem:0640
+kmem:root:kmem:0640
+port:root:kmem:0640
+full:root:root:0666
+null:root:root:0666
+zero:root:root:0666
+
+# misc devices
+nvram:root:root:0660
+rtc:root:root:0660
+
 # floppy devices
 fd[01]*:root:floppy:0660
 
@@ -117,6 +131,9 @@ npt*:root:tape:0660
 st*:root:tape:0660
 nst*:root:tape:0660
 
+# dm devices
+dm-*:root:root:0640
+
 # memstick devices
 memstick*:root:root:0600
 
@@ -135,10 +152,11 @@ fb[0-9]*:root:root:0600
 fb/*:root:root:0600
 
 # kbd devices
-kbd:root:root:0600
+kbd:root:root:0644
 
 # joystick devices
-js[0-9]*:root:root:0600
+js[0-9]*:root:root:0644
+djs[0-9]*:root:root:0644
 
 # v4l devices
 video*:root:video:0660
diff --git a/sys-fs/udev/udev-012.ebuild b/sys-fs/udev/udev-012.ebuild
new file mode 100644
index 000000000000..55e10db7d80a
--- /dev/null
+++ b/sys-fs/udev/udev-012.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-012.ebuild,v 1.1 2004/01/01 03:41:24 azarah Exp $
+
+# Note: Cannot use external libsysfs with klibc ..
+USE_KLIBC="no"
+USE_EXT_LIBSYSFS="no"
+
+inherit eutils
+
+DESCRIPTION="Linux dynamic device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-FAQ"
+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"
+
+RDEPEND="${DEPEND}
+	>=sys-apps/baselayout-1.8.6.12-r3"
+# We need some changes for devfs type layout
+
+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 there is no sudden changes to udev.rules.devfs
+	# (more for my own needs than anything else ...)
+	if [ "`md5sum < "${S}/etc/udev/udev.rules.devfs"`" != \
+	     "a16769804b6038c7def00012c47b84c5  -" ]
+	then
+		echo
+		eerror "udev.rules.devfs has been updated, please validate!"
+		die "udev.rules.devfs has been updated, please validate!"
+	fi
+
+	# 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 sleep if UDEV_NO_SLEEP is set
+	epatch ${FILESDIR}/${PN}-011-no-wait-for-sleep.patch
+}
+
+src_compile() {
+	local myconf=
+
+	# DBUS support?
+	if which pkg-config &>/dev/null && pkg-config dbus-1 &>/dev/null
+	then
+		myconf="USE_DBUS=true"
+	fi
+
+	# Do not work with emake
+	if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ]
+	then
+		make EXTRAS="extras/scsi_id" \
+			udevdir="/dev/" \
+			ARCH_LIB_OBJS="-lsysfs" \
+			SYSFS="" \
+			${myconf} || die
+	else
+		make EXTRAS="extras/scsi_id" \
+			udevdir="/dev/" \
+			${myconf} || die
+	fi
+}
+
+src_install() {
+	into /
+	dosbin udev
+	dosbin extras/scsi_id/scsi_id
+
+	exeinto /etc/udev/scripts
+	doexe extras/ide-devfs.sh
+
+	insinto /etc/udev
+	doins ${FILESDIR}/udev.conf
+#	newins etc/udev/udev.rules udev.rules.example
+	# For devfs style layout
+	doins ${FILESDIR}/udev.rules
+	# Our own custom udev.permissions
+	doins ${FILESDIR}/udev.permissions
+#	doins etc/udev/udev.permissions
+	insinto /etc
+	doins extras/scsi_id/scsi_id.config
+	# DBUS support?
+	if which pkg-config &>/dev/null && pkg-config dbus-1 &>/dev/null
+	then
+		insinto /etc/dbus-1/system.d
+		doins etc/dbus-1/system.d/udev_sysbus_policy.conf
+	fi
+
+	dodir /etc/hotplug.d/default
+	dosym ../../../sbin/udev /etc/hotplug.d/default/udev.hotplug
+
+	doman udev.8
+	doman extras/scsi_id/scsi_id.8
+
+	dodoc COPYING ChangeLog FAQ README TODO
+	dodoc docs/{overview,udev-OLS2003.pdf,udev_vs_devfs}
+}
+
+pkg_preinst() {
+	if [ -f "${ROOT}/etc/udev/udev.config" -a \
+	     ! -f "${ROOT}/etc/udev/udev.rules" ]
+	then
+		mv -f ${ROOT}/etc/udev/udev.config ${ROOT}/etc/udev/udev.rules
+	fi
+}
+