gentoo resync : 01.12.2017

3 files changed, 42 insertions, 2 deletions

diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 470cf60a8c7a..b1d2182f2641 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,10 +1,11 @@
 AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1ded8e51315f41292f9fcc0adb294e9b235b0c2f1e91f6f728076ab85f687ea1ba2877dc44b511eaceb24e7d6e71a8bbd4 SHA512 c3154a13550817c581fa142e24081edfbdbc145315d34cc4569d12ad87a518fa0bf1443c053b50fdfdea6915bda1325ad973455ee85079294b83a49fd53f4771
 AUX virtualbox-modules-4.1.4-pax-const.patch 2335 BLAKE2B 9d23df0a04e70765b0eb1ec123e7b835a8e3c35d5c89c08239cc3dedcbcf7a34ce49324ab607490738639a1b5d7febef9083ee4b6c3344112695bc2ee079081b SHA512 8f5ffcd53f34e616b895013660e269e6031837411471abf69711df4fd5d745299dcb08d361eda0979dcfde7d9aafa0d24c99fcc9f3875fbf35771945f6b224a1
+AUX virtualbox-modules-5.1.30-udp.patch 1239 BLAKE2B d49d96894bae2fdedc2b8a825c849a99ad0cf36a92cc4d89881ce72a0b7ebd53174f39e298c119670654932b790113fe7fbc3a3bae552f2c597cad20a370141f SHA512 f22e6c8edc360e0f97b207ba9a046042ef1898c10c724d9519badef004858720040caef12bffa1ed0f07517ae2d0b831973a0e4ef8ffb239a26faf62706b0618
 AUX virtualbox.conf 38 BLAKE2B 853f2ba0ac1627100241e778fa6c35ff4fc86e8c9c753f8aa23cb053ffacf966c131c5630d1fafd481d7b057acc3e9d6f8f1a22766db5d1cf61fffa38de7c01b SHA512 b61936fff57426d31efa6928eadb572cafe40a65d3e31a0eecb53dc784ba9d0a9e0ad5e419df74418b977f89c17873240c38e2ada95949e5252d879110d6094a
 DIST vbox-kernel-module-src-5.1.26.tar.xz 625384 SHA256 5ba4f728c5b62c3d93828d99c5b54b8fb24a16bc8674e704714c4f71eb95ddc4 SHA512 c77e0d8dfade2abac95162e7e7a424be4875e44d43bcf2a13e0e50caa69f5fd0d21c77f03bb2cd4cbd5df4ab31e9fbd49ecd9220a49af8cd10081b960e014010 WHIRLPOOL 519246aeae6637cb8eb4b841552dc5e63f9a3d761fa6bcec43601c8a3194264457e4e78d200e975e31266af2944aa81f7487cf389f43d93db08f60a700a7758e
 DIST vbox-kernel-module-src-5.1.28.tar.xz 625464 SHA256 d6f3b7afa98d2b526d8da3c8906addc307eea069db371d012ebbffc1ccdf9dd2 SHA512 c8ae6c065ad42e57eee9a54f288ba60fd9b32efe18cb74c8a035d547b30e7d857c9091307485a8dfc77eec45de29d3217c6871140e167e2438759c314c47680a WHIRLPOOL c6508d63cacfcd3ac901f276cd793dc83c595bc73965518baa544b5cf5157ea52363b759f03586f743d6c2e0fda7252b98136c96cef28ecfb31f6915d4ce5709
-DIST vbox-kernel-module-src-5.1.30.tar.xz 625424 SHA256 879b1bc45b9f1a3fd929d2fd2e67dcaffe4074839f6364bf0e64618bfe2b3b2e SHA512 8e2113584e63e2ace71b708dc77428fd09167a1bded12b47312a5a8f85ef448e17f76b4300dba4c8ec99d7f8cb278cef039c6282c676e35b8f200bafb5c4770a WHIRLPOOL aa6fc3a0516514c2ca0c39ea28200559582fdd648e96084a5ca1daabfd1f478312199576ad27336eba124b443fbe122364efde2c60ca3386872cd1274333f4df
+DIST vbox-kernel-module-src-5.1.30.tar.xz 625424 BLAKE2B 00d33cad237af1f0d5b4dbea38f84e0327d10d97fc309a8c7536433cb4fddf3614e6de160646077040b4fdc6dd126cfa2250081084ca0243cc572d9f5e9d5dfd SHA512 8e2113584e63e2ace71b708dc77428fd09167a1bded12b47312a5a8f85ef448e17f76b4300dba4c8ec99d7f8cb278cef039c6282c676e35b8f200bafb5c4770a
 EBUILD virtualbox-modules-5.1.26.ebuild 1656 BLAKE2B f4f00b5fc80875046f5339c4d29340eb4d14ecece2de7fdbd51c73f0c1928e5dcadc58737aec3cc157d698ffd279e62602855ebaa1e889b0597a7296fdaf5c05 SHA512 bdb8d8f9f6ef4db63fb6039b136e49d5e7e52cff9a6ed476ad404c81d161655d9458caa267c8705ed4bfb84bf1677622584973f6b0adb413601d57810fab6690
 EBUILD virtualbox-modules-5.1.28.ebuild 1658 BLAKE2B 3fd4e7c99a1df53bca889fbe8f94936890cb0b28e0fa281ae9f3bd9f1a5bd0abea1142b58e2a43ffd756109e01a74a6766bc3c1e1587e655cb4cf2574a316455 SHA512 b4733d729c837c9aaf0c2038a0b2fb6fcc845c56a6cea6d9e1ed9f4f28c995b2d71ee288d031a1cf45017fcf99054f9a01d33be70d6a5a35774732cb98d49209
