Fixed udev rules to look in /lib/udev for VBoxCreateUSBNode.sh (bug #373515)

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

5 files changed, 35 insertions, 25 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index c5153bbf0ae4..a8a86e78b30c 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.109 2011/06/28 20:43:04 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.110 2011/06/30 04:11:55 polynomial-c Exp $
+
+*virtualbox-bin-4.0.10-r1 (30 Jun 2011)
+
+  30 Jun 2011; Lars Wendler <polynomial-c@gentoo.org>
+  files/10-virtualbox.rules, virtualbox-bin-4.0.8.ebuild,
+  -virtualbox-bin-4.0.10.ebuild, +virtualbox-bin-4.0.10-r1.ebuild:
+  Fixed udev rules to look in /lib/udev for VBoxCreateUSBNode.sh. Thanks to
+  Nikolaos Chatzidakis for reporting this in bug #373515.
 
 *virtualbox-bin-4.0.10 (28 Jun 2011)
 
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index f8d0e7011df2..6f0996202f00 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX 10-virtualbox.rules 600 RMD160 da5c50cfddab6242320efa610204c7dfb4681563 SHA1 1cfccad8dad8b466e86212751f98c7c57e0c3ea7 SHA256 e3dd7974f15b596449d8189be0456fbb1fe9b92d05407f3044a9cf6bf15ced3f
+AUX 10-virtualbox.rules 576 RMD160 3dddd2ffa03bc214fea9d2e8b3363399ffd898e5 SHA1 6840d9e79790d01621ba79e00228071eda98355d SHA256 9fe8aaa16b42e6730a2ebd6cf0fbc9ad0db0f45e06e554cc4ae06b4dfc0045e1
 AUX vboxwebsrv-confd 620 RMD160 7a4ecbd895da0d5851f1a3afda54b3e2bb4012e1 SHA1 651f7b2588a16317f59d692e087b347aadd20aab SHA256 5ea07fcb6e5253cd013bb0277603cba17ca45d96044740172987c0b452f4324a
 AUX vboxwebsrv-initd 748 RMD160 0931bac34b942cb13cb3cf781308744e9d4892c3 SHA1 07ad3a1c29c9c537cfc1beef19b402af1888dabd SHA256 ce8bfaeb459d9d71684319140bc39dbf3e992de6ba1ab5256fcfafa6178bf76e
 AUX virtualbox-bin-3-wrapper 2931 RMD160 c73f7fca4531dc8023484b860c81c0a5805f022c SHA1 1d51680f1dc67394b0bf2c0533305e54c68ef177 SHA256 7ed4834ece201cb6a9da57e36a1a9b47bd054057d2ac4a46343a9966ff460644
@@ -19,24 +19,24 @@ DIST VirtualBoxSDK-3.2.12-68302.zip 9070046 RMD160 92fdbb561602c31d19955228d3d6c
 DIST VirtualBoxSDK-4.0.10-72479.zip 6495746 RMD160 6d5c3d0608628a62cd45dbd5ae74f7b3e63bcdd6 SHA1 0cf113a21c67c9284c62a23ebb9ed7c3b072fd1b SHA256 03f31cd9373ca4f31320097eec3ef6bbae988b1fd97ff5c06b161258a2c197e9
 DIST VirtualBoxSDK-4.0.8-71778.zip 6493963 RMD160 2933464a93417dfe6dfb6b937b5882769675a52a SHA1 76b6d88d0a35589d13d17988d2b8d8e5d774d0da SHA256 e797b5b2387c92719374637f4aa3e7eaf8eaf588b2468084343eb67b03e804fe
 EBUILD virtualbox-bin-3.2.12-r1.ebuild 9062 RMD160 b8cb94c664993bbd67fe76a0272fbd283bb7fa84 SHA1 3d2e3bc1f96ecd8fc0b19d0fbd09d47adb22995a SHA256 37b5b5b376c245a54a58367fc2be43cbb2dc5f1dd1356979add374113177c55c
-EBUILD virtualbox-bin-4.0.10.ebuild 10072 RMD160 f8042dc5741c29169df260fdd914d01014a19a9f SHA1 c5d89299ea82c5e61de91a71baed76daf762d60e SHA256 f726d77fecf77dcb39148c881dfeb3929a642d999ae61fb4f1641a182c1a93eb
-EBUILD virtualbox-bin-4.0.8.ebuild 9938 RMD160 25a1c31e7e3a96077a2d78a8f1bb55fe0a6becaa SHA1 df2b46698bb16c5cf440286607759ea189db1373 SHA256 305643d216bf12d194c9f7d76f72407759d82b2a60576bf430551696b56b8b96
-MISC ChangeLog 22130 RMD160 f43426df8c7956fe1428e4a0f79397be9d939bd4 SHA1 46607dc2e42778ceb8dc3b21773f05e12bdbaa6b SHA256 ac13c49b604c91472b5382a9bc3ba27e3bfa587738b1bce6be466ba1b22249aa
+EBUILD virtualbox-bin-4.0.10-r1.ebuild 10075 RMD160 c0001927104f833e60b68b842d6bd135faf47ada SHA1 6f9614d768e5c142baa15d78691b65c9b974861b SHA256 b07219b1f8b3057db16b5a90afcd2f27044bfd0793926aefcb844dd5dfdcd983
+EBUILD virtualbox-bin-4.0.8.ebuild 10045 RMD160 e9ab6f23f1b667586ed94eb530b320d3cd614479 SHA1 06fe638d3dd7ce86993049259957c058e06ff76d SHA256 6fe7a9c0b4e3f89cc60c0eb40ac198c1e1d21ec95d653d050ba6e1552f76d364
+MISC ChangeLog 22485 RMD160 9752d7c27a2e74ea4b3869351406801545db108a SHA1 cebf6c47660c62a2ed1ae6e2d298008891b29154 SHA256 7ffb9a9d8f286cb0204a58cb199e497cc0cb116766b7db9bd9e79f6b6078b49c
 MISC metadata.xml 776 RMD160 53115ae984c83c47fc86bc833eb7c9f7d8427cc3 SHA1 75fa6689975d96f294bc52f989e4838704c8c651 SHA256 fecaf0e98bd60995cb85c59300255fbe7732a4c7c6e5315ae554204d3c324d82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOCjzeAAoJEPiazRVxLXTFdy4P/0cKWU1Rlhc09ZyOSdf8lTBR
-b5tyzeewWIGGJzhUerUq4EaIRw+CsbimY9ePTptbe5/AJ0+vnJyuA7f4NBSEwUn6
-0hGI5xD8zVB5gcWc7Ik4KaegvSeWAmA+jDnVTy+SGJB8d6WW/bPdGyAVn8yDHyam
-D8jVfRd8WcZ+4UodIGl39rhUVtm86WQ+/x/LyHX92qty/Ky6ZyiMzFlaZnNIObW0
-kZ2Q9TgGCSZe+U2FBOIkLUtR1ADfKWumDJgLCsT3u1uRmfUX99F9lgNaGjw6dYfo
-W/0LUsaRPSsqsdGV7LgI9S2GmXdIvMqQM1zlbTPxtQsxohy0lWZcHWmQJmHOSvWZ
-5GQI+Ay5wYleRgcMQKdgjYlrCaGCXGUkyTZCWxJi5rlJLMGN82b+mFgMIn9LJ6Qm
-WsgxKuUieR+SihulKzkg2LyXavldGUJDlUl/K+7YkiaCyI11Mkie5T0mRSxlV7WK
-f83EDdvt/S84uVKDlYhSSLaYCq+I0EV7+/dEeQwD9w8TY97O4X9dfmVjq7/02MFj
-/ry2E4m6LewIoS089HyItwyb8gOyrKl00jvyEa9sDQ07IuVrhsLYDf/ePyNCif30
-x5Euoa031Qyz6oC+Yg4vAfr2KchonIqb+JgWfQ0MBqYo2z/cRt+lmZU2aS+40wDj
-43YDNgLwDQ2zQORGt2gS
-=aPuK
+iQIcBAEBCgAGBQJOC/eRAAoJEPiazRVxLXTFNY0QAN7yY54R2Nvj3J6eIKHRDR1E
+5jl+vZ16tvLejDBuYCtMvdprsEFnan2aD1fbMqHfd4efLSnTA0KTW5rK9LFTHN+W
+bgtSIiIilJNAJ/vVtZPW0yDMSuA+PL8egs+vd8hHibbaZH9DZLc6mFJk0yXBJzGP
+cJpdlXqVMOUfZOYdO0H95+lxYaPvs6dmvS3zxovcdN/oJuIx0h9U7RBwG+5GuzHD
+ZPMyEdZgn/0SJKtFM+49aS72qz7zGAGLU0QLfY5sJWbgbt99SvrGxPETNcfQBb1M
+guVEE+qHLR3Z/CBe/+aTawbFFhLoLikYIL21PhMf6JXi7WFqA0FW2Ek0UfaN4qag
+AlQocXyyX4NdwQPyOM5SxwGF131hx1OHPaVjDnsQnHww5XjlqcExVNgXc1d9Gk0C
+rlj4wxzbVdiLzHbWqAIfDmWPMNYjEiMgWc14fwrIWfNNkaNSqYBDtp/9szqBZKjJ
+xZSqOcF74VL/EcuqhcbKcKje3S1R1MTGXQALGjy206O3q+RWLIP9dr5XKkGXNimZ
+8fNbpP+kipoJVjrr35oe/2OOY+d/rtik8gWoxOwC3DQ2csfxdBopYju3fs4xrt22
+S+1xJ1U3Q/LW4wwWI147DW/MGx4mU0bAsrRsnqC8XdI+DJu2IT00G0Orpuhrivy2
+pHhuUTri/jtUypaMX9k0
+=0oks
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-bin/files/10-virtualbox.rules b/app-emulation/virtualbox-bin/files/10-virtualbox.rules
index a629704f4d76..8efff249f8fc 100644
--- a/app-emulation/virtualbox-bin/files/10-virtualbox.rules
+++ b/app-emulation/virtualbox-bin/files/10-virtualbox.rules
@@ -1,7 +1,7 @@
 # create second tree of USB devices according to
 # http://www.virtualbox.org/ticket/7759#comment:5
 
-SUBSYSTEM=="usb_device", ACTION!="remove", RUN="/opt/VirtualBox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM=="usb", ACTION!="remove", ENV{DEVTYPE}=="usb_device", RUN="/opt/VirtualBox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/opt/VirtualBox/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/opt/VirtualBox/VBoxCreateUSBNode.sh --remove $major $minor"
+SUBSYSTEM=="usb_device", ACTION!="remove", RUN="/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+SUBSYSTEM=="usb", ACTION!="remove", ENV{DEVTYPE}=="usb_device", RUN="/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor"
+SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor"
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.0.10.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.0.10-r1.ebuild
index 5b14efec35bf..4585f487eda5 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.0.10.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.0.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.0.10.ebuild,v 1.1 2011/06/28 20:43:04 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.0.10-r1.ebuild,v 1.1 2011/06/30 04:11:55 polynomial-c Exp $
 
 EAPI=2
 
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.0.8.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.0.8.ebuild
index 4a70f103ead2..0893ec37d536 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.0.8.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.0.8.ebuild,v 1.1 2011/05/18 21:34:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.0.8.ebuild,v 1.2 2011/06/30 04:11:55 polynomial-c Exp $
 
 EAPI=2
 
@@ -294,7 +294,9 @@ src_install() {
 
 	insinto /lib/udev/rules.d
 	doins "${FILESDIR}"/10-virtualbox.rules
-	fperms 0750 /opt/VirtualBox/VBoxCreateUSBNode.sh
+	# move udev scripts into /lib/udev (bug #372491)
+	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev
+	fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
 }
 
 pkg_postinst() {