Fixed compilation with linux kernel >=2.6.33 (bug #373585)

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

3 files changed, 167 insertions, 157 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index 0b874a290245..2867058bf448 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/virtualbox-guest-additions
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.69 2011/06/28 20:50:39 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.70 2011/06/30 15:53:49 polynomial-c Exp $
+
+  30 Jun 2011; Lars Wendler <polynomial-c@gentoo.org>
+  virtualbox-guest-additions-3.2.12.ebuild:
+  Fixed compilation with linux kernel >=2.6.33. Thanks to Jimis Hol for
+  reporting this issue in bug #373585.
 
 *virtualbox-guest-additions-4.0.10 (28 Jun 2011)
 
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 40b003a51212..c4f48c87bf25 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -9,25 +9,25 @@ AUX xorg.conf.vbox 407 RMD160 53dcfdd2b0ff8930d23f30b7f5cf4d525806eef6 SHA1 7302
 DIST VirtualBox-3.2.12-OSE.tar.bz2 58239733 RMD160 9bcb80327655d77cede13b1f76b1fa6c763b1a25 SHA1 73ddd9365588ea56a54ff81117719ac818e842f9 SHA256 064eb382e5b752a3f9189c930734393765125e70b5f99679a63ff4eb6186e261
 DIST VirtualBox-4.0.10.tar.bz2 69567366 RMD160 125aaea11ece10b5270f96795efcbc5190f538bb SHA1 eeb01e1cd814778f35abbd0b39ef725edbffb386 SHA256 47fca441db321f7b9cfad9beb52dbeb9d52f5270e95e26f2c1ece13e100e474c
 DIST VirtualBox-4.0.8.tar.bz2 69593014 RMD160 7224eaca14b0c6a3ca30a4de2ff8058f7211bb0e SHA1 f3c00be5ffa08c364a59d69bbe4d0675bbf53e00 SHA256 48961f0d6fe70c3887cbca5ea987767ac1bafd4b64dd3c4d25445682351e118e
-EBUILD virtualbox-guest-additions-3.2.12.ebuild 5473 RMD160 130209cf18984f33eb27c0d7d4971f29a78c0926 SHA1 6dd996091c47a891fd95c965e9a6e3d7d44174e6 SHA256 bc6c4d391dba66834d1f7eacded935e8b62d4161cab5c04de5d2e2a5fb36d60c
+EBUILD virtualbox-guest-additions-3.2.12.ebuild 5522 RMD160 c02a8f83122b7279aba17d630d4fc7d2cdfed5ea SHA1 27ebb489bfbeba26eea143df124eb2c2d4b0f6dd SHA256 2f5e16ffaaa162982072c5eced9a007c9cea1fa5d965c1b5b34cd10072631f40
 EBUILD virtualbox-guest-additions-4.0.10.ebuild 5556 RMD160 4ce881ea54a935846d06601384bd99422441dae3 SHA1 8d862a396e74afe9351981c244510b9c17d7733c SHA256 8576e8d4e8854facf03d0ff609b58d9bcb90248abc3339c21de1c72890cce6ca
 EBUILD virtualbox-guest-additions-4.0.8.ebuild 5555 RMD160 56179737a48f255880fc07d48b43f0f109dca8e8 SHA1 b74734cb0437518a9e5ef20572b506dce326b2c0 SHA256 46c1fdb71b913f938ca4b6bd61c97811ae8e1534907dd84c6274d2f51ff1349b
-MISC ChangeLog 20542 RMD160 7690dc2d96754e3c31846c9dfb6cb9b40db067c4 SHA1 94ca4841604eaa9ef6ea5be0dd2afde5dc124fd4 SHA256 95b2c857295f911018de3bc2234f77bb045c6b4dcacf45e92372257bf16db679
+MISC ChangeLog 20752 RMD160 05818f88acc714d60f46b7d684c23a3e9045341d SHA1 7517ebd054c02102b4fa6e6d54fa801d2286124d SHA256 52bd5731e69409593210eb7bf183fa76fd68847343a7b0c9b64b7a4b6951843b
 MISC metadata.xml 457 RMD160 12d3d923e95f66b27bd9456b76319b9a6d8ae815 SHA1 54139c285252e9229298cf32d0716062cde5f0de SHA256 1fbd88d74325c1c6c63512eb9b7185797d6b9992b8c4f809d51897252729eccf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOCj6lAAoJEPiazRVxLXTFqJcP/0g0lPrxoTEKnqxbuydlPEWD
-mB9MFFbaTBt1sP3+hRX9I6DiWCy2BXu/79O+qG1H4KLdouEjsVoa9jV0/JIP2AnM
-u6PGF76No7p4LdifU+ximbZnvps+HEM87uICdeJVrfMcIUVYu5Cj921lZRI+JvMC
-+8bmJcK2YXkBUxNAtTujQbYjagyeWKsXEsyZ7/yzzG0QMwNv0rZcc+SealIkBkiE
-zXO7X3cDmJbMN2rOmpYUnF+7lBuLk8pqNvhE+dNnt8uqxMYuoqKPmN98O7LjUoaD
-cd3Z+OMsKkI/SaJjPF3ZoAflamBxZF1dE44/kOuKEHE2oTz/cqz1mFroGJEdhPtR
-SyWE8IpgQs1hj1YSj6KZt85Trc5uKcAhdmHsQnhrbrl+8vAa8t0kwc3cP+LCI0bP
-gipK87tAYKS9cLNUZBmm86DFnNMDmAEmwH0gzwSaN2mJ98bspZknl8hwRYB1G4Ln
-6FwwwI2zVsdEeEf4hfW95pew2kBkFR+kwFnhQQhNzODp7VsjwuE8A9F1sb/0hm0n
-rGpHODylCS0g0nM+KhFykEg+2h7W20k61ieuVKZGChj8v7GNnptHPetZtc2Oic4I
-m6EsCZ2Ks3q31e+0ZP/al6KUGGM4/3G2XfHjQLp9WNROnSRAs9FXHhSQv78yjn0J
-C7KoLoJa01yVYjSmRO6n
-=5+tl
+iQIcBAEBCgAGBQJODJwTAAoJEPiazRVxLXTFsfgP/iXyt3dC2GJZBaUcytqrwfGn
+40nXNp/7ugsYsW6jHrsTT0McTFfer6h/pg5YZRXpa/ssFZh42IWU5NJ3VCK5Tsie
+ro1EJx86atH5VkqwjXR8lskzSXEUarVt633lrmOdfbxc7pHCrd+odSwuPgcOwa0V
+tjZOMtflFg/fyKkJkdOpWH9OhdhvosX7NLkEs9NxjF+rZJs9xH12XP17ixrWdKYU
+1uBbBtrePh9GbbnaqvtT9U5A8tUSGMqhoJ1ORD4ZkxNDn87gOI59+oSyads6z4T0
+N3KNCYI9XGkwyDHG6QSTVUDQpkpTUXErwRG4AZH2gOMAdlno27UjthB+4RXoG+Yk
+PrCjvmfgtnzV4rKNZp0vEUo+HKeUi4bz3xTcjwiTKJXO9FhnllYHg5M/VniP3+M9
+oV6N0e7SrpRYpS4fx68KeHYGuAWlV2/8RJmuUsisyGz7+L2BxC5ocJguFSamiDx1
+MGwJnDFzy1LbQfB/E0srsmZg93TSluBwGzvoWr/tWcZ7IfXzxkMisxbyrh3Co/my
+ASza3XJoswRiqwqfjjICvggXxbV6XAoGMy1zATkFTSSG6EY+v/SaWqEScEclK0jK
+U1+o+E3UR7UKgRdcXwoZT2fxvinkV83BvyTAdR1VOtTU2rgmstr8Ow8VKIQ1ZX9Z
+X2d/olWWLSSceWnnAS7S
+=MYvH
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild
index e4c37fb53aee..9ad2818ca42a 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.12.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-guest-additions/virtualbox-guest-additions-3.2.12.ebuild,v 1.5 2011/02/03 07:55:48 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild,v 1.6 2011/06/30 15:53:49 polynomial-c Exp $
 
 inherit eutils linux-mod
 
@@ -15,17 +15,17 @@ KEYWORDS="amd64 x86"
 IUSE="X"
 
 RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
-			 ~x11-drivers/xf86-input-virtualbox-${PV}
-			 x11-apps/xrandr
-			 x11-apps/xrefresh
-			 x11-libs/libXmu
-			 x11-libs/libX11
-			 x11-libs/libXt
-			 x11-libs/libXext
-			 x11-libs/libXau
-			 x11-libs/libXdmcp
-			 x11-libs/libSM
-			 x11-libs/libICE )"
+		~x11-drivers/xf86-input-virtualbox-${PV}
+		x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM
+		x11-libs/libICE )"
 DEPEND="${RDEPEND}
 		>=dev-util/kbuild-0.1.5-r1
 		>=dev-lang/yasm-0.6.2
