089-r1 fix path_id

Package-Manager: portage-2.1_pre7-r4

4 files changed, 268 insertions, 4 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 8ecd46a53b16..807744eab848 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.186 2006/04/03 16:58:50 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.187 2006/04/04 03:27:23 gregkh Exp $
+
+*udev-089-r1 (04 Apr 2006)
+
+  04 Apr 2006; Greg Kroah-Hartman <gregkh@gentoo.org> +udev-089-r1.ebuild:
+  oops path_id went away, put it back now.
 
 *udev-089 (03 Apr 2006)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 50b9f461be30..b306c2c78e73 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,6 +1,6 @@
-MD5 c3281a5a40238db2e597feb84e877e57 ChangeLog 33743
-RMD160 b42410a39b1329ba3b209016910ed414552070e3 ChangeLog 33743
-SHA256 a7cd670298151d615b6a03d364afeed43207b66318e9b100870c7e46788776e8 ChangeLog 33743
+MD5 04e24807967d5070d5fd1af507a17d20 ChangeLog 33890
+RMD160 e0285f23f91983656e0e94b979d6561c9e083019 ChangeLog 33890
+SHA256 577c6b75c9a8eb62c5193acbb1d77120c2225788544910becfc0650f29a8dba7 ChangeLog 33890
 MD5 17c291f5c6e624792d02dd304fb8177e files/05-udev-early.rules-078 288
 RMD160 e4d07ee5080618ba60c9cfb544d438f2eb11cab6 files/05-udev-early.rules-078 288
 SHA256 63602afdbefafa4eb0b3301685e47dec5cc206b66765e733f9bcc6afe2a5d31b files/05-udev-early.rules-078 288
@@ -73,6 +73,9 @@ SHA256 70ee083c84b52a4ca757cd6cc5ccae2905c9184d4f533fbdfe21b647760097d1 files/di
 MD5 9dc9ff90ebbc4e57f50f59de28f693ac files/digest-udev-089 229
 RMD160 f9e7142287acee4a3ff353c50ef5965538c59562 files/digest-udev-089 229
 SHA256 e12b90573d11e8ff79ac99338d536d3e1be647a4c6de7c664d166a7e9dcd6e3c files/digest-udev-089 229
+MD5 9dc9ff90ebbc4e57f50f59de28f693ac files/digest-udev-089-r1 229
+RMD160 f9e7142287acee4a3ff353c50ef5965538c59562 files/digest-udev-089-r1 229
+SHA256 e12b90573d11e8ff79ac99338d536d3e1be647a4c6de7c664d166a7e9dcd6e3c files/digest-udev-089-r1 229
 MD5 f00e3e0d3382e93cbd0c64fcef99f826 files/udev-021-udev_add_c-gcc295-compat.patch 493
 RMD160 b18937882d817963f5434551d60e8e54fc0dbf46 files/udev-021-udev_add_c-gcc295-compat.patch 493
 SHA256 c6f5914cf44969e597ec97c17e43e5dfdcfb15e1f2afdccf686c55889032f38c files/udev-021-udev_add_c-gcc295-compat.patch 493
@@ -223,6 +226,9 @@ SHA256 fe8d286ed7dd71982ae13dbe108fe9d9550e6f403ba33b0e1156cee145dc29d9 udev-086
 MD5 e7544f756dd4201652fd3107116ad7e2 udev-087.ebuild 7513
 RMD160 fb68fe3a6e667ca4508c9946fae1292665b9a7b9 udev-087.ebuild 7513
 SHA256 fb3317cef4f8eaba41334d7dedfe3eb986041e01e05c297c6b250fdec808a478 udev-087.ebuild 7513
+MD5 eacf636c0dac2813cffc62447645e096 udev-089-r1.ebuild 8065
+RMD160 4ccccb3cf9abc2913c51003bd12bfcf3ed4f4867 udev-089-r1.ebuild 8065
+SHA256 86b9d767d71fb7a8d81e1872895ffab81f28ce54ef671eebdc5d6640e2fde5d9 udev-089-r1.ebuild 8065
 MD5 5389c6d6568b322f8de41f87124369db udev-089.ebuild 8082
 RMD160 8a2db044b0e53f0545b4fc124cdb77e2e5d4f50b udev-089.ebuild 8082
 SHA256 75ec8b137530c984a027f9ba669591052b7957a4d58361bce0618a7f5b0669d9 udev-089.ebuild 8082
