bugfix for HAL

4 files changed, 160 insertions, 20 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 7014fd34d33c..fe94c2cec344 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udev
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.67 2004/10/08 00:11:22 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.68 2004/10/10 04:19:46 gregkh Exp $
+
+*udev-034-r1 (09 Oct 2004)
+
+  09 Oct 2004; Greg Kroah-Hartman <gregkh@gentoo.org> +udev-034-r1.ebuild:
+  Fix bug 66634 and 66930 at the same time.
+  (udevinfo and udevtest were getting placed in /bin/ instead of /usr/bin/)
 
 *udev-034 (07 Oct 2004)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 73d994a6d314..8eb3704fbc77 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,19 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 cebda9af01d1d18fc5bd8cb2adce0dd2 ChangeLog 13640
+MD5 64fc4b9c721739ca630358505e3b2aa0 udev-027.ebuild 3516
+MD5 e7e2c251ae7b4a7891650ab843e29d5c ChangeLog 13864
 MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
-MD5 c7a089cfa585cc48d2570f1350c17dc6 udev-024-r1.ebuild 3720
-MD5 54343e889ed8e1685908d27c9633dbb3 udev-025-r1.ebuild 3811
+MD5 43108b1317adc4dabce5dc33766006a3 udev-029.ebuild 3517
 MD5 61627f421ee2c1603a7feda4a6a31787 udev-026-r1.ebuild 3518
-MD5 64fc4b9c721739ca630358505e3b2aa0 udev-027.ebuild 3516
 MD5 1ed5a700a2b2209de427b7449633f330 udev-028.ebuild 3516
-MD5 43108b1317adc4dabce5dc33766006a3 udev-029.ebuild 3517
 MD5 751f5c228c885f44ca1a55e29e274acc udev-030.ebuild 3522
 MD5 23765c0c973e9614c100ecae43f22295 udev-031.ebuild 3617
 MD5 c30b5735565abaafb2229dbee61cca8b udev-032.ebuild 3621
 MD5 43f06a13e6e46c4ca41491ded1369593 udev-033.ebuild 3598
 MD5 fe7b1f0fe65a9241ddab0e48bf107e7f udev-034.ebuild 3588
+MD5 74b74a42a2af9670b8a4feb630374a20 udev-034-r1.ebuild 3590
+MD5 c7a089cfa585cc48d2570f1350c17dc6 udev-024-r1.ebuild 3720
+MD5 54343e889ed8e1685908d27c9633dbb3 udev-025-r1.ebuild 3811
+MD5 3f3fd84a95d1fabbf66be0cba8057a29 files/digest-udev-032 61
 MD5 882b525738c554bce2449356cd1fb9c5 files/digest-udev-024-r1 61
 MD5 63c1b792a1470ccaa74195f5debacd2f files/digest-udev-025-r1 61
 MD5 a691746515d05e3574c0a26b4cc6f0cc files/digest-udev-026-r1 61
@@ -22,9 +21,6 @@ MD5 05b440530066098b69f77ae477fbc74d files/digest-udev-028 61
 MD5 6d7c7441686712fb1845375857306560 files/digest-udev-029 61
 MD5 511c376c4c6346bcbf51531ef811f00c files/digest-udev-030 61
 MD5 cd92c9e177215e4622cfb5b4d4534b72 files/digest-udev-031 61
-MD5 71df3b63d0e1d8e660f4dccd286fe3b4 files/digest-udev-033 61
-MD5 06f3915555a7c2524b0638337cfaccff files/digest-udev-034 61
-MD5 77692161d3e1d624773ff10aec89b318 files/udev.hotplug.empty 106
 MD5 f00e3e0d3382e93cbd0c64fcef99f826 files/udev-021-udev_add_c-gcc295-compat.patch 493
 MD5 233bf645719657d9b8265f34a66d20e2 files/udev.conf 1183
 MD5 bbacca394d27aae427e503317b4bebfe files/udev.conf.post_024 1188
@@ -32,11 +28,7 @@ MD5 f558b841afc8ac6381903fc371331507 files/udev.permissions 3549
 MD5 d8da5df6f7d3c8a80bde23618ae8a797 files/udev.rules 3553
 MD5 6df9e08cd088f74720689640de2ffcd6 files/udev.rules-018 4365
 MD5 7f23fbfcba51c7c4b8c29a8c08429996 files/udev.rules.post_012 4184
-MD5 3f3fd84a95d1fabbf66be0cba8057a29 files/digest-udev-032 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBZfIsHTu7gpaalycRAs5TAKCBCYTupwdcUKvbi3uBxpTYaI5qZgCgtK+m
-xF/tR8k9iK2KCRkshWL320g=
-=o0Nq
------END PGP SIGNATURE-----
+MD5 71df3b63d0e1d8e660f4dccd286fe3b4 files/digest-udev-033 61
+MD5 06f3915555a7c2524b0638337cfaccff files/digest-udev-034 61
+MD5 77692161d3e1d624773ff10aec89b318 files/udev.hotplug.empty 106
+MD5 06f3915555a7c2524b0638337cfaccff files/digest-udev-034-r1 61
diff --git a/sys-fs/udev/files/digest-udev-034-r1 b/sys-fs/udev/files/digest-udev-034-r1
new file mode 100644
index 000000000000..5b70f48d4276
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-034-r1
@@ -0,0 +1 @@
+MD5 38488100701063f8f567644a07fe11c4 udev-034.tar.bz2 371749
diff --git a/sys-fs/udev/udev-034-r1.ebuild b/sys-fs/udev/udev-034-r1.ebuild
new file mode 100644
index 000000000000..16f03cd1f3ae
--- /dev/null
+++ b/sys-fs/udev/udev-034-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-034-r1.ebuild,v 1.1 2004/10/10 04:19:46 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="~arm ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc
+	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"`" != \
+	     "2ad43ee9c7a5a0bec284725755403ee0  -" ]
+	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 extras/volume_id"
+
+	# Do not work with emake
+	make EXTRAS="${extras}" \
+		udevdir="/dev/" \
+		${myconf} || die
+}
+
+src_install() {
+	dobin udevinfo
+	dobin udevtest
+	into /
+	dosbin udev
+	dosbin udevd
+	dosbin udevsend
+	dosbin wait_for_sysfs
+	dosbin extras/scsi_id/scsi_id
+	dosbin extras/volume_id/udev_volume_id
+	dosym /sbin/udev /sbin/udevstart
+
+	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
+
+	# 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
+	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
+	dosym ../../../sbin/wait_for_sysfs /etc/hotplug.d/default/05-wait_for_sysfs.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}
+	newdoc extras/volume_id/README README_volume_id
+}
+
+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 [ -f "${ROOT}/etc/hotplug.d/default/udev.hotplug" ]
+	then
+		rm -f ${ROOT}/etc/hotplug.d/default/udev.hotplug
+	fi
+}
+
+pkg_postinst() {
+	if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ]
+	then
+		killall -15 udevd &>/dev/null
+		sleep 1
+		killall -9 udevd &>/dev/null
+	fi
+}