attempt at fixing "EFLAGS.AC is clear!"; rel 4

see https://www.virtualbox.org/ticket/19305

diff --git a/VirtualBox.spec b/VirtualBox.spec
index b2708381def780eb831109ca831e565989909c3e..378c9591dc4fda40c257e2d793deb0e5d4c81764 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -47,7 +47,7 @@ exit 1
 
 %define                qtver   5.6.0
 
-%define                rel             3
+%define                rel             4
 %define                pname           VirtualBox
 Summary:       VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):     VirtualBox - wirtualizator sprzętu x86
@@ -87,6 +87,7 @@ Patch14:      %{pname}-multipython.patch
 Patch15:       %{pname}-lightdm-1.19.2.patch
 Patch16:       %{pname}-no-vboxvideo.patch
 Patch17:       qt5-gl.patch
+Patch18:       eflags.ac.patch
 URL:           http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
@@ -548,6 +549,7 @@ echo override vboxguest %{_kernel_ver} misc > kernel/installed/etc/depmod.d/%{_k
 %patch15 -p0
 %patch16 -p0
 %patch17 -p1
+%patch18 -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/eflags.ac.patch b/eflags.ac.patch
new file mode 100644 (file)
index 0000000..3a46115
--- /dev/null
+++ b/eflags.ac.patch
@@ -0,0 +1,13 @@
+--- VirtualBox-6.1.2/src/VBox/HostDrivers/linux/export_modules.sh.orig 2020-02-14 01:33:04.739918751 +0100
++++ VirtualBox-6.1.2/src/VBox/HostDrivers/linux/export_modules.sh      2020-02-14 01:33:35.779769111 +0100
+@@ -173,8 +173,8 @@
+         < $PATH_VBOXDRV/linux/Makefile > $PATH_TMP/vboxdrv/Makefile
+ else
+     sed -e "s;VBOX_WITH_HARDENING;;g" \
+-        -e "s;VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV;;g" \
+-        -e "s;IPRT_WITH_EFLAGS_AC_PRESERVING;;g" \
++        -e "s;VBOX_WITHOUT_EFLAGS_AC_SET_IN_VBOXDRV;;g" \
++        -e "s;IPRT_WITHOUT_EFLAGS_AC_PRESERVING;;g" \
+         < $PATH_VBOXDRV/linux/Makefile > $PATH_TMP/vboxdrv/Makefile
+ fi
+