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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index eaf9410b37b474e7467fcec8eab48cfd6911fd58..0284d2feacc13af00e6a98b6df9fc78421a966b2 100644 (file)
--- 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/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 2de375388a84d6d574a55bbf4cbe0f0328dda213..7309d9a9a8d82769af85f6beedea00d164717b23 100644 (file)
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,8 +1,7 @@
 AUX vboxclient.desktop 145 RMD160 2a337f588cd85da4edb74c2e2333d1be1018ca9d SHA1 8e634ef77d287cdbc116f14fa6e147d83559f263 SHA256 0e310fbb8defee6842f5fc9d2cf124a4ca7a0d1121074cf1aa2e1bea5900f905
+AUX vboxguest-log-use-c99.patch 562 RMD160 7973598545c9f801120ff87691fb6d068466942a SHA1 7a6e096cf1c1bfb5a878f31171948efebc41e0a9 SHA256 76e830ce0aae1b9afe84516907e5668c6012aea25377bda4c2de1967857b1c82
 AUX virtualbox-guest-additions-3-localconfig 937 RMD160 018d9cab7ddc9dc4cb300d2a518ce0ef827a45e8 SHA1 8680e37b364c99bac1375a1b8b7034ade87b70ee SHA256 477e3d4556a2b12c3c6125c4fecc63092b1f7879756941e53832d04a7c1eb682
 AUX virtualbox-guest-additions-3.initd 1454 RMD160 617d486535efccfd2cf013ffeb7c2ae9c211a533 SHA1 942b81b99d33e85d7dc6564f0449608620cd5d50 SHA256 d87d8386fbed5c17c4919368d59540ce527bcca7d539fb88927e3b4a849ad9ae
-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-7.initd 980 RMD160 326e8a115b6ab8c72dad391f65980bc3207b2274 SHA1 31f343280ef2da8e269e25936d99b92d487a3f56 SHA256 af61d1fe7c4e7c7d49e235406f9b69661eb229a96f3156443872884860becd69
 AUX xorg.conf.vbox 407 RMD160 53dcfdd2b0ff8930d23f30b7f5cf4d525806eef6 SHA1 73024a87ead01a21abdb05c94144af9eec0e3448 SHA256 34bb64aa6702811acf82304c35ff92b029067115563d3d6c78e65a846f2dd686
 DIST VirtualBox-3.0.12-OSE.tar.bz2 52075946 RMD160 4c19f2b945f7288235c8becfc0d1931ddf1bc94e SHA1 7ac46be39db4e51ea38cb6a857d2da544b7a820f SHA256 3c88b6ad1fa5739440485ad8cfd9754dbd17dc23df09a7dcc47b2e91635182b2
@@ -10,8 +9,8 @@ DIST VirtualBox-3.1.8-OSE.tar.bz2 56291753 RMD160 45aa637d1e008248bd9061e9824b9c
 DIST VirtualBox-3.2.2-OSE.tar.bz2 57639895 RMD160 d1fa4256571fa9b5ad663916f9fe5058f1b4388b SHA1 c6af6c2b4a50c9a2010317436cd8cd76383518f4 SHA256 e3d26ce4cffef5aa26aef7d387015f6636d03cd8f9d38f6ac1a55e40210c9df2
 DIST VirtualBox-3.2.4-OSE.tar.bz2 57492454 RMD160 489210351fe67bd6bddfaef0ee99110ee96786fc SHA1 767dc567ac98fde6d5e436afb10a181c75a5e8af SHA256 49e69fd357a80d2537a8139f970a23af9aa5e2f6c3179eefca69d1a75e1fb25c
 EBUILD virtualbox-guest-additions-3.0.12.ebuild 4203 RMD160 220f120b9491918acc465e6949af44281df8eeeb SHA1 f457f354fd4fe30a6238c01a59c42127f1fbde4a SHA256 1d59c89a053ba58b8193c2bfeafacabe6ff99e2f9017bd55f0c39fdddf55c5e6
-EBUILD virtualbox-guest-additions-3.1.8-r2.ebuild 4871 RMD160 279c4ced84963d7c663bb9dc256136dce39928ce SHA1 2b88a6a01d7595dd77867de52d14439da867cd61 SHA256 9ce60e2fe38664f92008b3fd27c24fcccc02c5c83b135ab3fa5db68aeaa4fc27
-EBUILD virtualbox-guest-additions-3.2.2.ebuild 5283 RMD160 60ec9fe3961591cb6c1c9e1e33e69b1bb60ad528 SHA1 b8c528d0117a4696393339f028780b38dfcf482e SHA256 5501596538c0269b7868a4f4b9f9b9fb439dea10fc498a19ee5807f218bccb9c
-EBUILD virtualbox-guest-additions-3.2.4.ebuild 5283 RMD160 56394960c5d9775477334769111e28c1f40730ea SHA1 8435cbe2cd713f714bb2b202b2dc1050cc9fffdf SHA256 fd16a8b8f314efa3ba02561ef43572da72686b59699b67965c0e40c6e1427fcc
-MISC ChangeLog 15249 RMD160 b40954f1ca7e64b5d9d8fbf2d2b02f2e7a1e9493 SHA1 1463ac885e2243c32b1a8efc1441278c22b97815 SHA256 d6bad3c59a5664582f4933a8fcfaca79734042328b8d9d1787dda04c20dae76d
+EBUILD virtualbox-guest-additions-3.1.8-r2.ebuild 4955 RMD160 1821c572624db6c435a5f11d2b6f651793ed28cf SHA1 5872119a11acf7b96acd2db80191676d0bb116c9 SHA256 bb90c878e1a6f415f658d3f369cf527efa7d21111045c51803e83594f0c97252
+EBUILD virtualbox-guest-additions-3.2.2.ebuild 5367 RMD160 01c78646fccdfdcf0d7e39dede09232dc9e4652e SHA1 c240e5697281a280cd3b153809de8341de4b4f97 SHA256 5e8354a0b2a3cb8b6773b51bc9f9bffe16d88638b7613ac93814d9086e8353c0
+EBUILD virtualbox-guest-additions-3.2.4.ebuild 5367 RMD160 4961ffb3624966893565a0dc423bcf1a5e6b9248 SHA1 ea2d0384c25cb000f60689f54819f186c7518cd5 SHA256 2b0e585907675b29947cc226f033399e16f742397d77b6e2b1ce7b1cff5d1e07
+MISC ChangeLog 15631 RMD160 cc37a801eeaa15f4eebd4434dcd09d33a76d0ffa SHA1 50e4f914ba8c707bf311fd3060b7b4e13641b05d SHA256 9d736754c35595d925646d53086004e27319b2bc036e3a55f6314468dbf6bfea
 MISC metadata.xml 457 RMD160 12d3d923e95f66b27bd9456b76319b9a6d8ae815 SHA1 54139c285252e9229298cf32d0716062cde5f0de SHA256 1fbd88d74325c1c6c63512eb9b7185797d6b9992b8c4f809d51897252729eccf

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 (file)
index 0000000..7834340
--- /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 (file)
index 732aaca..0000000
--- 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 (file)
index aeb4acb..0000000
--- 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 56bdf74dd977aa3952a67e0817c621f108246b70..6b9308a278d817ed4bbe026350d1145436dfc25c 100644 (file)
--- 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 612a880517658ed3f1f6621ab24c373b1e376fa3..36e5a6a4caf447f758411ebac6f0840695082c23 100644 (file)
--- 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 3206f505ec5ed748b7ada6157b27e06e62a7ea4c..0d9f26d64b1ee04c1294946e7186acea8b3f8b3c 100644 (file)
--- 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