Added a patch from PaX Team (bug #298988). Removed unused files.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

7 files changed, 38 insertions, 128 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index eaf9410b37b4..0284d2feacc1 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,15 @@
 # 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.44 2010/06/08 15:38:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.45 2010/06/08 17:52:54 polynomial-c Exp $
+
+  08 Jun 2010; Lars Wendler <polynomial-c@gentoo.org>
+  +files/vboxguest-log-use-c99.patch,
+  virtualbox-guest-additions-3.1.8-r2.ebuild,
+  virtualbox-guest-additions-3.2.2.ebuild,
+  virtualbox-guest-additions-3.2.4.ebuild,
+  -files/virtualbox-guest-additions-5.initd,
+  -files/virtualbox-guest-additions-6.initd:
+  Added a patch from PaX Team (bug #298988). Removed unused files.
 
   08 Jun 2010; Lars Wendler <polynomial-c@gentoo.org>
   virtualbox-guest-additions-3.1.8-r2.ebuild,
diff --git a/app-emulation/virtualbox-guest-additions/files/vboxguest-log-use-c99.patch b/app-emulation/virtualbox-guest-additions/files/vboxguest-log-use-c99.patch
new file mode 100644
index 000000000000..7834340910e1
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/files/vboxguest-log-use-c99.patch
@@ -0,0 +1,16 @@
+# https://bugs.gentoo.org/298988
+
+--- vboxguest/Makefile
++++ vboxguest/Makefile
+@@ -220,9 +220,9 @@ KFLAGS   := -D__KERNEL__ -DMODULE \
+ 	-DVBOX -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_GUEST -DIN_GUEST_R0 \
+ 	-DIN_MODULE -DRT_WITH_VBOX -DVBGL_VBOXGUEST -DVBOX_WITH_HGCM
+ ifeq ($(BUILD_TARGET_ARCH),amd64)
+- KFLAGS  += -DRT_ARCH_AMD64 -DVBOX_WITH_64_BITS_GUESTS
++ KFLAGS  += -DRT_ARCH_AMD64 -DVBOX_WITH_64_BITS_GUESTS -DLOG_USE_C99
+ else
+- KFLAGS  += -DRT_ARCH_X86
++ KFLAGS  += -DRT_ARCH_X86 -DLOG_USE_C99
+ endif
+ ifeq ($(BUILD_TYPE),debug)
+ KFLAGS   += -DDEBUG
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
deleted file mode 100644
index 732aacac7b67..000000000000
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-5.initd
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/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-6.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-6.initd
deleted file mode 100644
index aeb4acb7490d..000000000000
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-6.initd
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/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 vboxsf &> /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 vboxsf &> /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.8-r2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r2.ebuild
index 56bdf74dd977..6b9308a278d8 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r2.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r2.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-r2.ebuild,v 1.2 2010/06/08 15:38:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r2.ebuild,v 1.3 2010/06/08 17:52:54 polynomial-c Exp $
 
 inherit eutils linux-mod
 
@@ -58,6 +58,9 @@ src_unpack() {
 		"${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
 		unpack ./vbox-kmod.tar.gz
 
+		# PaX fixes (see bug #298988)
+		epatch "${FILESDIR}"/vboxguest-log-use-c99.patch
+
 		# Remove shipped binaries (kBuild,yasm), see bug #232775
 		cd "${S}"
 		rm -rf kBuild/bin tools
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.2.ebuild
index 612a88051765..36e5a6a4caf4 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.2.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.2.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.2.2.ebuild,v 1.2 2010/06/08 15:38:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.2.ebuild,v 1.3 2010/06/08 17:52:54 polynomial-c Exp $
 
 inherit eutils linux-mod
 
@@ -58,6 +58,9 @@ src_unpack() {
 		"${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
 		unpack ./vbox-kmod.tar.gz
 
+		# PaX fixes (see bug #298988)
+		epatch "${FILESDIR}"/vboxguest-log-use-c99.patch
+
 		# Remove shipped binaries (kBuild,yasm), see bug #232775
 		cd "${S}"
 		rm -rf kBuild/bin tools
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.4.ebuild
index 3206f505ec5e..0d9f26d64b1e 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.4.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.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.2.4.ebuild,v 1.2 2010/06/08 15:38:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.4.ebuild,v 1.3 2010/06/08 17:52:54 polynomial-c Exp $
 
 inherit eutils linux-mod
 
@@ -58,6 +58,9 @@ src_unpack() {
 		"${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
 		unpack ./vbox-kmod.tar.gz
 
+		# PaX fixes (see bug #298988)
+		epatch "${FILESDIR}"/vboxguest-log-use-c99.patch
+
 		# Remove shipped binaries (kBuild,yasm), see bug #232775
 		cd "${S}"
 		rm -rf kBuild/bin tools