025 version bump

5 files changed, 202 insertions, 1 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index ffa9de494074..a0e82ecd19d0 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-fs/udev
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.44 2004/04/12 23:29:03 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.45 2004/04/21 23:57:04 gregkh Exp $
+
+*udev-025-r1 (21 Apr 2004)
+
+  21 Apr 2004; Greg Kroah-Hartman <gregkh@gentoo.org>
+  +files/udev.conf.post_024, +udev-025-r1.ebuild:
+  version bump.
+  
+  Changed the configs to look in /etc/udev/rules.d/ for udev rules
+  and in /etc/udev/permissions.d/ for permission files.  Put the
+  default files in those directories with the 50- prefix to allow
+  users to override anything they don't like much easier.
 
   07 Apr 2004; Will Woods <wwoods@gentoo.org> udev-024-r1.ebuild:
   added ~alpha to KEYWORDS
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 45cb1cd81a40..3c01786b3da1 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -11,6 +11,7 @@ MD5 0a5fd647aa0c1cff0dda9c68d75c5a29 udev-021-r1.ebuild 3844
 MD5 2b332e1c8a1b9d64b37278ff1019e065 udev-022-r1.ebuild 3866
 MD5 c5b96c22bae300fd46cff8cdcf496b0e udev-023-r1.ebuild 3542
 MD5 ee3d0772a0392f5fb98bde8cd8ce9e57 udev-024-r1.ebuild 3721
+MD5 66a7e5fb69878093d9f3ec2a82aa0a73 udev-025-r1.ebuild 3810
 MD5 a6c3a71920f59dc127d418d7ba3c6a77 files/digest-udev-016-r2 62
 MD5 c7b3c31e1f8d7843d2b3672cf5f120c1 files/digest-udev-017-r1 61
 MD5 6cf3f436068259264e186080dbdf6640 files/digest-udev-018-r3 61
@@ -33,3 +34,5 @@ MD5 5a1604faa5c8a1b5cf7a6a66f13fe226 files/udev.rules.post_012 4185
 MD5 2307973356422a7496eea98636a8d667 files/digest-udev-022-r1 61
 MD5 3163c259f50298207d2bf5b80c92eab1 files/digest-udev-023-r1 61
 MD5 882b525738c554bce2449356cd1fb9c5 files/digest-udev-024-r1 61
