summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Alirzaev <zl29ah@gmail.com>2018-04-10 16:37:55 +0300
committerLars Wendler <polynomial-c@gentoo.org>2018-04-11 09:54:02 +0200
commit2973c351fff931847f9da4a871d4ad44eb85b746 (patch)
tree384761654a21bc14fa5c626a008b6c0d921444fa
parentapp-emulation/virtualbox: fix patching for hardened (diff)
downloadgentoo-2973c351fff931847f9da4a871d4ad44eb85b746.tar.gz
gentoo-2973c351fff931847f9da4a871d4ad44eb85b746.tar.bz2
gentoo-2973c351fff931847f9da4a871d4ad44eb85b746.zip
app-emulation/virtualbox-modules: fix patching for pax
Bug: https://bugs.gentoo.org/643466
-rw-r--r--app-emulation/virtualbox-modules/files/virtualbox-modules-5.2.8-pax-const.patch44
-rw-r--r--app-emulation/virtualbox-modules/virtualbox-modules-5.2.8.ebuild2
2 files changed, 45 insertions, 1 deletions
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