From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 5 May 2019 08:39:08 +0000 (+0200)
Subject: - really disable hardening in kernel modules (looks like 6.0+ breakage)
X-Git-Tag: auto/th/VirtualBox-6.0.6-2
X-Git-Url: http://git.pld-linux.org/?p=packages%2FVirtualBox.git;a=commitdiff_plain;h=de53f540befe8450eb9ad352ff5cade137c67446

- really disable hardening in kernel modules (looks like 6.0+ breakage)
- rel 2
---

diff --git a/VirtualBox.spec b/VirtualBox.spec
index a0cdd6b..3145e60 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -42,7 +42,7 @@ exit 1
 
 %define		qtver	5.6.0
 
-%define		rel		1
+%define		rel		2
 %define		pname		VirtualBox
 Summary:	VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):	VirtualBox - wirtualizator sprzętu x86
@@ -83,6 +83,7 @@ Patch13:	%{pname}-no-scrextend.patch
 Patch14:	%{pname}-multipython.patch
 Patch15:	%{pname}-lightdm-1.19.2.patch
 Patch16:	%{pname}-no-vboxvideo.patch
+Patch17:	disable-hardening.patch
 URL:		http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
@@ -561,6 +562,7 @@ echo override vboxguest %{_kernel_ver} misc > PLD-MODULE-BUILD/installed/etc/dep
 %patch14 -p0
 %patch15 -p0
 %patch16 -p0
+%patch17 -p1
 
 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
 	-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
diff --git a/disable-hardening.patch b/disable-hardening.patch
new file mode 100644
index 0000000..f294be1
--- /dev/null
+++ b/disable-hardening.patch
@@ -0,0 +1,43 @@
+--- VirtualBox-6.0.6/src/VBox/HostDrivers/linux/export_modules.sh.orig	2019-04-16 12:16:41.000000000 +0200
++++ VirtualBox-6.0.6/src/VBox/HostDrivers/linux/export_modules.sh	2019-05-05 10:20:35.010948761 +0200
+@@ -159,6 +159,7 @@
+         < $PATH_VBOXDRV/linux/Makefile > $PATH_TMP/vboxdrv/Makefile
+ else
+     sed -e "s;-DVBOX_WITH_HARDENING;;g" \
++        -e "s;VBOX_WITH_HARDENING;;g" \
+         -e "s;-DVBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV;;g" \
+         -e "s;-DIPRT_WITH_EFLAGS_AC_PRESERVING;;g" \
+         < $PATH_VBOXDRV/linux/Makefile > $PATH_TMP/vboxdrv/Makefile
+@@ -172,7 +173,9 @@
+ if [ -n "$VBOX_WITH_HARDENING" ]; then
+     cat                                   $PATH_VBOXNET/linux/Makefile > $PATH_TMP/vboxnetflt/Makefile
+ else
+-    sed -e "s;-DVBOX_WITH_HARDENING;;g" < $PATH_VBOXNET/linux/Makefile > $PATH_TMP/vboxnetflt/Makefile
++    sed -e "s;-DVBOX_WITH_HARDENING;;g" \
++        -e "s;VBOX_WITH_HARDENING;;g" \
++	    < $PATH_VBOXNET/linux/Makefile > $PATH_TMP/vboxnetflt/Makefile
+ fi
+ 
+ # vboxnetadp (VirtualBox network adapter kernel module)
+@@ -183,7 +186,9 @@
+ if [ -n "$VBOX_WITH_HARDENING" ]; then
+     cat                                   $PATH_VBOXADP/linux/Makefile > $PATH_TMP/vboxnetadp/Makefile
+ else
+-    sed -e "s;-DVBOX_WITH_HARDENING;;g" < $PATH_VBOXADP/linux/Makefile > $PATH_TMP/vboxnetadp/Makefile
++    sed -e "s;-DVBOX_WITH_HARDENING;;g" \
++        -e "s;VBOX_WITH_HARDENING;;g" \
++	    < $PATH_VBOXADP/linux/Makefile > $PATH_TMP/vboxnetadp/Makefile
+ fi
+ 
+ # vboxpci (VirtualBox host PCI access kernel module)
+@@ -194,7 +199,9 @@
+ if [ -n "$VBOX_WITH_HARDENING" ]; then
+     cat                                   $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile
+ else
+-    sed -e "s;-DVBOX_WITH_HARDENING;;g" < $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile
++    sed -e "s;-DVBOX_WITH_HARDENING;;g" \
++        -e "s;VBOX_WITH_HARDENING;;g" \
++	    < $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile
+ fi
+ 
+ install -D -m 0644 $PATH_LINUX/Makefile $PATH_TMP/Makefile