diff --git a/sys-fs/udev/files/digest-udev-089-r1 b/sys-fs/udev/files/digest-udev-089-r1
new file mode 100644
index 000000000000..a03471825ef4
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-089-r1
@@ -0,0 +1,3 @@
+MD5 ed2d885527da9c5f72abd9a43cb1af98 udev-089.tar.bz2 191032
+RMD160 3e845904ce1c24b407c616f0cb024d758a7afbe2 udev-089.tar.bz2 191032
+SHA256 cee32e4392d0c3ea84838e98ead8ca2a031c332126e0ff5321b981135b7e76fd udev-089.tar.bz2 191032
diff --git a/sys-fs/udev/udev-089-r1.ebuild b/sys-fs/udev/udev-089-r1.ebuild
new file mode 100644
index 000000000000..a382dfc924b2
--- /dev/null
+++ b/sys-fs/udev/udev-089-r1.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-089-r1.ebuild,v 1.1 2006/04/04 03:27:23 gregkh Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
+SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux"
+
+# still rely on hotplug (need to fix that), but now we implement coldplug
+
+DEPEND="sys-apps/hotplug-base"
+RDEPEND="!<=sys-apps/coldplug"
+RDEPEND="${DEPEND} ${RDEPEND}
+	>=sys-apps/baselayout-1.11.14"
+# We need the lib/rcscripts/addon support
+PROVIDE="virtual/dev-manager"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	# patches go here...
+	#epatch ${FILESDIR}/${P}-udev_volume_id.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 ...)
+	MD5=`md5sum < "${S}/etc/udev/gentoo/udev.rules"`
+	MD5=${MD5/  -/}
+	if [ "${MD5}" != "590d3e6346938e3b608237973f4f1805" ]
+	then
+		echo
+		eerror "gentoo/udev.rules has been updated, please validate!"
+		die "gentoo/udev.rules has been updated, please validate!"
+	fi
+}
+
+src_compile() {
+	filter-flags -fprefetch-loop-arrays
+	local myconf=
+	local extras="extras/scsi_id extras/volume_id extras/ata_id extras/run_directory extras/usb_id extras/floppy extras/cdrom_id extras/firmware"
+
+	use selinux && myconf="${myconf} USE_SELINUX=true"
+
+	# Not everyone has full $CHOST-{ld,ar,etc...} yet
+	local mycross=""
+	type -p ${CHOST}-ar && mycross=${CHOST}-
+
+	echo "get_libdir = $(get_libdir)"
+	# Do not work with emake
+	make \
+		EXTRAS="${extras}" \
+		udevdir="/dev/" \
+		CROSS=${mycross} \
+		${myconf} || die
+}
+
+src_install() {
+	# we install everything by "hand" and don't rely on the udev Makefile to do
+	# it for us (why? it's easier that way...)
+	dobin udevinfo
+	dobin udevtest
+	dobin udevmonitor
+	into /
+	dosbin udev
+	dosbin udevd
+	dosbin udevsend
+	dosbin udevtrigger
+	dosbin udevcontrol
+	dosbin extras/run_directory/udev_run_devd
+	dosbin extras/run_directory/udev_run_hotplugd
+	dosbin extras/ata_id/ata_id
+	dosbin extras/volume_id/vol_id
+	dosbin extras/scsi_id/scsi_id
+	dosbin extras/usb_id/usb_id
+	dosbin extras/path_id/path_id
+	dosbin extras/cdrom_id/cdrom_id
+
+	# vol_id library (needed by mount and HAL)
+	dolib extras/volume_id/lib/*.a extras/volume_id/lib/*.so*
+	# move the .a files to /usr/lib
+	dodir /usr/$(get_libdir)
+	mv -f "${D}"/$(get_libdir)/*.a  "${D}"/usr/$(get_libdir)/
+
+	# handle static linking bug #4411
+	gen_usr_ldscript libvolume_id.so
+
+	# save pkgconfig info
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins extras/volume_id/lib/*.pc
+
+	#exeinto /etc/udev/scripts
+	exeinto /lib/udev
+	#doexe extras/ide-devfs.sh
+	#doexe extras/scsi-devfs.sh
+	#doexe extras/raid-devfs.sh
+	doexe extras/floppy/create_floppy_devices
+	doexe extras/firmware/firmware_helper
+
+	# Our udev config file
+	insinto /etc/udev
+	newins ${FILESDIR}/udev.conf.post_081 udev.conf
+
+	# Our rules files
+	insinto /etc/udev/rules.d/
+	newins etc/udev/gentoo/udev.rules 50-udev.rules
+	#newins ${FILESDIR}/udev.rules-084 50-udev.rules
+	newins ${FILESDIR}/05-udev-early.rules-079 05-udev-early.rules
+
+	# scsi_id configuration
+	insinto /etc
+	doins extras/scsi_id/scsi_id.config
+
+	# set up symlinks in /etc/hotplug.d/default
+	dodir /etc/hotplug.d/default
+	dosym ../../../sbin/udevsend /etc/hotplug.d/default/10-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 extras/run_directory/dev.d/net/hotplug.dev
+
+	# all of the man pages
+	doman *.7
+	doman *.8
+	doman extras/ata_id/ata_id.8
+	doman extras/edd_id/edd_id.8
+	doman extras/scsi_id/scsi_id.8
+	doman extras/volume_id/vol_id.8
+	doman extras/dasd_id/dasd_id.8
+	doman extras/cdrom_id/cdrom_id.8
+
+	# our udev hooks into the rc system
+	insinto /lib/rcscripts/addons
+	newins "${FILESDIR}"/udev-start-089.sh udev-start.sh
+	doins "${FILESDIR}"/udev-stop.sh
+
+	dodoc ChangeLog FAQ README TODO RELEASE-NOTES
+	dodoc docs/{overview,udev_vs_devfs}
+	dodoc docs/writing_udev_rules/*
+
+	newdoc extras/volume_id/README README_volume_id
+
+	# Create some nodes that we know we need.
+	# set the time/date so we can see in /dev which ones we copied over
+	# in the udev-start.sh script
+	mkdir ${D}/lib/udev/devices
+
+	mknod ${D}/lib/udev/devices/null c 1 3
+	chmod 666 ${D}/lib/udev/devices/null
+	touch -t 200010220101 ${D}/lib/udev/devices/null
+
+	mknod ${D}/lib/udev/devices/zero c 1 5
+	chmod 666 ${D}/lib/udev/devices/zero
+	touch -t 200010220101 ${D}/lib/udev/devices/zero
+
+	mknod ${D}/lib/udev/devices/console c 5 1
+	chmod 600 ${D}/lib/udev/devices/console
+	chown root:tty ${D}/lib/udev/devices/console
+	touch -t 200010220101 ${D}/lib/udev/devices/console
+}
+
+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
+
+	# delete the old udev.hotplug symlink if it is present
+	if [ -h "${ROOT}/etc/hotplug.d/default/udev.hotplug" ]
+	then
+		rm -f ${ROOT}/etc/hotplug.d/default/udev.hotplug
+	fi
+
+	# delete the old wait_for_sysfs.hotplug symlink if it is present
+	if [ -h "${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug" ]
+	then
+		rm -f ${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug
+	fi
+}
+
+pkg_postinst() {
+	if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ]
+	then
+		killall -15 udevd &>/dev/null
+		sleep 1
+		killall -9 udevd &>/dev/null
+	fi
+	/sbin/udevd --daemon
+
+	# people want reminders, I'll give them reminders.  Odds are they will
+	# just ignore them anyway...
+	if has_version '<sys-fs/udev-046' ; then
+		ewarn "Note: If you rely on the output of udevinfo for anything, please"
+		ewarn "      either run 'udevstart' now, or reboot, in order to get a"
+		ewarn "      up-to-date udev database."
+		ewarn
+	fi
+	if has_version '<sys-fs/udev-050' ; then
+		ewarn "Note: If you had written some custom permissions rules, please"
+		ewarn "      realize that the permission rules are now part of the main"
+		ewarn "      udev rules files and are not stand-alone anymore.  This means"
+		ewarn "      you need to rewrite them."
+		ewarn
+	fi
+	if has_version '<sys-fs/udev-059' ; then
+		ewarn "Note: If you are upgrading from a version of udev prior to 059"
+		ewarn "      and you have written custom rules, and rely on the etc/dev.d/"
+		ewarn "      functionality, or the etc/hotplug.d functionality, or just"
+		ewarn "      want to write some very cool and power udev rules, please "
+		ewarn "      read the RELEASE-NOTES file for details on what has changed"
+		ewarn "      with this feature, and how to change your rules to work properly."
+		ewarn
+	elif has_version '<sys-fs/udev-057' ; then
+		ewarn "Note: If you have written custom rules, and rely on the etc/dev.d/"
+		ewarn "      functionality, please read the RELEASE-NOTES file for details"
+		ewarn "      on what has changed with this feature, and how to change your"
+		ewarn "      rules to work properly."
+		ewarn
+	fi
+	if has_version '<sys-fs/udev-063' ; then
+		ewarn "Note: If you use the devfs-style names for your block devices"
+		ewarn "      or use devfs-style names in /etc/inittab or /etc/securetty or"
+		ewarn "      your GRUB or LILO kernel boot command line, you need to"
+		ewarn "      change them back to LSB compliant names, as the devfs names are"
+		ewarn "      now gone.  If you wish to use some persistent names for your"
+		ewarn "      block devices, look at the symlinks in /dev/disk/ for the names"
+		ewarn "      you can use."
+		ewarn
+	fi
+
+	einfo
+	einfo "For more information on udev on Gentoo, writing udev rules, and"
+	einfo "         fixing known issues visit:"
+	einfo "         http://www.gentoo.org/doc/en/udev-guide.xml"
+}