Need s/vboxadd/vboxguest/ in the init script for version 3.1.4 and later (Bug #305583)

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

7 files changed, 101 insertions, 25 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index c92282763475..ff525585eae8 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-emulation/virtualbox-guest-additions
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.37 2010/05/11 05:39:44 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.38 2010/05/11 18:52:37 lack Exp $
+
+*virtualbox-guest-additions-3.1.8-r1 (11 May 2010)
+
+  11 May 2010; Jim Ramsay <lack@gentoo.org>
+  virtualbox-guest-additions-3.1.4.ebuild,
+  virtualbox-guest-additions-3.1.6.ebuild,
+  -virtualbox-guest-additions-3.1.8.ebuild,
+  +virtualbox-guest-additions-3.1.8-r1.ebuild,
+  -files/virtualbox-guest-additions-4.initd,
+  +files/virtualbox-guest-additions-5.initd,
+  +files/virtualbox-guest-additions-6.initd:
+  Need s/vboxadd/vboxguest/ in the init script for version 3.1.4 and later
+  (Bug #305583)
 
   11 May 2010; Lars Wendler <polynomial-c@gentoo.org>
   virtualbox-guest-additions-3.1.8.ebuild,
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index d407124b5991..5edd8a685934 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,7 +1,8 @@
 AUX virtualbox-guest-additions-2-localconfig 877 RMD160 7a09c0e50c1294c289cfd0665dc29986e55f2f7c SHA1 186a04d197c4f1a22376f767b4804cb05a8c811a SHA256 0115ff252376fa9c1244f79f183041a8e1b078f64d8bea2126d344e8b21a7b84
 AUX virtualbox-guest-additions-3-localconfig 877 RMD160 7a09c0e50c1294c289cfd0665dc29986e55f2f7c SHA1 186a04d197c4f1a22376f767b4804cb05a8c811a SHA256 0115ff252376fa9c1244f79f183041a8e1b078f64d8bea2126d344e8b21a7b84
 AUX virtualbox-guest-additions-3.initd 1454 RMD160 617d486535efccfd2cf013ffeb7c2ae9c211a533 SHA1 942b81b99d33e85d7dc6564f0449608620cd5d50 SHA256 d87d8386fbed5c17c4919368d59540ce527bcca7d539fb88927e3b4a849ad9ae
-AUX virtualbox-guest-additions-4.initd 1452 RMD160 09a233e65ecb5cb960cbb477e24433efce3416b5 SHA1 027967966f0b9ea05433bc5d6d60edafefad9fc8 SHA256 89c903600134d0ad59ac4f5b2d117dd0d5fed2b73ff5c78601f11a293d9519d4
+AUX virtualbox-guest-additions-5.initd 1484 RMD160 aeca98255287c1e4000887d288fef9fa1f9ff2e9 SHA1 2ea17f3442c2a6049fbbe50a93af6ae436114ed7 SHA256 1e6df134835645478f8f46bb3cde5543ba8570d46bb6e2355f799bd6cc45b2ac
+AUX virtualbox-guest-additions-6.initd 1482 RMD160 822843f6258a3fec4e8cb8dc7873d1cbb3172757 SHA1 d53a9a59d95cee81d696e6ce5826086742ed2e29 SHA256 9386ff9452a09d1d085ae2d9eaf79af2e8e9b1d12da530140fb87a28f0e6b116
 AUX virtualbox-guest-additions.initd 1463 RMD160 4daceefa3e10659381f4b714512548944c7f54fd SHA1 f5290150bbf99feac5c6d81c4f82f9191e5f1786 SHA256 933dbdc5e5363dfbdc2d51deed0726ab91f1ea89e330298266b9ffb03c38989a
 DIST VirtualBox-3.0.12-OSE.tar.bz2 52075946 RMD160 4c19f2b945f7288235c8becfc0d1931ddf1bc94e SHA1 7ac46be39db4e51ea38cb6a857d2da544b7a820f SHA256 3c88b6ad1fa5739440485ad8cfd9754dbd17dc23df09a7dcc47b2e91635182b2
 DIST VirtualBox-3.1.0-OSE.tar.bz2 55491869 RMD160 7e3600ca1320af601d01d24f0a4e78ef04c89aac SHA1 fb7c97d692fc8e9973578ef44a848a5988694606 SHA256 da8affc44342d3988c96ad2d98c248b99f481ecd001af1557aeb31cd15e10639
@@ -12,8 +13,8 @@ DIST VirtualBox-3.1.8-OSE.tar.bz2 56291753 RMD160 45aa637d1e008248bd9061e9824b9c
 EBUILD virtualbox-guest-additions-3.0.12.ebuild 4203 RMD160 220f120b9491918acc465e6949af44281df8eeeb SHA1 f457f354fd4fe30a6238c01a59c42127f1fbde4a SHA256 1d59c89a053ba58b8193c2bfeafacabe6ff99e2f9017bd55f0c39fdddf55c5e6
 EBUILD virtualbox-guest-additions-3.1.0.ebuild 4269 RMD160 507f8f7a3eaea71c56f0402e71e5ac03ecc92dff SHA1 de27de651887f87f9340e43b6a9dfe72d7a2d232 SHA256 e633a13909871292a65c87ee0b8a7d1740489db3b95f675f0db3df5f60619c71
 EBUILD virtualbox-guest-additions-3.1.2.ebuild 4268 RMD160 c5b284478a9f3f0b929cd944193490899ef5c7d5 SHA1 79517951b8793d982bc602bf6332fe453b467e3f SHA256 14f33922fa1939da44023646cebbabdb3eae39a1ee5fa0600e04a3ed0763ebf1
-EBUILD virtualbox-guest-additions-3.1.4.ebuild 4268 RMD160 90a68252721e1a2aa5e8221ff7612a47e7e68a87 SHA1 c97f6b4b161bc2aa0e0125eaa32f870e855fed7c SHA256 92de42847ec6946705ca09ab259c88fcc4d6e572a25aab102efee35d78558f9a
-EBUILD virtualbox-guest-additions-3.1.6.ebuild 4268 RMD160 ccaa4e4bcb267970dc25edc7ec74e24a6083706a SHA1 60ada0dac66bc3f0082a10a0f72f6eff35eef2bd SHA256 19d02d4168baf4d1fb8d30cc6e1332dcccb4a87f1f10b15ea966695eccc9bf1c
-EBUILD virtualbox-guest-additions-3.1.8.ebuild 4204 RMD160 dcfeebee312b99f750c8a92739a099b10fc590f2 SHA1 6e149eb79d62d096bedcfc4b9916f2c567752a5d SHA256 fa107fe50af8cdb77ac9688a70aac837655a99b76508cb2753e6475951c6ae7e
-MISC ChangeLog 13236 RMD160 b90915b82f85a1ac9ab6b3699fb457e967db134b SHA1 341fc86ee664eb62f2afa2717bba6f9bdbbcc52f SHA256 546e23d31012be8336d1889aeeabc7504c4ece5f263c9883d83431a3982e9ecf
+EBUILD virtualbox-guest-additions-3.1.4.ebuild 4267 RMD160 a5a58dc6dd77283dc52c4ecc8172c5319e9be26d SHA1 51c906831f95df5036c74fae02f22712fdf49b7d SHA256 61df982fac8a6a8b4a280e8e537125ec6714477bcca0dff4f2f1e7168a90a5d8
+EBUILD virtualbox-guest-additions-3.1.6.ebuild 4267 RMD160 d29b4ff2f525a1eea138200ffbbc1bc475a90579 SHA1 3d24ab232a5611912dcf5c20225348ddb984c300 SHA256 096ca5370faac47319b2d324961edf9ab41747e092210a95f6f13e07bd0c80c1
+EBUILD virtualbox-guest-additions-3.1.8-r1.ebuild 4199 RMD160 e0c91f5a49fe22c7a62b241ebf2019f655e36acb SHA1 8baf426ed8f18831847b58c59abe9f97c080dd1c SHA256 aea9cead0a0072aa91e4d786b3ed8d38d1104b6e055a3b2755c978d0d89f5800
+MISC ChangeLog 13728 RMD160 00b0e595c8c3451bb552c2bbe4c163f53985cdce SHA1 68b81d127f58730fbcba0746e11f58d6d08ee022 SHA256 66e98e37ce2c5c782d006dd063d464fc97c475498eff1f17886fb528600cfc32
 MISC metadata.xml 353 RMD160 0fd52505150025043cf0f6d53b54736082f266bb SHA1 60aa8776951b13cd71fde130db73849977b4c48f SHA256 c8c97cdc3c8878c361444f278d234b1ad6fe9db06d8c4d4d9bcee711a2f6369d
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-5.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-5.initd
new file mode 100644
index 000000000000..732aacac7b67
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-5.initd
@@ -0,0 +1,62 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:
+
+depend() {
+        need localmount
+	before xdm
+}
+
+createvboxdevice() {
+		local maj min
+
+		maj=`sed -n 's;\([0-9]\+\) vboxguest;\1;p' /proc/devices`
+
+		if ! [[ -z $maj ]] ; then
+			min=0
+		else
+			min=`sed -n 's;\([0-9]\+\) vboxguest;\1;p' /proc/misc`
+			if ! [[ -z $min ]] ; then
+				maj=10
+			fi
+		fi
+
+		mknod /dev/vboxguest c $maj $min -m 0664 &> /dev/null
+}
+
+start() {
+	ebegin "Starting VirtualBox guest additions"
+
+	if [[ -e /dev/vboxguest ]] ; then
+		rm -f /dev/vboxguest &> /dev/null
+	fi
+
+	einfo "	Loading kernel modules and creating devices"
+	/sbin/modprobe vboxguest &> /dev/null
+	createvboxdevice
+	/sbin/modprobe vboxvfs &> /dev/null
+
+	einfo "	Starting the vboxguest system service"
+        start-stop-daemon --start --make-pidfile \
+		--exec /usr/sbin/vboxguest-service --pidfile /var/run/vboxguest-service.pid \
+		--name vboxguest-service \
+		--background -- \
+		--foreground
+
+        eend $? "Failed to start VirtualBox guest additions"
+}
+
+stop() {
+        ebegin "Stopping VirtualBox guest additions"
+
+	einfo "	Stopping the vboxguest system service"
+	start-stop-daemon --stop --quiet \
+		--pidfile /var/run/vboxguest-service.pid --name vboxguest-service
+
+	einfo " Unloading kernel modules and removing devices"
+	/sbin/rmmod vboxvfs &> /dev/null
+	/sbin/rmmod vboxguest &> /dev/null
+	rm -f /dev/vboxguest &> /dev/null
+        eend $?
+}
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-4.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-6.initd
index be00ba264b12..aeb4acb7490d 100644
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-4.initd
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-6.initd
@@ -11,36 +11,36 @@ depend() {
 createvboxdevice() {
 		local maj min
 
-		maj=`sed -n 's;\([0-9]\+\) vboxadd;\1;p' /proc/devices`
+		maj=`sed -n 's;\([0-9]\+\) vboxguest;\1;p' /proc/devices`
 
 		if ! [[ -z $maj ]] ; then
 			min=0
 		else
-			min=`sed -n 's;\([0-9]\+\) vboxadd;\1;p' /proc/misc`
+			min=`sed -n 's;\([0-9]\+\) vboxguest;\1;p' /proc/misc`
 			if ! [[ -z $min ]] ; then
 				maj=10
 			fi
 		fi
 
-		mknod /dev/vboxadd c $maj $min -m 0664 &> /dev/null
+		mknod /dev/vboxguest c $maj $min -m 0664 &> /dev/null
 }
 
 start() {
 	ebegin "Starting VirtualBox guest additions"
 
-	if [[ -e /dev/vboxadd ]] ; then
-		rm -f /dev/vboxadd &> /dev/null
+	if [[ -e /dev/vboxguest ]] ; then
+		rm -f /dev/vboxguest &> /dev/null
 	fi
 
 	einfo "	Loading kernel modules and creating devices"
-	/sbin/modprobe vboxadd &> /dev/null
+	/sbin/modprobe vboxguest &> /dev/null
 	createvboxdevice
 	/sbin/modprobe vboxsf &> /dev/null
 
-	einfo "	Starting the vboxadd system service"
+	einfo "	Starting the vboxguest system service"
         start-stop-daemon --start --make-pidfile \
-		--exec /usr/sbin/vboxadd-service --pidfile /var/run/vboxadd-service.pid \
-		--name vboxadd-service \
+		--exec /usr/sbin/vboxguest-service --pidfile /var/run/vboxguest-service.pid \
+		--name vboxguest-service \
 		--background -- \
 		--foreground
 
@@ -50,13 +50,13 @@ start() {
 stop() {
         ebegin "Stopping VirtualBox guest additions"
 
-	einfo "	Stopping the vboxadd system service"
+	einfo "	Stopping the vboxguest system service"
 	start-stop-daemon --stop --quiet \
-		--pidfile /var/run/vboxadd-service.pid --name vboxadd-service
+		--pidfile /var/run/vboxguest-service.pid --name vboxguest-service
 
 	einfo " Unloading kernel modules and removing devices"
 	/sbin/rmmod vboxsf &> /dev/null
-	/sbin/rmmod vboxadd &> /dev/null
-	rm -f /dev/vboxadd &> /dev/null
+	/sbin/rmmod vboxguest &> /dev/null
+	rm -f /dev/vboxguest &> /dev/null
         eend $?
 }
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.4.ebuild
index 44e5bec7ff5d..652f7bf52bab 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.4.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.4.ebuild,v 1.2 2010/05/01 14:04:21 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.4.ebuild,v 1.3 2010/05/11 18:52:37 lack Exp $
 
 inherit eutils linux-mod
 
@@ -102,7 +102,7 @@ src_install() {
 		newins mount.vboxsf mount.vboxsf
 		fperms 4755 /sbin/mount.vboxsf
 
-		newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
+		newinitd "${FILESDIR}"/${PN}-5.initd ${PN}
 
 		insinto /usr/sbin/
 		newins VBoxService vboxguest-service
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.6.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.6.ebuild
index fe594d0870fd..be2229f7ee0a 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.6.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.6.ebuild,v 1.2 2010/05/01 14:04:21 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.6.ebuild,v 1.3 2010/05/11 18:52:37 lack Exp $
 
 inherit eutils linux-mod
 
@@ -102,7 +102,7 @@ src_install() {
 		newins mount.vboxsf mount.vboxsf
 		fperms 4755 /sbin/mount.vboxsf
 
-		newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
+		newinitd "${FILESDIR}"/${PN}-5.initd ${PN}
 
 		insinto /usr/sbin/
 		newins VBoxService vboxguest-service
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r1.ebuild
index 82dbbf527b69..b78a3c784791 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8.ebuild,v 1.2 2010/05/11 05:39:44 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r1.ebuild,v 1.1 2010/05/11 18:52:37 lack Exp $
 
 inherit eutils linux-mod
 
@@ -102,7 +102,7 @@ src_install() {
 		newins mount.vboxsf mount.vboxsf
 		fperms 4755 /sbin/mount.vboxsf
 
-		newinitd "${FILESDIR}"/${PN}-4.initd ${PN}
+		newinitd "${FILESDIR}"/${PN}-6.initd ${PN}
 
 		insinto /usr/sbin/
 		newins VBoxService vboxguest-service