Move devfs files from baselayout back into this package.

4 files changed, 120 insertions, 43 deletions

diff --git a/sys-fs/devfsd/ChangeLog b/sys-fs/devfsd/ChangeLog
index f0492772b401..a7c847dead65 100644
--- a/sys-fs/devfsd/ChangeLog
+++ b/sys-fs/devfsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/devfsd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/ChangeLog,v 1.14 2004/09/29 12:30:14 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/ChangeLog,v 1.15 2004/10/16 17:09:36 vapier Exp $
+
+  16 Oct 2004; Mike Frysinger <vapier@gentoo.org> files/devfsd.conf,
+  devfsd-1.3.25-r8.ebuild:
+  Move devfs files from baselayout back into this package.
 
   29 Sep 2004; Jason Wever <weeve@gentoo.org> devfsd-1.3.25-r8.ebuild:
   Stable on sparc.
diff --git a/sys-fs/devfsd/Manifest b/sys-fs/devfsd/Manifest
index 78223da56ae1..251dc2029dd8 100644
--- a/sys-fs/devfsd/Manifest
+++ b/sys-fs/devfsd/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f09bb2fd42855d665332a22f0006ea16 ChangeLog 4898
-MD5 3a6e301b734da11bbd516fd5f2db975d devfsd-1.3.25-r8.ebuild 1242
+MD5 79742254305819c3ce971dd6404b26f7 ChangeLog 5055
+MD5 fa1c9d14a03598fd82add4761281dfd1 devfsd-1.3.25-r8.ebuild 1208
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 e928d1edc1cdcb816cf7219d59e3f828 files/devfsd.conf 1644
+MD5 72d324e2b484a8ba4087e16c46e6e2bf files/devfsd.conf 5139
 MD5 d580e9efc3658a0e71a165b3b531d415 files/devfsd 245
 MD5 41a6be534a78f5a0ad994b10e4134e6e files/devfsd-1.3.25-kernel-2.5.patch 3929
 MD5 b8ec7858c1ac54c47302ca839a52188f files/digest-devfsd-1.3.25-r8 65
@@ -13,7 +13,7 @@ MD5 3df00d60f0ad517c5489f558c1a95056 files/devfsd-1.3.25-no-nis.patch 2142
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBYsJuHTu7gpaalycRAnO2AJwP6xAGvXfCGAKHMFLBoDgClVs9ngCfcqdq
-EGUkEwW3n1G5rcHLC+p/F6w=
-=Uy6C
+iD8DBQFBcVXcHTu7gpaalycRAhR1AKD13f8o/3/c+b8f0wIaTEi5W0VTOACg0bey
+UKctCnbQhKmnuPWV2nr7Ez0=
+=RD/H
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild b/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild
index 5b0a4c98d9e0..4b31cd5fee44 100644
--- a/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild
+++ b/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild,v 1.9 2004/10/05 15:48:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild,v 1.10 2004/10/16 17:09:36 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -34,16 +34,12 @@ src_unpack() {
 	use uclibc && sed -e 's|libnsl.so.1|libnsl.so.0|' -i GNUmakefile
 }
 
-src_compile() {
-	make || die
-}
-
 src_install() {
 	dodir /sbin /usr/share/man /etc
 	make PREFIX=${D} install || die
-
-	#config file is handled in baselayout
-	rm -f ${D}/etc/devfsd.conf
-
 	dodoc devfsd.conf INSTALL
+
+	dodir /etc/devfs.d
+	insinto /etc
+	doins ${FILESDIR}/devfsd.conf
 }
diff --git a/sys-fs/devfsd/files/devfsd.conf b/sys-fs/devfsd/files/devfsd.conf
index dbb62b470fe3..1431d7eda350 100644
--- a/sys-fs/devfsd/files/devfsd.conf
+++ b/sys-fs/devfsd/files/devfsd.conf
@@ -1,44 +1,121 @@
 # Sample /etc/devfsd.conf configuration file.
