From: Jan Palus <atler@pld-linux.org>
Date: Sat, 18 May 2019 20:36:11 +0000 (+0200)
Subject: up to 6.0.8
X-Git-Tag: auto/th/VirtualBox-6.0.8-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2FVirtualBox.git;a=commitdiff_plain;h=e08a3b3fbadda8d1e450937fd4eccdff5829baae

up to 6.0.8

- disabling hardening appears to be fixed with https://www.virtualbox.org/ticket/18621
---

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 3145e60..552a3ef 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -42,19 +42,19 @@ exit 1
 
 %define		qtver	5.6.0
 
-%define		rel		2
+%define		rel		1
 %define		pname		VirtualBox
 Summary:	VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):	VirtualBox - wirtualizator sprzętu x86
 Name:		%{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:	6.0.6
+Version:	6.0.8
 Release:	%{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:	GPL v2
 Group:		Applications/Emulators
 Source0:	http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5:	1b3da9c363848c9d516e38eb61b7d1ff
+# Source0-md5:	8f703ae98002f9e11dcb29eb01f87718
 Source1:	http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5:	f7c63c2ffebc5d7ff950435d41abbfdf
+# Source1-md5:	7fab0b92e88b57c19bcc9aa081de245f
 Source2:	vboxservice.init
 Source3:	vboxservice.service
 Source4:	vboxservice.sysconfig
@@ -83,7 +83,6 @@ 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}
@@ -562,7 +561,6 @@ 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
deleted file mode 100644
index f294be1..0000000
--- a/disable-hardening.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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