Fixed kernel panic on suspend (bug #377229)

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

5 files changed, 102 insertions, 21 deletions

diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog
index 2afd5231535c..166fed07d4e5 100644
--- a/app-emulation/virtualbox-modules/ChangeLog
+++ b/app-emulation/virtualbox-modules/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/virtualbox-modules
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.86 2011/07/22 16:58:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.87 2011/08/07 11:18:29 polynomial-c Exp $
+
+*virtualbox-modules-4.1.0-r1 (07 Aug 2011)
+
+  07 Aug 2011; Lars Wendler <polynomial-c@gentoo.org>
+  +virtualbox-modules-4.1.0-r1.ebuild,
+  +files/virtualbox-modules-4.1.0-vboxbug9305.patch, metadata.xml:
+  Fixed kernel panic on suspend. Thanks to Martin Atenreit for reporting this
+  in bug #377229.
 
   22 Jul 2011; Markos Chandras <hwoarang@gentoo.org>
   virtualbox-modules-4.0.12.ebuild:
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index edb44fba8561..a1372ea8757c 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX virtualbox-modules-4.1.0-vboxbug9305.patch 555 RMD160 d9d6707749fe8302bdcb653c4ff0b4c208c29629 SHA1 598575a6cabeecc3ec23973987020024129bb67d SHA256 9477d900db7bce8cd7ce12792567ea28ce4e3a1529c54f56da1937a000cc07e4
 DIST vbox-kernel-module-src-3.2.12.tar.bz2 767089 RMD160 5764412c2cec0703ac15842c6898757d21e0d771 SHA1 fc6ccc69da64c41ec8997d23341ae028db0c3659 SHA256 8d2a403c8f0fddb5d4a078a3358415d6c912036c7c31f895ac6c7a0c10693d18
 DIST vbox-kernel-module-src-4.0.10.tar.bz2 902210 RMD160 193b68885aab9c33e0fd1d72c4c3d35525473d0a SHA1 86bd9cf3e8babb176a60bcaf67227a87aab48688 SHA256 13822bd807b51c1becea82514da2cb9137fe95fb7219d6e790a13e42e932e08f
 DIST vbox-kernel-module-src-4.0.12.tar.bz2 901005 RMD160 6bc21432d363ec7d92a3c7b784788f3d8b2e60b9 SHA1 b431fd82d1e23cbcab52fcc2461424d896058eff SHA256 de7306958d5e807d5aed0aa401e0cbf6106f7f89c5930a7b04ceb8cd2d7ca5d1
@@ -8,23 +9,24 @@ DIST vbox-kernel-module-src-4.1.0.tar.bz2 1168697 RMD160 1a10988b610312a14854d13
 EBUILD virtualbox-modules-3.2.12.ebuild 2100 RMD160 83de654f74703d626185dad42629a593fcc741a4 SHA1 62ecb93b3d0d90ae1ae49b530ddcc4e2b44e0022 SHA256 649baf4dcd9cae5a9d41dc9ba512fa259cfb6301f92ac40a512b3904e9dae0c6
 EBUILD virtualbox-modules-4.0.10.ebuild 1576 RMD160 4c121820e0e95b91b5a81c7de3e5d78e82baf44f SHA1 11e738c17cff2f7aede5c75b658d11f2df95e269 SHA256 99bc700e8daa810cf1e48fe8a1332bcfc4c6f01b9c1523d40bfb9ef60b9bae51
 EBUILD virtualbox-modules-4.0.12.ebuild 1570 RMD160 48502bec63dcabe8f9cae90651a0d08e1a2cd60e SHA1 42aa2e640f5e8772ae2ea0ccf6f7a427051572ea SHA256 56012f6439898de74457cfb429cd2f72c29c58daf67df9d833619a27d44a73de
+EBUILD virtualbox-modules-4.1.0-r1.ebuild 1643 RMD160 beda82e57c18d71f6907cbf55077755ae0b10649 SHA1 224f5bb8268f7899e2a88918fa72e1dca52c31e2 SHA256 b9fc918bc045c0795e8173d9bccbaaa3b3ca8c2c1528ded1c126ebafa650e6e5
 EBUILD virtualbox-modules-4.1.0.ebuild 1594 RMD160 80f19c6c84964f47e1bd4f14b7f3699138b7b00d SHA1 49ad9b1d254ec0d7bb1e441dc55f5544bd546bc8 SHA256 acb4ca04bf182093026c63b0262946e23a619f5ebdff7f699c360015b0e1f3f1
-MISC ChangeLog 15399 RMD160 211650828727ee944a3180b5000c700c81ef2252 SHA1 5ba8e8179325e03be4b130eebdc4941985ac5e08 SHA256 2db9cd5c515ca593b8dafbb21133a3ec44c61edae26cc013bc2dca1ad9c2ba68
-MISC metadata.xml 457 RMD160 12d3d923e95f66b27bd9456b76319b9a6d8ae815 SHA1 54139c285252e9229298cf32d0716062cde5f0de SHA256 1fbd88d74325c1c6c63512eb9b7185797d6b9992b8c4f809d51897252729eccf
+MISC ChangeLog 15704 RMD160 db81982ea328fff1453f1f4ab27816bc0a805fb2 SHA1 204f5f49606a2878946df8ec89182d4df88a68b4 SHA256 1414692cf4717c8b4ca5916485d65ce09cc2c826af03f35bd861b0909f005ec1
+MISC metadata.xml 457 RMD160 f1c959f5797bd3dd9f8f1f76359a64b61b20dd3f SHA1 4b5cc27e10133d557bba44b8e070e5c28a825b66 SHA256 e36c3bf10615119a0d0f7d0e272a08d699dc8bb836fb6336dc34c4eb52513bc1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOKaxKAAoJEPqDWhW0r/LCrr4P/2gzvKJvDfkTVKlAYEm6vbJv
-iHdYcoMPv88qDeFqagL95/DqXLBqb902a8rdsMdYHinFqaiPA46r+ss2pvu+51Ob
-PXbcKCvt9yl9zQDjmp3rTKl6rxAfdgiYp5iWk0gfz0w4L2uwyJYOH9MIFz3dgKsF
-l2AMiJETQkF+5JkhwmQbwaRbU91WKLyFmP1yYOLUf3tVqYY1EH4wSrMdOIAwBzLW
-6YKUcJCmymX0C17PqcmLgfGbznosFgxAjGpMWWPl0tbYhNvbS9uuEaEu4pZPnAOT
-+VmR3dbMjss7V1raBVHPhtrfM/jXSUXIEhGB4f+7MPK33WjnFu0gC/gRVG995rjJ
-HZdajXMpF6LQt9SMM+VQAunDZE6cnxH8mJDZ2/J9WzHMY69w9Z+BUyQZfAMPA65w
-PSToUsQhUey59YTK0uaW+Q0cq8ehVq4SPQN0jgInnTvhRR23bwB+K0lmgCbPiGCt
-aTjoqMk+pfhwwnswrhvU3d+95d93AkgXehOqSikQaeRKQDr0w8ZZSWjKlCru1Rn/
-5R8lz1lO4JM8kIs+vpAsY+a6gB0ujSG7E83e1SKcQGcY24HoyY/vq855ZQmVdqj0
-FoOtsm15HbGUVflIwyzi/7W3IDBra8tCloz3OotHsYSH6f2Kp54WVx46ygEQE7sF
-hEA2ba1gzXLOzQkmrI+F
-=dKWR
+iQIcBAEBCgAGBQJOPnSLAAoJEPiazRVxLXTFezIP/ibng6pDDS0CW9cBV0i4dtgI
+V+7++48yaOuY4kxJEEZBlTpayscgk1MOvL2qj87WvwUbgAiOyyfRMstRUavasqc5
+rOoZ5Abj/kXctSozXtJTj39SzflnLLeKf/vTUQp/MpRTQ3nQj8UAdzo97sSV0s46
+YnMmcPSY4Lm3hnJC/6gP6YWtZVwuqM6ld6aoskw6YbV0ickcB97ct+Jf/2ejBfA2
+18cs1LsdE2TSNat9+wjxw+E7A08tf0OJtaQ8VURhep8ecGS6X9L/vSokOI0wl6zr
+iF5WJRS5Bp1S6EuQ/zRujjXIRt6TnyVBNESEGrx6Dkv+t3JBnscW+Ny4MRgBy02f
+TBjVz+x0hPV1Geg19IVVjJWvKDMs5YIXbFBsOcHiv04N447jmAlvWaWJ9VEySjCw
+ztM22G8C+py2SFvUu02YAqjw9J6fN0pUWvj8tvKq6ZLMnR7z1JqMNG3Tk+YyUIWg
+BPG4Uwi+mqToRIs0v0j6p56pqM6DZl1Vj+kcn4Xezmo1tr0YxNbKJBdRPQWmhGNV
+RA/psNzOUx4M+CL7noujOsN4W0Wvoqp9RZSBIxzrFx9krnJgD/p7aHlN74YH6wQc
+nnpY0PX4thbGt40lJD57sInMVP7zUxwTl4U9SJ/R8c+lvDVFBtmQMbnXZqFysXT5
+/mWZRhn3dVRvLbhEkiJX
+=yWBv
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.0-vboxbug9305.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.0-vboxbug9305.patch
new file mode 100644
index 000000000000..be0f5d91d752
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.0-vboxbug9305.patch
@@ -0,0 +1,11 @@
+--- vboxdrv/r0drv/linux/mpnotification-r0drv-linux.c	(revision 73209)
++++ vboxdrv/r0drv/linux/mpnotification-r0drv-linux.c	(revision 73210)
+@@ -77,7 +77,7 @@
+  * @param pvUser2           The notification event.
+  * @remarks This can be invoked in interrupt context.
+  */
+-static void rtMpNotificationLinuxOnCurrentCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
++static DECLCALLBACK(void) rtMpNotificationLinuxOnCurrentCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
+ {
+     unsigned long ulNativeEvent = *(unsigned long *)pvUser2;
+     NOREF(pvUser1);
diff --git a/app-emulation/virtualbox-modules/metadata.xml b/app-emulation/virtualbox-modules/metadata.xml
index 702621ee83d7..70197e4e4541 100644
--- a/app-emulation/virtualbox-modules/metadata.xml
+++ b/app-emulation/virtualbox-modules/metadata.xml
@@ -3,6 +3,10 @@
 <pkgmetadata>
 <herd>no-herd</herd>
   <maintainer>
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+  <maintainer>
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
@@ -10,8 +14,4 @@
   <email>swapon@gmail.com</email>
   <name>Alessio Cassibba</name>
 </maintainer>
-  <maintainer>
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
 </pkgmetadata>
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.0-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..48e4b98944f2
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.0-r1.ebuild,v 1.1 2011/08/07 11:18:29 polynomial-c Exp $
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=2
+
+inherit eutils linux-mod
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S=${WORKDIR}
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+	enewgroup vboxusers
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-vboxbug9305.patch
+
+	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
+}
+
+src_install() {
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	elog "Starting with the 3.x release new kernel modules were added,"
+	elog "be sure to load all the needed modules."
+	elog ""
+	elog "Please add \"vboxdrv\", \"vboxnetflt\" and \"vboxnetadp\" to:"
+	if has_version sys-apps/openrc; then
+		elog "/etc/conf.d/modules"
+	else
+		elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
+	fi
+}