summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/virtualbox-modules/ChangeLog9
-rw-r--r--app-emulation/virtualbox-modules/Manifest31
-rw-r--r--app-emulation/virtualbox-modules/files/virtualbox-modules-3.17.patch49
-rw-r--r--app-emulation/virtualbox-modules/virtualbox-modules-4.3.14-r1.ebuild (renamed from app-emulation/virtualbox-modules/virtualbox-modules-4.3.14.ebuild)5
4 files changed, 77 insertions, 17 deletions
diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog
index ce1f643c2107..4cacd66da155 100644
--- a/app-emulation/virtualbox-modules/ChangeLog
+++ b/app-emulation/virtualbox-modules/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-emulation/virtualbox-modules
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.153 2014/07/18 13:47:55 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.154 2014/09/03 16:27:36 prometheanfire Exp $
+
+*virtualbox-modules-4.3.14-r1 (03 Sep 2014)
+
+ 03 Sep 2014; Matthew Thode <prometheanfire@gentoo.org>
+ +files/virtualbox-modules-3.17.patch, +virtualbox-modules-4.3.14-r1.ebuild,
+ -virtualbox-modules-4.3.14.ebuild:
+ bumping for 3.17 support
*virtualbox-modules-4.3.14 (18 Jul 2014)
*virtualbox-modules-4.2.26 (18 Jul 2014)
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 469dc49b63fb..98016f05e272 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -2,6 +2,7 @@
Hash: SHA256
AUX create_vbox_modules_tarball.sh 896 SHA256 4309bbf762e05ae09a2b92a737abddb89807b5a36f587178d7ac7f6ad4d91316 SHA512 c3154a13550817c581fa142e24081edfbdbc145315d34cc4569d12ad87a518fa0bf1443c053b50fdfdea6915bda1325ad973455ee85079294b83a49fd53f4771 WHIRLPOOL 761079d4ba0124488be9cc78305eef6c6df18d232c539ff4479caf3f04ea307e043c92a5f4099c7745a4e23741ce28259e87dd79bce8cee6862ef5e0661b2497
+AUX virtualbox-modules-3.17.patch 2423 SHA256 4710e52625f81131093f971c667752a702299d02de33396feac8cb0623548101 SHA512 ee1abda41bbf776d5120b34180183ea6a0c0a645ecba6438df0cdd5170746859ab162d9d48e724552b15256d6a7f4a1319840cfafa3113cce435a626d8b75af1 WHIRLPOOL d1a037b1f9ceec7d33d71d82ab2e2e70417316443132d959c00b7307cc1e50da65a4d59752f72cb2b6769ad8ae55af133905fce079a2e6c00c63ba3f4694a323
AUX virtualbox-modules-4.1.4-pax-const.patch 2335 SHA256 d23da93fa1a3b7833766caa8329745ed7de7a5ed6ce1fecb090325fdc83e42f3 SHA512 8f5ffcd53f34e616b895013660e269e6031837411471abf69711df4fd5d745299dcb08d361eda0979dcfde7d9aafa0d24c99fcc9f3875fbf35771945f6b224a1 WHIRLPOOL b875d0747bdf3c2970d9dc84c7e4f6fac1bd37b85ba6086a981397c8b506a7af2709fa94317896650fd9ae98921d40f399e589b851eb2da2f9854eb1f443930c
AUX virtualbox.conf 30 SHA256 0ab3195ae385753244a45a8b01e35ad5a1c9569fdda01b3fa025137c002e206a SHA512 8261c323ed1abcb5d45044a2cd49b5f62c84b5a7e43339f42a0d3f20e54ce5fef092106d331a3e2758e690803a2a397c2f533d0d1b7c67e05d707e6095564ef8 WHIRLPOOL 1f7e0d363be6a70dc276ca7a96a4d28873af34c5b2b15cabaa2a3fb609def8b20c725e964d2349b4e3cc62c9e2b6794ed6a0f41a3ea444a4434c410ee7d83775
DIST vbox-kernel-module-src-4.2.24.tar.xz 494432 SHA256 b1fec8e809885104f3d86f4782d858e723aebc75b7bfc94bc0a4416c04759a4d SHA512 2aed47ceda7e0ad0fadb4ca85853a54d1e44ce62a6fe3618be4169915b80ef580ed45b0c73b8c502b0b470b607f3a2bbcbb6c5b261bba900dc0e23b61356adec WHIRLPOOL 960cc8750c5c4aecfd1b425fc82fe5bb58642aceafe61d587bb744a239efea11591a0f25bebd4e31c1e05f5b30a03bb7a96f3aeaeb73c5719725058a4ef7df0e
@@ -11,23 +12,23 @@ DIST vbox-kernel-module-src-4.3.14.tar.xz 534712 SHA256 9dd6ed0a4706444a0ac91538
EBUILD virtualbox-modules-4.2.24.ebuild 1591 SHA256 5f37c41bb01b169a330d04359ce5fcb29f9018e38e11a892885d7e46424e4c9e SHA512 16254932e33252ebd2dfb33ebfbc1d252fdc91156885f243fd849c28f15c61c2bee51c71eb03250d8d58e65a275024283239f98a3bee4f50c5c3c01a01d5552e WHIRLPOOL c42aa9df74db196568002beecbbeb0ab69d8be79546f810a727902b122c8d15fb9178f4cba68350f4d5a058901e34d9c2b0526c3b5ad645dc4269f0b8f8b6463
EBUILD virtualbox-modules-4.2.26.ebuild 1602 SHA256 5cf22342e1498ce204fe2867c6f1fcd14f014fddc2ca11d1af70271e976ddc22 SHA512 217e956d7bb6b52e67e951b0fa2ade009fb8fcf4e6b95e31692b43ddfeaf5c1299a296cf96264723240cbe05647c430b89a50fc923ce8a3f442969b7dc1dff1a WHIRLPOOL 6b5511553e797fd1d1a83df483ffa756785a1e05bc3ee957a71fac6bec0969c3aeb8f94b9d07505c691cabf65dd84f3d05b6300f46dc252b4b89a6fdbda6040f
EBUILD virtualbox-modules-4.3.12.ebuild 1580 SHA256 181aa7ae566b3f128196e934f6adc2bd38515a34b9bffaa4cd2874478c59e7b1 SHA512 d1f7013cc216f9aaa4c9b398d65c8dbd92f1bbad4e968dcb85b5cb1d69fb393cc3be31209bde1946534a4542248c9d660868734b194962baac8becef2c49afbe WHIRLPOOL 245a93b39f284f42ff706747587257b876478cca031c6d538c520eb4dca04070ccca72e5e93a114ec3064e19baae21fdd46841ba224deff0de1642c9683c1032
-EBUILD virtualbox-modules-4.3.14.ebuild 1580 SHA256 f82aec593e5b54777541fb23b138dd4e63e25766b34142219855f6c17fa7e50a SHA512 c0ccaffa036da37a746e7190c9d409980a5fbe889a8257c69af15f2d8e244a507da090053a07b2e114620557e312367c83bc50e7e6c5bd3b0ea83c4654e7f73c WHIRLPOOL 822e11bc32b70eb464396e042fd476a24a8c834912d76e31b86ccf7d6007a31b46e994501e52b21004aa2134310c8e7e4df6ce052e6872edf20de2772f282c2d
-MISC ChangeLog 27420 SHA256 1c799a9c1841397b1135c1328c70bb9728ed3f9a5066abda53b42f6ff00f43ee SHA512 194ee8930d0ffffd1738c39ea6892f43bb6211cb6fcfcb5cb1d1742b3e8621485e090930647ea370df0fc4f0d1d6dbe4dcbc6194713975028002ecbf5ea4dc90 WHIRLPOOL 9b04ea1d15e3d30aae47be9f39126b904f27892d99cf2c0df9d473695bbd2a4577a117b10edd1d25aeb0888928b2c2cb940b67eb370bbeeca203a5ebbfbbcc57
+EBUILD virtualbox-modules-4.3.14-r1.ebuild 1659 SHA256 37fcba93071b70ba4bba6742858f4cc5b129a4dacba8b68740c7dc5e2b86508f SHA512 b0173c9c32f070dbd6ba5e1077027ee8d524b16cd1bea84011b41d96ec85166367202bb0fac94ee92d4a881c889decd8b043ce9a5a5c7d8abfc301e0965cdeb6 WHIRLPOOL 590b49f4aa600e4a495e1ab2bc3065c803bd43080f534746b1710a27fc614cae37ae050d47fd5c6d294a009c2b88cad0bd75c8b70f702901e5f0cf00766c035e
+MISC ChangeLog 27667 SHA256 5276729404d93a3cb63646ee6eb53d1a5c518b1d0a318cb82d217222e031b2b0 SHA512 e82ce80b270062200b8eb60eda58eb1f04f8dbc47101d9dd117c5421043a3d1c6bcd1fc45725841463f3fc543c47a18a152d9f823452e5606213f8d3ba00df97 WHIRLPOOL 4e47743a565369d10a1548709fad63b6d91fb0c7a2a824f8bc68dcbfd308f328cb823b9b5317027b317d357019a464a9f9c38ed855ebe6166b1ea697837f3df9
MISC metadata.xml 431 SHA256 dd5f585b5465db14257bab08b1e7fe6f9ceca47d631bb8418665dd4ab0819e77 SHA512 6269d132a33ffae160ed2b4b87618ef764b990bfdbdaf026401a0794b48fb2bd0c4203892a4e0e31904b84f967cd4ef5343dcfa6e2bdb9e755894d9906b38df8 WHIRLPOOL 8d8b65880991d6feecd562639e4da520247dae4418cb7869e03ae775be668898dd1a84141a4146f17d8c6e9e0a5d1a0fe5ecc64517b03f19bd2777ccf84f41c5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJTySWMAAoJEPiazRVxLXTFA+EQAMzlGvuLhFhh0I3JK9b+Ff6I
-wEFhMEq8oYXfdfEhTlt0y4VMnGohkQ5gVy1C5FrQtXtbAGPPfOTJfaPOzoyqZ5gi
-8rgtV3r7fcAoAa4niPQxtnj4c+fV4Wc8Fc7KuWzsLWhbpnm75lyXSJb5FsDttmtR
-Xy4m4wt/cssn7nvJWQL84HWRiM4aJSw+eHK/518dv2tX0aP59XGUHbp8n8H1j/sE
-Euc0Vma1AnEELJUPHtRwpiLESzlTi01NmVcM4JGq7A+0uUioWByKvUCDbEw4WHH1
-sZ+toAo12212ameQCDViH8tRyEajJyJchWI7YpAQ8l0OZPgSbeKNebyC5Av6S3dR
-tr76qYPxQgig2E0vQvGoUQziN78MzD4g7dgnrOucfcbpFiiiePzvkzgm/lHcZzy4
-HKUoIfeaMqlDFoVFawmP2sblMAM7uXlBAIsYL89eJBG3vuURtkbY32WNlQu/tdzr
-obg1b5Bc5nJ030CySr8RdYDrzrIUVng9d/oD9lhse9kbEs71nBBRjcXsp6Ved8xr
-ZyVQauuKMlncH2VeZuPTrcqjFIzEqBqqI56os4ImpwT+FmDlVkZw8bonziehZ4WX
-9kZRm93XkolxjXpuJu9M3bXemo8MzkK2ZBB/jVV3QY5rkjy4hycW4bXaodccz9MF
-QC8RLBQ7F/fILNLvFHtH
-=4dZX
+iQIcBAEBCAAGBQJUB0GLAAoJECRx6z5ArFrDKtMQAIY1v6j5r1jFmYZLYrMv4si7
+68jK+d2bI3hQKfBc8ZZH8nQMGbIaQLkuiEsiG8lkhRPvKN7TwuhNtzMyQDYfs4A3
+rgsDFOhH/7A0IEOjhCaBMQocijW+5vhxALU3c2/HK/6oSMnpLMpC/vvnJ//BfZIm
+qPPzUKsYoVllAbkJ1etoy3uq1DxX6j28kvwRX25IzCd9XzEJ2egHv6drs+3yv8MG
+RbK8a0fi690tP+vvf6UE0kUdJjvbWlhwSRqXmdleovZA38a3atSXb2HqbX8opGNK
+BkIzWntyTMu4XrYpDPHulne+61TFaUYJ8V3+lTGI4qAbOyBEWYL0Vl8mb2FgB3k5
+CEFiAIKnHBPz9VdUKm5VZRkZd/Wffop/p5d8TNXM+YcB+n02B9m4WW/hMqkpPaDc
+MDZ2EdpW15rog2InJ0RDVRIOdFZeUoslkBl6M5USf9wGGKmxDpdRuG1AXLIcv9Cl
+pKG+o46YZ9YMTsGBIKsPmsdlDxxaVEp/UEPrvroy7GqnLGWAjra8E61tnb39Nztd
+t3NWBna5nIXspFrxRG64Yf70dRbAfFBGV6ECYD9ej2pnfebXRgiA3rb/DUAvsN0x
+UFr/7/N+kqiQY1v8Y9pxla/ye1TILGQTeMugIlcuRO9U5y8dBDd47ja4vhNNExo6
+xw77Vg470pNkAwI7ZXYG
+=5pgV
-----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-3.17.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-3.17.patch
new file mode 100644
index 000000000000..1d059c5af361
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-3.17.patch
@@ -0,0 +1,49 @@
+diff -rupN work/vboxdrv/r0drv/linux/alloc-r0drv-linux.c work.new/vboxdrv/r0drv/linux/alloc-r0drv-linux.c
+--- work/vboxdrv/r0drv/linux/alloc-r0drv-linux.c 2014-01-14 04:27:06.000000000 -0600
++++ work.new/vboxdrv/r0drv/linux/alloc-r0drv-linux.c 2014-09-03 11:12:28.247795756 -0500
+@@ -191,7 +191,7 @@ static PRTMEMHDR rtR0MemAllocExecVmArea(
+ struct page **papPagesIterator = papPages;
+ pVmArea->nr_pages = cPages;
+ pVmArea->pages = papPages;
+- if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC, &papPagesIterator))
++ if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC, papPagesIterator))
+ {
+ PRTMEMLNXHDREX pHdrEx = (PRTMEMLNXHDREX)pVmArea->addr;
+ pHdrEx->pVmArea = pVmArea;
+diff -rupN work/vboxnetadp/linux/VBoxNetAdp-linux.c work.new/vboxnetadp/linux/VBoxNetAdp-linux.c
+--- work/vboxnetadp/linux/VBoxNetAdp-linux.c 2013-10-09 06:02:09.000000000 -0500
++++ work.new/vboxnetadp/linux/VBoxNetAdp-linux.c 2014-09-03 11:13:55.999687819 -0500
+@@ -52,6 +52,25 @@
+
+ #define VBOXNETADP_FROM_IFACE(iface) ((PVBOXNETADP) ifnet_softc(iface))
+
++/*******************************
++source for the 4th parameter alloc_netdev fix for kernel 3.17-rc1 is:
++https://github.com/proski/madwifi/commit/c5246021b7b8580c2aeb0a145903acc07d246ac1
++*/
++#ifndef NET_NAME_UNKNOWN
++#undef alloc_netdev
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
++#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \
++ alloc_netdev(sizeof_priv, name, setup)
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
++#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \
++ alloc_netdev_mq(sizeof_priv, name, setup, 1)
++#else
++#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \
++ alloc_netdev_mqs(sizeof_priv, name, setup, 1, 1)
++#endif
++#endif
++/*******************************/
++
+ /*******************************************************************************
+ * Internal Functions *
+ *******************************************************************************/
+@@ -183,6 +202,7 @@ int vboxNetAdpOsCreate(PVBOXNETADP pThis
+ /* No need for private data. */
+ pNetDev = alloc_netdev(sizeof(VBOXNETADPPRIV),
+ pThis->szName[0] ? pThis->szName : VBOXNETADP_LINUX_NAME,
++ NET_NAME_UNKNOWN,
+ vboxNetAdpNetDevInit);
+ if (pNetDev)
+ {
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.14.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.14-r1.ebuild
index e45574f80220..2c6e817c1e53 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.14.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.14-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.3.14.ebuild,v 1.1 2014/07/18 13:47:55 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.3.14-r1.ebuild,v 1.1 2014/09/03 16:27:36 prometheanfire Exp $
# XXX: the tarball here is just the kernel modules split out of the binary
# package that comes from virtualbox-bin
@@ -43,6 +43,9 @@ src_prepare() {
if use pax_kernel && kernel_is -ge 3 0 0 ; then
epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
fi
+ if kernel_is -ge 3 17 ; then
+ epatch "${FILESDIR}"/${PN}-3.17.patch
+ fi
}
src_install() {