-EBUILD virtualbox-modules-5.1.30.ebuild 1658 BLAKE2B 3fd4e7c99a1df53bca889fbe8f94936890cb0b28e0fa281ae9f3bd9f1a5bd0abea1142b58e2a43ffd756109e01a74a6766bc3c1e1587e655cb4cf2574a316455 SHA512 b4733d729c837c9aaf0c2038a0b2fb6fcc845c56a6cea6d9e1ed9f4f28c995b2d71ee288d031a1cf45017fcf99054f9a01d33be70d6a5a35774732cb98d49209
+EBUILD virtualbox-modules-5.1.30.ebuild 1741 BLAKE2B 6a3327b4cc91dc1e689c597700a198c0183ba067ec38d01c71b36841d7a23f03a4dd7fa819d1efa8129ca5987de5c7816d2b24b44851daf01b062043c7583c49 SHA512 d2c9cea345226560e676d5d8035c5442ba40992093f1e78e23e5d5d703f74e14c87178d3fbb6390684cf9f0cd4f79a3aa7c61265b039a27e45bddecb258508e8
 MISC metadata.xml 502 BLAKE2B 043fc7e11b803453d5c193562322ade34ce17f5966c5ba6f557c605174bab43a47fe374684b7f3b10a87d92429c70006abc2759169124c0b29ad28ad4c181b46 SHA512 399c87acfd980b7dc29b42d7eeeead868bc8e9efc085f23aa97507d9da6f4af272e747172c4d5d6c1dfe15dc125193a72a5d6ca47ec82615345e239ff26246e4
diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.30-udp.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.30-udp.patch
new file mode 100644
index 000000000000..b9f695e49a1b
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.30-udp.patch
@@ -0,0 +1,35 @@
+diff --git a/work/vboxnetflt/linux/VBoxNetFlt-linux.c b/work/vboxnetflt/linux/VBoxNetFlt-linux.c
+index f824654..b61d82c 100644
+--- work/vboxnetflt/linux/VBoxNetFlt-linux.c
++++ work/vboxnetflt/linux/VBoxNetFlt-linux.c
+@@ -126,6 +126,10 @@ typedef struct VBOXNETFLTNOTIFIER *PVBOXNETFLTNOTIFIER;
+ # endif
+ #endif
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++#define SKB_GSO_UDP 0
++#endif
++
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
+ # define VBOX_HAVE_SKB_VLAN
+ #else
+diff --git a/work/vboxpci/linux/VBoxPci-linux.c b/work/vboxpci/linux/VBoxPci-linux.c
+index 2dbf47f..e361ef3 100644
+--- work/vboxpci/linux/VBoxPci-linux.c
++++ work/vboxpci/linux/VBoxPci-linux.c
+@@ -353,12 +353,16 @@ static void  vboxPciFileClose(struct file* file)
+ static int vboxPciFileWrite(struct file* file, unsigned long long offset, unsigned char* data, unsigned int size)
+ {
+     int          ret;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++    ret = kernel_write(file, data, size, &offset);
++#else
+     mm_segment_t fs_save;
+
+     fs_save = get_fs();
+     set_fs(get_ds());
+     ret = vfs_write(file, data, size, &offset);
+     set_fs(fs_save);
++#endif
+     if (ret < 0)
+         printk(KERN_DEBUG "vboxPciFileWrite: error %d\n", ret);
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.30.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.30.ebuild
index 6600e4fb53b0..5a0792755863 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.30.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.30.ebuild
@@ -47,6 +47,10 @@ src_prepare() {
 		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
 	fi
 
+	if kernel_is -ge 4 14 0 ; then
+		epatch "${FILESDIR}"/${PN}-5.1.30-udp.patch
+	fi
+
 	default
 }