commit: b16c2460c7efcd2e54ea2efeb400970b3dd99891 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Tue Jan 29 10:01:38 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Feb 6 09:32:10 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b16c2460
app-emulation/virtualbox-modules: remove unused patches Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/10928 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> .../files/virtualbox-modules-4.1.4-pax-const.patch | 44 ---------------------- .../files/virtualbox-modules-5.1.30-udp.patch | 35 ----------------- 2 files changed, 79 deletions(-) diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.4-pax-const.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.4-pax-const.patch deleted file mode 100644 index f9878848ae1..00000000000 --- a/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.4-pax-const.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- vboxdrv/SUPDrvIDC.h -+++ vboxdrv/SUPDrvIDC.h -@@ -160,7 +160,7 @@ typedef struct SUPDRVIDCREQGETSYM - { - /** The symbol address. */ - PFNRT pfnSymbol; -- } Out; -+ } __no_const Out; - } u; - } SUPDRVIDCREQGETSYM; - /** Pointer to a SUPDRV IDC get symbol request. */ ---- vboxnetflt/include/VBox/intnet.h -+++ vboxnetflt/include/VBox/intnet.h -@@ -783,7 +783,7 @@ typedef struct INTNETTRUNKFACTORY - DECLR0CALLBACKMEMBER(int, pfnCreateAndConnect,(struct INTNETTRUNKFACTORY *pIfFactory, const char *pszName, - PINTNETTRUNKSWPORT pSwitchPort, uint32_t fFlags, - PINTNETTRUNKIFPORT *ppIfPort)); --} INTNETTRUNKFACTORY; -+} __no_const INTNETTRUNKFACTORY; - /** Pointer to the trunk factory. */ - typedef INTNETTRUNKFACTORY *PINTNETTRUNKFACTORY; - ---- vboxnetflt/linux/VBoxNetFlt-linux.c -+++ vboxnetflt/linux/VBoxNetFlt-linux.c -@@ -840,7 +840,7 @@ typedef struct ethtool_ops OVR_OPSTYPE; - - # else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */ - --typedef struct net_device_ops OVR_OPSTYPE; -+typedef net_device_ops_no_const OVR_OPSTYPE; - # define OVR_OPS netdev_ops - # define OVR_XMIT pOrgOps->ndo_start_xmit - ---- vboxpci/include/VBox/rawpci.h -+++ vboxpci/include/VBox/rawpci.h -@@ -545,7 +545,7 @@ typedef struct RAWPCIFACTORY - DECLR0CALLBACKMEMBER(void, pfnDeinitVm,(PRAWPCIFACTORY pFactory, - PVM pVM, - PRAWPCIPERVM pPciData)); --} RAWPCIFACTORY; -+} __no_const RAWPCIFACTORY; - - #define RAWPCIFACTORY_UUID_STR "ea089839-4171-476f-adfb-9e7ab1cbd0fb" - 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 deleted file mode 100644 index b9f695e49a1..00000000000 --- a/app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.30-udp.patch +++ /dev/null @@ -1,35 +0,0 @@ -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);