+MD5 63c1b792a1470ccaa74195f5debacd2f files/digest-udev-025-r1 61
+MD5 6bddd08e1b87f5440554531fffd31836 files/udev.conf.post_024 1180
diff --git a/sys-fs/udev/files/digest-udev-025-r1 b/sys-fs/udev/files/digest-udev-025-r1
new file mode 100644
index 000000000000..4bfb41952d1a
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-025-r1
@@ -0,0 +1 @@
+MD5 4f4c0ace4307cb1c73d9f5365fe6c946 udev-025.tar.bz2 370029
diff --git a/sys-fs/udev/files/udev.conf.post_024 b/sys-fs/udev/files/udev.conf.post_024
new file mode 100644
index 000000000000..deb149bc7855
--- /dev/null
+++ b/sys-fs/udev/files/udev.conf.post_024
@@ -0,0 +1,31 @@
+# /etc/udev/udev.conf:  main config file for udev
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.conf.post_024,v 1.1 2004/04/21 23:57:04 gregkh Exp $
+#
+# This file can be used to override some of udev's default values
+# for where it looks for files, and where it places device nodes.
+
+
+# udev_root - where in the filesystem to place the device nodes
+udev_root="/dev/"
+
+# udev_db - The name and location of the udev database.
+#           NOTE: this should be somewhere that is writable before
+#                 / is mounted rw, like /dev ...
+udev_db="/dev/.udev.tdb"
+
+# udev_rules - The name and location of the udev rules file
+udev_rules="/etc/udev/rules.d/"
+
+# udev_permissions - The name and location of the udev permission file
+udev_permissions="/etc/udev/permissions.d/"
+
+# default_mode - set the default mode for all nodes that have no 
+#                explicit match in the permissions file
+#                NOTE: do not set to anything else if you are not
+#                      sure you have everything needed for normal
+#                      user to function in the permissions file!
+default_mode="0666"
+
+# udev_log - set to "yes" if you want logging
+udev_log="no"
+
diff --git a/sys-fs/udev/udev-025-r1.ebuild b/sys-fs/udev/udev-025-r1.ebuild
new file mode 100644
index 000000000000..b6ada2e9bfdf
--- /dev/null
+++ b/sys-fs/udev/udev-025-r1.ebuild
@@ -0,0 +1,155 @@
+# 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-025-r1.ebuild,v 1.1 2004/04/21 23:57:04 gregkh Exp $
+
+# Note: Cannot use external libsysfs with klibc ..
+USE_KLIBC="no"
+
+inherit eutils
+
+DESCRIPTION="Linux dynamic and persistent 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 ~ppc ~sparc ~hppa ~amd64 ~mips ~alpha"
+
+DEPEND="virtual/glibc
+	sys-apps/hotplug-base"
+
+RDEPEND="${DEPEND}
+	>=sys-apps/baselayout-1.8.6.12-r3"
+# We need some changes for devfs type layout
+
+PROVIDE="virtual/dev-manager"
+
+pkg_setup() {
+	[ "${USE_KLIBC}" = "yes" ] && check_KV
+
+	return 0
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# patches go here...
+	# epatch ${FILESDIR}/${P}-udev_add_c-gcc295-compat.patch
+
+	# 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.gentoo
+	# (more for my own needs than anything else ...)
+	if [ "`md5sum < "${S}/etc/udev/udev.rules.gentoo"`" != \
+	     "1b240acdcf4cbfacf9b749b55271e26b  -" ]
+	then
+		echo
+		eerror "udev.rules.gentoo has been updated, please validate!"
+		die "udev.rules.gentoo has been updated, please validate!"
+	fi
+
+	# Setup things for klibc
+	if [ "${USE_KLIBC}" = "yes" ]
+	then
+		ln -snf ${ROOT}/usr/src/linux ${S}/klibc/linux
+	fi
+}
+
+src_compile() {
+	local myconf=
+	local extras="extras/scsi_id"
+
+	# DBUS support?
+	# disabled for now as it's currently broken.
+#	if which pkg-config &>/dev/null && pkg-config dbus-1 &>/dev/null
+#	then
+#		myconf="USE_DBUS=true"
+#	fi
+
+	# Device-mapper support?
+	if false
+	then
+		extras="${extras} extras/multipath"
+	fi
+
+	# Do not work with emake
+	make EXTRAS="${extras}" \
+		udevdir="/dev/" \
+		${myconf} || die
+}
+
+src_install() {
+	dobin udevinfo udevtest
+	into /
+	dosbin udev udevd udevsend udevstart
+	dosbin extras/scsi_id/scsi_id
+	# Device-mapper support?
+	if false
+	then
+		dosbin extras/multipath/{multipath,devmap_name}
+		exeinto /etc/hotplug.d/scsi/
+		doexe extras/multipath/multipath.hotplug
+	fi
+
+	exeinto /etc/udev/scripts
+	doexe extras/ide-devfs.sh
+	doexe extras/scsi-devfs.sh
+
+	insinto /etc/udev
+	newins ${FILESDIR}/udev.conf.post_024 udev.conf
+#	newins etc/udev/udev.rules udev.rules.example
+	# For devfs style layout
+	insinto /etc/udev/rules.d/
+	newins etc/udev/udev.rules.gentoo 50-udev.rules
+	# Our own custom udev.permissions
+	insinto /etc/udev/permissions.d/
+	newins etc/udev/udev.permissions.gentoo 50-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/udevsend /etc/hotplug.d/default/udev.hotplug
+
+	# set up the /etc/dev.d directory tree
+	dodir /etc/dev.d/default
+	dodir /etc/dev.d/net
+	exeinto /etc/dev.d/net
+	doexe etc/dev.d/net/hotplug.dev
+
+	doman *.8
+	doman extras/scsi_id/scsi_id.8
+
+	dodoc COPYING ChangeLog FAQ HOWTO-udev_for_dev README TODO
+	dodoc docs/{overview,udev-OLS2003.pdf,udev_vs_devfs,RFC-dev.d}
+}
+
+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
+}
+
+pkg_postinst() {
+	if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ]
+	then
+		killall -15 udevd &>/dev/null
+		sleep 1
+		killall -9 udevd &>/dev/null
+	fi
+}