commit: 2973c351fff931847f9da4a871d4ad44eb85b746 Author: Sergey Alirzaev <zl29ah <AT> gmail <DOT> com> AuthorDate: Tue Apr 10 13:37:55 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Apr 11 07:54:02 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2973c351
app-emulation/virtualbox-modules: fix patching for pax Bug: https://bugs.gentoo.org/643466 .../files/virtualbox-modules-5.2.8-pax-const.patch | 44 ++++++++++++++++++++++ .../virtualbox-modules-5.2.8.ebuild | 2 +- 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-5.2.8-pax-const.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-5.2.8-pax-const.patch new file mode 100644 index 00000000000..6251e33ce59 --- /dev/null +++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-5.2.8-pax-const.patch @@ -0,0 +1,44 @@ +--- 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 pVmData)); +-} RAWPCIFACTORY; ++} __no_const RAWPCIFACTORY; + + #define RAWPCIFACTORY_UUID_STR "ea089839-4171-476f-adfb-9e7ab1cbd0fb" + diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.8.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.8.ebuild index 91e66b6535c..81bd3967d83 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.8.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.8.ebuild @@ -39,7 +39,7 @@ pkg_setup() { src_prepare() { if use pax_kernel && kernel_is -ge 3 0 0 ; then - eapply "${FILESDIR}"/${PN}-4.1.4-pax-const.patch + eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch fi default