@@ -39,150 +39,155 @@ DEPEND="${RDEPEND}
 BUILD_TARGETS="all"
 BUILD_TARGET_ARCH="${ARCH}"
 MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-			vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
 
 S=${WORKDIR}/${MY_P/-OSE/_OSE}
 
 pkg_setup() {
-		linux-mod_pkg_setup
-		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-		enewgroup vboxguest
-		enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+	enewgroup vboxguest
+	enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
 }
 
 src_unpack() {
-		unpack ${A}
-
-		# Create and unpack a tarball with the sources of the Linux guest
-		# kernel modules, to include all the needed files
-		"${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
-
-		# Disable things unused or splitted into separate ebuilds
-		cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
-
-		# stupid new header references...
-		for vboxheader in {product,revision}-generated.h ; do
-			for mdir in vbox{guest,sf} ; do
-				ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-					"${WORKDIR}/${mdir}/${vboxheader}"
-			done
+	unpack ${A}
+
+	# Create and unpack a tarball with the sources of the Linux guest
+	# kernel modules, to include all the needed files
+	"${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
+	unpack ./vbox-kmod.tar.gz
+
+	if kernel_is -ge 2 6 33 ; then
+		# evil patch for new kernels - header moved
+		grep -lR linux/autoconf.h *  | xargs sed -i -e \
+			's:<linux/autoconf.h>:<generated/autoconf.h>:'
+	fi
+
+	# 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
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
+
+	# stupid new header references...
+	for vboxheader in {product,revision}-generated.h ; do
+		for mdir in vbox{guest,sf} ; do
+			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+				"${WORKDIR}/${mdir}/${vboxheader}"
 		done
+	done
 }
 
 src_compile() {
-		# build the user-space tools, warnings are harmless
-		./configure --nofatal \
-		--disable-xpcom \
-		--disable-sdl-ttf \
-		--disable-pulse \
-		--disable-alsa \
-		--build-headless || die "configure failed"
-		source ./env.sh
-
-		for each in	/src/VBox/{Runtime,Additions/common} \
-		/src/VBox/Additions/linux/{sharedfolders,daemon} ; do
-				cd "${S}"${each}
-				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxControl failed"
-		done
-
-		if use X; then
-				cd "${S}"/src/VBox/Additions/x11/VBoxClient
-				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxClient failed"
-		fi
-
-		# Now creating the kernel modules. We must do this _after_
-		# we compiled the user-space tools as we need two of the
-		# automatically generated header files. (>=3.2.0)
-		linux-mod_src_compile
+	# build the user-space tools, warnings are harmless
+	./configure --nofatal \
+	--disable-xpcom \
+	--disable-sdl-ttf \
+	--disable-pulse \
+	--disable-alsa \
+	--build-headless || die "configure failed"
+	source ./env.sh
+
+	for each in	/src/VBox/{Runtime,Additions/common} \
+	/src/VBox/Additions/linux/{sharedfolders,daemon} ; do
+		cd "${S}"${each}
+		MAKE="kmk" emake TOOL_YASM_AS=yasm \
+		KBUILD_PATH="${S}/kBuild" \
+		|| die "kmk VBoxControl failed"
+	done
+
+	if use X; then
+		cd "${S}"/src/VBox/Additions/x11/VBoxClient
+		MAKE="kmk" emake TOOL_YASM_AS=yasm \
+		KBUILD_PATH="${S}/kBuild" \
+			|| die "kmk VBoxClient failed"
+	fi
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	linux-mod_src_compile
 }
 
 src_install() {
-		linux-mod_src_install
-
-		cd "${S}"/out/linux.${ARCH}/release/bin/additions
-
-		insinto /sbin
-		newins mount.vboxsf mount.vboxsf
-		fperms 4755 /sbin/mount.vboxsf
-
-		newinitd "${FILESDIR}"/${PN}-7.initd ${PN}
-
-		insinto /usr/sbin/
-		newins VBoxService vboxguest-service
-		fperms 0755 /usr/sbin/vboxguest-service
-
-		insinto /usr/bin
-		doins VBoxControl
-		fperms 0755 /usr/bin/VBoxControl
-
-		# VBoxClient user service and xrandr wrapper
-		if use X; then
-			doins VBoxClient
-			fperms 0755 /usr/bin/VBoxClient
-
-			cd "${S}"/src/VBox/Additions/x11/Installer
-			newins 98vboxadd-xclient VBoxClient-all
-			fperms 0755 /usr/bin/VBoxClient-all
-		fi
-
-		# udev rule for vboxdrv
-		dodir /etc/udev/rules.d
-		echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
-		echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
-
-		# VBoxClient autostart file
-		insinto /etc/xdg/autostart
-		doins "${FILESDIR}"/vboxclient.desktop
-
-		# sample xorg.conf
-		insinto /usr/share/doc/${PF}
-		doins "${FILESDIR}"/xorg.conf.vbox
+	linux-mod_src_install
+
+	cd "${S}"/out/linux.${ARCH}/release/bin/additions
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	newinitd "${FILESDIR}"/${PN}-7.initd ${PN}
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use X; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+		cd "${S}"/src/VBox/Additions/x11/Installer
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+	fi
+
+	# udev rule for vboxdrv
+	dodir /etc/udev/rules.d
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+	>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+	>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	insinto /usr/share/doc/${PF}
+	doins "${FILESDIR}"/xorg.conf.vbox
 }
 
 pkg_postinst() {
-		linux-mod_pkg_postinst
-		if ! useq X ; then
-			elog "use flag X is off, enable it to install the"
-			elog "X Window System input and video drivers"
-		fi
-		elog ""
-		elog "Please add users to the \"vboxguest\" group so they can"
-		elog "benefit from seamless mode, auto-resize and clipboard."
-		elog ""
-		elog "Please add:"
-		elog "/etc/init.d/${PN}"
-		elog "to the default runlevel in order to start"
-		elog "needed services."
-		elog "To use the VirtualBox X drivers, use the following"
-		elog "file as your /etc/X11/xorg.conf:"
-		elog "    /usr/share/doc/${PF}/xorg.conf.xorg"
-		elog ""
-		elog "Also make sure you use the Mesa library for OpenGL:"
-		elog "    eselect opengl set xorg-x11"
-		elog ""
-		elog "An autostart .desktop file has been installed to start"
-		elog "VBoxClient in desktop sessions."
-		elog ""
-		elog "You can mount shared folders with:"
-		elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-		elog ""
-		elog "Warning:"
-		elog "this ebuild is only needed if you are running gentoo"
-		elog "inside a VirtualBox Virtual Machine, you don't need"
-		elog "it to run VirtualBox itself."
-		elog ""
+	linux-mod_pkg_postinst
+	if ! useq X ; then
+		elog "use flag X is off, enable it to install the"
+		elog "X Window System input and video drivers"
+	fi
+	elog ""
+	elog "Please add users to the \"vboxguest\" group so they can"
+	elog "benefit from seamless mode, auto-resize and clipboard."
+	elog ""
+	elog "Please add:"
+	elog "/etc/init.d/${PN}"
+	elog "to the default runlevel in order to start"
+	elog "needed services."
+	elog "To use the VirtualBox X drivers, use the following"
+	elog "file as your /etc/X11/xorg.conf:"
+	elog "    /usr/share/doc/${PF}/xorg.conf.xorg"
+	elog ""
+	elog "Also make sure you use the Mesa library for OpenGL:"
+	elog "    eselect opengl set xorg-x11"
+	elog ""
+	elog "An autostart .desktop file has been installed to start"
+	elog "VBoxClient in desktop sessions."
+	elog ""
+	elog "You can mount shared folders with:"
+	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+	elog ""
+	elog "Warning:"
+	elog "this ebuild is only needed if you are running gentoo"
+	elog "inside a VirtualBox Virtual Machine, you don't need"
+	elog "it to run VirtualBox itself."
+	elog ""
 }