-# Richard Gooch  <rgooch@atnf.csiro.au>		3-JUL-2000
+# Richard Gooch  <rgooch@atnf.csiro.au>		17-FEB-2002
 #
-# Many permission issues may be resolved by also updating the
-# files in /etc/security/
+# The Gentoo Linux Team - http://www.gentoo.org/
+#     - Many fixes, etc
+#
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/files/devfsd.conf,v 1.3 2004/10/16 17:09:36 vapier Exp $
 
 # Enable full compatibility mode for old device names. You may comment these
 # out if you don't use the old device names. Make sure you know what you're
 # doing!
-REGISTER	.*		MKOLDCOMPAT
-UNREGISTER	.*		RMOLDCOMPAT
+REGISTER        .*           MKOLDCOMPAT
+UNREGISTER      .*           RMOLDCOMPAT
 
 # You may comment out the above and uncomment the following if you've
 # configured your system to use the original "new" devfs names or the really
 # new names
-#REGISTER	vc/.*		MKOLDCOMPAT
-#UNREGISTER	vc/.*		RMOLDCOMPAT
-#REGISTER	pty/.*		MKOLDCOMPAT
-#UNREGISTER	pty/.*		RMOLDCOMPAT
-#REGISTER	misc		MKOLDCOMPAT
-#UNREGISTER	misc		RMOLDCOMPAT
+#REGISTER       ^vc/.*       MKOLDCOMPAT
+#UNREGISTER     ^vc/.*       RMOLDCOMPAT
+#REGISTER       ^pty/.*      MKOLDCOMPAT
+#UNREGISTER     ^pty/.*      RMOLDCOMPAT
+#REGISTER       ^misc        MKOLDCOMPAT
+#UNREGISTER     ^misc        RMOLDCOMPAT
 
 # You may comment these out if you don't use the original "new" names
-REGISTER	.*		MKNEWCOMPAT
-UNREGISTER	.*		RMNEWCOMPAT
+REGISTER        .*           MKNEWCOMPAT
+UNREGISTER      .*           RMNEWCOMPAT
 
 # Enable module autoloading. You may comment this out if you don't use
 # autoloading
-LOOKUP		.*		MODLOAD
+LOOKUP          .*           MODLOAD
+
+# Uncomment the following if you want to set the group to "tty" for the
+# pseudo-tty devices. This is necessary so that mesg(1) can later be used to
+# enable/disable talk requests and wall(1) messages.
+REGISTER        ^pty/s.*     PERMISSIONS -1.tty  0600
+REGISTER        ^pts/.*      PERMISSIONS -1.tty  0600
 
 # Uncomment this if you want permissions to be saved and restored
-REGISTER        ^pt[sy]/.*      IGNORE
-CHANGE          ^pt[sy]/.*      IGNORE
-REGISTER        .*              COPY    /dev-state/$devname $devpath
-CHANGE          .*              COPY    $devpath /dev-state/$devname
-CREATE          .*              COPY    $devpath /dev-state/$devname
-
-LOOKUP ^cdrom$ CFUNCTION GLOBAL symlink ${mntpnt}/cdroms/cdrom0 $devpath
-REGISTER ^cdrom/cdrom0$  CFUNCTION GLOBAL symlink cdroms/cdrom0 cdrom
-UNREGISTER ^cdrom/cdrom0$  CFUNCTION GLOBAL unlink cdrom
-
-LOOKUP snd MODLOAD ACTION snd
-REGISTER sound/.* PERMISSIONS root.audio 660
-REGISTER snd/.* PERMISSIONS root.audio 660
+# NB: Do NOT change the following!
+# Do not do this for pseudo-terminal devices
+REGISTER        ^pt[sy]/.*   IGNORE
+CHANGE          ^pt[sy]/.*   IGNORE
+CREATE          ^pt[sy]/.*   IGNORE
+DELETE          ^pt[sy]      IGNORE
+REGISTER        ^log         IGNORE
+CHANGE          ^log         IGNORE
+CREATE          ^log         IGNORE
+DELETE          ^log         IGNORE
+REGISTER        .*           COPY    /lib/dev-state/$devname $devpath
+CHANGE          .*           COPY    $devpath /lib/dev-state/$devname
+CREATE          .*           COPY    $devpath /lib/dev-state/$devname
+DELETE          .*           CFUNCTION GLOBAL unlink /lib/dev-state/$devname
+RESTORE         /lib/dev-state
+
+# You can force default like this :
+# PERMISSIONS owner_and_group access_mode
+
+# Video4Linux devices
+REGISTER       v4l/.*       PERMISSIONS root.video 660
+
+# ALSA/OSS stuff
+# Comment/change these if you want to change the permissions on
+# the audio devices
+LOOKUP          snd          MODLOAD ACTION snd
+LOOKUP          dsp          MODLOAD
+LOOKUP          mixer        MODLOAD
+LOOKUP          midi         MODLOAD
+REGISTER        sound/.*     PERMISSIONS root.audio 660
+REGISTER        snd/.*       PERMISSIONS root.audio 660
+
+# Uncomment this to let PAM manage devfs
+#REGISTER        .*           CFUNCTION /lib/security/pam_console_apply_devfsd.so pam_console_apply_single $devpath
+
+# Autoload the sg module if generic scsi driver compiled as module.
+#LOOKUP          ^sg$      MODLOAD ACTION sg
+
+# Give the cdrw group write permissions to /dev/sg0
+# This is done to have non root user use the burner (scan the scsi bus)
+#REGISTER        ^scsi/host.*/bus.*/target.*/lun.*/generic    PERMISSIONS root.cdrw 660
+
+# General note for the following auto creation of symlinks:
+#
+#    If you change the device that the symlink points to,
+#    you should also remove the symlink before restarting
+#    devfsd
+
+# Create /dev/cdrom for the first cdrom drive
+LOOKUP          ^cdrom$          CFUNCTION GLOBAL mksymlink cdroms/cdrom0 cdrom
+REGISTER        ^cdroms/cdrom0$   CFUNCTION GLOBAL mksymlink $devname cdrom
+UNREGISTER      ^cdroms/cdrom0$   CFUNCTION GLOBAL unlink cdrom
+
+# Create /dev/dvd for the second cdrom drive
+# (change 'cdroms/cdrom1' to suite your setup)
+# NOTE: We add the fully qualified path here, else some apps
+#       have problems to resolve the true device (drip comes to mind)
+#LOOKUP          ^dvd$           CFUNCTION GLOBAL mksymlink ${mntpnt}/cdroms/cdrom1 dvd
+#REGISTER        ^cdroms/cdrom1$  CFUNCTION GLOBAL mksymlink ${devpath} dvd
+#UNREGISTER      ^cdroms/cdrom1$  CFUNCTION GLOBAL unlink dvd
+
+# Create /dev/cdrw for the first cdrom on the scsi bus
+# (change 'sr0' to suite your setup)
+#LOOKUP          ^cdrw$          CFUNCTION GLOBAL mksymlink sr0 cdrw
+#REGISTER        ^sr0$           CFUNCTION GLOBAL mksymlink $devname cdrw
+#UNREGISTER      ^sr0$           CFUNCTION GLOBAL unlink cdrw
+
+# Create /dev/mouse
+LOOKUP          ^mouse$          CFUNCTION GLOBAL mksymlink misc/psaux mouse
+REGISTER        ^misc/psaux$     CFUNCTION GLOBAL mksymlink $devname mouse
+UNREGISTER      ^misc/psaux$     CFUNCTION GLOBAL unlink mouse
+
+# Manage USB mouse
+REGISTER        ^input/mouse0$   CFUNCTION GLOBAL mksymlink $devname usbmouse
+UNREGISTER      ^input/mouse0$   CFUNCTION GLOBAL unlink usbmouse
+REGISTER        ^input/mice$     CFUNCTION GLOBAL mksymlink $devname usbmouse
+UNREGISTER      ^input/mice$     CFUNCTION GLOBAL unlink usbmouse
+
+# Support additional config installed by packages ...
+INCLUDE /etc/devfs.d
+
+# devfsd.conf ends here